From 5e9a91a3b821e356f74f1728372a58220c49069c Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 30 May 2021 02:59:13 +0530 Subject: app: replace some uses of getEncryptedGitPrefs Signed-off-by: Harsh Shandilya --- app/src/main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'app/src/main/java/dev/msfjarvis/aps/ui/git') diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt index 1d917a3a..b3155264 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt +++ b/app/src/main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt @@ -4,6 +4,7 @@ */ package dev.msfjarvis.aps.ui.git.base +import android.content.SharedPreferences import androidx.appcompat.app.AppCompatActivity import androidx.core.content.edit import com.github.ajalt.timberkt.d @@ -14,7 +15,7 @@ import com.github.michaelbull.result.mapError import com.google.android.material.dialog.MaterialAlertDialogBuilder import dagger.hilt.android.AndroidEntryPoint import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.util.extensions.getEncryptedGitPrefs +import dev.msfjarvis.aps.injection.prefs.GitPreferences import dev.msfjarvis.aps.util.extensions.sharedPrefs import dev.msfjarvis.aps.util.git.ErrorMessages import dev.msfjarvis.aps.util.git.operation.BreakOutOfDetached @@ -52,6 +53,7 @@ abstract class BaseGitActivity : ContinuationContainerActivity() { } @Inject lateinit var gitSettings: GitSettings + @GitPreferences @Inject lateinit var gitPrefs: SharedPreferences /** * Attempt to launch the requested Git operation. @@ -85,7 +87,7 @@ abstract class BaseGitActivity : ContinuationContainerActivity() { suspend fun promptOnErrorHandler(err: Throwable, onPromptDone: () -> Unit = {}) { val error = rootCauseException(err) if (!isExplicitlyUserInitiatedError(error)) { - getEncryptedGitPrefs().edit { remove(PreferenceKeys.HTTPS_PASSWORD) } + gitPrefs.edit { remove(PreferenceKeys.HTTPS_PASSWORD) } sharedPrefs.edit { remove(PreferenceKeys.SSH_OPENKEYSTORE_KEYID) } d(error) withContext(Dispatchers.Main) { -- cgit v1.2.3