aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt
diff options
context:
space:
mode:
authorHarsh Shandilya <msfjarvis@gmail.com>2019-10-27 00:14:42 +0530
committerGitHub <noreply@github.com>2019-10-27 00:14:42 +0530
commitcdf45bc323bd21eeb6252c9d9b70a990f7b39b75 (patch)
treee23c97e6135b680fc83fa6d3a4905cb3a8f83f75 /app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt
parent2fcec8685b7d198d8f3cd3a5d5960cb633394fe5 (diff)
downloadHardenedPass-cdf45bc323bd21eeb6252c9d9b70a990f7b39b75.tar.gz
HardenedPass-cdf45bc323bd21eeb6252c9d9b70a990f7b39b75.zip
Add setting to save OpenKeychain auth keyid (#554)
* Add setting to save OpenKeychain auth keyid * Hide pref not disable Co-Authored-By: Reagan Sanders <vexofp@gmail.com> Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt')
-rw-r--r--app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt13
1 files changed, 5 insertions, 8 deletions
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()
+ }
}
/**