From 7e2eb2425e7b9b6ccb37b7b89f19de3fa7a20c44 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sat, 15 May 2021 12:56:49 +0530 Subject: all: reformat with Spotless again Signed-off-by: Harsh Shandilya --- .../dev/msfjarvis/aps/util/settings/GitSettings.kt | 18 +++++++++++++----- .../java/dev/msfjarvis/aps/util/settings/Migrations.kt | 8 ++++++-- .../msfjarvis/aps/util/settings/PasswordSortOrder.kt | 9 +++++++-- 3 files changed, 26 insertions(+), 9 deletions(-) (limited to 'app/src/main/java/dev/msfjarvis/aps/util/settings') diff --git a/app/src/main/java/dev/msfjarvis/aps/util/settings/GitSettings.kt b/app/src/main/java/dev/msfjarvis/aps/util/settings/GitSettings.kt index 3a508e45..d3c85fa7 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/settings/GitSettings.kt +++ b/app/src/main/java/dev/msfjarvis/aps/util/settings/GitSettings.kt @@ -25,7 +25,8 @@ enum class Protocol(val pref: String) { private val map = values().associateBy(Protocol::pref) fun fromString(type: String?): Protocol { - return map[type ?: return Ssh] ?: throw IllegalArgumentException("$type is not a valid Protocol") + return map[type ?: return Ssh] + ?: throw IllegalArgumentException("$type is not a valid Protocol") } } } @@ -41,7 +42,8 @@ enum class AuthMode(val pref: String) { private val map = values().associateBy(AuthMode::pref) fun fromString(type: String?): AuthMode { - return map[type ?: return SshKey] ?: throw IllegalArgumentException("$type is not a valid AuthMode") + return map[type ?: return SshKey] + ?: throw IllegalArgumentException("$type is not a valid AuthMode") } } } @@ -50,12 +52,18 @@ object GitSettings { private const val DEFAULT_BRANCH = "master" - private val settings by lazy(LazyThreadSafetyMode.PUBLICATION) { Application.instance.sharedPrefs } + private val settings by lazy(LazyThreadSafetyMode.PUBLICATION) { + Application.instance.sharedPrefs + } private val encryptedSettings by lazy(LazyThreadSafetyMode.PUBLICATION) { Application.instance.getEncryptedGitPrefs() } - private val proxySettings by lazy(LazyThreadSafetyMode.PUBLICATION) { Application.instance.getEncryptedProxyPrefs() } - private val hostKeyPath by lazy(LazyThreadSafetyMode.NONE) { "${Application.instance.filesDir}/.host_key" } + private val proxySettings by lazy(LazyThreadSafetyMode.PUBLICATION) { + Application.instance.getEncryptedProxyPrefs() + } + private val hostKeyPath by lazy(LazyThreadSafetyMode.NONE) { + "${Application.instance.filesDir}/.host_key" + } var authMode get() = AuthMode.fromString(settings.getString(PreferenceKeys.GIT_REMOTE_AUTH)) 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 index a5612603..b9333617 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/settings/Migrations.kt +++ b/app/src/main/java/dev/msfjarvis/aps/util/settings/Migrations.kt @@ -60,7 +60,8 @@ private fun migrateToGitUrlBasedConfig(sharedPrefs: SharedPreferences) { val url = when { urlWithFreeEntryScheme.startsWith("https://") -> urlWithFreeEntryScheme - urlWithFreeEntryScheme.startsWith("http://") -> urlWithFreeEntryScheme.replaceFirst("http", "https") + urlWithFreeEntryScheme.startsWith("http://") -> + urlWithFreeEntryScheme.replaceFirst("http", "https") else -> "https://$urlWithFreeEntryScheme" } runCatching { if (URI(url).rawAuthority != null) url else null }.get() @@ -96,7 +97,10 @@ private fun migrateToHideAll(sharedPrefs: SharedPreferences) { private fun migrateToSshKey(context: Context, sharedPrefs: SharedPreferences) { val privateKeyFile = File(context.filesDir, ".ssh_key") - if (sharedPrefs.contains(PreferenceKeys.USE_GENERATED_KEY) && !SshKey.exists && privateKeyFile.exists()) { + 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. diff --git a/app/src/main/java/dev/msfjarvis/aps/util/settings/PasswordSortOrder.kt b/app/src/main/java/dev/msfjarvis/aps/util/settings/PasswordSortOrder.kt index ee678de2..6b48b6a9 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/settings/PasswordSortOrder.kt +++ b/app/src/main/java/dev/msfjarvis/aps/util/settings/PasswordSortOrder.kt @@ -18,10 +18,15 @@ enum class PasswordSortOrder(val comparator: java.util.Comparator) (p1.type + p1.name).compareTo(p2.type + p2.name, ignoreCase = true) } ), - INDEPENDENT(Comparator { p1: PasswordItem, p2: PasswordItem -> p1.name.compareTo(p2.name, ignoreCase = true) }), + INDEPENDENT( + Comparator { p1: PasswordItem, p2: PasswordItem -> + p1.name.compareTo(p2.name, ignoreCase = true) + } + ), RECENTLY_USED( Comparator { p1: PasswordItem, p2: PasswordItem -> - val recentHistory = Application.instance.getSharedPreferences("recent_password_history", Context.MODE_PRIVATE) + val recentHistory = + Application.instance.getSharedPreferences("recent_password_history", Context.MODE_PRIVATE) val timeP1 = recentHistory.getString(p1.file.absolutePath.base64()) val timeP2 = recentHistory.getString(p2.file.absolutePath.base64()) when { -- cgit v1.2.3