all: re-do package structure yet again

1 files changed, 0 insertions, 154 deletions

diff --git a/app/src/main/java/dev/msfjarvis/aps/util/settings/Migrations.kt b/app/src/main/java/dev/msfjarvis/aps/util/settings/Migrations.kt
deleted file mode 100644
index 7e91ab41..00000000
--- a/app/src/main/java/dev/msfjarvis/aps/util/settings/Migrations.kt
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
- * SPDX-License-Identifier: GPL-3.0-only
- */
-@file:Suppress("DEPRECATION")
-
-package dev.msfjarvis.aps.util.settings
-
-import android.content.SharedPreferences
-import androidx.core.content.edit
-import com.github.michaelbull.result.get
-import com.github.michaelbull.result.runCatching
-import dev.msfjarvis.aps.util.extensions.getString
-import dev.msfjarvis.aps.util.git.sshj.SshKey
-import java.io.File
-import java.net.URI
-import logcat.LogPriority.ERROR
-import logcat.LogPriority.INFO
-import logcat.logcat
-
-private const val TAG = "Migrations"
-
-fun runMigrations(filesDirPath: String, sharedPrefs: SharedPreferences, gitSettings: GitSettings) {
-  migrateToGitUrlBasedConfig(sharedPrefs, gitSettings)
-  migrateToHideAll(sharedPrefs)
-  migrateToSshKey(filesDirPath, sharedPrefs)
-  migrateToClipboardHistory(sharedPrefs)
-  migrateToDiceware(sharedPrefs)
-  removeExternalStorageProperties(sharedPrefs)
-}
-
-private fun migrateToGitUrlBasedConfig(sharedPrefs: SharedPreferences, gitSettings: GitSettings) {
-  val serverHostname = sharedPrefs.getString(PreferenceKeys.GIT_REMOTE_SERVER) ?: return
-  logcat(TAG, INFO) { "Migrating to URL-based Git config" }
-  val serverPort = sharedPrefs.getString(PreferenceKeys.GIT_REMOTE_PORT) ?: ""
-  val serverUser = sharedPrefs.getString(PreferenceKeys.GIT_REMOTE_USERNAME) ?: ""
-  val serverPath = sharedPrefs.getString(PreferenceKeys.GIT_REMOTE_LOCATION) ?: ""
-  val protocol = Protocol.fromString(sharedPrefs.getString(PreferenceKeys.GIT_REMOTE_PROTOCOL))
-
-  // Whether we need the leading ssh:// depends on the use of a custom port.
-  val hostnamePart = serverHostname.removePrefix("ssh://")
-  val url =
-    when (protocol) {
-      Protocol.Ssh -> {
-        val userPart = if (serverUser.isEmpty()) "" else "${serverUser.trimEnd('@')}@"
-        val portPart = if (serverPort == "22" || serverPort.isEmpty()) "" else ":$serverPort"
-        if (portPart.isEmpty()) {
-          "$userPart$hostnamePart:$serverPath"
-        } else {
-          // Only absolute paths are supported with custom ports.
-          if (!serverPath.startsWith('/')) {
-            null
-          } else {
-            // We have to specify the ssh scheme as this is the only way to pass a custom
-            // port.
-            "ssh://$userPart$hostnamePart$portPart$serverPath"
-          }
-        }
-      }
-      Protocol.Https -> {
-        val portPart = if (serverPort == "443" || serverPort.isEmpty()) "" else ":$serverPort"
-        val pathPart = serverPath.trimStart('/', ':')
-        val urlWithFreeEntryScheme = "$hostnamePart$portPart/$pathPart"
-        val url =
-          when {
-            urlWithFreeEntryScheme.startsWith("https://") -> urlWithFreeEntryScheme
-            urlWithFreeEntryScheme.startsWith("http://") ->
-              urlWithFreeEntryScheme.replaceFirst("http", "https")
-            else -> "https://$urlWithFreeEntryScheme"
-          }
-        runCatching { if (URI(url).rawAuthority != null) url else null }.get()
-      }
-    }
-
-  sharedPrefs.edit {
-    remove(PreferenceKeys.GIT_REMOTE_LOCATION)
-    remove(PreferenceKeys.GIT_REMOTE_PORT)
-    remove(PreferenceKeys.GIT_REMOTE_SERVER)
-    remove(PreferenceKeys.GIT_REMOTE_USERNAME)
-    remove(PreferenceKeys.GIT_REMOTE_PROTOCOL)
-  }
-  if (
-    url == null ||
-      gitSettings.updateConnectionSettingsIfValid(
-        newAuthMode = gitSettings.authMode,
-        newUrl = url,
-        newBranch = gitSettings.branch
-      ) != GitSettings.UpdateConnectionSettingsResult.Valid
-  ) {
-    logcat(TAG, ERROR) { "Failed to migrate to URL-based Git config, generated URL is invalid" }
-  }
-}
-
-private fun migrateToHideAll(sharedPrefs: SharedPreferences) {
-  sharedPrefs.all[PreferenceKeys.SHOW_HIDDEN_FOLDERS] ?: return
-  val isHidden = sharedPrefs.getBoolean(PreferenceKeys.SHOW_HIDDEN_FOLDERS, false)
-  sharedPrefs.edit {
-    remove(PreferenceKeys.SHOW_HIDDEN_FOLDERS)
-    putBoolean(PreferenceKeys.SHOW_HIDDEN_CONTENTS, isHidden)
-  }
-}
-
-private fun migrateToSshKey(filesDirPath: String, sharedPrefs: SharedPreferences) {
-  val privateKeyFile = File(filesDirPath, ".ssh_key")
-  if (
-    sharedPrefs.contains(PreferenceKeys.USE_GENERATED_KEY) &&
-      !SshKey.exists &&
-      privateKeyFile.exists()
-  ) {
-    // Currently uses a private key imported or generated with an old version of Password Store.
-    // Generated keys come with a public key which the user should still be able to view after
-    // the migration (not possible for regular imported keys), hence the special case.
-    val isGeneratedKey = sharedPrefs.getBoolean(PreferenceKeys.USE_GENERATED_KEY, false)
-    SshKey.useLegacyKey(isGeneratedKey)
-    sharedPrefs.edit { remove(PreferenceKeys.USE_GENERATED_KEY) }
-  }
-}
-
-private fun migrateToClipboardHistory(sharedPrefs: SharedPreferences) {
-  if (sharedPrefs.contains(PreferenceKeys.CLEAR_CLIPBOARD_20X)) {
-    sharedPrefs.edit {
-      putBoolean(
-        PreferenceKeys.CLEAR_CLIPBOARD_HISTORY,
-        sharedPrefs.getBoolean(PreferenceKeys.CLEAR_CLIPBOARD_20X, false)
-      )
-      remove(PreferenceKeys.CLEAR_CLIPBOARD_20X)
-    }
-  }
-}
-
-private fun migrateToDiceware(sharedPrefs: SharedPreferences) {
-  if (sharedPrefs.contains(PreferenceKeys.PREF_KEY_PWGEN_TYPE)) {
-    sharedPrefs.edit {
-      if (sharedPrefs.getString(PreferenceKeys.PREF_KEY_PWGEN_TYPE) == "xkpasswd") {
-        putString(PreferenceKeys.PREF_KEY_PWGEN_TYPE, "diceware")
-      }
-    }
-  }
-}
-
-private fun removeExternalStorageProperties(prefs: SharedPreferences) {
-  logcat(TAG, INFO) { "Removing preferences related to external storage" }
-  prefs.edit {
-    if (prefs.contains(PreferenceKeys.GIT_EXTERNAL)) {
-      if (prefs.getBoolean(PreferenceKeys.GIT_EXTERNAL, false)) {
-        putBoolean(PreferenceKeys.GIT_EXTERNAL_MIGRATED, true)
-      }
-      remove(PreferenceKeys.GIT_EXTERNAL)
-    }
-    if (prefs.contains(PreferenceKeys.GIT_EXTERNAL_REPO)) {
-      remove(PreferenceKeys.GIT_EXTERNAL_REPO)
-    }
-  }
-}