downloader: add missing resolve when iOS cancels picker copy

code cleanup

Author: drangelod

packages/nativescript-downloader/index.android.ts

@@ -56,8 +56,6 @@ export class Downloader extends DownloaderCommon {
         //       android.permission.DOWNLOAD_WITHOUT_NOTIFICATION
         req.setNotificationVisibility(notification ? android.app.DownloadManager.Request.VISIBILITY_VISIBLE : android.app.DownloadManager.Request.VISIBILITY_HIDDEN);
 
-        // req.allowScanningByMediaScanner();//deprecated, files saved outside app directory will be scanned automatically
-
         //if we don't set the title, the server may provide a valid filename, or it may provide the url with whatever querystring it has
         req.setDescription(destinationFilename);
         req.setTitle(destinationFilename);
@@ -117,7 +115,7 @@ export class Downloader extends DownloaderCommon {
                 if (fdelete.delete()) {
                   // console.log('file Deleted :' + uri.getPath());
                 } else {
-                  // console.log('file not Deleted :' + uri.getPath());
+                  // console.warn('file not Deleted :' + uri.getPath());
                 }
               }
 
@@ -215,6 +213,7 @@ export class Downloader extends DownloaderCommon {
                 outputStream.close();
               }
             }
+
             //return the user-accessible downloaded file path to user
             const downloadedFile = File.fromPath(outputpath);
             emit(DownloaderCommon.DOWNLOAD_COMPLETE, { filepath: outputpath });
@@ -335,7 +334,7 @@ function getActivity(): android.app.Activity {
   return Application.android.foregroundActivity || Application.android.startActivity;
 }
 
-// Not sure why DocumentsContact is not defined in Android types yet?
+// Not sure why DocumentsContact is not defined in NS Android types yet?
 type ProviderWithDocumentsContact = typeof android.provider & {
   DocumentsContract: any;
 };

packages/nativescript-downloader/index.ios.ts

@@ -89,10 +89,8 @@ export class Downloader extends DownloaderCommon {
               if (!this.handle.seekToEndReturningOffsetError(written)) {
                 emit(DownloaderCommon.DOWNLOAD_ERROR, { error: 'Error seeking end of file' });
                 return reject();
-                // throw new Error('Error seeking end of file');
               }
               if (!this.handle.writeDataError(data)) {
-                // throw new Error('Error writing data');
                 emit(DownloaderCommon.DOWNLOAD_ERROR, { error: 'Error writing data' });
                 return reject();
               }
@@ -219,14 +217,13 @@ export class Downloader extends DownloaderCommon {
                       PHAssetChangeRequest.creationRequestForAssetFromVideoAtFileURL(iosurl);
                     } else if (isImage) {
                       PHAssetChangeRequest.creationRequestForAssetFromImageAtFileURL(iosurl);
-                    }
-                    // else console.log('neither a video or image, not saving to gallery');
+                    } else console.warn('not a recognized video or image file extension, not saving to gallery');
                   },
                   (success, err) => {
                     if (success) {
                       // console.log('success');
                     } else {
-                      // console.log('failed');
+                      console.warn('Unable to copy into Photos gallery', err);
                     }
                     resolve(downloadedFile);
                   }
@@ -298,7 +295,7 @@ class UIDocumentPickerDelegateImpl extends NSObject implements UIDocumentPickerD
     return this._owner.get();
   }
 
-  //this shouldn't be called, but we'll have the same handler code just in case
+  //for a directory picker, this should never be called, but we'll include the code anyway
   documentPickerDidPickDocumentAtURL(controller: UIDocumentPickerViewController, url: NSURL): void {
     const access = url.startAccessingSecurityScopedResource();
     let copypath = url.path + '/' + this._downloadFilename;
@@ -314,20 +311,16 @@ class UIDocumentPickerDelegateImpl extends NSObject implements UIDocumentPickerD
         if (!NSFileManager.defaultManager.fileExistsAtPath(copypath)) break;
       }
     }
-    const suc = NSFileManager.defaultManager.copyItemAtPathToPathError(this._downloadPath, copypath);
+    NSFileManager.defaultManager.copyItemAtPathToPathError(this._downloadPath, copypath);
     if (access) url.stopAccessingSecurityScopedResource();
     const downloadedFile = File.fromPath(this._downloadPath);
     this._resolve(downloadedFile);
     controller.dismissViewControllerAnimatedCompletion(true, null);
     this.deRegisterFromGlobal();
   }
 
-  //if multiple selections allowed:
   documentPickerDidPickDocumentsAtURLs(controller: UIDocumentPickerViewController, urls: NSArray<NSURL>): void {
-    const files: File[] = [];
-    //This view can't display an UIActivityIndicatorView inside it using the usual ios spinner approach,
-    //    but picker shows a small spinner on the "Open" button while processing
-    //Process picker results
+    //we should only get one folder, but will loop through just in case and just return the first one as destination
     for (let i = 0; i < urls.count; i++) {
       const url = urls.objectAtIndex(i); //urls[0];
       const access = url.startAccessingSecurityScopedResource();
@@ -337,15 +330,14 @@ class UIDocumentPickerDelegateImpl extends NSObject implements UIDocumentPickerD
         const fileName = fileParts[fileParts.length - 1];
         const filePrefix = fileName.split('.', 2).length > 0 ? fileName.split('.', 2)[0] : null;
         const fileSuffix = fileName.split('.', 2).length > 0 ? '.' + fileName.split('.', 2)[1] : null;
-        // let tempFileName = 'dl-' + generateId() + fileSuffix;
         let tempFileName;
         for (let i = 1; i < 999999999; i++) {
           tempFileName = filePrefix + '-' + i + fileSuffix;
           copypath = copypath.replace(/\/[^/]+$/, `/${tempFileName}`);
           if (!NSFileManager.defaultManager.fileExistsAtPath(copypath)) break;
         }
       }
-      const suc = NSFileManager.defaultManager.copyItemAtPathToPathError(this._downloadPath, copypath);
+      NSFileManager.defaultManager.copyItemAtPathToPathError(this._downloadPath, copypath);
       if (access) url.stopAccessingSecurityScopedResource();
       const downloadedFile = File.fromPath(this._downloadPath);
       this._resolve(downloadedFile);
@@ -357,5 +349,8 @@ class UIDocumentPickerDelegateImpl extends NSObject implements UIDocumentPickerD
   documentPickerWasCancelled(controller: UIDocumentPickerViewController): void {
     controller.dismissViewControllerAnimatedCompletion(true, null);
     this.deRegisterFromGlobal();
+    //user canceled the extra copy, just resolve the downloaded file
+    const downloadedFile = File.fromPath(this._downloadPath);
+    this._resolve(downloadedFile);
   }
 }