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

2 files changed, 26 insertions, 202 deletions

diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/CloneFragment.kt b/app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/CloneFragment.kt
index 603c016b..16c1a784 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/CloneFragment.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/CloneFragment.kt
@@ -11,7 +11,10 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.edit
 import androidx.fragment.app.Fragment
+import com.github.michaelbull.result.onFailure
+import com.github.michaelbull.result.runCatching
 import dev.msfjarvis.aps.R
+import dev.msfjarvis.aps.data.repo.PasswordRepository
 import dev.msfjarvis.aps.databinding.FragmentCloneBinding
 import dev.msfjarvis.aps.ui.git.config.GitServerConfigActivity
 import dev.msfjarvis.aps.util.extensions.finish
@@ -20,6 +23,9 @@ import dev.msfjarvis.aps.util.extensions.sharedPrefs
 import dev.msfjarvis.aps.util.extensions.unsafeLazy
 import dev.msfjarvis.aps.util.extensions.viewBinding
 import dev.msfjarvis.aps.util.settings.PreferenceKeys
+import logcat.LogPriority.ERROR
+import logcat.asLog
+import logcat.logcat
 
 class CloneFragment : Fragment(R.layout.fragment_clone) {
 
@@ -38,17 +44,33 @@ class CloneFragment : Fragment(R.layout.fragment_clone) {
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
     binding.cloneRemote.setOnClickListener { cloneToHiddenDir() }
-    binding.createLocal.setOnClickListener {
-      parentFragmentManager.performTransactionWithBackStack(RepoLocationFragment.newInstance())
-    }
+    binding.createLocal.setOnClickListener { createRepository() }
   }
 
   /** Clones a remote Git repository to the app's private directory */
   private fun cloneToHiddenDir() {
-    settings.edit { putBoolean(PreferenceKeys.GIT_EXTERNAL, false) }
     cloneAction.launch(GitServerConfigActivity.createCloneIntent(requireContext()))
   }
 
+  private fun createRepository() {
+    val localDir = PasswordRepository.getRepositoryDirectory()
+    runCatching {
+      check(localDir.exists() || localDir.mkdir()) { "Failed to create directory!" }
+      PasswordRepository.createRepository(localDir)
+      if (!PasswordRepository.isInitialized) {
+        PasswordRepository.initialize()
+      }
+      parentFragmentManager.performTransactionWithBackStack(KeySelectionFragment.newInstance())
+    }
+      .onFailure { e ->
+        logcat(ERROR) { e.asLog() }
+        if (!localDir.delete()) {
+          logcat { "Failed to delete local repository: $localDir" }
+        }
+        finish()
+      }
+  }
+
   companion object {
 
     fun newInstance(): CloneFragment = CloneFragment()
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/RepoLocationFragment.kt b/app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/RepoLocationFragment.kt
deleted file mode 100644
index befe44f1..00000000
--- a/app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/RepoLocationFragment.kt
+++ /dev/null
@@ -1,198 +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.onboarding.fragments
-
-import android.Manifest
-import android.content.Intent
-import android.os.Bundle
-import android.view.View
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.edit
-import androidx.fragment.app.Fragment
-import com.github.michaelbull.result.onFailure
-import com.github.michaelbull.result.runCatching
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import dev.msfjarvis.aps.R
-import dev.msfjarvis.aps.data.repo.PasswordRepository
-import dev.msfjarvis.aps.databinding.FragmentRepoLocationBinding
-import dev.msfjarvis.aps.ui.settings.DirectorySelectionActivity
-import dev.msfjarvis.aps.util.extensions.finish
-import dev.msfjarvis.aps.util.extensions.getString
-import dev.msfjarvis.aps.util.extensions.isPermissionGranted
-import dev.msfjarvis.aps.util.extensions.listFilesRecursively
-import dev.msfjarvis.aps.util.extensions.performTransactionWithBackStack
-import dev.msfjarvis.aps.util.extensions.sharedPrefs
-import dev.msfjarvis.aps.util.extensions.unsafeLazy
-import dev.msfjarvis.aps.util.extensions.viewBinding
-import dev.msfjarvis.aps.util.settings.PasswordSortOrder
-import dev.msfjarvis.aps.util.settings.PreferenceKeys
-import java.io.File
-import logcat.LogPriority.ERROR
-import logcat.asLog
-import logcat.logcat
-
-class RepoLocationFragment : Fragment(R.layout.fragment_repo_location) {
-
-  private val settings by unsafeLazy { requireActivity().applicationContext.sharedPrefs }
-  private val directorySelectIntent by unsafeLazy {
-    Intent(requireContext(), DirectorySelectionActivity::class.java)
-  }
-  private val binding by viewBinding(FragmentRepoLocationBinding::bind)
-  private val sortOrder: PasswordSortOrder
-    get() = PasswordSortOrder.getSortOrder(settings)
-
-  private val repositoryInitAction =
-    registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-      if (result.resultCode == AppCompatActivity.RESULT_OK) {
-        initializeRepositoryInfo()
-      }
-    }
-
-  private val externalDirectorySelectAction =
-    registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-      if (result.resultCode == AppCompatActivity.RESULT_OK) {
-        if (checkExternalDirectory()) {
-          finish()
-        } else {
-          createRepository()
-        }
-      }
-    }
-
-  private val externalDirPermGrantedAction = createPermGrantedAction {
-    externalDirectorySelectAction.launch(directorySelectIntent)
-  }
-
-  private val repositoryUsePermGrantedAction = createPermGrantedAction {
-    initializeRepositoryInfo()
-  }
-
-  private val repositoryChangePermGrantedAction = createPermGrantedAction {
-    repositoryInitAction.launch(directorySelectIntent)
-  }
-
-  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-    super.onViewCreated(view, savedInstanceState)
-    binding.hidden.setOnClickListener { createRepoInHiddenDir() }
-
-    binding.sdcard.setOnClickListener { createRepoFromExternalDir() }
-  }
-
-  /** Initializes an empty repository in the app's private directory */
-  private fun createRepoInHiddenDir() {
-    settings.edit {
-      putBoolean(PreferenceKeys.GIT_EXTERNAL, false)
-      remove(PreferenceKeys.GIT_EXTERNAL_REPO)
-    }
-    initializeRepositoryInfo()
-  }
-
-  /** Initializes an empty repository in a selected directory if one does not already exist */
-  private fun createRepoFromExternalDir() {
-    settings.edit { putBoolean(PreferenceKeys.GIT_EXTERNAL, true) }
-    val externalRepo = settings.getString(PreferenceKeys.GIT_EXTERNAL_REPO)
-    if (externalRepo == null) {
-      if (!isPermissionGranted(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
-        externalDirPermGrantedAction.launch(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-      } else {
-        // Unlikely we have storage permissions without user ever selecting a directory,
-        // but let's not assume.
-        externalDirectorySelectAction.launch(directorySelectIntent)
-      }
-    } else {
-      MaterialAlertDialogBuilder(requireActivity())
-        .setTitle(resources.getString(R.string.directory_selected_title))
-        .setMessage(resources.getString(R.string.directory_selected_message, externalRepo))
-        .setPositiveButton(resources.getString(R.string.use)) { _, _ ->
-          if (!isPermissionGranted(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
-            repositoryUsePermGrantedAction.launch(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-          } else {
-            initializeRepositoryInfo()
-          }
-        }
-        .setNegativeButton(resources.getString(R.string.change)) { _, _ ->
-          if (!isPermissionGranted(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
-            repositoryChangePermGrantedAction.launch(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-          } else {
-            repositoryInitAction.launch(directorySelectIntent)
-          }
-        }
-        .show()
-    }
-  }
-
-  private fun checkExternalDirectory(): Boolean {
-    if (settings.getBoolean(PreferenceKeys.GIT_EXTERNAL, false) &&
-        settings.getString(PreferenceKeys.GIT_EXTERNAL_REPO) != null
-    ) {
-      val externalRepoPath = settings.getString(PreferenceKeys.GIT_EXTERNAL_REPO)
-      val dir = externalRepoPath?.let { File(it) }
-      if (dir != null && // The directory could be opened
-        dir.exists() && // The directory exists
-          dir.isDirectory && // The directory, is really a directory
-          dir.listFilesRecursively().isNotEmpty() && // The directory contains files
-          // The directory contains a non-zero number of password files
-          PasswordRepository.getPasswords(
-              dir,
-              PasswordRepository.getRepositoryDirectory(),
-              sortOrder
-            )
-            .isNotEmpty()
-      ) {
-        PasswordRepository.closeRepository()
-        return true
-      }
-    }
-    return false
-  }
-
-  private fun createRepository() {
-    val localDir = PasswordRepository.getRepositoryDirectory()
-    runCatching {
-      check(localDir.exists() || localDir.mkdir()) { "Failed to create directory!" }
-      PasswordRepository.createRepository(localDir)
-      if (!PasswordRepository.isInitialized) {
-        PasswordRepository.initialize()
-      }
-      parentFragmentManager.performTransactionWithBackStack(KeySelectionFragment.newInstance())
-    }
-      .onFailure { e ->
-        logcat(ERROR) { e.asLog() }
-        if (!localDir.delete()) {
-          logcat { "Failed to delete local repository: $localDir" }
-        }
-        finish()
-      }
-  }
-
-  private fun initializeRepositoryInfo() {
-    val externalRepo = settings.getBoolean(PreferenceKeys.GIT_EXTERNAL, false)
-    val externalRepoPath = settings.getString(PreferenceKeys.GIT_EXTERNAL_REPO)
-    if (externalRepo && !isPermissionGranted(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
-      return
-    }
-    if (externalRepo && externalRepoPath != null) {
-      if (checkExternalDirectory()) {
-        finish()
-        return
-      }
-    }
-    createRepository()
-  }
-
-  private fun createPermGrantedAction(block: () -> Unit) =
-    registerForActivityResult(ActivityResultContracts.RequestPermission()) { granted ->
-      if (granted) {
-        block.invoke()
-      }
-    }
-
-  companion object {
-
-    fun newInstance(): RepoLocationFragment = RepoLocationFragment()
-  }
-}