Fix receiving files

patrykcoding · May 1, 2018 · f19cb3a · f19cb3a
1 parent e5e2626
commit f19cb3a
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/app/src/main/java/ca/pkay/rcloneexplorer/SharingActivity.java b/app/src/main/java/ca/pkay/rcloneexplorer/SharingActivity.java
@@ -244,14 +244,21 @@ private class CopyFile extends AsyncTask<Void, Void, Boolean> {
         @Override
         protected Boolean doInBackground(Void... voids) {
             for (Uri uri : uris) {
-                Cursor returnCursor = getContentResolver().query(uri, null, null, null, null);
-                if (returnCursor == null) {
-                    return false;
+                String fileName;
+                if (uri.getScheme().equals("content")) {
+                    Cursor returnCursor = getContentResolver().query(uri, null, null, null, null);
+                    if (returnCursor == null) {
+                        return false;
+                    }
+                    int nameIndex = returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
+                    returnCursor.moveToFirst();
+                    fileName = returnCursor.getString(nameIndex);
+                    returnCursor.close();
+                } else {
+                    fileName = uri.getPath();
+                    int index = fileName.lastIndexOf("/");
+                    fileName = fileName.substring(index + 1);
                 }
-                int nameIndex = returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
-                returnCursor.moveToFirst();
-                String fileName = returnCursor.getString(nameIndex);
-                returnCursor.close();
 
                 File cacheDir = getExternalCacheDir();
                 InputStream inputStream;