Remove support for external storage and raise target SDK to 31 (#1863)

2 files changed, 26 insertions, 126 deletions

diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/settings/DirectorySelectionActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/settings/DirectorySelectionActivity.kt
deleted file mode 100644
index 1f8873c0..00000000
--- a/app/src/main/java/dev/msfjarvis/aps/ui/settings/DirectorySelectionActivity.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
- * SPDX-License-Identifier: GPL-3.0-only
- */
-
-package dev.msfjarvis.aps.ui.settings
-
-import android.net.Uri
-import android.os.Bundle
-import android.os.Environment
-import android.provider.DocumentsContract
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.edit
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import dev.msfjarvis.aps.R
-import dev.msfjarvis.aps.util.extensions.sharedPrefs
-import dev.msfjarvis.aps.util.settings.PreferenceKeys
-import logcat.logcat
-
-class DirectorySelectionActivity : AppCompatActivity() {
-
-  @Suppress("DEPRECATION")
-  private val directorySelectAction =
-    registerForActivityResult(ActivityResultContracts.OpenDocumentTree()) { uri: Uri? ->
-      if (uri == null) return@registerForActivityResult
-
-      logcat { "Selected repository URI is $uri" }
-      // TODO: This is fragile. Workaround until PasswordItem is backed by DocumentFile
-      val docId = DocumentsContract.getTreeDocumentId(uri)
-      val split = docId.split(":".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
-      val path = if (split.size > 1) split[1] else split[0]
-      val repoPath = "${Environment.getExternalStorageDirectory()}/$path"
-      val prefs = sharedPrefs
-
-      logcat { "Selected repository path is $repoPath" }
-
-      if (Environment.getExternalStorageDirectory().path == repoPath) {
-        MaterialAlertDialogBuilder(this)
-          .setTitle(resources.getString(R.string.sdcard_root_warning_title))
-          .setMessage(resources.getString(R.string.sdcard_root_warning_message))
-          .setPositiveButton(resources.getString(R.string.sdcard_root_warning_remove_everything)) {
-            _,
-            _ ->
-            prefs.edit { putString(PreferenceKeys.GIT_EXTERNAL_REPO, uri.path) }
-          }
-          .setNegativeButton(R.string.dialog_cancel, null)
-          .show()
-      }
-      prefs.edit { putString(PreferenceKeys.GIT_EXTERNAL_REPO, repoPath) }
-      setResult(RESULT_OK)
-      finish()
-    }
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    directorySelectAction.launch(null)
-  }
-}
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/settings/RepositorySettings.kt b/app/src/main/java/dev/msfjarvis/aps/ui/settings/RepositorySettings.kt
index cbd9c18f..1c43127a 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/settings/RepositorySettings.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/settings/RepositorySettings.kt
@@ -23,7 +23,6 @@ import dagger.hilt.components.SingletonComponent
 import de.Maxr1998.modernpreferences.Preference
 import de.Maxr1998.modernpreferences.PreferenceScreen
 import de.Maxr1998.modernpreferences.helpers.checkBox
-import de.Maxr1998.modernpreferences.helpers.onCheckedChange
 import de.Maxr1998.modernpreferences.helpers.onClick
 import de.Maxr1998.modernpreferences.helpers.pref
 import dev.msfjarvis.aps.R
@@ -60,17 +59,6 @@ class RepositorySettings(private val activity: FragmentActivity) : SettingsProvi
 
   private var showSshKeyPref: Preference? = null
 
-  private fun selectExternalGitRepository() {
-    MaterialAlertDialogBuilder(activity)
-      .setTitle(activity.resources.getString(R.string.external_repository_dialog_title))
-      .setMessage(activity.resources.getString(R.string.external_repository_dialog_text))
-      .setPositiveButton(R.string.dialog_ok) { _, _ ->
-        activity.launchActivity(DirectorySelectionActivity::class.java)
-      }
-      .setNegativeButton(R.string.dialog_cancel, null)
-      .show()
-  }
-
   override fun provideSettings(builder: PreferenceScreen.Builder) {
     val encryptedPreferences = hiltEntryPoint.encryptedPreferences()
     val gitSettings = hiltEntryPoint.gitSettings()
@@ -162,64 +150,35 @@ class RepositorySettings(private val activity: FragmentActivity) : SettingsProvi
           true
         }
       }
