kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

refactor(format-common): add a getter to PasswordEntry for current OTP value

Browse source
This commit is contained in:
Harsh Shandilya 2022-10-29 05:34:09 +05:30
parent e8d9a77539
commit 505c2fa705
No known key found for this signature in database
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/app/passwordstore/util/autofill/AutofillPreferences.kt
View file

@ -15,8 +15,6 @@ import app.passwordstore.util.settings.PreferenceKeys
import com.github.androidpasswordstore.autofillparser.Credentials import com.github.androidpasswordstore.autofillparser.Credentials
import java.io.File import java.io.File
import java.nio.file.Paths import java.nio.file.Paths
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.runBlocking
enum class DirectoryStructure(val value: String) { enum class DirectoryStructure(val value: String) {
EncryptedUsername("encrypted_username"), EncryptedUsername("encrypted_username"),
@ -143,7 +141,7 @@ object AutofillPreferences {
// Always give priority to a username stored in the encrypted extras // Always give priority to a username stored in the encrypted extras
val username = val username =
entry.username ?: directoryStructure.getUsernameFor(file) ?: context.getDefaultUsername() entry.username ?: directoryStructure.getUsernameFor(file) ?: context.getDefaultUsername()
val totp = if (entry.hasTotp()) runBlocking { entry.totp.first().value } else null val totp = if (entry.hasTotp()) entry.currentOtp else null
return Credentials(username, entry.password, totp) return Credentials(username, entry.password, totp)
} }
} }

4
format-common/src/main/kotlin/app/passwordstore/data/passfile/PasswordEntry.kt
View file

@ -70,6 +70,10 @@ constructor(
} }
} }
/** Obtain the [Totp.value] for this [PasswordEntry] at the current time. */
public val currentOtp: String
get() = calculateTotp().value
/** /**
* String representation of [extraContent] but with authentication related data such as TOTP URIs * String representation of [extraContent] but with authentication related data such as TOTP URIs
* and usernames stripped. * and usernames stripped.