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

1 files changed, 4 insertions, 45 deletions

diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordStore.kt b/app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordStore.kt
index d80959b8..e4ec2359 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordStore.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordStore.kt
@@ -4,7 +4,6 @@
  */
 package dev.msfjarvis.aps.ui.passwords
 
-import android.Manifest
 import android.annotation.SuppressLint
 import android.content.ComponentName
 import android.content.Context
@@ -40,12 +39,10 @@ import dev.msfjarvis.aps.ui.crypto.DecryptActivity
 import dev.msfjarvis.aps.ui.crypto.DecryptActivityV2
 import dev.msfjarvis.aps.ui.crypto.PasswordCreationActivity
 import dev.msfjarvis.aps.ui.crypto.PasswordCreationActivityV2
-import dev.msfjarvis.aps.ui.dialogs.BasicBottomSheet
 import dev.msfjarvis.aps.ui.dialogs.FolderCreationDialogFragment
 import dev.msfjarvis.aps.ui.folderselect.SelectFolderActivity
 import dev.msfjarvis.aps.ui.git.base.BaseGitActivity
 import dev.msfjarvis.aps.ui.onboarding.activity.OnboardingActivity
-import dev.msfjarvis.aps.ui.settings.DirectorySelectionActivity
 import dev.msfjarvis.aps.ui.settings.SettingsActivity
 import dev.msfjarvis.aps.util.autofill.AutofillMatcher
 import dev.msfjarvis.aps.util.extensions.base64
@@ -53,7 +50,6 @@ import dev.msfjarvis.aps.util.extensions.commitChange
 import dev.msfjarvis.aps.util.extensions.contains
 import dev.msfjarvis.aps.util.extensions.getString
 import dev.msfjarvis.aps.util.extensions.isInsideRepository
-import dev.msfjarvis.aps.util.extensions.isPermissionGranted
 import dev.msfjarvis.aps.util.extensions.listFilesRecursively
 import dev.msfjarvis.aps.util.extensions.sharedPrefs
 import dev.msfjarvis.aps.util.features.Feature
@@ -206,16 +202,7 @@ class PasswordStore : BaseGitActivity() {
 
   @SuppressLint("NewApi")
   override fun onCreate(savedInstanceState: Bundle?) {
-    // If user opens app with permission granted then revokes and returns,
-    // prevent attempt to create password list fragment
-    var savedInstance = savedInstanceState
-    if (savedInstanceState != null &&
-        (!settings.getBoolean(PreferenceKeys.GIT_EXTERNAL, false) ||
-          !isPermissionGranted(Manifest.permission.WRITE_EXTERNAL_STORAGE))
-    ) {
-      savedInstance = null
-    }
-    super.onCreate(savedInstance)
+    super.onCreate(savedInstanceState)
     setContentView(R.layout.activity_pwdstore)
 
     model.currentDir.observe(this) { dir ->
@@ -233,11 +220,7 @@ class PasswordStore : BaseGitActivity() {
 
   override fun onResume() {
     super.onResume()
-    if (settings.getBoolean(PreferenceKeys.GIT_EXTERNAL, false)) {
-      hasRequiredStoragePermissions()
-    } else {
-      checkLocalRepository()
-    }
+    checkLocalRepository()
     if (settings.getBoolean(PreferenceKeys.SEARCH_ON_START, false) && ::searchItem.isInitialized) {
       if (!searchItem.isActionViewExpanded) {
         searchItem.expandActionView()
@@ -362,33 +345,9 @@ class PasswordStore : BaseGitActivity() {
         )
     }
 
-  /**
-   * Validates if storage permission is granted, and requests for it if not. The return value is
-   * true if the permission has been granted.
-   */
-  private fun hasRequiredStoragePermissions(): Boolean {
-    return if (!isPermissionGranted(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
-      BasicBottomSheet.Builder(this)
-        .setMessageRes(R.string.access_sdcard_text)
-        .setPositiveButtonClickListener(getString(R.string.snackbar_action_grant)) {
-          storagePermissionRequest.launch(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-        }
-        .build()
-        .show(supportFragmentManager, "STORAGE_PERMISSION_MISSING")
-      false
-    } else {
-      checkLocalRepository()
-      true
-    }
-  }
-
   private fun checkLocalRepository() {
-    val repo = PasswordRepository.initialize()
-    if (repo == null) {
-      directorySelectAction.launch(Intent(this, DirectorySelectionActivity::class.java))
-    } else {
-      checkLocalRepository(PasswordRepository.getRepositoryDirectory())
-    }
+    PasswordRepository.initialize()
+    checkLocalRepository(PasswordRepository.getRepositoryDirectory())
   }
 
   private fun checkLocalRepository(localDir: File?) {