Fix issue #9

HBiSoft · Dec 9, 2019 · 09a0a43 · 09a0a43
1 parent 9f5a8a2
commit 09a0a43
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/pickit/src/main/java/com/hbisoft/pickit/DownloadAsyncTask.java b/pickit/src/main/java/com/hbisoft/pickit/DownloadAsyncTask.java
@@ -67,8 +67,14 @@ protected String doInBackground(Uri... params) {
         try {
             try {
                 if (returnCursor != null && returnCursor.moveToFirst()){
-                    int sizeIndex = returnCursor.getColumnIndex(OpenableColumns.SIZE);
-                    size = (int) returnCursor.getLong(sizeIndex);
+                    if (mUri.getScheme() != null)
+                    if (mUri.getScheme().equals("content")) {
+                        int sizeIndex = returnCursor.getColumnIndex(OpenableColumns.SIZE);
+                        size = (int) returnCursor.getLong(sizeIndex);
+                    }else if (mUri.getScheme().equals("file")) {
+                        File ff = new File(mUri.getPath());
+                        size = (int) ff.length();
+                    }
                 }
             }
             finally {

diff --git a/pickit/src/main/java/com/hbisoft/pickit/PickiT.java b/pickit/src/main/java/com/hbisoft/pickit/PickiT.java
@@ -52,12 +52,14 @@ public void getPath(Uri uri, int APILevel){
                     //We first check if it was called before, avoiding multiple calls
                     if (!unknownProviderCalledBefore) {
                         unknownProviderCalledBefore = true;
-                        //Then we check if the _data colomn returned null
-                        if (Utils.errorReason() != null && Utils.errorReason().equals("dataReturnedNull")) {
-                            isFromUnknownProvider = true;
-                            //Copy the file to the temporary folder
-                            downloadFile(uri, getFileName(uri));
-                            return;
+                        if (uri.getScheme() != null && uri.getScheme().equals(ContentResolver.SCHEME_CONTENT)) {
+                            //Then we check if the _data colomn returned null
+                            if (Utils.errorReason() != null && Utils.errorReason().equals("dataReturnedNull")) {
+                                isFromUnknownProvider = true;
+                                //Copy the file to the temporary folder
+                                downloadFile(uri, getFileName(uri));
+                                return;
+                            }
                         }
                     }
                     //Else an error occurred, get/set the reason for the error