Jelajahi Sumber

Merge pull request #7649 from nextcloud/ezaquarii/fix-upload-via-share-make-mtime-read-optional

Fix upload by sharing link with defensive check during mtime read
Tobias Kaminsky 4 tahun lalu
induk
melakukan
69af47857b

+ 6 - 4
src/main/java/com/owncloud/android/ui/asynctasks/CopyAndUploadContentUrisTask.java

@@ -152,9 +152,11 @@ public class CopyAndUploadContentUrisTask extends AsyncTask<Object, Void, Result
                                                                  null,
                                                                  null)) {
                     if (cursor != null && cursor.moveToFirst()) {
-                        lastModified = cursor.getLong(
-                            cursor.getColumnIndexOrThrow(
-                                DocumentsContract.Document.COLUMN_LAST_MODIFIED));
+                        // this check prevents a crash when last modification time is not available on certain phones
+                        int columnIndex = cursor.getColumnIndex(DocumentsContract.Document.COLUMN_LAST_MODIFIED);
+                        if (columnIndex >= 0) {
+                            lastModified = cursor.getLong(columnIndex);
+                        }
                     }
                 }
 
@@ -173,7 +175,7 @@ public class CopyAndUploadContentUrisTask extends AsyncTask<Object, Void, Result
                 while ((count = inputStream.read(buffer)) > 0) {
                     outputStream.write(buffer, 0, count);
                 }
- 
+
                 if (lastModified != 0) {
                     try {
                         if (!cacheFile.setLastModified(lastModified)) {