@nativescript-community/ui-document-picker 1.1.5 → 1.1.9

package/index.d.ts

@@ -0,0 +1,5 @@
+import { FilePickerOptions, FolderPickerOptions } from './index.common';
+
+export { FilePickerOptions, FolderPickerOptions };
+export function openFilePicker(params?: FilePickerOptions): Promise<{ files: string[]; ios?; android? }>;
+export function pickFolder(params?: FolderPickerOptions): Promise<{ folders: string[]; ios?; android? }>;

package/index.ios.d.ts

@@ -0,0 +1,7 @@
+import { FolderPickerOptions } from '.';
+import { FilePickerOptions } from './index.common';
+export { FilePickerOptions };
+export declare function openFilePicker(params: FilePickerOptions): Promise<unknown>;
+export declare function pickFolder(params?: FolderPickerOptions): Promise<{
+    folders: any[];
+}>;

package/{filepicker.ios.js → index.ios.js}

@@ -14,11 +14,12 @@ var DocumentPickerDelegate = /** @class */ (function (_super) {
         this._resolve = null;
         this._reject = null;
         controller.delegate = null;
+        delegate = null;
     };
     DocumentPickerDelegate.prototype.documentPickerDidPickDocumentAtURL = function (controller, url) {
         this._resolve({
             files: [url.absoluteString],
-            ios: url,
+            ios: url
         });
         this.cleanup(controller);
     };
@@ -29,25 +30,25 @@ var DocumentPickerDelegate = /** @class */ (function (_super) {
         }
         this._resolve({
             files: output,
-            ios: urls,
+            ios: urls
         });
         this.cleanup(controller);
     };
     DocumentPickerDelegate.prototype.documentPickerWasCancelled = function (controller) {
         this._resolve({
-            files: [],
+            files: []
         });
         this.cleanup(controller);
     };
     DocumentPickerDelegate.ObjCProtocols = [UIDocumentPickerDelegate];
     return DocumentPickerDelegate;
 }(NSObject));
+let delegate;
 export function openFilePicker(params) {
     let documentTypes;
     if (params.extensions && params.extensions.length > 0) {
         documentTypes = Utils.ios.collections.jsArrayToNSArray(params.extensions);
     }
-    let delegate;
     return new Promise((resolve, reject) => {
         const controller = UIDocumentPickerViewController.alloc().initWithDocumentTypesInMode(documentTypes, params.pickerMode !== undefined ? params.pickerMode : 0);
         delegate = DocumentPickerDelegate.initWithResolveReject(resolve, reject);
@@ -59,4 +60,9 @@ export function openFilePicker(params) {
         visibleVC.presentViewControllerAnimatedCompletion(controller, true, null);
     });
 }
-//# sourceMappingURL=filepicker.ios.js.map
+export async function pickFolder(params = {}) {
+    return {
+        folders: []
+    };
+}
+//# sourceMappingURL=index.ios.js.map

package/index.ios.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.ios.js","sourceRoot":"../src/","sources":["index.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAuD3C,IAAI,QAAQ,CAAC;AACb,MAAM,UAAU,cAAc,CAAC,MAAyB;IAEpD,IAAI,aAAa,CAAC;IAElB,IAAI,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;QACnD,aAAa,GAAG,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,gBAAgB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;KAC7E;IAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,MAAM,UAAU,GAAG,8BAA8B,CAAC,KAAK,EAAE,CAAC,2BAA2B,CACjF,aAAa,EACb,MAAM,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,EAA4B,CACpF,CAAC;QACF,QAAQ,GAAG,sBAAsB,CAAC,qBAAqB,CAAC,OAAO,EAAE,MAAM,CAAQ,CAAC;QAChF,UAAU,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAG/B,UAAU,CAAC,uBAAuB,GAAG,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC;QAIhE,MAAM,GAAG,GAAG,aAAa,CAAC,iBAAiB,CAAC;QAC5C,MAAM,MAAM,GAAG,GAAG,CAAC,SAAS,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,GAAG,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1E,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,wBAAwB,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;QAChF,SAAS,CAAC,uCAAuC,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC9E,CAAC,CAAC,CAAC;AACP,CAAC;AACD,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,SAA8B,EAAE;IAC7D,OAAO;QACH,OAAO,EAAE,EAAE;KACd,CAAC;AACN,CAAC"}

package/package.json

@@ -1,35 +1,42 @@
 {
-  "name": "@nativescript-community/ui-document-picker",
-  "version": "1.1.5",
-  "description": "File Picker",
-  "main": "./filepicker",
-  "typings": "./filepicker.d.ts",
-  "sideEffects": false,
-  "nativescript": {
-    "platforms": {
-      "android": "3.0.0",
-      "ios": "3.0.0"
-    }
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/nativescript-community/ui-document-picker.git"
-  },
-  "keywords": [
-    "ecosystem:NativeScript",
-    "NativeScript"
-  ],
-  "author": {
-    "name": "Martin Guillon",
-    "email": "martin.guillon@akyasl.fr"
-  },
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/nativescript-community/ui-document-picker/issues"
-  },
-  "homepage": "https://github.com/nativescript-community/ui-document-picker",
-  "dependencies": {
-    "@nativescript-community/perms": "^2.1.0"
-  },
-  "gitHead": "3a1d3d36d049aff05ca966aff9d8cc8d33d922bd"
+    "name": "@nativescript-community/ui-document-picker",
+    "version": "1.1.9",
+    "description": "A NativeScript plugin that allows you to select files from the device.",
+    "main": "index",
+    "typings": "index.d.ts",
+    "sideEffects": false,
+    "scripts": {
+        "build": "npm run tsc && npm run readme",
+        "readme": "../../node_modules/.bin/readme generate -c ../../tools/readme/blueprint.json",
+        "tsc": "../../node_modules/.bin/cpy '**/*.d.ts' '../../packages/ui-document-picker' --parents --cwd=../../src/ui-document-picker && ../../node_modules/.bin/tsc -skipLibCheck -d",
+        "clean": "../../node_modules/.bin/rimraf ./*.d.ts ./*.js ./*.js.map"
+    },
+    "nativescript": {
+        "platforms": {
+            "android": "6.0.0",
+            "ios": "6.0.0"
+        }
+    },
+    "keywords": [
+        "NativeScript",
+        "JavaScript",
+        "Android",
+        "iOS",
+        "vue",
+        "vue.js"
+    ],
+    "author": {
+        "name": "Martin Guillon",
+        "email": "martin@akylas.fr"
+    },
+    "bugs": {
+        "url": "https://github.com/nativescript-community/ui-document-picker/issues"
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/nativescript-community/ui-document-picker"
+    },
+    "license": "Apache-2.0",
+    "readmeFilename": "README.md",
+    "gitHead": "1fce752aa083808c2949ae602a81122724fddd0a"
 }

