From cdf45bc323bd21eeb6252c9d9b70a990f7b39b75 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 27 Oct 2019 00:14:42 +0530 Subject: Add setting to save OpenKeychain auth keyid (#554) * Add setting to save OpenKeychain auth keyid * Hide pref not disable Co-Authored-By: Reagan Sanders Signed-off-by: Harsh Shandilya --- app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt') diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt b/app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt index cbc64b3e..3b3c6f22 100644 --- a/app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt +++ b/app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt @@ -235,14 +235,11 @@ abstract class GitOperation(fileDir: File, internal val callingActivity: Activit * Action to execute on error */ open fun onError(errorMessage: String) { - MaterialAlertDialogBuilder(callingActivity) - .setTitle(callingActivity.resources.getString(R.string.jgit_error_dialog_title)) - .setMessage(callingActivity.resources.getString(R.string.jgit_error_dialog_text) + errorMessage) - .setPositiveButton(callingActivity.resources.getString(R.string.dialog_ok)) { _, _ -> - callingActivity.setResult(Activity.RESULT_CANCELED) - callingActivity.finish() - } - .show() + if (SshSessionFactory.getInstance() is SshApiSessionFactory) { + // Clear stored key id from settings on auth failure + PreferenceManager.getDefaultSharedPreferences(callingActivity.applicationContext) + .edit().putString("ssh_openkeystore_keyid", null).apply() + } } /** -- cgit v1.2.3