Respect encrypted username when filling Autofill generated entry

2020-04-15 17:13:19 +02:00 · 2020-04-15 17:13:19 +02:00 · 5a3220527f
commit 5a3220527f
parent d6db10e089
1 changed files with 3 additions and 4 deletions
--- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt
@ -609,10 +609,9 @@ class PgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBound {
                                        AutofillPreferences.directoryStructure(applicationContext)
                                    val entry = PasswordEntry(content)
                                    returnIntent.putExtra("PASSWORD", entry.password)
-                                    returnIntent.putExtra(
-                                        "USERNAME",
-                                        directoryStructure.getUsernameFor(file)
-                                    )
+                                    val username = PasswordEntry(content).username
+                                        ?: directoryStructure.getUsernameFor(file)
+                                    returnIntent.putExtra("USERNAME", username)
                                }

                                setResult(RESULT_OK, returnIntent)