From 5cbb758a63c8e1db77a978f667376903b86fc8d3 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Mon, 16 Nov 2026 08:23:57 +0100 Subject: [PATCH 1/3] wip Signed-off-by: alperozturk96 --- .../android/ui/helpers/FileOperationsHelper.kt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.kt b/app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.kt index 0738d904c22a..025506ac3a2b 100755 --- a/app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.kt +++ b/app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.kt @@ -306,15 +306,19 @@ class FileOperationsHelper( private fun createOpenFileIntent(file: OCFile): Intent { val storagePath = file.storagePath val fileUri = file.getExposedFileUri(fileActivity) - val extension = storagePath.substringAfterLast('.', missingDelimiterValue = "") - val guessedMimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension) + val extension = storagePath.substringAfterLast('.', "") - val openFileIntent = guessedMimeType?.let { Intent(Intent.ACTION_VIEW).setDataAndType(fileUri, it) } + fun viewIntent(type: String?) = Intent(Intent.ACTION_VIEW).setDataAndType(fileUri, type) + + val intent = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)?.let(::viewIntent) ?: createIntentFromShortcutFile(storagePath, extension) - ?: Intent(Intent.ACTION_VIEW).setDataAndType(fileUri, file.mimeType) + ?: viewIntent(file.mimeType) - openFileIntent.flags = Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION - return openFileIntent + return intent.addFlags( + Intent.FLAG_GRANT_READ_URI_PERMISSION or + Intent.FLAG_GRANT_WRITE_URI_PERMISSION or + Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION + ) } private fun createIntentFromShortcutFile(storagePath: String, extension: String): Intent? { From 52cf64ca805ccf455eaf25c3f720e8b15408218b Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Thu, 19 Nov 2026 09:53:27 +0100 Subject: [PATCH 2/3] add allowAccessFromOtherApps Signed-off-by: alperozturk96 --- .../ui/helpers/FileOperationsHelper.kt | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.kt b/app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.kt index 025506ac3a2b..48db52645045 100755 --- a/app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.kt +++ b/app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.kt @@ -47,6 +47,8 @@ import com.owncloud.android.datamodel.ArbitraryDataProviderImpl import com.owncloud.android.datamodel.FileDataStorageManager import com.owncloud.android.datamodel.OCFile import com.owncloud.android.datamodel.UploadsStorageManager +import com.owncloud.android.datastorage.DataStorageProvider +import com.owncloud.android.datastorage.StoragePoint import com.owncloud.android.files.StreamMediaFileOperation import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode import com.owncloud.android.lib.common.utils.Log_OC @@ -314,11 +316,19 @@ class FileOperationsHelper( ?: createIntentFromShortcutFile(storagePath, extension) ?: viewIntent(file.mimeType) - return intent.addFlags( - Intent.FLAG_GRANT_READ_URI_PERMISSION or - Intent.FLAG_GRANT_WRITE_URI_PERMISSION or - Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION - ) + val allowAccessFromOtherApps = + DataStorageProvider + .getInstance() + .availableStoragePoints + .all { it.privacyType == StoragePoint.PrivacyType.PUBLIC } + + val flags = (Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION) + + return if (allowAccessFromOtherApps) { + intent.addFlags(flags or Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION) + } else { + intent.addFlags(flags) + } } private fun createIntentFromShortcutFile(storagePath: String, extension: String): Intent? { From 9ded19cac125390f7f16cb094258a9435929dd80 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Thu, 19 Nov 2026 10:11:50 +0100 Subject: [PATCH 3/3] add allowAccessFromOtherApps Signed-off-by: alperozturk96 --- .../datastorage/DataStorageProvider.java | 9 +++++++++ .../android/ui/helpers/FileOperationsHelper.kt | 17 +++++------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/owncloud/android/datastorage/DataStorageProvider.java b/app/src/main/java/com/owncloud/android/datastorage/DataStorageProvider.java index bc213a45b705..c05a5ff1177b 100644 --- a/app/src/main/java/com/owncloud/android/datastorage/DataStorageProvider.java +++ b/app/src/main/java/com/owncloud/android/datastorage/DataStorageProvider.java @@ -16,6 +16,7 @@ import java.io.File; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -84,6 +85,14 @@ public StoragePoint[] getAvailableStoragePoints() { return mCachedStoragePoints.toArray(new StoragePoint[0]); } + public boolean allowAccessFromOtherApps() { + String storagePath = MainApp.getStoragePath(); + + return Arrays.stream(getAvailableStoragePoints()) + .anyMatch(point -> point.getPath().equals(storagePath) && + point.getPrivacyType() == StoragePoint.PrivacyType.PUBLIC); + } + /* Checks if external storage is available for read and write */ public boolean isExternalStorageWritable() { String state = Environment.getExternalStorageState(); diff --git a/app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.kt b/app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.kt index 48db52645045..f25eca4956b1 100755 --- a/app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.kt +++ b/app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.kt @@ -48,7 +48,6 @@ import com.owncloud.android.datamodel.FileDataStorageManager import com.owncloud.android.datamodel.OCFile import com.owncloud.android.datamodel.UploadsStorageManager import com.owncloud.android.datastorage.DataStorageProvider -import com.owncloud.android.datastorage.StoragePoint import com.owncloud.android.files.StreamMediaFileOperation import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode import com.owncloud.android.lib.common.utils.Log_OC @@ -316,19 +315,13 @@ class FileOperationsHelper( ?: createIntentFromShortcutFile(storagePath, extension) ?: viewIntent(file.mimeType) - val allowAccessFromOtherApps = - DataStorageProvider - .getInstance() - .availableStoragePoints - .all { it.privacyType == StoragePoint.PrivacyType.PUBLIC } + intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION) - val flags = (Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION) - - return if (allowAccessFromOtherApps) { - intent.addFlags(flags or Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION) - } else { - intent.addFlags(flags) + if (DataStorageProvider.getInstance().allowAccessFromOtherApps()) { + intent.addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION) } + + return intent } private fun createIntentFromShortcutFile(storagePath: String, extension: String): Intent? {