From ad8e5253fdda562d05d5606da62b2da5191ce164 Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Sun, 15 Nov 2020 10:29:35 +0900
Subject: [PATCH 1/3] added proguard conf for TiffBitmapFactory

---
 .github/workflows/release.yml  | 2 +-
 android/app/build.gradle       | 4 ++++
 android/app/proguard-rules.pro | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 android/app/proguard-rules.pro

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 066abbfea..8b6cb9187 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -89,6 +89,6 @@ jobs:
         with:
           serviceAccountJsonPlainText: ${{ secrets.PLAYSTORE_ACCOUNT_KEY }}
           packageName: deckers.thibault.aves
-          releaseFile: app-release.aab
+          releaseFiles: app-release.aab
           track: beta
           whatsNewDirectory: whatsnew
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 75bac6650..6e9bfd207 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -79,6 +79,10 @@ android {
         }
         release {
             signingConfig signingConfigs.release
+
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
 }
diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro
new file mode 100644
index 000000000..1cb00fc82
--- /dev/null
+++ b/android/app/proguard-rules.pro
@@ -0,0 +1 @@
+-keep class org.beyka.tiffbitmapfactory.**{ *; }

From 79f8fa7f71ea3c5d978af475bcb5e59f5871edf1 Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Sun, 15 Nov 2020 10:56:00 +0900
Subject: [PATCH 2/3] restored metadata-extractor tiff detection false positive
 workaround

---
 .../deckers/thibault/aves/channel/calls/MetadataHandler.kt   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MetadataHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MetadataHandler.kt
index 21e275e5e..446649bdb 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MetadataHandler.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MetadataHandler.kt
@@ -222,11 +222,14 @@ class MetadataHandler(private val context: Context) : MethodCallHandler {
                         // * file extension is unreliable
                         // In the end, `metadata-extractor` is the most reliable, except for `tiff` (false positives, false negatives),
                         // in which case we trust the file extension
+                        // cf https://github.com/drewnoakes/metadata-extractor/issues/296
                         if (path?.matches(tiffExtensionPattern) == true) {
                             metadataMap[KEY_MIME_TYPE] = MimeTypes.TIFF
                         } else {
                             dir.getSafeString(FileTypeDirectory.TAG_DETECTED_FILE_MIME_TYPE) {
-                                metadataMap[KEY_MIME_TYPE] = it
+                                if (it != MimeTypes.TIFF) {
+                                    metadataMap[KEY_MIME_TYPE] = it
+                                }
                             }
                         }
                     }

From e7b48c796ef4f03daeb0d517f42ae0632a5806b3 Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Sun, 15 Nov 2020 11:01:46 +0900
Subject: [PATCH 3/3] version bump

---
 CHANGELOG.md            | 4 +++-
 pubspec.yaml            | 2 +-
 whatsnew/whatsnew-en-US | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1aa68ce9..a805011e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
-## [v1.2.6] - 2020-11-15
+## [v1.2.7] - 2020-11-15
 ### Added
 - Support for TIFF images (single page)
 - Viewer overlay: minimap (optional)
@@ -15,6 +15,8 @@ All notable changes to this project will be documented in this file.
 ### Fixed
 - Fixed finding dimensions of entries with incorrect EXIF
 
+## [v1.2.6] - 2020-11-15 [YANKED]
+
 ## [v1.2.5] - 2020-11-01
 ### Added
 - Search: show recently used filters (optional)
diff --git a/pubspec.yaml b/pubspec.yaml
index 185627a12..1eef71a3a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.2.6+32
+version: 1.2.7+33
 
 # brendan-duncan/image (as of v2.1.19):
 # - does not support TIFF with JPEG compression (issue #184)
diff --git a/whatsnew/whatsnew-en-US b/whatsnew/whatsnew-en-US
index c2f309c4d..a4f88aadb 100644
--- a/whatsnew/whatsnew-en-US
+++ b/whatsnew/whatsnew-en-US
@@ -1,5 +1,5 @@
 Thanks for using Aves!
-v1.2.6:
+v1.2.7:
 - subsampling and tiling of large images
 - support for TIFF images (single page only)
 - optional minimap in viewer overlay