From da8ca8b46d5d842670c9400c9a55b181eceb10b2 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Fri, 6 Nov 2020 10:50:34 +0530 Subject: Fix extra content for multiple username fields (#1192) Fixes #1190 Signed-off-by: Harsh Shandilya (cherry picked from commit df6ebfee27597887075b94a945e707ecd69decb1) --- app/src/main/java/com/zeapo/pwdstore/model/PasswordEntry.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app/src/main') diff --git a/app/src/main/java/com/zeapo/pwdstore/model/PasswordEntry.kt b/app/src/main/java/com/zeapo/pwdstore/model/PasswordEntry.kt index a143fcb9..5727c4ba 100644 --- a/app/src/main/java/com/zeapo/pwdstore/model/PasswordEntry.kt +++ b/app/src/main/java/com/zeapo/pwdstore/model/PasswordEntry.kt @@ -60,9 +60,11 @@ class PasswordEntry(content: String, private val totpFinder: TotpFinder = UriTot } val extraContentWithoutAuthData by lazy(LazyThreadSafetyMode.NONE) { + var foundUsername = false extraContent.splitToSequence("\n").filter { line -> return@filter when { - USERNAME_FIELDS.any { prefix -> line.startsWith(prefix, ignoreCase = true) } -> { + USERNAME_FIELDS.any { prefix -> line.startsWith(prefix, ignoreCase = true) } && !foundUsername -> { + foundUsername = true false } line.startsWith("otpauth://", ignoreCase = true) || -- cgit v1.2.3