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 --- app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt') diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt index 413e6f6a..c6fda844 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt +++ b/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt @@ -30,8 +30,8 @@ import kotlin.time.Duration import kotlin.time.ExperimentalTime import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay -import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch import kotlinx.coroutines.withContext @@ -210,12 +210,7 @@ class DecryptActivity : BasePgpActivity(), OpenPgpServiceConnection.OnBound { 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) } } .onFailure { e -> logcat(ERROR) { e.asLog() } } -- cgit v1.2.3