From 8f7d3052ea0814ee701b3aefb13b7be386a21c39 Mon Sep 17 00:00:00 2001 From: Fabian Henneke Date: Fri, 26 Jun 2020 09:12:39 +0200 Subject: [PATCH] Use remembered credential even if it is empty (#880) * Use remembered credential even if it is empty Should fix #875. * .isNull() --> == null * Update relnotes Signed-off-by: Harsh Shandilya * Reword relnotes Signed-off-by: Harsh Shandilya * 2019 it is Signed-off-by: Harsh Shandilya Co-authored-by: Harsh Shandilya (cherry picked from commit b60c5fb605893be51840b742bf3e3c89c5b446a5) Signed-off-by: Harsh Shandilya --- CHANGELOG.md | 4 ++++ app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2247f45e..77b7def1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +### Fixed + +- Remember passphrase option did not work with keys that had empty passphrases and were generated before 2019 + ### Added - Add GNU IceCatMobile to the list of supported browsers for Autofill 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 6df5f65d..8cf09b39 100644 --- a/app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt +++ b/app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt @@ -67,7 +67,7 @@ private class GitOperationCredentialFinder(val callingActivity: Activity, val co val storedCredential = gitOperationPrefs.getString(credentialPref, null) if (isRetry) gitOperationPrefs.edit { remove(credentialPref) } - if (storedCredential.isNullOrEmpty()) { + if (storedCredential == null) { val layoutInflater = LayoutInflater.from(callingActivity) @SuppressLint("InflateParams")