-      val deleteRepoPref =
-        pref(PreferenceKeys.GIT_DELETE_REPO) {
-          titleRes = R.string.pref_git_delete_repo_title
-          summaryRes = R.string.pref_git_delete_repo_summary
-          visible = !activity.sharedPrefs.getBoolean(PreferenceKeys.GIT_EXTERNAL, false)
-          onClick {
-            val repoDir = PasswordRepository.getRepositoryDirectory()
-            MaterialAlertDialogBuilder(activity)
-              .setTitle(R.string.pref_dialog_delete_title)
-              .setMessage(activity.getString(R.string.dialog_delete_msg, repoDir))
-              .setCancelable(false)
-              .setPositiveButton(R.string.dialog_delete) { dialogInterface, _ ->
-                runCatching {
-                  PasswordRepository.getRepositoryDirectory().deleteRecursively()
-                  PasswordRepository.closeRepository()
-                }
-                  .onFailure { it.message?.let { message -> activity.snackbar(message = message) } }
+      pref(PreferenceKeys.GIT_DELETE_REPO) {
+        titleRes = R.string.pref_git_delete_repo_title
+        summaryRes = R.string.pref_git_delete_repo_summary
+        onClick {
+          val repoDir = PasswordRepository.getRepositoryDirectory()
+          MaterialAlertDialogBuilder(activity)
+            .setTitle(R.string.pref_dialog_delete_title)
+            .setMessage(activity.getString(R.string.dialog_delete_msg, repoDir))
+            .setCancelable(false)
+            .setPositiveButton(R.string.dialog_delete) { dialogInterface, _ ->
+              runCatching {
+                PasswordRepository.getRepositoryDirectory().deleteRecursively()
+                PasswordRepository.closeRepository()
+              }
+                .onFailure { it.message?.let { message -> activity.snackbar(message = message) } }
 
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
-                  activity.getSystemService<ShortcutManager>()?.apply {
-                    removeDynamicShortcuts(dynamicShortcuts.map { it.id }.toMutableList())
-                  }
+              if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+                activity.getSystemService<ShortcutManager>()?.apply {
+                  removeDynamicShortcuts(dynamicShortcuts.map { it.id }.toMutableList())
                 }
-                activity.sharedPrefs.edit {
-                  putBoolean(PreferenceKeys.REPOSITORY_INITIALIZED, false)
-                }
-                dialogInterface.cancel()
-                activity.finish()
-              }
-              .setNegativeButton(R.string.dialog_do_not_delete) { dialogInterface, _ ->
-                run { dialogInterface.cancel() }
               }
-              .show()
-            true
-          }
-        }
-      checkBox(PreferenceKeys.GIT_EXTERNAL) {
-        titleRes = R.string.pref_external_repository_title
-        summaryRes = R.string.pref_external_repository_summary
-        onCheckedChange { checked ->
-          deleteRepoPref.visible = !checked
-          deleteRepoPref.requestRebind()
-          PasswordRepository.closeRepository()
-          activity.sharedPrefs.edit { putBoolean(PreferenceKeys.REPO_CHANGED, true) }
-          true
-        }
-      }
-      pref(PreferenceKeys.GIT_EXTERNAL_REPO) {
-        val externalRepo = activity.sharedPrefs.getString(PreferenceKeys.GIT_EXTERNAL_REPO)
-        if (externalRepo != null) {
-          summary = externalRepo
-        } else {
-          summaryRes = R.string.pref_select_external_repository_summary_no_repo_selected
-        }
-        titleRes = R.string.pref_select_external_repository_title
-        dependency = PreferenceKeys.GIT_EXTERNAL
-        onClick {
-          selectExternalGitRepository()
+              activity.sharedPrefs.edit { putBoolean(PreferenceKeys.REPOSITORY_INITIALIZED, false) }
+              dialogInterface.cancel()
+              activity.finish()
+            }
+            .setNegativeButton(R.string.dialog_do_not_delete) { dialogInterface, _ ->
+              run { dialogInterface.cancel() }
+            }
+            .show()
           true
         }
       }