2 files changed, 17 insertions, 8 deletions
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 b4fd0165..2cd31256 100644
--- a/app/src/main/java/com/zeapo/pwdstore/model/PasswordEntry.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/model/PasswordEntry.kt
@@ -31,7 +31,7 @@ class PasswordEntry(content: String, private val totpFinder: TotpFinder = UriTot
 
     init {
         val passContent = content.split("\n".toRegex(), 2).toTypedArray()
-        password = passContent[0]
+        password = if (UriTotpFinder.TOTP_FIELDS.any { passContent[0].startsWith(it) }) "" else passContent[0]
         extraContent = findExtraContent(passContent)
         username = findUsername()
         digits = findOtpDigits(content)
@@ -85,8 +85,10 @@ class PasswordEntry(content: String, private val totpFinder: TotpFinder = UriTot
         return null
     }
 
-    private fun findExtraContent(passContent: Array<String>): String {
-        return if (passContent.size > 1) passContent[1] else ""
+    private fun findExtraContent(passContent: Array<String>) = when {
+        password.isEmpty() && passContent[0].isNotEmpty() -> passContent[0]
+        passContent.size > 1 -> passContent[1]
+        else -> ""
     }
 
     private fun findTotpSecret(decryptedContent: String): String? {
diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/UriTotpFinder.kt b/app/src/main/java/com/zeapo/pwdstore/utils/UriTotpFinder.kt
index 57c8f580..aab72d38 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/UriTotpFinder.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/utils/UriTotpFinder.kt
@@ -14,10 +14,10 @@ class UriTotpFinder : TotpFinder {
 
     override fun findSecret(content: String): String? {
         content.split("\n".toRegex()).forEach { line ->
-            if (line.startsWith("otpauth://totp/")) {
+            if (line.startsWith(TOTP_FIELDS[0])) {
                 return Uri.parse(line).getQueryParameter("secret")
             }
-            if (line.startsWith("totp:", ignoreCase = true)) {
+            if (line.startsWith(TOTP_FIELDS[1], ignoreCase = true)) {
                 return line.split(": *".toRegex(), 2).toTypedArray()[1]
             }
         }
@@ -26,7 +26,7 @@ class UriTotpFinder : TotpFinder {
 
     override fun findDigits(content: String): String {
         content.split("\n".toRegex()).forEach { line ->
-            if (line.startsWith("otpauth://totp/") &&
+            if (line.startsWith(TOTP_FIELDS[0]) &&
                 Uri.parse(line).getQueryParameter("digits") != null) {
                 return Uri.parse(line).getQueryParameter("digits")!!
             }
@@ -36,7 +36,7 @@ class UriTotpFinder : TotpFinder {
 
     override fun findPeriod(content: String): Long {
         content.split("\n".toRegex()).forEach { line ->
-            if (line.startsWith("otpauth://totp/") &&
+            if (line.startsWith(TOTP_FIELDS[0]) &&
                 Uri.parse(line).getQueryParameter("period") != null) {
                 val period = Uri.parse(line).getQueryParameter("period")!!.toLongOrNull()
                 if (period != null && period > 0)
@@ -48,11 +48,18 @@ class UriTotpFinder : TotpFinder {
 
     override fun findAlgorithm(content: String): String {
         content.split("\n".toRegex()).forEach { line ->
-            if (line.startsWith("otpauth://totp/") &&
+            if (line.startsWith(TOTP_FIELDS[0]) &&
                 Uri.parse(line).getQueryParameter("algorithm") != null) {
                 return Uri.parse(line).getQueryParameter("algorithm")!!
             }
         }
         return "sha1"
     }
+
+    companion object {
+        val TOTP_FIELDS = arrayOf(
+            "otpauth://totp",
+            "totp:"
+        )
+    }
 }