π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mobile][photos] Fix media extension Android integration
laurenspriem438225117b88
diff --git a/mobile/apps/photos/plugins/media_extension/android/src/main/AndroidManifest.xml b/mobile/apps/photos/plugins/media_extension/android/src/main/AndroidManifest.xmlindex a2f47b6057..8af39c354f 100644--- a/mobile/apps/photos/plugins/media_extension/android/src/main/AndroidManifest.xml+++ b/mobile/apps/photos/plugins/media_extension/android/src/main/AndroidManifest.xml@@ -1,2 +1,13 @@<manifest xmlns:android="http://schemas.android.com/apk/res/android">+ <application>+ <provider+ android:name=".MediaExtensionFileProvider"+ android:authorities="${applicationId}.file_provider"+ android:exported="false"+ android:grantUriPermissions="true">+ <meta-data+ android:name="android.support.FILE_PROVIDER_PATHS"+ android:resource="@xml/media_extension_provider_paths" />+ </provider>+ </application></manifest>diff --git a/mobile/apps/photos/plugins/media_extension/android/src/main/kotlin/io/ente/photos/media_extension/MediaExtensionFileProvider.kt b/mobile/apps/photos/plugins/media_extension/android/src/main/kotlin/io/ente/photos/media_extension/MediaExtensionFileProvider.ktnew file mode 100644index 0000000000..11a36c2aff--- /dev/null+++ b/mobile/apps/photos/plugins/media_extension/android/src/main/kotlin/io/ente/photos/media_extension/MediaExtensionFileProvider.kt@@ -0,0 +1,5 @@+package io.ente.photos.media_extension++import androidx.core.content.FileProvider++class MediaExtensionFileProvider : FileProvider()diff --git a/mobile/apps/photos/plugins/media_extension/android/src/main/kotlin/io/ente/photos/media_extension/MediaExtensionPlugin.kt b/mobile/apps/photos/plugins/media_extension/android/src/main/kotlin/io/ente/photos/media_extension/MediaExtensionPlugin.ktindex 87121dad74..73775cc9ab 100644--- a/mobile/apps/photos/plugins/media_extension/android/src/main/kotlin/io/ente/photos/media_extension/MediaExtensionPlugin.kt+++ b/mobile/apps/photos/plugins/media_extension/android/src/main/kotlin/io/ente/photos/media_extension/MediaExtensionPlugin.kt@@ -26,6 +26,12 @@ import java.util.concurrent.Executorsimport java.util.concurrent.RejectedExecutionExceptionimport kotlin.collections.HashMap+private const val MediaStorePendingItemErrorPrefix =+ "Only owner is able to interact with pending"++internal fun isMediaStorePendingItemError(message: String?): Boolean {+ return message?.contains(MediaStorePendingItemErrorPrefix, ignoreCase = true) == true+}/// The Class which implements Activity Aware FlutterPluginclass MediaExtensionPlugin : FlutterPlugin, MethodCallHandler, ActivityAware,@@ -41,7 +47,7 @@ class MediaExtensionPlugin : FlutterPlugin, MethodCallHandler, ActivityAware,private var activityBinding: ActivityPluginBinding? = nullprivate val mainHandler = Handler(Looper.getMainLooper())private val ioExecutor: ExecutorService = Executors.newSingleThreadExecutor()- private val logTag = "EnteMediaExtensionPlugin"+ private val logTag = "EnteMediaExtension"///ENUM of all the possible IntentAction for a gallery app.enum class IntentAction {@@ -401,13 +407,9 @@ class MediaExtensionPlugin : FlutterPlugin, MethodCallHandler, ActivityAware,return false}- // MediaProvider uses the same text for its pending ContentResolver check and- // its pending/trashed FUSE check. Only the former propagates this exception;- // FUSE converts trashed access to a generic I/O failure.- return error.message?.contains(- MediaStorePendingOrTrashedItemError,- ignoreCase = true,- ) == true+ // Only the ContentResolver pending check propagates this exception;+ // the FUSE pending/trashed check converts it to a generic I/O failure.+ return isMediaStorePendingItemError(error.message)}private fun InputStream.readBytesWithLimit(maxBytes: Long): ByteArray {@@ -578,8 +580,6 @@ class MediaExtensionPlugin : FlutterPlugin, MethodCallHandler, ActivityAware,private companion object {private const val MediaStoreAuthority = "media"private const val MediaDocumentsAuthority = "com.android.providers.media.documents"- private const val MediaStorePendingOrTrashedItemError =- "Only owner is able to interact with pending/trashed item"private const val MaxReadUriBytes = 100L * 1024L * 1024L}diff --git a/mobile/apps/photos/plugins/media_extension/android/src/main/res/xml/media_extension_provider_paths.xml b/mobile/apps/photos/plugins/media_extension/android/src/main/res/xml/media_extension_provider_paths.xmlnew file mode 100644index 0000000000..708fc8d8c4--- /dev/null+++ b/mobile/apps/photos/plugins/media_extension/android/src/main/res/xml/media_extension_provider_paths.xml@@ -0,0 +1,12 @@+<?xml version="1.0" encoding="utf-8"?>+<paths xmlns:android="http://schemas.android.com/apk/res/android">+ <cache-path+ name="cache"+ path="." />+ <files-path+ name="files"+ path="." />+ <external-path+ name="external"+ path="." />+</paths>diff --git a/mobile/apps/photos/plugins/media_extension/android/src/test/kotlin/io/ente/photos/media_extension/MediaExtensionPluginTest.kt b/mobile/apps/photos/plugins/media_extension/android/src/test/kotlin/io/ente/photos/media_extension/MediaExtensionPluginTest.ktnew file mode 100644index 0000000000..8f9725a7fc--- /dev/null+++ b/mobile/apps/photos/plugins/media_extension/android/src/test/kotlin/io/ente/photos/media_extension/MediaExtensionPluginTest.kt@@ -0,0 +1,26 @@+package io.ente.photos.media_extension++import kotlin.test.Test+import kotlin.test.assertFalse+import kotlin.test.assertTrue++class MediaExtensionPluginTest {+ @Test+ fun matchesSupportedMediaProviderPendingMessages() {+ val messages = listOf(+ "Only owner is able to interact with pending media content://media/item",+ "Only owner is able to interact with pending item content://media/item",+ "Only owner is able to interact with pending/trashed item content://media/item",+ )++ for (message in messages) {+ assertTrue(isMediaStorePendingItemError(message), message)+ }+ }++ @Test+ fun rejectsUnrelatedMediaProviderErrors() {+ assertFalse(isMediaStorePendingItemError(null))+ assertFalse(isMediaStorePendingItemError("Permission denied"))+ }+}