From 9d0a6e170e71df8935520bc66727ad14382b88da Mon Sep 17 00:00:00 2001
From: Hardcore Sushi <mateo.delerue2@gmail.com>
Date: Thu, 27 Aug 2020 22:03:45 +0200
Subject: [PATCH] Release shrink fixes: unsafe features & camera focus marker

---
 app/build.gradle                            | 2 ++
 app/proguard-rules.pro                      | 9 ++++++++-
 app/src/main/AndroidManifest.xml            | 5 +++--
 app/src/main/res/layout/activity_camera.xml | 1 +
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index dcadaac..7d29b90 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,6 +24,8 @@ android {
 
     buildTypes {
         release {
+            minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 481bb43..01533fb 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -18,4 +18,11 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
+#-renamesourcefileattribute SourceFile
+
+-keepattributes InnerClasses
+-keep class sushi.hardcore.droidfs.SettingsActivity$** {
+    *;
+}
+-keep class sushi.hardcore.droidfs.explorers.ExplorerElement
+-keep class com.otaliastudios.cameraview.markers.DefaultAutoFocusMarker
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e1f1fad..74578d2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,12 +7,13 @@
         android:name="${applicationId}.WRITE_TEMPORARY_STORAGE"
         android:protectionLevel="signature" />
 
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.USE_FINGERPRINT" />
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
+    <uses-feature android:name="android.hardware.camera.any" android:required="false"/>
+    <uses-feature android:name="android.hardware.fingerprint" android:required="false"/>
 
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" tools:node="remove"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" tools:node="remove"/> <!--removing this permission automatically added by exoplayer-->
 
     <application
         android:name=".ColoredApplication"
diff --git a/app/src/main/res/layout/activity_camera.xml b/app/src/main/res/layout/activity_camera.xml
index a85b699..17a4491 100644
--- a/app/src/main/res/layout/activity_camera.xml
+++ b/app/src/main/res/layout/activity_camera.xml
@@ -15,6 +15,7 @@
         app:cameraAutoFocusMarker="@string/cameraview_default_autofocus_marker"
         app:cameraHdr="on"
         app:cameraPictureFormat="jpeg"
+        app:cameraPlaySounds="false"
         app:cameraAudio="off"/>
 
     <androidx.constraintlayout.widget.ConstraintLayout