浏览代码

simplest possible fix for #311 (#313)

Steve Liles 8 年前
父节点
当前提交
335d83d36c
共有 1 个文件被更改,包括 14 次插入13 次删除
  1. 14
    13
      ios/RNFetchBlob/RNFetchBlob.m

+ 14
- 13
ios/RNFetchBlob/RNFetchBlob.m 查看文件

300
 #pragma mark - fs.stat
300
 #pragma mark - fs.stat
301
 RCT_EXPORT_METHOD(stat:(NSString *)target callback:(RCTResponseSenderBlock) callback)
301
 RCT_EXPORT_METHOD(stat:(NSString *)target callback:(RCTResponseSenderBlock) callback)
302
 {
302
 {
303
-    
303
+
304
     [RNFetchBlobFS getPathFromUri:target completionHandler:^(NSString *path, ALAssetRepresentation *asset) {
304
     [RNFetchBlobFS getPathFromUri:target completionHandler:^(NSString *path, ALAssetRepresentation *asset) {
305
         __block NSMutableArray * result;
305
         __block NSMutableArray * result;
306
         if(path != nil)
306
         if(path != nil)
309
             BOOL exist = nil;
309
             BOOL exist = nil;
310
             BOOL isDir = nil;
310
             BOOL isDir = nil;
311
             NSError * error = nil;
311
             NSError * error = nil;
312
-            
312
+
313
             exist = [fm fileExistsAtPath:path isDirectory:&isDir];
313
             exist = [fm fileExistsAtPath:path isDirectory:&isDir];
314
             if(exist == NO) {
314
             if(exist == NO) {
315
                 callback(@[[NSString stringWithFormat:@"failed to stat path `%@` for it is not exist or it is not exist", path]]);
315
                 callback(@[[NSString stringWithFormat:@"failed to stat path `%@` for it is not exist or it is not exist", path]]);
316
                 return ;
316
                 return ;
317
             }
317
             }
318
             result = [RNFetchBlobFS stat:path error:&error];
318
             result = [RNFetchBlobFS stat:path error:&error];
319
-            
319
+
320
             if(error == nil)
320
             if(error == nil)
321
                 callback(@[[NSNull null], result]);
321
                 callback(@[[NSNull null], result]);
322
             else
322
             else
375
 #pragma mark - fs.cp
375
 #pragma mark - fs.cp
376
 RCT_EXPORT_METHOD(cp:(NSString*)src toPath:(NSString *)dest callback:(RCTResponseSenderBlock) callback)
376
 RCT_EXPORT_METHOD(cp:(NSString*)src toPath:(NSString *)dest callback:(RCTResponseSenderBlock) callback)
377
 {
377
 {
378
-    
378
+
379
 //    path = [RNFetchBlobFS getPathOfAsset:path];
379
 //    path = [RNFetchBlobFS getPathOfAsset:path];
380
     [RNFetchBlobFS getPathFromUri:src completionHandler:^(NSString *path, ALAssetRepresentation *asset) {
380
     [RNFetchBlobFS getPathFromUri:src completionHandler:^(NSString *path, ALAssetRepresentation *asset) {
381
         NSError * error = nil;
381
         NSError * error = nil;
387
         else
387
         else
388
         {
388
         {
389
             BOOL result = [[NSFileManager defaultManager] copyItemAtURL:[NSURL fileURLWithPath:path] toURL:[NSURL fileURLWithPath:dest] error:&error];
389
             BOOL result = [[NSFileManager defaultManager] copyItemAtURL:[NSURL fileURLWithPath:path] toURL:[NSURL fileURLWithPath:dest] error:&error];
390
-            
390
+
391
             if(error == nil)
391
             if(error == nil)
392
                 callback(@[[NSNull null], @YES]);
392
                 callback(@[[NSNull null], @YES]);
393
             else
393
             else
394
                 callback(@[[error localizedDescription], @NO]);
394
                 callback(@[[error localizedDescription], @NO]);
395
         }
395
         }
396
     }];
396
     }];
397
-    
397
+
398
 }
398
 }
399
 
399
 
400
 
400
 
456
         else
456
         else
457
             bufferSize = 4096;
457
             bufferSize = 4096;
458
     }
458
     }
459
-    
459
+
460
     dispatch_async(fsQueue, ^{
460
     dispatch_async(fsQueue, ^{
461
         [RNFetchBlobFS readStream:path encoding:encoding bufferSize:bufferSize tick:tick streamId:streamId bridgeRef:_bridge];
461
         [RNFetchBlobFS readStream:path encoding:encoding bufferSize:bufferSize tick:tick streamId:streamId bridgeRef:_bridge];
462
     });
462
     });
482
 #pragma mark - net.enableProgressReport
482
 #pragma mark - net.enableProgressReport
483
 RCT_EXPORT_METHOD(enableProgressReport:(NSString *)taskId interval:(nonnull NSNumber*)interval count:(nonnull NSNumber*)count)
483
 RCT_EXPORT_METHOD(enableProgressReport:(NSString *)taskId interval:(nonnull NSNumber*)interval count:(nonnull NSNumber*)count)
484
 {
484
 {
485
-    
485
+
486
     RNFetchBlobProgress * cfg = [[RNFetchBlobProgress alloc] initWithType:Download interval:interval count:count];
486
     RNFetchBlobProgress * cfg = [[RNFetchBlobProgress alloc] initWithType:Download interval:interval count:count];
487
     [RNFetchBlobNetwork enableProgressReport:taskId config:cfg];
487
     [RNFetchBlobNetwork enableProgressReport:taskId config:cfg];
488
 }
488
 }
509
     UIViewController *rootCtrl = [[[[UIApplication sharedApplication] delegate] window] rootViewController];
509
     UIViewController *rootCtrl = [[[[UIApplication sharedApplication] delegate] window] rootViewController];
510
     documentController.delegate = self;
510
     documentController.delegate = self;
511
     if(scheme == nil || [[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:scheme]]) {
511
     if(scheme == nil || [[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:scheme]]) {
512
-        dispatch_sync(dispatch_get_main_queue(), ^{
513
-            [documentController  presentOptionsMenuFromRect:rootCtrl.view.bounds inView:rootCtrl.view animated:YES];
514
-        });
512
+      CGRect rect = CGRectMake(0.0, 0.0, 0.0, 0.0);
513
+      dispatch_sync(dispatch_get_main_queue(), ^{
514
+          [documentController  presentOptionsMenuFromRect:rect inView:rootCtrl.view animated:YES];
515
+      });
515
         resolve(@[[NSNull null]]);
516
         resolve(@[[NSNull null]]);
516
     } else {
517
     } else {
517
         reject(@"RNFetchBlob could not open document", @"scheme is not supported", nil);
518
         reject(@"RNFetchBlob could not open document", @"scheme is not supported", nil);
527
     // NSURL * url = [[NSURL alloc] initWithString:uri];
528
     // NSURL * url = [[NSURL alloc] initWithString:uri];
528
     documentController = [UIDocumentInteractionController interactionControllerWithURL:url];
529
     documentController = [UIDocumentInteractionController interactionControllerWithURL:url];
529
     documentController.delegate = self;
530
     documentController.delegate = self;
530
-    
531
+
531
     if(scheme == nil || [[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:scheme]]) {
532
     if(scheme == nil || [[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:scheme]]) {
532
         dispatch_sync(dispatch_get_main_queue(), ^{
533
         dispatch_sync(dispatch_get_main_queue(), ^{
533
             [documentController presentPreviewAnimated:YES];
534
             [documentController presentPreviewAnimated:YES];
550
     } else {
551
     } else {
551
         reject(@"RNFetchBlob could not open document", [error description], nil);
552
         reject(@"RNFetchBlob could not open document", [error description], nil);
552
     }
553
     }
553
-    
554
+
554
 }
555
 }
555
 
556
 
556
 
557