From 08ea34f5bea2839e0522c012d10c07de630d5c8e Mon Sep 17 00:00:00 2001 From: Fabian Henneke Date: Tue, 23 Jun 2020 16:46:26 +0200 Subject: [PATCH 1/5] Use remembered credential even if it is empty Should fix #875. --- app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6df5f65d79..852446c68b 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.isNull()) { val layoutInflater = LayoutInflater.from(callingActivity) @SuppressLint("InflateParams") From 8fe4dbc7e36a77233407ed9f7c60f62865a4b847 Mon Sep 17 00:00:00 2001 From: Fabian Henneke Date: Tue, 23 Jun 2020 16:49:55 +0200 Subject: [PATCH 2/5] .isNull() --> == null --- app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 852446c68b..8cf09b394b 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.isNull()) { + if (storedCredential == null) { val layoutInflater = LayoutInflater.from(callingActivity) @SuppressLint("InflateParams") From c11c5904f184ccfc3cf8ad3a0368fa84c7060f1f Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 25 Jun 2020 00:42:11 +0530 Subject: [PATCH 3/5] Update relnotes Signed-off-by: Harsh Shandilya --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2247f45ec6..5e36f5adea 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 generated before 2018 that had empty passphrases + ### Added - Add GNU IceCatMobile to the list of supported browsers for Autofill From 13ad27143799d88bc839169e4a2f8ee57f1406a2 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 25 Jun 2020 00:43:18 +0530 Subject: [PATCH 4/5] Reword relnotes Signed-off-by: Harsh Shandilya --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e36f5adea..a1c670a589 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file. ### Fixed -- Remember passphrase option did not work with keys generated before 2018 that had empty passphrases +- Remember passphrase option did not work with keys that had empty passphrases and were generated before 2018 ### Added From fd2d9c24d5ab806e2c290111d6781eed5c658a3c Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 25 Jun 2020 01:00:31 +0530 Subject: [PATCH 5/5] 2019 it is Signed-off-by: Harsh Shandilya --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1c670a589..77b7def15b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file. ### Fixed -- Remember passphrase option did not work with keys that had empty passphrases and were generated before 2018 +- Remember passphrase option did not work with keys that had empty passphrases and were generated before 2019 ### Added