From 61709a10712599eb86c7149c3eaf695bc1c310f2 Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Tue, 28 Feb 2023 17:14:57 +0100
Subject: [PATCH] minor fixes

---
 .../deckers/thibault/aves/model/provider/ImageProvider.kt   | 6 ++++++
 lib/services/common/optional_event_channel.dart             | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/ImageProvider.kt b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/ImageProvider.kt
index f00b52ec8..05fb4df29 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/ImageProvider.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/ImageProvider.kt
@@ -423,6 +423,12 @@ abstract class ImageProvider {
             ExifInterface.TAG_IMAGE_LENGTH,
             ExifInterface.TAG_IMAGE_WIDTH,
             ExifInterface.TAG_ORIENTATION,
+            // Thumbnail Offset / Length
+            ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT,
+            ExifInterface.TAG_JPEG_INTERCHANGE_FORMAT_LENGTH,
+            // Exif Image Width / Height
+            ExifInterface.TAG_PIXEL_X_DIMENSION,
+            ExifInterface.TAG_PIXEL_Y_DIMENSION,
         )
         if (canReadWithExifInterface(sourceMimeType) && canEditExif(targetMimeType)) {
             StorageUtils.openInputStream(context, sourceUri)?.use { input ->
diff --git a/lib/services/common/optional_event_channel.dart b/lib/services/common/optional_event_channel.dart
index e6a2495a8..4f8aff6c0 100644
--- a/lib/services/common/optional_event_channel.dart
+++ b/lib/services/common/optional_event_channel.dart
@@ -40,6 +40,11 @@ class OptionalEventChannel extends EventChannel {
       try {
         await methodChannel.invokeMethod<void>('cancel', arguments);
       } catch (error, stack) {
+        if (error is PlatformException && error.message == 'No active stream to cancel') {
+          // ignore
+          return;
+        }
+
         FlutterError.reportError(FlutterErrorDetails(
           exception: error,
           stack: stack,