Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[mobile][photos] Classify retryable media reads

laurenspriemb0748c213799
diff --git a/mobile/apps/photos/changes/android-pending-photo-read.md b/mobile/apps/photos/changes/android-pending-photo-read.md
new file mode 100644
index 0000000000..4064e30efe
--- /dev/null
+++ b/mobile/apps/photos/changes/android-pending-photo-read.md
@@ -0,0 +1 @@
+- Fixed an issue that could prevent newly captured photos from opening in Ente on Android.
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.kt
index c30b5bccbe..16fbb0f9bf 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
@@ -374,6 +374,16 @@ class MediaExtensionPlugin : FlutterPlugin, MethodCallHandler, ActivityAware,
mainHandler.post {
result.error("readUriBytes-too-large", e.message, null)
}
+ } catch (e: IllegalStateException) {
+ val errorCode = if (e.isPendingOrTrashedMediaItemError()) {
+ "readUriBytes-pending"
+ } else {
+ "readUriBytes-failed"
+ }
+ Log.w(logTag, "failed to read uri bytes for uri=$uri", e)
+ mainHandler.post {
+ result.error(errorCode, e.message, null)
+ }
} catch (e: Exception) {
Log.w(logTag, "failed to read uri bytes for uri=$uri", e)
mainHandler.post {
@@ -382,6 +392,10 @@ class MediaExtensionPlugin : FlutterPlugin, MethodCallHandler, ActivityAware,
}
}
+ private fun IllegalStateException.isPendingOrTrashedMediaItemError(): Boolean {
+ return message?.contains("pending/trashed item", ignoreCase = true) == true
+ }
+
private fun InputStream.readBytesWithLimit(maxBytes: Long): ByteArray {
val output = ByteArrayOutputStream()
val buffer = ByteArray(DEFAULT_BUFFER_SIZE)
diff --git a/mobile/apps/photos/plugins/media_extension/lib/media_extension_method_channel.dart b/mobile/apps/photos/plugins/media_extension/lib/media_extension_method_channel.dart
index 8565fb6271..0b819b1483 100644
--- a/mobile/apps/photos/plugins/media_extension/lib/media_extension_method_channel.dart
+++ b/mobile/apps/photos/plugins/media_extension/lib/media_extension_method_channel.dart
@@ -129,16 +129,10 @@ class MethodChannelMediaExtension extends MediaExtensionPlatform {
if (defaultTargetPlatform != TargetPlatform.android) {
return null;
}
-
- try {
- return await methodChannel.invokeMethod<Uint8List>(
- 'readUriBytes',
- <String, dynamic>{'uri': uri},
- );
- } on PlatformException catch (e) {
- debugPrint(e.message);
- }
- return null;
+ return methodChannel.invokeMethod<Uint8List>(
+ 'readUriBytes',
+ <String, dynamic>{'uri': uri},
+ );
}
@override