Fix up crashes on file loads from Dropbox & Google Drive

Author: niftynei

app/src/main/java/com/zulip/android/activities/ZulipActivity.java

@@ -619,7 +619,7 @@ public void onRequestPermissionsResult(int requestCode,
 
     /**
      * Helper function to update UI to indicate image is being uploaded and call
-     * {@link ZulipActivity#uploadFile(String)} to upload the image.
+     * {@link ZulipActivity#uploadFile(File)} to upload the image.
      */
     private void startFileUpload() {
         // Update UI to indicate image is being loaded
@@ -629,20 +629,33 @@ private void startFileUpload() {
         String loadingMsg = getResources().getString(R.string.uploading_message);
         sendingMessage(true, loadingMsg);
 
-        // get actual file path
-        String imageFilePath = FilePathHelper.getPath(this, mImageUri);
+        File file = null;
+        if (FilePathHelper.isLegacy(mImageUri)) {
+            file = FilePathHelper.getTempFileFromContentUri(this, mImageUri);
+        } else {
+            // get actual file path
+            String imageFilePath = FilePathHelper.getPath(this, mImageUri);
+            if (imageFilePath != null) {
+                file = new File(imageFilePath);
+            } else if ("content".equalsIgnoreCase(mImageUri.getScheme())) {
+                file = FilePathHelper.getTempFileFromContentUri(this, mImageUri);
+            }
+        }
 
+        if (file == null) {
+            Toast.makeText(this, R.string.invalid_image, Toast.LENGTH_SHORT).show();
+            return;
+        }
         // upload the file asynchronously to the server
-        uploadFile(imageFilePath);
+        uploadFile(file);
     }
 
     /**
      * Function to upload file asynchronously to the server using retrofit callback
      * upload {@link com.zulip.android.service.ZulipServices#upload(MultipartBody.Part)}
-     * @param filePath on local storage
+     * @param file on local storage
      */
-    private void uploadFile(String filePath) {
-        File file = new File(filePath);
+    private void uploadFile(File file) {
 
         // create RequestBody instance from file
         RequestBody requestFile =

app/src/main/java/com/zulip/android/util/FilePathHelper.java

@@ -8,6 +8,14 @@
 import android.os.Environment;
 import android.provider.DocumentsContract;
 import android.provider.MediaStore;
+import android.widget.Toast;
+
+import com.zulip.android.R;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * This class helps to find the actual file path from a given content Uri
@@ -63,6 +71,9 @@ else if (isMediaDocument(uri)) {
                 return getDataColumn(context, contentUri, selection, selectionArgs);
             }
         }
+        else if (isLegacy(uri)) {
+            return null;
+        }
         // MediaStore (and general)
         else if ("content".equalsIgnoreCase(uri.getScheme())) {
             return getDataColumn(context, uri, null, null);
@@ -101,6 +112,9 @@ private static String getDataColumn(Context context, Uri uri, String selection,
                 final int column_index = cursor.getColumnIndexOrThrow(column);
                 return cursor.getString(column_index);
             }
+        } catch (IllegalArgumentException ex) {
+            // there was no _data column for this content thing a ma bob
+            return null;
         } finally {
             if (cursor != null)
                 cursor.close();
@@ -132,4 +146,48 @@ private static boolean isDownloadsDocument(Uri uri) {
     private static boolean isMediaDocument(Uri uri) {
         return "com.android.providers.media.documents".equals(uri.getAuthority());
     }
+
+    /**
+     * @param uri The Uri to check.
+     * @return Whether the Uri authority is a legacy uri
+     */
+    public static boolean isLegacy(Uri uri) {
+        return "com.google.android.apps.docs.storage.legacy".equals(uri.getAuthority());
+    }
+
+    public static File getTempFileFromContentUri(Context context, Uri uri) {
+        InputStream is = null;
+        File tempFile = null;
+        try {
+            is = context.getContentResolver().openInputStream(uri);
+            tempFile = File.createTempFile("imgUpload", ".jpg");
+            tempFile.deleteOnExit();
+            FileOutputStream out = new FileOutputStream(tempFile);
+            try {
+                byte[] buffer = new byte[4 * 1024];
+                int read;
+                while ((read = is.read(buffer)) != -1) {
+                    out.write(buffer, 0, read);
+                }
+                out.flush();
+            } finally {
+                try {
+                    out.close();
+                } catch (IOException e) {
+                    // ignore
+                }
+            }
+        } catch (IOException e) {
+            return null;
+        } finally {
+            if (is != null) {
+                try {
+                    is.close();
+                } catch (IOException e) {
+                    // ignored
+                }
+            }
+        }
+        return tempFile;
+    }
 }

app/src/main/res/values/strings.xml

@@ -93,4 +93,5 @@
     <string name="cannot_upload_image">Cannot Upload Image</string>
     <string name="cannot_find_image">Could not find the image</string>
     <string name="failed_to_upload">Failed to upload</string>
+    <string name="invalid_image">Unable to load that image</string>
 </resources>