Workaround log writing on Android 10

proxer · Nov 7, 2020 · 018467a · 018467a
1 parent c7e6d6f
commit 018467a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/src/debug/AndroidManifest.xml b/src/debug/AndroidManifest.xml
@@ -7,4 +7,8 @@
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         tools:ignore="ScopedStorage" />
+
+    <application
+        android:requestLegacyExternalStorage="true"
+        tools:ignore="GoogleAppIndexingWarning" />
 </manifest>
diff --git a/src/logRelease/AndroidManifest.xml b/src/logRelease/AndroidManifest.xml
@@ -8,13 +8,7 @@
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         tools:ignore="ScopedStorage" />
 
-    <application tools:ignore="GoogleAppIndexingWarning">
-        <activity
-            android:name=".ui.crash.CrashActivity"
-            android:process=":error_activity">
-            <intent-filter>
-                <action android:name="cat.ereza.customactivityoncrash.ERROR" />
-            </intent-filter>
-        </activity>
-    </application>
+    <application
+        android:requestLegacyExternalStorage="true"
+        tools:ignore="GoogleAppIndexingWarning" />
 </manifest>
diff --git a/src/main/kotlin/me/proxer/app/MainActivity.kt b/src/main/kotlin/me/proxer/app/MainActivity.kt
@@ -73,9 +73,12 @@ class MainActivity : DrawerActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        // Request storage permission for writing logs in debug variants.
         if (BuildConfig.LOG && VERSION.SDK_INT >= VERSION_CODES.M) {
-            if (ContextCompat.checkSelfPermission(this, WRITE_EXTERNAL_STORAGE) != PERMISSION_GRANTED) {
-                ActivityCompat.requestPermissions(this, arrayOf(WRITE_EXTERNAL_STORAGE), 1)
+            if (VERSION.SDK_INT >= VERSION_CODES.M) {
+                if (ContextCompat.checkSelfPermission(this, WRITE_EXTERNAL_STORAGE) != PERMISSION_GRANTED) {
+                    ActivityCompat.requestPermissions(this, arrayOf(WRITE_EXTERNAL_STORAGE), 1)
+                }
             }
         }
 

diff --git a/src/main/kotlin/me/proxer/app/util/logging/TimberFileTree.kt b/src/main/kotlin/me/proxer/app/util/logging/TimberFileTree.kt
@@ -31,6 +31,7 @@ class TimberFileTree : Timber.Tree() {
     @Suppress("DEPRECATION") // What is Android even doing?
     private val downloadsDirectory
         get() = Environment.getExternalStoragePublicDirectory(DIRECTORY_DOWNLOADS)
+
     private val resolvedLogsDirectory get() = File(downloadsDirectory, LOGS_DIRECTORY).also { it.mkdirs() }
 
     override fun isLoggable(tag: String?, priority: Int) = priority >= Log.INFO