From e8562e1df45636786cd5f46951ace0ce8ac59e0d Mon Sep 17 00:00:00 2001
From: rubikscraft <contact@rubikscraft.nl>
Date: Sat, 30 Oct 2021 18:18:32 +0200
Subject: [PATCH] Improve compatibility with other GCam versions and minify app

---
 app/build.gradle                                             | 5 +++--
 app/src/main/AndroidManifest.xml                             | 2 ++
 .../main/java/com/google/android/apps/photos/MainActivity.kt | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 51bad3d..f4240b4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,8 +19,8 @@ android {
         applicationId 'com.google.android.apps.photos'
         minSdkVersion 29
         targetSdkVersion 31
-        versionCode 4
-        versionName "1.1.1"
+        versionCode 5
+        versionName "1.2.0"
     }
 
     signingConfigs {
@@ -40,6 +40,7 @@ android {
             signingConfig signingConfigs.debug
         }
         release {
+            minifyEnabled true
             signingConfig signingConfigs.release
         }
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a1d22da..1c4aa85 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -24,6 +24,8 @@
             <intent-filter>
                 <action android:name="android.provider.action.REVIEW" />
                 <action android:name="android.provider.action.REVIEW_SECURE" />
+                <action android:name="com.android.camera.action.REVIEW" />
+                <action android:name="com.google.android.apps.photos.action.SECURE_REVIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
 
diff --git a/app/src/main/java/com/google/android/apps/photos/MainActivity.kt b/app/src/main/java/com/google/android/apps/photos/MainActivity.kt
index 58d1b72..e56bc10 100644
--- a/app/src/main/java/com/google/android/apps/photos/MainActivity.kt
+++ b/app/src/main/java/com/google/android/apps/photos/MainActivity.kt
@@ -40,7 +40,7 @@ class MainActivity : Activity() {
             Log.i("PhotosShim", "No READ_EXTERNAL_STORAGE permission, requesting it")
             requestPermissions(arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE), PERMISSIONS_INT)
             // We can now quit the app, as GCam wil relaunch it again automatically
-            return quit()
+            return finish()
         }
 
         Log.i(