package/platforms/android/AndroidManifest.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+</manifest>

package/platforms/android/include.gradle

@@ -0,0 +1,5 @@
+dependencies {
+    def storageVersion =  project.hasProperty("storageVersion") ? project.storageVersion : "0.13.0"
+    implementation "com.anggrayudi:storage:$storageVersion"
+
+}

package/platforms/android/java/com/nativescript/documentpicker/FilePath.java

@@ -4,7 +4,6 @@ import android.text.TextUtils;
 import android.Manifest;
 import android.content.ContentUris;
 import android.content.Context;
-import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.provider.OpenableColumns;
 import android.util.Log;
@@ -14,10 +13,6 @@ import android.os.Environment;
 import android.provider.DocumentsContract;
 import android.provider.MediaStore;
 
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.json.JSONException;
-
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.util.List;
@@ -39,32 +34,6 @@ public class FilePath {
     public static final String READ = Manifest.permission.READ_EXTERNAL_STORAGE;
 
 
-
-    // public static String resolveNativePath() throws JSONException {
-    //     /* content:///... */
-    //     Uri pvUrl = Uri.parse(this.uriStr);
-
-    //     Log.d(TAG, "URI: " + this.uriStr);
-
-    //     Context appContext = this.cordova.getActivity().getApplicationContext();
-    //     String filePath = getPath(appContext, pvUrl);
-
-    //     //check result; send error/success callback
-    //     if (filePath == GET_PATH_ERROR_ID) {
-
-    //         throw new java.lang.Exception("Unable to resolve filesystem path");
-    //     }
-    //     else if (filePath.equals(GET_CLOUD_PATH_ERROR_ID)) {
-
-    //         throw new java.lang.Exception("Files from cloud cannot be resolved to filesystem, download is required");
-    //     }
-    //     else {
-    //         Log.d(TAG, "Filepath: " + filePath);
-
-    //         return "file://" + filePath;
-    //     }
-    // }
-
     /**
      * @param uri The Uri to check.
      * @return Whether the Uri authority is ExternalStorageProvider.
@@ -131,6 +100,39 @@ public class FilePath {
             if (cursor != null && cursor.moveToFirst()) {
                 final int column_index = cursor.getColumnIndexOrThrow(column);
                 return cursor.getString(column_index);
+            } else if (!cursor.moveToFirst()){
+                return getMediaStore(context, uri, null, null);
+            }
+        } finally {
+            if (cursor != null)
+                cursor.close();
+        }
+        return null;
+    }
+
+    /**
+     * Get the value of the data column for this Uri. This is useful for
+     * MediaStore Uris, and other file-based ContentProviders.
+     *
+     * @param context The context.
+     * @param uri The Uri to query.
+     * @param selection (Optional) Filter used in the query.
+     * @param selectionArgs (Optional) Selection arguments used in the query.
+     * @return The value of the _data column, which is typically a file path.
+     */
+    private static String getMediaStore(Context context, Uri uri, String selection,
+                                        String[] selectionArgs) {
+
+        Cursor cursor = null;
+        final String[] projection = {
+                android.provider.MediaStore.Files.FileColumns.DISPLAY_NAME
+        };
+        try {
+            cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs,
+                    null);
+            if (cursor != null && cursor.moveToFirst()) {
+                final int column_index = cursor.getColumnIndexOrThrow(android.provider.MediaStore.Files.FileColumns.DISPLAY_NAME);
+                return cursor.getString(column_index);
             }
         } finally {
             if (cursor != null)
@@ -207,6 +209,11 @@ public class FilePath {
             return fullPath;
         }
 
+        fullPath = "/storage/" + type + relativePath;
+        if (fileExists(fullPath)) {
+            return fullPath;
+        }
+
         return fullPath;
     }
 
@@ -225,6 +232,7 @@ public class FilePath {
 
         Log.d(TAG, "File - " +
                 "Authority: " + uri.getAuthority() +
+                ", Path: " + uri.getPath() +
                 ", Fragment: " + uri.getFragment() +
                 ", Port: " + uri.getPort() +
                 ", Query: " + uri.getQuery() +
@@ -237,6 +245,7 @@ public class FilePath {
 
         // DocumentProvider
         if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) {
+
             // ExternalStorageProvider
             if (isExternalStorageDocument(uri)) {
                 final String docId = DocumentsContract.getDocumentId(uri);
@@ -259,20 +268,23 @@ public class FilePath {
                     cursor = context.getContentResolver().query(uri, new String[]{MediaStore.MediaColumns.DISPLAY_NAME}, null, null, null);
                     if (cursor != null && cursor.moveToFirst()) {
                         String fileName = cursor.getString(0);
-                        String path = Environment.getExternalStorageDirectory().toString() + "/Download/" + fileName;
+                        String folders = android.os.Environment.getExternalStoragePublicDirectory(
+                        android.os.Environment.DIRECTORY_DOWNLOADS
+                        ).getAbsolutePath();
+                        String path = folders + "/" + fileName;
                         if (!TextUtils.isEmpty(path)) {
                             return path;
                         }
                     }
                 } finally {
                     if (cursor != null)
-                    cursor.close();
+                        cursor.close();
                 }
                 //
                 final String id = DocumentsContract.getDocumentId(uri);
                 try {
                     final Uri contentUri = ContentUris.withAppendedId(
-                        Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
+                            Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
 
                     return getDataColumn(context, contentUri, null, null);
                 } catch(NumberFormatException e) {
@@ -282,10 +294,12 @@ public class FilePath {
             }
             // MediaProvider
             else if (isMediaDocument(uri)) {
+
                 final String docId = DocumentsContract.getDocumentId(uri);
                 final String[] split = docId.split(":");
                 final String type = split[0];
 
+                Log.i(TAG, type);
                 Uri contentUri = null;
                 if ("image".equals(type)) {
                     contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
@@ -293,6 +307,8 @@ public class FilePath {
                     contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
                 } else if ("audio".equals(type)) {
                     contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
+                } else {
+                    contentUri = MediaStore.Files.getContentUri("external");
                 }
 
                 final String selection = "_id=?";
@@ -300,7 +316,11 @@ public class FilePath {
                         split[1]
                 };
 
-                return getDataColumn(context, contentUri, selection, selectionArgs);
+                try {
+                    return getDataColumn(context, contentUri, selection, selectionArgs);
+                } catch (Exception e) {
+                    return getMediaStore(context, contentUri, null, null);
+                }
             }
             else if(isGoogleDriveUri(uri)){
                 return getDriveFilePath(uri,context);
@@ -308,7 +328,6 @@ public class FilePath {
         }
         // MediaStore (and general)
         else if ("content".equalsIgnoreCase(uri.getScheme())) {
-
             // Return the remote address
             if (isGooglePhotosUri(uri)) {
                 String contentPath = getContentFromSegments(uri.getPathSegments());
@@ -321,10 +340,15 @@ public class FilePath {
             }
 
             if(isGoogleDriveUri(uri)){
+                Log.i(TAG, "4");
                 return getDriveFilePath(uri,context);
             }
 
-            return getDataColumn(context, uri, null, null);
+            try {
+                return getDataColumn(context, uri, null, null);
+            } catch (Exception ex) {
+                return getMediaStore(context, uri, null, null);
+            }
         }
         // File
         else if ("file".equalsIgnoreCase(uri.getScheme())) {
@@ -338,10 +362,10 @@ public class FilePath {
         Uri returnUri =uri;
         Cursor returnCursor = context.getContentResolver().query(returnUri, null, null, null, null);
         /*
-        * Get the column indexes of the data in the Cursor,
-        *     * move to the first row in the Cursor, get the data,
-        *     * and display it.
-        * */
+         * Get the column indexes of the data in the Cursor,
+         *     * move to the first row in the Cursor, get the data,
+         *     * and display it.
+         * */
         int nameIndex = returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
         int sizeIndex = returnCursor.getColumnIndex(OpenableColumns.SIZE);
         returnCursor.moveToFirst();

package/references.d.ts

@@ -0,0 +1 @@
+/// <reference path="./typings/android.d.ts" />