all: re-do package structure yet again

8 files changed, 0 insertions, 729 deletions

diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/settings/AutofillSettings.kt b/app/src/main/java/dev/msfjarvis/aps/ui/settings/AutofillSettings.kt
deleted file mode 100644
index 80dce577..00000000
--- a/app/src/main/java/dev/msfjarvis/aps/ui/settings/AutofillSettings.kt
+++ /dev/null
@@ -1,133 +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.annotation.SuppressLint
-import android.content.Intent
-import android.net.Uri
-import android.os.Build
-import android.provider.Settings
-import androidx.annotation.RequiresApi
-import androidx.appcompat.widget.AppCompatTextView
-import androidx.fragment.app.FragmentActivity
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleEventObserver
-import com.github.androidpasswordstore.autofillparser.BrowserAutofillSupportLevel
-import com.github.androidpasswordstore.autofillparser.getInstalledBrowsersWithAutofillSupportLevel
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import de.Maxr1998.modernpreferences.PreferenceScreen
-import de.Maxr1998.modernpreferences.helpers.editText
-import de.Maxr1998.modernpreferences.helpers.onClick
-import de.Maxr1998.modernpreferences.helpers.singleChoice
-import de.Maxr1998.modernpreferences.helpers.switch
-import de.Maxr1998.modernpreferences.preferences.SwitchPreference
-import de.Maxr1998.modernpreferences.preferences.choice.SelectionItem
-import dev.msfjarvis.aps.BuildConfig
-import dev.msfjarvis.aps.R
-import dev.msfjarvis.aps.util.autofill.DirectoryStructure
-import dev.msfjarvis.aps.util.extensions.autofillManager
-import dev.msfjarvis.aps.util.settings.PreferenceKeys
-
-class AutofillSettings(private val activity: FragmentActivity) : SettingsProvider {
-
-  private val isAutofillServiceEnabled: Boolean
-    get() {
-      if (Build.VERSION.SDK_INT < 26) return false
-      return activity.autofillManager?.hasEnabledAutofillServices() == true
-    }
-
-  @RequiresApi(26)
-  private fun showAutofillDialog(pref: SwitchPreference) {
-    val observer = LifecycleEventObserver { _, event ->
-      when (event) {
-        Lifecycle.Event.ON_RESUME -> {
-          pref.checked = isAutofillServiceEnabled
-        }
-        else -> {}
-      }
-    }
-    MaterialAlertDialogBuilder(activity).run {
-      setTitle(R.string.pref_autofill_enable_title)
-      @SuppressLint("InflateParams")
-      val layout = activity.layoutInflater.inflate(R.layout.oreo_autofill_instructions, null)
-      val supportedBrowsersTextView = layout.findViewById<AppCompatTextView>(R.id.supportedBrowsers)
-      supportedBrowsersTextView.text =
-        getInstalledBrowsersWithAutofillSupportLevel(context).joinToString(separator = "\n") {
-          val appLabel = it.first
-          val supportDescription =
-            when (it.second) {
-              BrowserAutofillSupportLevel.None ->
-                activity.getString(R.string.oreo_autofill_no_support)
-              BrowserAutofillSupportLevel.FlakyFill ->
-                activity.getString(R.string.oreo_autofill_flaky_fill_support)
-              BrowserAutofillSupportLevel.PasswordFill ->
-                activity.getString(R.string.oreo_autofill_password_fill_support)
-              BrowserAutofillSupportLevel.PasswordFillAndSaveIfNoAccessibility ->
-                activity.getString(
-                  R.string.oreo_autofill_password_fill_and_conditional_save_support
-                )
-              BrowserAutofillSupportLevel.GeneralFill ->
-                activity.getString(R.string.oreo_autofill_general_fill_support)
-              BrowserAutofillSupportLevel.GeneralFillAndSave ->
-                activity.getString(R.string.oreo_autofill_general_fill_and_save_support)
-            }
-          "$appLabel: $supportDescription"
-        }
-      setView(layout)
-      setPositiveButton(R.string.dialog_ok) { _, _ ->
-        val intent =
-          Intent(Settings.ACTION_REQUEST_SET_AUTOFILL_SERVICE).apply {
-            data = Uri.parse("package:${BuildConfig.APPLICATION_ID}")
-          }
-        activity.startActivity(intent)
-      }
-      setNegativeButton(R.string.dialog_cancel, null)
-      setOnDismissListener { pref.checked = isAutofillServiceEnabled }
-      activity.lifecycle.addObserver(observer)
-      show()
-    }
-  }
-
-  override fun provideSettings(builder: PreferenceScreen.Builder) {
-    builder.apply {
-      switch(PreferenceKeys.AUTOFILL_ENABLE) {
-        titleRes = R.string.pref_autofill_enable_title
-        visible = Build.VERSION.SDK_INT >= 26
-        defaultValue = isAutofillServiceEnabled
-        onClick {
-          if (Build.VERSION.SDK_INT < 26) return@onClick true
-          if (isAutofillServiceEnabled) {
-            activity.autofillManager?.disableAutofillServices()
-          } else {
-            showAutofillDialog(this)
-          }
-          false
-        }
-      }
-      val values =
-        activity.resources.getStringArray(R.array.oreo_autofill_directory_structure_values)
-      val titles =
-        activity.resources.getStringArray(R.array.oreo_autofill_directory_structure_entries)
-      val items = values.zip(titles).map { SelectionItem(it.first, it.second, null) }
-      singleChoice(PreferenceKeys.OREO_AUTOFILL_DIRECTORY_STRUCTURE, items) {
-        initialSelection = DirectoryStructure.DEFAULT.value
-        dependency = PreferenceKeys.AUTOFILL_ENABLE
-        titleRes = R.string.oreo_autofill_preference_directory_structure
-      }
-      editText(PreferenceKeys.OREO_AUTOFILL_DEFAULT_USERNAME) {
-        dependency = PreferenceKeys.AUTOFILL_ENABLE
-        titleRes = R.string.preference_default_username_title
-        summaryProvider = { activity.getString(R.string.preference_default_username_summary) }
-      }
-      editText(PreferenceKeys.OREO_AUTOFILL_CUSTOM_PUBLIC_SUFFIXES) {
-        dependency = PreferenceKeys.AUTOFILL_ENABLE
-        titleRes = R.string.preference_custom_public_suffixes_title
-        summaryProvider = { activity.getString(R.string.preference_custom_public_suffixes_summary) }
-        textInputHintRes = R.string.preference_custom_public_suffixes_hint
-      }
-    }
-  }
-}
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/settings/GeneralSettings.kt b/app/src/main/java/dev/msfjarvis/aps/ui/settings/GeneralSettings.kt
deleted file mode 100644
index 21ecd55c..00000000
--- a/app/src/main/java/dev/msfjarvis/aps/ui/settings/GeneralSettings.kt
+++ /dev/null
@@ -1,110 +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.content.pm.ShortcutManager
-import android.os.Build
-import androidx.core.content.edit
-import androidx.core.content.getSystemService
-import androidx.fragment.app.FragmentActivity
-import de.Maxr1998.modernpreferences.PreferenceScreen
-import de.Maxr1998.modernpreferences.helpers.checkBox
-import de.Maxr1998.modernpreferences.helpers.onClick
-import de.Maxr1998.modernpreferences.helpers.singleChoice
-import de.Maxr1998.modernpreferences.preferences.choice.SelectionItem
-import dev.msfjarvis.aps.R
-import dev.msfjarvis.aps.util.auth.BiometricAuthenticator
-import dev.msfjarvis.aps.util.auth.BiometricAuthenticator.Result
-import dev.msfjarvis.aps.util.extensions.sharedPrefs
-import dev.msfjarvis.aps.util.settings.PreferenceKeys
-
-class GeneralSettings(private val activity: FragmentActivity) : SettingsProvider {
-
-  override fun provideSettings(builder: PreferenceScreen.Builder) {
-    builder.apply {
-      val themeValues = activity.resources.getStringArray(R.array.app_theme_values)
-      val themeOptions = activity.resources.getStringArray(R.array.app_theme_options)
-      val themeItems =
-        themeValues.zip(themeOptions).map { SelectionItem(it.first, it.second, null) }
-      singleChoice(PreferenceKeys.APP_THEME, themeItems) {
-        initialSelection = activity.resources.getString(R.string.app_theme_def)
-        titleRes = R.string.pref_app_theme_title
-      }
-
-      val sortValues = activity.resources.getStringArray(R.array.sort_order_values)
-      val sortOptions = activity.resources.getStringArray(R.array.sort_order_entries)
-      val sortItems = sortValues.zip(sortOptions).map { SelectionItem(it.first, it.second, null) }
-      singleChoice(PreferenceKeys.SORT_ORDER, sortItems) {
-        initialSelection = sortValues[0]
-        titleRes = R.string.pref_sort_order_title
-      }
-
-      checkBox(PreferenceKeys.DISABLE_SYNC_ACTION) {
-        titleRes = R.string.pref_disable_sync_on_pull_title
-        summaryRes = R.string.pref_disable_sync_on_pull_summary
-        defaultValue = false
-      }
-
-      checkBox(PreferenceKeys.FILTER_RECURSIVELY) {
-        titleRes = R.string.pref_recursive_filter_title
-        summaryRes = R.string.pref_recursive_filter_summary
-        defaultValue = true
-      }
-
-      checkBox(PreferenceKeys.SEARCH_ON_START) {
-        titleRes = R.string.pref_search_on_start_title
-        summaryRes = R.string.pref_search_on_start_summary
-        defaultValue = false
-      }
-
-      checkBox(PreferenceKeys.SHOW_HIDDEN_CONTENTS) {
-        titleRes = R.string.pref_show_hidden_title
-        summaryRes = R.string.pref_show_hidden_summary
-        defaultValue = false
-      }
-
-      val canAuthenticate = BiometricAuthenticator.canAuthenticate(activity)
-      checkBox(PreferenceKeys.BIOMETRIC_AUTH) {
-        titleRes = R.string.pref_biometric_auth_title
-        defaultValue = false
-        enabled = canAuthenticate
-        summaryRes =
-          if (canAuthenticate) R.string.pref_biometric_auth_summary
-          else R.string.pref_biometric_auth_summary_error
-        onClick {
-          enabled = false
-          val isChecked = checked
-          activity.sharedPrefs.edit {
-            BiometricAuthenticator.authenticate(activity) { result ->
-              when (result) {
-                is Result.Success -> {
-                  // Apply the changes
-                  putBoolean(PreferenceKeys.BIOMETRIC_AUTH, checked)
-                  enabled = true
-                }
-                is Result.Retry -> {}
-                else -> {
-                  // If any error occurs, revert back to the previous
-                  // state. This
-                  // catch-all clause includes the cancellation case.
-                  putBoolean(PreferenceKeys.BIOMETRIC_AUTH, !checked)
-                  checked = !isChecked
-                  enabled = true
-                }
-              }
-            }
-          }
-          if (Build.VERSION.SDK_INT >= 25) {
-            activity.getSystemService<ShortcutManager>()?.apply {
-              removeDynamicShortcuts(dynamicShortcuts.map { it.id }.toMutableList())
-            }
-          }
-          false
-        }
-      }
-    }
-  }
-}
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/settings/MiscSettings.kt b/app/src/main/java/dev/msfjarvis/aps/ui/settings/MiscSettings.kt
deleted file mode 100644
index 5bb50cd8..00000000
--- a/app/src/main/java/dev/msfjarvis/aps/ui/settings/MiscSettings.kt
+++ /dev/null
@@ -1,81 +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.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.os.Build
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.documentfile.provider.DocumentFile
-import androidx.fragment.app.FragmentActivity
-import de.Maxr1998.modernpreferences.PreferenceScreen
-import de.Maxr1998.modernpreferences.helpers.checkBox
-import de.Maxr1998.modernpreferences.helpers.onClick
-import de.Maxr1998.modernpreferences.helpers.pref
-import dev.msfjarvis.aps.BuildConfig
-import dev.msfjarvis.aps.R
-import dev.msfjarvis.aps.util.services.PasswordExportService
-import dev.msfjarvis.aps.util.settings.PreferenceKeys
-
-class MiscSettings(activity: FragmentActivity) : SettingsProvider {
-
-  private val storeExportAction =
-    activity.registerForActivityResult(
-      object : ActivityResultContracts.OpenDocumentTree() {
-        override fun createIntent(context: Context, input: Uri?): Intent {
-          return super.createIntent(context, input).apply {
-            flags =
-              Intent.FLAG_GRANT_READ_URI_PERMISSION or
-                Intent.FLAG_GRANT_WRITE_URI_PERMISSION or
-                Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION or
-                Intent.FLAG_GRANT_PREFIX_URI_PERMISSION
-          }
-        }
-      }
-    ) { uri: Uri? ->
-      if (uri == null) return@registerForActivityResult
-      val targetDirectory = DocumentFile.fromTreeUri(activity.applicationContext, uri)
-
-      if (targetDirectory != null) {
-        val service =
-          Intent(activity.applicationContext, PasswordExportService::class.java).apply {
-            action = PasswordExportService.ACTION_EXPORT_PASSWORD
-            putExtra("uri", uri)
-          }
-
-        if (Build.VERSION.SDK_INT >= 26) {
-          activity.startForegroundService(service)
-        } else {
-          activity.startService(service)
-        }
-      }
-    }
-
-  override fun provideSettings(builder: PreferenceScreen.Builder) {
-    builder.apply {
-      pref(PreferenceKeys.EXPORT_PASSWORDS) {
-        titleRes = R.string.prefs_export_passwords_title
-        summaryRes = R.string.prefs_export_passwords_summary
-        onClick {
-          storeExportAction.launch(null)
-          true
-        }
-      }
-      checkBox(PreferenceKeys.CLEAR_CLIPBOARD_HISTORY) {
-        defaultValue = false
-        titleRes = R.string.pref_clear_clipboard_title
-        summaryRes = R.string.pref_clear_clipboard_summary
-      }
-      checkBox(PreferenceKeys.ENABLE_DEBUG_LOGGING) {
-        defaultValue = false
-        titleRes = R.string.pref_debug_logging_title
-        summaryRes = R.string.pref_debug_logging_summary
-        visible = !BuildConfig.DEBUG
-      }
-    }
-  }
-}
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/settings/PGPSettings.kt b/app/src/main/java/dev/msfjarvis/aps/ui/settings/PGPSettings.kt
deleted file mode 100644
index b81af006..00000000
--- a/app/src/main/java/dev/msfjarvis/aps/ui/settings/PGPSettings.kt
+++ /dev/null
@@ -1,37 +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 androidx.fragment.app.FragmentActivity
-import de.Maxr1998.modernpreferences.PreferenceScreen
-import de.Maxr1998.modernpreferences.helpers.checkBox
-import de.Maxr1998.modernpreferences.helpers.onClick
-import de.Maxr1998.modernpreferences.helpers.pref
-import dev.msfjarvis.aps.ui.pgp.PGPKeyImportActivity
-import dev.msfjarvis.aps.util.extensions.launchActivity
-import dev.msfjarvis.aps.util.features.Feature
-
-class PGPSettings(private val activity: FragmentActivity) : SettingsProvider {
-
-  override fun provideSettings(builder: PreferenceScreen.Builder) {
-    builder.apply {
-      val enablePGPainless =
-        checkBox(Feature.EnablePGPainlessBackend.configKey) {
-          title = "Enable new PGP backend"
-          persistent = true
-        }
-      pref("_") {
-        title = "Import PGP key"
-        persistent = false
-        dependency = enablePGPainless.key
-        onClick {
-          activity.launchActivity(PGPKeyImportActivity::class.java)
-          false
-        }
-      }
-    }
-  }
-}
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/settings/PasswordSettings.kt b/app/src/main/java/dev/msfjarvis/aps/ui/settings/PasswordSettings.kt
deleted file mode 100644
index db3d3670..00000000
--- a/app/src/main/java/dev/msfjarvis/aps/ui/settings/PasswordSettings.kt
+++ /dev/null
@@ -1,53 +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.text.InputType
-import androidx.fragment.app.FragmentActivity
-import de.Maxr1998.modernpreferences.PreferenceScreen
-import de.Maxr1998.modernpreferences.helpers.checkBox
-import de.Maxr1998.modernpreferences.helpers.editText
-import de.Maxr1998.modernpreferences.helpers.onSelectionChange
-import de.Maxr1998.modernpreferences.helpers.singleChoice
-import de.Maxr1998.modernpreferences.preferences.choice.SelectionItem
-import dev.msfjarvis.aps.R
-import dev.msfjarvis.aps.util.settings.PreferenceKeys
-
-class PasswordSettings(private val activity: FragmentActivity) : SettingsProvider {
-
-  override fun provideSettings(builder: PreferenceScreen.Builder) {
-    builder.apply {
-      val values = activity.resources.getStringArray(R.array.pwgen_provider_values)
-      val labels = activity.resources.getStringArray(R.array.pwgen_provider_labels)
-      val items = values.zip(labels).map { SelectionItem(it.first, it.second, null) }
-      singleChoice(
-        PreferenceKeys.PREF_KEY_PWGEN_TYPE,
-        items,
-      ) {
-        initialSelection = "classic"
-        titleRes = R.string.pref_password_generator_type_title
-        onSelectionChange { true }
-      }
-      editText(PreferenceKeys.GENERAL_SHOW_TIME) {
-        titleRes = R.string.pref_clipboard_timeout_title
-        summaryProvider = { timeout ->
-          activity.getString(R.string.pref_clipboard_timeout_summary, timeout ?: "45")
-        }
-        textInputType = InputType.TYPE_CLASS_NUMBER
-      }
-      checkBox(PreferenceKeys.SHOW_PASSWORD) {
-        titleRes = R.string.show_password_pref_title
-        summaryRes = R.string.show_password_pref_summary
-        defaultValue = true
-      }
-      checkBox(PreferenceKeys.COPY_ON_DECRYPT) {
-        titleRes = R.string.pref_copy_title
-        summaryRes = R.string.pref_copy_summary
-        defaultValue = false
-      }
-    }
-  }
-}
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
deleted file mode 100644
index df34b145..00000000
--- a/app/src/main/java/dev/msfjarvis/aps/ui/settings/RepositorySettings.kt
+++ /dev/null
@@ -1,194 +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.content.Intent
-import android.content.SharedPreferences
-import android.content.pm.ShortcutManager
-import android.os.Build
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.content.edit
-import androidx.core.content.getSystemService
-import androidx.fragment.app.FragmentActivity
-import com.github.michaelbull.result.onFailure
-import com.github.michaelbull.result.runCatching
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import dagger.hilt.EntryPoint
-import dagger.hilt.InstallIn
-import dagger.hilt.android.EntryPointAccessors
-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.onClick
-import de.Maxr1998.modernpreferences.helpers.pref
-import dev.msfjarvis.aps.R
-import dev.msfjarvis.aps.data.repo.PasswordRepository
-import dev.msfjarvis.aps.injection.prefs.GitPreferences
-import dev.msfjarvis.aps.ui.git.config.GitConfigActivity
-import dev.msfjarvis.aps.ui.git.config.GitServerConfigActivity
-import dev.msfjarvis.aps.ui.proxy.ProxySelectorActivity
-import dev.msfjarvis.aps.ui.sshkeygen.ShowSshKeyFragment
-import dev.msfjarvis.aps.ui.sshkeygen.SshKeyGenActivity
-import dev.msfjarvis.aps.ui.sshkeygen.SshKeyImportActivity
-import dev.msfjarvis.aps.util.extensions.getString
-import dev.msfjarvis.aps.util.extensions.launchActivity
-import dev.msfjarvis.aps.util.extensions.sharedPrefs
-import dev.msfjarvis.aps.util.extensions.snackbar
-import dev.msfjarvis.aps.util.extensions.unsafeLazy
-import dev.msfjarvis.aps.util.git.sshj.SshKey
-import dev.msfjarvis.aps.util.settings.GitSettings
-import dev.msfjarvis.aps.util.settings.PreferenceKeys
-
-class RepositorySettings(private val activity: FragmentActivity) : SettingsProvider {
-
-  private val generateSshKey =
-    activity.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-      showSshKeyPref?.visible = SshKey.canShowSshPublicKey
-    }
-
-  private val hiltEntryPoint by unsafeLazy {
-    EntryPointAccessors.fromApplication(
-      activity.applicationContext,
-      RepositorySettingsEntryPoint::class.java,
-    )
-  }
-
-  private var showSshKeyPref: Preference? = null
-
-  override fun provideSettings(builder: PreferenceScreen.Builder) {
-    val encryptedPreferences = hiltEntryPoint.encryptedPreferences()
-    val gitSettings = hiltEntryPoint.gitSettings()
-
-    builder.apply {
-      checkBox(PreferenceKeys.REBASE_ON_PULL) {
-        titleRes = R.string.pref_rebase_on_pull_title
-        summaryRes = R.string.pref_rebase_on_pull_summary
-        summaryOnRes = R.string.pref_rebase_on_pull_summary_on
-        defaultValue = true
-      }
-      pref(PreferenceKeys.GIT_SERVER_INFO) {
-        titleRes = R.string.pref_edit_git_server_settings
-        visible = PasswordRepository.isGitRepo()
-        onClick {
-          activity.launchActivity(GitServerConfigActivity::class.java)
-          true
-        }
-      }
-      pref(PreferenceKeys.PROXY_SETTINGS) {
-        titleRes = R.string.pref_edit_proxy_settings
-        visible = gitSettings.url?.startsWith("https") == true && PasswordRepository.isGitRepo()
-        onClick {
-          activity.launchActivity(ProxySelectorActivity::class.java)
-          true
-        }
-      }
-      pref(PreferenceKeys.GIT_CONFIG) {
-        titleRes = R.string.pref_edit_git_config
-        visible = PasswordRepository.isGitRepo()
-        onClick {
-          activity.launchActivity(GitConfigActivity::class.java)
-          true
-        }
-      }
-      pref(PreferenceKeys.SSH_KEY) {
-        titleRes = R.string.pref_import_ssh_key_title
-        visible = PasswordRepository.isGitRepo()
-        onClick {
-          activity.launchActivity(SshKeyImportActivity::class.java)
-          true
-        }
-      }
-      pref(PreferenceKeys.SSH_KEYGEN) {
-        titleRes = R.string.pref_ssh_keygen_title
-        onClick {
-          generateSshKey.launch(Intent(activity, SshKeyGenActivity::class.java))
-          true
-        }
-      }
-      showSshKeyPref =
-        pref(PreferenceKeys.SSH_SEE_KEY) {
-          titleRes = R.string.pref_ssh_see_key_title
-          visible = PasswordRepository.isGitRepo() && SshKey.canShowSshPublicKey
-          onClick {
-            ShowSshKeyFragment().show(activity.supportFragmentManager, "public_key")
-            true
-          }
-        }
-      pref(PreferenceKeys.CLEAR_SAVED_PASS) {
-        fun Preference.updatePref() {
-          val sshPass = encryptedPreferences.getString(PreferenceKeys.SSH_KEY_LOCAL_PASSPHRASE)
-          val httpsPass = encryptedPreferences.getString(PreferenceKeys.HTTPS_PASSWORD)
-          if (sshPass == null && httpsPass == null) {
-            visible = false
-            return
-          }
-          when {
-            httpsPass != null -> titleRes = R.string.clear_saved_passphrase_https
-            sshPass != null -> titleRes = R.string.clear_saved_passphrase_ssh
-          }
-          visible = true
-          requestRebind()
-        }
-        onClick {
-          updatePref()
-          true
-        }
-        updatePref()
-      }
-      pref(PreferenceKeys.SSH_OPENKEYSTORE_CLEAR_KEY_ID) {
-        titleRes = R.string.pref_title_openkeystore_clear_keyid
-        visible =
-          activity.sharedPrefs.getString(PreferenceKeys.SSH_OPENKEYSTORE_KEYID)?.isNotEmpty()
-            ?: false
-        onClick {
-          activity.sharedPrefs.edit { putString(PreferenceKeys.SSH_OPENKEYSTORE_KEYID, null) }
-          visible = false
-          true
-        }
-      }
-      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 >= 25) {
-                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
-        }
-      }
-    }
-  }
-
-  @EntryPoint
-  @InstallIn(SingletonComponent::class)
-  interface RepositorySettingsEntryPoint {
-    fun gitSettings(): GitSettings
-    @GitPreferences fun encryptedPreferences(): SharedPreferences
-  }
-}
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/settings/SettingsActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/settings/SettingsActivity.kt
deleted file mode 100644
index d31aa630..00000000
--- a/app/src/main/java/dev/msfjarvis/aps/ui/settings/SettingsActivity.kt
+++ /dev/null
@@ -1,106 +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.os.Bundle
-import android.view.MenuItem
-import androidx.appcompat.app.AppCompatActivity
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import de.Maxr1998.modernpreferences.Preference
-import de.Maxr1998.modernpreferences.PreferencesAdapter
-import de.Maxr1998.modernpreferences.helpers.screen
-import de.Maxr1998.modernpreferences.helpers.subScreen
-import dev.msfjarvis.aps.R
-import dev.msfjarvis.aps.databinding.ActivityPreferenceRecyclerviewBinding
-import dev.msfjarvis.aps.util.extensions.viewBinding
-
-class SettingsActivity : AppCompatActivity() {
-
-  private val miscSettings = MiscSettings(this)
-  private val autofillSettings = AutofillSettings(this)
-  private val passwordSettings = PasswordSettings(this)
-  private val repositorySettings = RepositorySettings(this)
-  private val generalSettings = GeneralSettings(this)
-  private val pgpSettings = PGPSettings(this)
-
-  private val binding by viewBinding(ActivityPreferenceRecyclerviewBinding::inflate)
-  private val preferencesAdapter: PreferencesAdapter
-    get() = binding.preferenceRecyclerView.adapter as PreferencesAdapter
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    setContentView(binding.root)
-    Preference.Config.dialogBuilderFactory = { context -> MaterialAlertDialogBuilder(context) }
-    val screen =
-      screen(this) {
-        subScreen {
-          titleRes = R.string.pref_category_general_title
-          iconRes = R.drawable.app_settings_alt_24px
-          generalSettings.provideSettings(this)
-        }
-        subScreen {
-          titleRes = R.string.pref_category_autofill_title
-          iconRes = R.drawable.ic_wysiwyg_24px
-          autofillSettings.provideSettings(this)
-        }
-        subScreen {
-          titleRes = R.string.pref_category_passwords_title
-          iconRes = R.drawable.ic_password_24px
-          passwordSettings.provideSettings(this)
-        }
-        subScreen {
-          titleRes = R.string.pref_category_repository_title
-          iconRes = R.drawable.ic_call_merge_24px
-          repositorySettings.provideSettings(this)
-        }
-        subScreen {
-          titleRes = R.string.pref_category_misc_title
-          iconRes = R.drawable.ic_miscellaneous_services_24px
-          miscSettings.provideSettings(this)
-        }
-        subScreen {
-          titleRes = R.string.pref_category_pgp_title
-          iconRes = R.drawable.ic_lock_open_24px
-          pgpSettings.provideSettings(this)
-        }
-      }
-    val adapter = PreferencesAdapter(screen)
-    adapter.onScreenChangeListener =
-      PreferencesAdapter.OnScreenChangeListener { subScreen, entering ->
-        supportActionBar?.title =
-          if (!entering) {
-            getString(R.string.action_settings)
-          } else {
-            getString(subScreen.titleRes)
-          }
-      }
-    savedInstanceState
-      ?.getParcelable<PreferencesAdapter.SavedState>("adapter")
-      ?.let(adapter::loadSavedState)
-    binding.preferenceRecyclerView.adapter = adapter
-  }
-
-  override fun onSaveInstanceState(outState: Bundle) {
-    super.onSaveInstanceState(outState)
-    outState.putParcelable("adapter", preferencesAdapter.getSavedState())
-  }
-
-  override fun onOptionsItemSelected(item: MenuItem): Boolean {
-    return when (item.itemId) {
-      android.R.id.home ->
-        if (!preferencesAdapter.goBack()) {
-          super.onOptionsItemSelected(item)
-        } else {
-          true
-        }
-      else -> super.onOptionsItemSelected(item)
-    }
-  }
-
-  override fun onBackPressed() {
-    if (!preferencesAdapter.goBack()) super.onBackPressed()
-  }
-}
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/settings/SettingsProvider.kt b/app/src/main/java/dev/msfjarvis/aps/ui/settings/SettingsProvider.kt
deleted file mode 100644
index 61b11064..00000000
--- a/app/src/main/java/dev/msfjarvis/aps/ui/settings/SettingsProvider.kt
+++ /dev/null
@@ -1,15 +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 de.Maxr1998.modernpreferences.PreferenceScreen
-
-/** Used to generate a uniform API for all settings UI classes. */
-interface SettingsProvider {
-
-  /** Inserts the settings items for the class into the given [builder]. */
-  fun provideSettings(builder: PreferenceScreen.Builder)
-}