fix: catch SecurityException from getExternalStoragePublicDirectory on Samsung SDK 35

Author: matsuzaka-yuki

app/src/main/java/me/bmax/apatch/ui/screen/ExecuteAPMAction.kt

@@ -41,6 +41,7 @@ import kotlinx.coroutines.withContext
 import me.bmax.apatch.APApplication
 import me.bmax.apatch.R
 import me.bmax.apatch.ui.component.KeyEventBlocker
+import me.bmax.apatch.util.getSafeDownloadsDir
 import me.bmax.apatch.util.runAPModuleAction
 import me.bmax.apatch.util.ui.LocalSnackbarHost
 import java.io.File
@@ -119,7 +120,7 @@ fun ExecuteAPMActionScreen(navigator: DestinationsNavigator, moduleId: String) {
                         val format = SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.getDefault())
                         val date = format.format(Date())
                         val file = File(
-                            Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS),
+                            getSafeDownloadsDir(me.bmax.apatch.apApp),
                             "APatch_apm_action_log_${date}.log"
                         )
                         file.writeText(fullLogBuffer.toString())

app/src/main/java/me/bmax/apatch/ui/screen/Install.kt

@@ -49,6 +49,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import me.bmax.apatch.R
 import me.bmax.apatch.ui.component.KeyEventBlocker
+import me.bmax.apatch.util.getSafeDownloadsDir
 import me.bmax.apatch.util.installModule
 import me.bmax.apatch.util.BulkInstallManager
 import me.bmax.apatch.util.reboot
@@ -143,7 +144,7 @@ fun InstallScreen(navigator: DestinationsNavigator, uri: Uri, type: MODULE_TYPE)
                 val format = SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.getDefault())
                 val date = format.format(Date())
                 val file = File(
-                    Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS),
+                    getSafeDownloadsDir(context),
                     "APatch_install_${type}_log_${date}.log"
                 )
                 file.writeText(fullLogBuffer.toString())

app/src/main/java/me/bmax/apatch/ui/screen/ScriptExecutionLogScreen.kt

@@ -47,6 +47,7 @@ import me.bmax.apatch.APApplication
 import me.bmax.apatch.R
 import me.bmax.apatch.apApp
 import me.bmax.apatch.data.ScriptInfo
+import me.bmax.apatch.util.getSafeDownloadsDir
 import me.bmax.apatch.util.ui.AnsiUtils
 import me.bmax.apatch.util.ui.LocalSnackbarHost
 import java.io.File
@@ -239,7 +240,7 @@ fun ScriptExecutionLogScreen(
                                     val format = SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.getDefault())
                                     val date = format.format(Date())
                                     val file = File(
-                                        Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS),
+                                        getSafeDownloadsDir(context),
                                         "FolkPatch/${scriptInfo.alias}_${date}.log"
                                     )
                                     file.writeText(fullLogBuffer.toString())

app/src/main/java/me/bmax/apatch/ui/screen/settings/BackupSettings.kt

@@ -84,7 +84,7 @@ fun BackupSettingsContent(
             ExpressiveCard(
                 flat = flat,
                 onClick = {
-                    val backupDir = java.io.File(android.os.Environment.getExternalStoragePublicDirectory(android.os.Environment.DIRECTORY_DOWNLOADS), "FolkPatch/ModuleBackups")
+                    val backupDir = java.io.File(me.bmax.apatch.util.getSafeDownloadsDir(context), "FolkPatch/ModuleBackups")
                     if (!backupDir.exists()) backupDir.mkdirs()
 
                     try {

app/src/main/java/me/bmax/apatch/ui/viewmodel/PatchesViewModel.kt

@@ -28,6 +28,7 @@ import me.bmax.apatch.BuildConfig
 import me.bmax.apatch.R
 import me.bmax.apatch.apApp
 import me.bmax.apatch.util.Version
+import me.bmax.apatch.util.getSafeDownloadsDir
 import me.bmax.apatch.util.copyAndClose
 import me.bmax.apatch.util.copyAndCloseOut
 import me.bmax.apatch.util.createRootShell
@@ -667,7 +668,7 @@ class PatchesViewModel : ViewModel() {
                 APApplication.markNeedReboot()
             } else if (mode == PatchMode.PATCH_ONLY) {
                 val newBootFile = patchDir.getChildFile("new-boot.img")
-                val outDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
+                val outDir = getSafeDownloadsDir(apApp)
                 if (!outDir.exists()) outDir.mkdirs()
                 val outPath = File(outDir, outFilename)
                 val inputUri = newBootFile.getUri(apApp)

app/src/main/java/me/bmax/apatch/util/Downloader.kt

@@ -13,6 +13,16 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import me.bmax.apatch.apApp
 import androidx.core.content.ContextCompat
+import java.io.File
+
+fun getSafeDownloadsDir(context: Context): File {
+    return try {
+        Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
+    } catch (_: SecurityException) {
+        context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)
+            ?: File(context.filesDir, "Download")
+    }
+}
 
 @SuppressLint("Range")
 fun download(

app/src/main/java/me/bmax/apatch/util/ModuleBackupUtils.kt

@@ -56,7 +56,7 @@ object ModuleBackupUtils {
             val localJob = async {
                 if (APApplication.sharedPreferences.getBoolean("auto_backup_module", false)) {
                     try {
-                        val baseBackupDir = File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), "FolkPatch/ModuleBackups")
+                        val baseBackupDir = File(getSafeDownloadsDir(me.bmax.apatch.apApp), "FolkPatch/ModuleBackups")
                         // Use subDir (APM/KPM) to separate backups
                         val backupDir = File(baseBackupDir, subDir)
 

app/src/main/java/me/bmax/apatch/util/ThemeDownloader.kt

@@ -100,7 +100,7 @@ class ThemeDownloader(private val context: Context) {
      */
     private fun getExternalThemesDir(): File {
         val externalDir = File(
-            android.os.Environment.getExternalStoragePublicDirectory(android.os.Environment.DIRECTORY_DOWNLOADS),
+            getSafeDownloadsDir(context),
             "FolkPatch/Themes"
         )
         if (!externalDir.exists()) {