From 6713d489746830d83437e6a8f6eb88624070b7c5 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sat, 5 Sep 2020 20:12:19 +0530 Subject: DecryptActivity: properly calculate remaining OTP time on first pass (#1080) * DecryptActivity: properly calculate remaining OTP time on first pass We default to 30 seconds for each recalculation but the first run might not have 30 seconds left in its period, making the value stale much earlier. While most websites offer another 30 seconds of validity for TOTP codes, many do not, thus making it hard to enter a correct OTP Signed-off-by: Harsh Shandilya * Update changelog Signed-off-by: Harsh Shandilya --- app/src/main/java/com/zeapo/pwdstore/crypto/DecryptActivity.kt | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'app/src') diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/DecryptActivity.kt b/app/src/main/java/com/zeapo/pwdstore/crypto/DecryptActivity.kt index 79f9e6da..f2f50e8e 100644 --- a/app/src/main/java/com/zeapo/pwdstore/crypto/DecryptActivity.kt +++ b/app/src/main/java/com/zeapo/pwdstore/crypto/DecryptActivity.kt @@ -194,6 +194,13 @@ class DecryptActivity : BasePgpActivity(), OpenPgpServiceConnection.OnBound { ) } launch(Dispatchers.IO) { + // Calculate the actual remaining time for the first pass + // then return to the standard 30 second affair. + val remainingTime = entry.totpPeriod - (System.currentTimeMillis() % entry.totpPeriod) + withContext(Dispatchers.Main) { + otpText.setText(entry.calculateTotpCode() ?: "Error") + } + delay(remainingTime.seconds) repeat(Int.MAX_VALUE) { val code = entry.calculateTotpCode() ?: "Error" withContext(Dispatchers.Main) { -- cgit v1.2.3