From 2f034bc2372d29b4ddebf74d532279073fb3d92b Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Fri, 11 Mar 2022 01:52:39 +0530 Subject: Show remaining time in TOTP field (#1766) * Pass down remaining time for TOTPs to UI layer * format-common: switch TOTP flow to use co-operative cancelation * format-common: add a regression test for OTP duration calculation * Abstract out labels * Switch to launchIn --- .../java/dev/msfjarvis/aps/ui/crypto/DecryptActivityV2.kt | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivityV2.kt') diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivityV2.kt b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivityV2.kt index f5c02e49..21cd42aa 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivityV2.kt +++ b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivityV2.kt @@ -25,17 +25,18 @@ import dev.msfjarvis.aps.util.settings.PreferenceKeys import java.io.ByteArrayOutputStream import java.io.File import javax.inject.Inject -import kotlin.time.Duration +import kotlin.time.Duration.Companion.seconds import kotlin.time.ExperimentalTime import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay -import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch import kotlinx.coroutines.withContext +@OptIn(ExperimentalTime::class) @AndroidEntryPoint class DecryptActivityV2 : BasePgpActivity() { @@ -90,10 +91,9 @@ class DecryptActivityV2 : BasePgpActivity() { * Automatically finishes the activity 60 seconds after decryption succeeded to prevent * information leaks from stale activities. */ - @OptIn(ExperimentalTime::class) private fun startAutoDismissTimer() { lifecycleScope.launch { - delay(Duration.seconds(60)) + delay(60.seconds) finish() } } @@ -198,12 +198,7 @@ class DecryptActivityV2 : BasePgpActivity() { binding.recyclerView.adapter = adapter if (entry.hasTotp()) { - lifecycleScope.launch { - entry - .totp - .onEach { code -> withContext(Dispatchers.Main) { adapter.updateOTPCode(code) } } - .collect() - } + entry.totp.onEach(adapter::updateOTPCode).launchIn(lifecycleScope) } } -- cgit v1.2.3