feat: add scoped storage for full builds

Author: Fandroid745

AnkiDroid/src/main/java/com/ichi2/anki/InitialActivity.kt

@@ -35,6 +35,7 @@ import com.ichi2.anki.exception.StorageAccessException
 import com.ichi2.anki.servicelayer.PreferenceUpgradeService
 import com.ichi2.anki.servicelayer.PreferenceUpgradeService.setPreferencesUpToDate
 import com.ichi2.anki.servicelayer.ScopedStorageService.isLegacyStorage
+import com.ichi2.anki.settings.Prefs
 import com.ichi2.anki.ui.windows.permissions.InternetPermissionFragment
 import com.ichi2.anki.ui.windows.permissions.NotificationsPermissionFragment
 import com.ichi2.anki.ui.windows.permissions.PermissionsFragment
@@ -257,6 +258,9 @@ internal fun selectAnkiDroidFolder(
 }
 
 fun selectAnkiDroidFolder(context: Context): AnkiDroidFolder {
+    if (Prefs.usePrivateStorage) {
+        return AnkiDroidFolder.AppPrivateFolder
+    }
     val canAccessLegacyStorage = Build.VERSION.SDK_INT < Build.VERSION_CODES.Q || Environment.isExternalStorageLegacy()
     val currentFolderIsAccessibleAndLegacy = canAccessLegacyStorage && isLegacyStorage(context, setCollectionPath = false) == true
 

AnkiDroid/src/main/java/com/ichi2/anki/IntentHandler.kt

@@ -349,14 +349,18 @@ class IntentHandler : AbstractIntentHandler() {
          *
          * @throws SystemStorageException if `getExternalFilesDir` returns null
          */
+
+        fun hasRequiredPermissions(context: Context): Boolean {
+            if (Prefs.usePrivateStorage) return true
+            return !ScopedStorageService.isLegacyStorage(context) || hasLegacyStorageAccessPermission(context) ||
+                Permissions.isExternalStorageManagerCompat()
+        }
+
         fun grantedStoragePermissions(
             context: Context,
             showToast: Boolean,
         ): Boolean {
-            val granted =
-                !ScopedStorageService.isLegacyStorage(context) ||
-                    hasLegacyStorageAccessPermission(context) ||
-                    Permissions.isExternalStorageManagerCompat()
+            val granted = hasRequiredPermissions(context)
 
             if (!granted && showToast) {
                 showThemedToast(context, context.getString(R.string.intent_handler_failed_no_storage_permission), false)

AnkiDroid/src/main/java/com/ichi2/anki/settings/Prefs.kt

@@ -339,6 +339,8 @@ open class PrefsRepository(
 
     var internetPermissionRequested by booleanPref(R.string.internet_permission_requested_key, false)
 
+    var usePrivateStorage by booleanPref(R.string.use_private_storage_key, false)
+
     // **************************************** Reviewer **************************************** //
 
     val ignoreDisplayCutout by booleanPref(R.string.ignore_display_cutout_key, false)

AnkiDroid/src/main/java/com/ichi2/anki/ui/windows/permissions/PermissionsStartingAt30Fragment.kt

@@ -18,13 +18,20 @@ package com.ichi2.anki.ui.windows.permissions
 import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
+import androidx.core.content.edit
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.ichi2.anki.AnkiDroidApp
+import com.ichi2.anki.CollectionHelper
 import com.ichi2.anki.R
 import com.ichi2.anki.databinding.FragmentPermissionsStartingAt30Binding
+import com.ichi2.anki.settings.Prefs
 import com.ichi2.utils.Permissions
 import com.ichi2.utils.Permissions.canManageExternalStorage
+import java.io.File
 
 /**
  * Permissions screen for requesting permissions at and above API 30,
@@ -43,6 +50,8 @@ class PermissionsStartingAt30Fragment : PermissionsFragment(R.layout.fragment_pe
         ) {
             if (hasAllPermissions()) {
                 requireActivity().finish()
+            } else {
+                showPrivateStorageWarningDialog()
             }
         }
 
@@ -57,5 +66,29 @@ class PermissionsStartingAt30Fragment : PermissionsFragment(R.layout.fragment_pe
                 .requestExternalStorageOnClick(accessAllFilesLauncher)
             internetPermission
                 .initializeInternetPermissionItem()
+            btnUsePrivateStorage.visibility = View.VISIBLE
+            btnUsePrivateStorage.setOnClickListener {
+                showPrivateStorageWarningDialog()
+            }
         }.root
+
+    private fun showPrivateStorageWarningDialog() {
+        MaterialAlertDialogBuilder(requireContext())
+            .setTitle(R.string.private_storage_warning_title)
+            .setMessage(R.string.private_storage_warning)
+            .setPositiveButton(R.string.dialog_continue) { _, _ ->
+                Prefs.usePrivateStorage = true
+
+                val externalFilesDir =
+                    requireContext().getExternalFilesDir(null) ?: requireContext().filesDir
+                val privateDir = File(externalFilesDir, "AnkiDroid").apply { mkdirs() }
+
+                AnkiDroidApp.sharedPrefs().edit(commit = true) {
+                    putString(CollectionHelper.PREF_COLLECTION_PATH, privateDir.absolutePath)
+                }
+
+                requireActivity().finish()
+            }.setNegativeButton(R.string.dialog_cancel, null)
+            .show()
+    }
 }

AnkiDroid/src/main/res/layout/fragment_permissions_starting_at_30.xml

@@ -26,4 +26,13 @@
         app:permissionSummary="@string/permission_access_summary"
         app:permission="@string/manage_internet_permission"
         />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btn_use_private_storage"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp"
+        android:text="@string/btn_skip_permission"
+        android:visibility="gone"/>
+
 </LinearLayout>

AnkiDroid/src/main/res/values/preferences.xml

@@ -269,4 +269,8 @@
 
     <!-- Onboarding -->
     <string name="internet_permission_requested_key">internetPermissionRequested</string>
+    <string name="use_private_storage_key">usePrivatestorage</string>
+    <string name="btn_skip_permission">Skip</string>
+    <string name="private_storage_warning_title"> Limited Storage access</string>
+    <string name="private_storage_warning">Without this permission, Your Ankidroid collection will be stored in app\'s private storage and will be permanently deleted if you uninstall Ankidroid.</string>
 </resources>