Merge pull request #14879 from nextcloud/backport/14775/stable-3.31

[stable-3.31] Handle Downloaded File Open Intent

Author: tobiasKaminsky

app/src/main/java/com/owncloud/android/datamodel/OCFile.java

@@ -23,7 +23,6 @@
 import com.nextcloud.utils.BuildHelper;
 import com.owncloud.android.R;
 import com.owncloud.android.lib.common.network.WebdavEntry;
-import com.owncloud.android.lib.common.network.WebdavUtils;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.files.model.FileLockType;
 import com.owncloud.android.lib.resources.files.model.GeoLocation;
@@ -386,36 +385,19 @@ public Uri getStorageUri() {
         return localUri;
     }
 
-
-    public Uri getLegacyExposedFileUri() {
-        if (TextUtils.isEmpty(localPath)) {
-            return null;
-        }
-
-        if (exposedFileUri == null) {
-            return Uri.parse(ContentResolver.SCHEME_FILE + "://" + WebdavUtils.encodePath(localPath));
-        }
-
-        return exposedFileUri;
-
-    }
-    /*
-        Partly disabled because not all apps understand paths that we get via this method for now
-     */
     public Uri getExposedFileUri(Context context) {
         if (TextUtils.isEmpty(localPath)) {
             return null;
         }
+
         if (exposedFileUri == null) {
             try {
                 exposedFileUri = FileProvider.getUriForFile(
                         context,
                         context.getString(R.string.file_provider_authority),
                         new File(localPath));
             } catch (IllegalArgumentException ex) {
-                // Could not share file using FileProvider URI scheme.
-                // Fall back to legacy URI parsing.
-                getLegacyExposedFileUri();
+                Log_OC.d(TAG, "Given File is outside the paths supported by the provider");
             }
         }
 

app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.kt

@@ -48,6 +48,7 @@ import javax.inject.Inject
 /**
  * Wrapper activity which will be launched if keep-in-sync file will be modified by external application.
  */
+@Suppress("Detekt.TooManyFunctions")
 class ConflictsResolveActivity : FileActivity(), OnConflictDecisionMadeListener {
     @Inject
     lateinit var uploadsStorageManager: UploadsStorageManager

app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java

@@ -81,7 +81,6 @@
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
@@ -263,89 +262,94 @@ public boolean canOpenFile(OCFile file) {
         return !launchables.isEmpty();
     }
 
+    private void openRichDocumentFileWithoutAvailableApps(@NonNull OCFile file) {
+        Account account = fileActivity.getAccount();
+        OCCapability capability = fileActivity.getStorageManager().getCapability(account.name);
+        final var richDocumentMimeTypeList = capability.getRichDocumentsMimeTypeList();
+
+        if (richDocumentMimeTypeList != null &&
+            richDocumentMimeTypeList.contains(file.getMimeType()) &&
+            capability.getRichDocumentsDirectEditing().isTrue()) {
+            openFileAsRichDocument(file, fileActivity);
+        } else {
+            DisplayUtils.showSnackMessage(fileActivity, R.string.file_list_no_app_for_file_type);
+        }
+    }
+
     public void openFile(OCFile file) {
-        if (file != null) {
-            final Intent openFileWithIntent = createOpenFileIntent(file);
+        if (file == null) {
+            Log_OC.e(TAG, "Trying to open a NULL OCFile");
+            return;
+        }
 
-            List<ResolveInfo> launchables = fileActivity.getPackageManager().
-                queryIntentActivities(openFileWithIntent, PackageManager.GET_RESOLVED_FILTER);
+        final Intent openFileWithIntent = createOpenFileIntent(file);
 
-            if (launchables.isEmpty()) {
-                Optional<User> optionalUser = fileActivity.getUser();
+        List<ResolveInfo> availableApps = fileActivity.getPackageManager().
+            queryIntentActivities(openFileWithIntent, PackageManager.GET_RESOLVED_FILTER);
 
-                if (optionalUser.isPresent() && editorUtils.isEditorAvailable(optionalUser.get(), file.getMimeType())) {
-                    openFileWithTextEditor(file, fileActivity);
-                } else {
-                    Account account = fileActivity.getAccount();
-                    OCCapability capability = fileActivity.getStorageManager().getCapability(account.name);
-                    if (capability.getRichDocumentsMimeTypeList().contains(file.getMimeType()) &&
-                        capability.getRichDocumentsDirectEditing().isTrue()) {
-                        openFileAsRichDocument(file, fileActivity);
-                        return;
-                    } else {
-                        DisplayUtils.showSnackMessage(fileActivity, R.string.file_list_no_app_for_file_type);
-                        return;
-                    }
-                }
+        if (availableApps.isEmpty()) {
+            Optional<User> optionalUser = fileActivity.getUser();
+
+            if (optionalUser.isPresent() && editorUtils.isEditorAvailable(optionalUser.get(), file.getMimeType())) {
+                openFileWithTextEditor(file, fileActivity);
+                return;
             }
 
-            fileActivity.showLoadingDialog(fileActivity.getResources().getString(R.string.sync_in_progress));
-            new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    User user = currentAccount.getUser();
-                    FileDataStorageManager storageManager =
-                        new FileDataStorageManager(user, fileActivity.getContentResolver());
-                    // a fresh object is needed; many things could have occurred to the file
-                    // since it was registered to observe again, assuming that local files
-                    // are linked to a remote file AT MOST, SOMETHING TO BE DONE;
-                    SynchronizeFileOperation sfo = new SynchronizeFileOperation(file,
-                                                                                null,
-                                                                                user,
-                                                                                true,
-                                                                                fileActivity,
-                                                                                storageManager,
-                                                                                false);
-                    RemoteOperationResult result = sfo.execute(fileActivity);
-                    fileActivity.dismissLoadingDialog();
-                    if (result.getCode() == RemoteOperationResult.ResultCode.SYNC_CONFLICT) {
-                        // ISSUE 5: if the user is not running the app (this is a service!),
-                        // this can be very intrusive; a notification should be preferred
-                        Intent intent = ConflictsResolveActivity.createIntent(file,
-                                                                              user,
-                                                                              -1,
-                                                                              Intent.FLAG_ACTIVITY_NEW_TASK,
-                                                                              fileActivity);
-                        fileActivity.startActivity(intent);
-                    } else {
-                        if (!launchables.isEmpty()) {
-                            try {
-                                if (!result.isSuccess()) {
-                                    DisplayUtils.showSnackMessage(fileActivity, R.string.file_not_synced);
-                                    try {
-                                        Thread.sleep(3000);
-                                    } catch (InterruptedException e) {
-                                        Log_OC.e(TAG, "Failed to sleep");
-                                    }
-                                }
-
-                                openFileWithIntent.setFlags(openFileWithIntent.getFlags() |
-                                                                Intent.FLAG_ACTIVITY_NEW_TASK);
-                                fileActivity.startActivity(openFileWithIntent);
-                            } catch (ActivityNotFoundException exception) {
-                                DisplayUtils.showSnackMessage(fileActivity, R.string.file_list_no_app_for_file_type);
-                            }
-                        } else {
-                            DisplayUtils.showSnackMessage(fileActivity, R.string.file_list_no_app_for_file_type);
-                        }
-                    }
+            openRichDocumentFileWithoutAvailableApps(file);
 
+            return;
+        }
+
+        fileActivity.showLoadingDialog(fileActivity.getResources().getString(R.string.sync_in_progress));
+
+        new Thread(() -> {
+            User user = currentAccount.getUser();
+            final var storageManager = new FileDataStorageManager(user, fileActivity.getContentResolver());
+            // a fresh object is needed; many things could have occurred to the file
+            // since it was registered to observe again, assuming that local files
+            // are linked to a remote file AT MOST, SOMETHING TO BE DONE;
+            final var sfo = new SynchronizeFileOperation(file,null, user, true, fileActivity, storageManager, false);
+            final var result = sfo.execute(fileActivity);
+
+            fileActivity.dismissLoadingDialog();
+            if (result.getCode() == RemoteOperationResult.ResultCode.SYNC_CONFLICT) {
+                // ISSUE 5: if the user is not running the app (this is a service!),
+                // this can be very intrusive; a notification should be preferred
+                Intent intent = ConflictsResolveActivity.createIntent(file,
+                                                                      user,
+                                                                      -1,
+                                                                      Intent.FLAG_ACTIVITY_NEW_TASK,
+                                                                      fileActivity);
+                fileActivity.startActivity(intent);
+                return;
+            }
+
+            if (availableApps.isEmpty()) {
+                fileActivity.runOnUiThread(() -> DisplayUtils.showSnackMessage(fileActivity, R.string.file_list_no_app_for_file_type));
+
+                return;
+            }
+
+            if (!result.isSuccess()) {
+                fileActivity.runOnUiThread(() -> DisplayUtils.showSnackMessage(fileActivity, R.string.file_not_synced));
+
+                // Sleep to show snackbar message
+                try {
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {
+                    Log_OC.e(TAG, "Failed to sleep");
                 }
-            }).start();
+            }
 
-        } else {
-            Log_OC.e(TAG, "Trying to open a NULL OCFile");
-        }
+            fileActivity.runOnUiThread(() -> {
+                try {
+                    openFileWithIntent.setFlags(openFileWithIntent.getFlags() | Intent.FLAG_ACTIVITY_NEW_TASK);
+                    fileActivity.startActivity(openFileWithIntent);
+                } catch (ActivityNotFoundException exception) {
+                    DisplayUtils.showSnackMessage(fileActivity, R.string.file_list_no_app_for_file_type);
+                }
+            });
+        }).start();
     }
 
     public void openFileAsRichDocument(OCFile file, Context context) {
@@ -376,19 +380,16 @@ public void openRichWorkspaceWithTextEditor(OCFile file, String url, Context con
     @NonNull
     private Intent createOpenFileIntent(OCFile file) {
         String storagePath = file.getStoragePath();
-        Uri fileUri = getFileUri(file, MainApp.getAppContext().getResources().getStringArray(R.array
-                                                                                                 .ms_office_extensions));
+        Uri fileUri = file.getExposedFileUri(fileActivity);
+
         Intent openFileWithIntent = null;
         int lastIndexOfDot = storagePath.lastIndexOf('.');
         if (lastIndexOfDot >= 0) {
             String fileExt = storagePath.substring(lastIndexOfDot + 1);
             String guessedMimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(fileExt);
             if (guessedMimeType != null) {
                 openFileWithIntent = new Intent(Intent.ACTION_VIEW);
-                openFileWithIntent.setDataAndType(
-                    fileUri,
-                    guessedMimeType
-                                                 );
+                openFileWithIntent.setDataAndType(fileUri, guessedMimeType);
             }
         }
 
@@ -398,25 +399,12 @@ private Intent createOpenFileIntent(OCFile file) {
 
         if (openFileWithIntent == null) {
             openFileWithIntent = new Intent(Intent.ACTION_VIEW);
-            openFileWithIntent.setDataAndType(
-                fileUri,
-                file.getMimeType()
-                                             );
+            openFileWithIntent.setDataAndType(fileUri, file.getMimeType());
         }
 
         openFileWithIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
-        return openFileWithIntent;
-    }
 
-    private Uri getFileUri(OCFile file, String... officeExtensions) {
-        if (file.getFileName().contains(".") &&
-            Arrays.asList(officeExtensions).contains(file.getFileName().substring(file.getFileName().
-                                                                                      lastIndexOf(".") + 1)) &&
-            !file.getStoragePath().startsWith(MainApp.getAppContext().getFilesDir().getAbsolutePath())) {
-            return file.getLegacyExposedFileUri();
-        } else {
-            return file.getExposedFileUri(fileActivity);
-        }
+        return openFileWithIntent;
     }
 
     public void streamMediaFile(OCFile file) {
@@ -1063,7 +1051,7 @@ public void uploadFromCamera(Activity activity, int requestCode, boolean isVideo
         File cameraFile = createCameraFile(activity, isVideo);
 
         Uri cameraUri = FileProvider.getUriForFile(activity.getApplicationContext(),
-                                                  activity.getResources().getString(R.string.file_provider_authority), cameraFile);
+                                                   activity.getResources().getString(R.string.file_provider_authority), cameraFile);
         intent.putExtra(MediaStore.EXTRA_OUTPUT, cameraUri);
 
         if (intent.resolveActivity(activity.getPackageManager()) != null) {