Fix backup on A13 (#280)

app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt

@@ -4,6 +4,7 @@ import android.content.ComponentName
 import android.content.Intent
 import android.content.res.ColorStateList
 import android.content.res.Configuration
+import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.KeyEvent

app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt

@@ -1,5 +1,6 @@
 package com.lagradost.cloudstream3.utils
 
+import android.annotation.SuppressLint
 import android.content.ContentValues
 import android.content.Context
 import android.net.Uri
@@ -74,7 +75,7 @@ object BackupUtils {
         return !nonTransferableKeys.contains(this)
     }
 
-    var restoreFileSelector: ActivityResultLauncher<Array<String>>? = null
+    private var restoreFileSelector: ActivityResultLauncher<Array<String>>? = null
 
     // Kinda hack, but I couldn't think of a better way
     data class BackupVars(
@@ -91,6 +92,7 @@ object BackupUtils {
         @JsonProperty("settings") val settings: BackupVars
     )
 
+    @Suppress("UNCHECKED_CAST")
     fun Context.getBackup(): BackupFile {
         val allData = getSharedPrefs().all.filter { it.key.isTransferable() }
         val allSettings = getDefaultSharedPrefs().all.filter { it.key.isTransferable() }
@@ -143,17 +145,24 @@ object BackupUtils {
         }
     }
 
+    @SuppressLint("SimpleDateFormat")
     fun FragmentActivity.backup() {
         try {
-            if (checkWrite()) {
+            if (!checkWrite()) {
+                showToast(this, getString(R.string.backup_failed), Toast.LENGTH_LONG)
+                requestRW()
+                return
+            }
+
             val subDir = getBasePath().first
             val date = SimpleDateFormat("yyyy_MM_dd_HH_mm").format(Date(currentTimeMillis()))
             val ext = "json"
             val displayName = "CS3_Backup_${date}"
             val backupFile = getBackup()
 
-                val steam =
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && subDir?.isDownloadDir() == true) {
+            val steam = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
+                && subDir?.isDownloadDir() == true
+            ) {
                 val cr = this.contentResolver
                 val contentUri =
                     MediaStore.Downloads.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY) // USE INSTEAD OF MediaStore.Downloads.EXTERNAL_CONTENT_URI
@@ -196,11 +205,6 @@ object BackupUtils {
                 R.string.backup_success,
                 Toast.LENGTH_LONG
             )
-            } else {
-                showToast(this, getString(R.string.backup_failed), Toast.LENGTH_LONG)
-                requestRW()
-                return
-            }
         } catch (e: Exception) {
             logError(e)
             try {

app/src/main/java/com/lagradost/cloudstream3/utils/UIHelper.kt

@@ -57,7 +57,10 @@ object UIHelper {
             this,
             Manifest.permission.WRITE_EXTERNAL_STORAGE
         )
-                == PackageManager.PERMISSION_GRANTED)
+                == PackageManager.PERMISSION_GRANTED
+                // Since Android 13, we can't request external storage permission,
+                // so don't check it.
+                || Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
     }
 
     fun Activity.requestRW() {