fix duplicated code by moving it to SimpleActivity.kt

Signed-off-by: Jan Guegel <[email protected]>

Author: Jan Guegel

app/src/main/kotlin/org/fossify/filemanager/activities/MainActivity.kt

@@ -8,7 +8,6 @@ import android.graphics.drawable.Drawable
 import android.media.RingtoneManager
 import android.net.Uri
 import android.os.Bundle
-import android.os.Environment
 import android.os.Handler
 import android.provider.Settings
 import android.widget.ImageView
@@ -281,15 +280,6 @@ class MainActivity : SimpleActivity() {
         }
     }
 
-    @SuppressLint("NewApi")
-    override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
-        super.onActivityResult(requestCode, resultCode, resultData)
-        isAskingPermissions = false
-        if (requestCode == MANAGE_STORAGE_RC && isRPlus()) {
-            actionOnPermission?.invoke(Environment.isExternalStorageManager())
-        }
-    }
-
     private fun updateMenuColors() {
         updateStatusbarColor(getProperBackgroundColor())
         binding.mainMenu.updateColors()

app/src/main/kotlin/org/fossify/filemanager/activities/SaveAsActivity.kt

@@ -1,18 +1,15 @@
 package org.fossify.filemanager.activities
 
-import android.annotation.SuppressLint
 import android.content.Intent
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
-import android.os.Environment
 import androidx.annotation.RequiresApi
 import androidx.core.net.toUri
 import org.fossify.commons.dialogs.FilePickerDialog
 import org.fossify.commons.extensions.*
 import org.fossify.commons.helpers.NavigationIcon
 import org.fossify.commons.helpers.ensureBackgroundThread
-import org.fossify.commons.helpers.isRPlus
 import org.fossify.filemanager.R
 import org.fossify.filemanager.databinding.ActivitySaveAsBinding
 import org.fossify.filemanager.extensions.config
@@ -89,18 +86,4 @@ class SaveAsActivity : SimpleActivity() {
         return filename.replace("[/\\\\<>:\"|?*\u0000-\u001F]".toRegex(), "_")
             .takeIf { it.isNotBlank() } ?: "unnamed_file"
     }
-
-    @SuppressLint("NewApi")
-    override fun onActivityResult(requestCode: Int, resultCode: Int, dataIntent: Intent?) {
-        super.onActivityResult(requestCode, resultCode, dataIntent)
-
-        if (requestCode == MANAGE_STORAGE_RC && isRPlus()) {
-            if (Environment.isExternalStorageManager()) {
-                recreate()
-            } else {
-                toast(R.string.no_storage_permissions)
-                finish()
-            }
-        }
-    }
 }

app/src/main/kotlin/org/fossify/filemanager/activities/SimpleActivity.kt

@@ -1,9 +1,11 @@
 package org.fossify.filemanager.activities
 
 import android.annotation.SuppressLint
+import android.content.Intent
 import android.os.Environment
 import org.fossify.commons.activities.BaseSimpleActivity
 import org.fossify.commons.extensions.hasPermission
+import org.fossify.commons.extensions.toast
 import org.fossify.commons.helpers.PERMISSION_WRITE_STORAGE
 import org.fossify.commons.helpers.isRPlus
 import org.fossify.filemanager.R
@@ -31,10 +33,28 @@ open class SimpleActivity : BaseSimpleActivity() {
         R.mipmap.ic_launcher_grey_black
     )
 
+    companion object {
+        private const val MANAGE_STORAGE_RC = 201
+    }
+
     override fun getAppLauncherName() = getString(R.string.app_launcher_name)
 
     override fun getRepositoryName() = "File-Manager"
 
+    @SuppressLint("NewApi")
+    override fun onActivityResult(requestCode: Int, resultCode: Int, dataIntent: Intent?) {
+        super.onActivityResult(requestCode, resultCode, dataIntent)
+
+        if (requestCode == MANAGE_STORAGE_RC && isRPlus()) {
+            if (Environment.isExternalStorageManager()) {
+                recreate()
+            } else {
+                toast(R.string.no_storage_permissions)
+                finish()
+            }
+        }
+    }
+
     @SuppressLint("NewApi")
     fun hasStoragePermission(): Boolean {
         return if (isRPlus()) {