From 8b5fe79849e1638a64150885587a2ff9f7cd5988 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Sun, 12 Sep 2021 13:01:18 -0400
Subject: [PATCH] Update our image viewer versions.

---
 app/build.gradle                                   | 14 ++++++--------
 .../securesms/components/ZoomingImageView.java     |  1 +
 app/witness-verifications.gradle                   |  8 ++++----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 617c3390ab..9c5d80df1a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,12 +11,6 @@ apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'app.cash.exhaustive'
 
 repositories {
-    maven {
-        url "https://raw.github.com/signalapp/maven/master/photoview/releases/"
-        content {
-            includeGroupByRegex "com\\.github\\.chrisbanes.*"
-        }
-    }
     maven {
         url "https://raw.github.com/signalapp/maven/master/circular-progress-button/releases/"
         content {
@@ -35,6 +29,10 @@ repositories {
             includeGroupByRegex "com\\.amulyakhare.*"
         }
     }
+    maven {
+        url "https://www.jitpack.io"
+    }
+
     google()
     mavenCentral()
     mavenLocal()
@@ -472,7 +470,7 @@ dependencies {
     implementation 'se.emilsjolander:stickylistheaders:2.7.0'
     implementation 'com.jpardogo.materialtabstrip:library:1.0.9'
     implementation 'org.apache.httpcomponents:httpclient-android:4.3.5'
-    implementation 'com.github.chrisbanes:PhotoView:2.1.3'
+    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
     implementation 'com.github.bumptech.glide:glide:4.11.0'
     kapt 'com.github.bumptech.glide:compiler:4.11.0'
     kapt 'androidx.annotation:annotation:1.1.0'
@@ -485,7 +483,7 @@ dependencies {
     implementation 'mobi.upod:time-duration-picker:1.1.3'
     implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
     implementation 'com.google.zxing:core:3.2.1'
-    implementation ('com.davemorrissey.labs:subsampling-scale-image-view:3.6.0') {
+    implementation ('com.davemorrissey.labs:subsampling-scale-image-view:3.10.0') {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
     implementation ('cn.carbswang.android:NumberPickerView:1.0.9') {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java
index 13b63be883..18f6da9315 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java
@@ -66,6 +66,7 @@ public class ZoomingImageView extends FrameLayout {
     this.photoView            = findViewById(R.id.image_view);
     this.subsamplingImageView = findViewById(R.id.subsampling_image_view);
 
+    this.subsamplingImageView.setOrientation(SubsamplingScaleImageView.ORIENTATION_USE_EXIF);
     this.subsamplingImageView.setOrientation(SubsamplingScaleImageView.ORIENTATION_USE_EXIF);
 
     this.photoView.setZoomTransitionDuration(ZOOM_TRANSITION_DURATION);
diff --git a/app/witness-verifications.gradle b/app/witness-verifications.gradle
index a38813180c..354036ca0f 100644
--- a/app/witness-verifications.gradle
+++ b/app/witness-verifications.gradle
@@ -267,8 +267,8 @@ dependencyVerification {
         ['com.codewaves.stickyheadergrid:stickyheadergrid:0.9.4',
          '5b4aa6a52a957cfd55f60f4220c11c0c371385a3cb9786cae03c260dcdef5794'],
 
-        ['com.davemorrissey.labs:subsampling-scale-image-view:3.6.0',
-         '550c5baa07e0bb4ff0a18b705e96d34436d22619248bd8c08c08c730b1f55cfe'],
+        ['com.davemorrissey.labs:subsampling-scale-image-view:3.10.0',
+         'c76e3d9796cd16ce9894063ea8c53be6903c7df4081f8adca63a6ac1651a019d'],
 
         ['com.fasterxml.jackson.core:jackson-annotations:2.12.0',
          'c28fbe62e7be1e29df75953fa8a887ff875d4482291fbfddb1aec5c91191ecda'],
@@ -294,8 +294,8 @@ dependencyVerification {
         ['com.github.bumptech.glide:glide:4.11.0',
          '5c294e6a5f0f812cef876b8412954c1822da184af38e082a5b766e3c4f4fcd95'],
 
-        ['com.github.chrisbanes:PhotoView:2.1.3',
-         'ed06775308da260e1fd86d1d3288988fcd3d80db24ce0d7c9fcfedc39e622292'],
+        ['com.github.chrisbanes:PhotoView:2.3.0',
+         '6c8989f2945d50ab38b3e0300064f1f8d2d75bbcae1434fe535d9fb6898e9ad6'],
 
         ['com.github.dmytrodanylyk.circular-progress-button:library:1.1.3-S2',
          '8dc6a29a5a8db7b2ad5a9a7fda1dc9ae0893f4c8f0545732b2c63854ea693e8e'],