diff options
| author | Aditya Wasan <adityawasan55@gmail.com> | 2021-05-22 17:25:43 +0530 |
|---|---|---|
| committer | Harsh Shandilya <me@msfjarvis.dev> | 2021-05-22 20:05:53 +0530 |
| commit | c3f8de99be1f81958a1d7a7546f948930b38a322 (patch) | |
| tree | a46189c1c093d1cd1f23143d921fbd2e10f024c5 /app/src/main/java/dev/msfjarvis/aps/util/settings/Migrations.kt | |
| parent | 47099c723b006cb305af4f2785e547a6525a903a (diff) | |
| download | HardenedPass-c3f8de99be1f81958a1d7a7546f948930b38a322.tar.gz HardenedPass-c3f8de99be1f81958a1d7a7546f948930b38a322.zip | |
app: refactor GitSettings and ProxyUtils and inject them using hilt
Signed-off-by: Aditya Wasan <adityawasan55@gmail.com>
Diffstat (limited to 'app/src/main/java/dev/msfjarvis/aps/util/settings/Migrations.kt')
| -rw-r--r-- | app/src/main/java/dev/msfjarvis/aps/util/settings/Migrations.kt | 21 |
1 files changed, 9 insertions, 12 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 index b9333617..b24914d0 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 @@ -6,7 +6,6 @@ package dev.msfjarvis.aps.util.settings -import android.content.Context import android.content.SharedPreferences import androidx.core.content.edit import com.github.ajalt.timberkt.e @@ -14,20 +13,18 @@ import com.github.ajalt.timberkt.i import com.github.michaelbull.result.get import com.github.michaelbull.result.runCatching import dev.msfjarvis.aps.util.extensions.getString -import dev.msfjarvis.aps.util.extensions.sharedPrefs import dev.msfjarvis.aps.util.git.sshj.SshKey import java.io.File import java.net.URI -fun runMigrations(context: Context) { - val sharedPrefs = context.sharedPrefs - migrateToGitUrlBasedConfig(sharedPrefs) +fun runMigrations(filesDirPath: String, sharedPrefs: SharedPreferences, gitSettings: GitSettings) { + migrateToGitUrlBasedConfig(sharedPrefs, gitSettings) migrateToHideAll(sharedPrefs) - migrateToSshKey(context, sharedPrefs) + migrateToSshKey(filesDirPath, sharedPrefs) migrateToClipboardHistory(sharedPrefs) } -private fun migrateToGitUrlBasedConfig(sharedPrefs: SharedPreferences) { +private fun migrateToGitUrlBasedConfig(sharedPrefs: SharedPreferences, gitSettings: GitSettings) { val serverHostname = sharedPrefs.getString(PreferenceKeys.GIT_REMOTE_SERVER) ?: return i { "Migrating to URL-based Git config" } val serverPort = sharedPrefs.getString(PreferenceKeys.GIT_REMOTE_PORT) ?: "" @@ -76,10 +73,10 @@ private fun migrateToGitUrlBasedConfig(sharedPrefs: SharedPreferences) { remove(PreferenceKeys.GIT_REMOTE_PROTOCOL) } if (url == null || - GitSettings.updateConnectionSettingsIfValid( - newAuthMode = GitSettings.authMode, + gitSettings.updateConnectionSettingsIfValid( + newAuthMode = gitSettings.authMode, newUrl = url, - newBranch = GitSettings.branch + newBranch = gitSettings.branch ) != GitSettings.UpdateConnectionSettingsResult.Valid ) { e { "Failed to migrate to URL-based Git config, generated URL is invalid" } @@ -95,8 +92,8 @@ private fun migrateToHideAll(sharedPrefs: SharedPreferences) { } } -private fun migrateToSshKey(context: Context, sharedPrefs: SharedPreferences) { - val privateKeyFile = File(context.filesDir, ".ssh_key") +private fun migrateToSshKey(filesDirPath: String, sharedPrefs: SharedPreferences) { + val privateKeyFile = File(filesDirPath, ".ssh_key") if (sharedPrefs.contains(PreferenceKeys.USE_GENERATED_KEY) && !SshKey.exists && privateKeyFile.exists() |