vaultwarden
/
keyguard-app-Bitwarden-Vaultwarden
mirror of https://github.com/AChep/keyguard-app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Respect Auto-copy OTP switch preference

This commit is contained in:
Artem Chepurnoy 2024-04-22 15:38:01 +03:00
parent d839363cf4
commit 00575ae189
No known key found for this signature in database
GPG Key ID: FAC37D0CF674043E
1 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
common/src/androidMain/kotlin/com/artemchep/keyguard/android/AutofillFakeAuthActivity.kt
View File

@ -12,8 +12,10 @@ import arrow.core.toOption
import com.artemchep.keyguard.android.autofill.AutofillStructure2
import com.artemchep.keyguard.android.clipboard.KeyguardClipboardService
import com.artemchep.keyguard.common.io.effectMap
import com.artemchep.keyguard.common.io.flatMap
import com.artemchep.keyguard.common.io.flatten
import com.artemchep.keyguard.common.io.handleErrorWith
import com.artemchep.keyguard.common.io.io
import com.artemchep.keyguard.common.io.ioUnit
import com.artemchep.keyguard.common.io.launchIn
import com.artemchep.keyguard.common.io.toIO
@ -24,6 +26,7 @@ import com.artemchep.keyguard.common.model.MasterSession
import com.artemchep.keyguard.common.model.TotpToken
import com.artemchep.keyguard.common.usecase.AddCipherUsedAutofillHistory
import com.artemchep.keyguard.common.usecase.AddUriCipher
import com.artemchep.keyguard.common.usecase.GetAutofillCopyTotp
import com.artemchep.keyguard.common.usecase.GetAutofillSaveUri
import com.artemchep.keyguard.common.usecase.GetVaultSession
import com.artemchep.keyguard.common.usecase.WindowCoroutineScope
@ -108,18 +111,37 @@ class AutofillFakeAuthActivity : AppCompatActivity(), DIAware {
private fun launchCopyTotpService() {
val windowCoroutineScope: WindowCoroutineScope by instance()
args?.cipherTotpRaw
.toOption()
.toEither {
NullPointerException()
}
.flatMap { url ->
TotpToken.parse(url)
}
val getVaultSession: GetVaultSession by instance()
getVaultSession()
.toIO()
.effectMap(Dispatchers.Main) {
val intent = KeyguardClipboardService.getIntent(this, args?.cipherName, it)
startForegroundService(intent)
.effectMap { session ->
val a = session as? MasterSession.Key
?: return@effectMap io(false)
val getAutofillCopyTotp: GetAutofillCopyTotp by a.di.instance()
getAutofillCopyTotp()
.toIO()
}
.flatten()
.flatMap { enabled ->
if (!enabled) {
return@flatMap ioUnit()
}
args?.cipherTotpRaw
.toOption()
.toEither {
NullPointerException()
}
.flatMap { url ->
TotpToken.parse(url)
}
.toIO()
.effectMap(Dispatchers.Main) {
val intent = KeyguardClipboardService.getIntent(this, args?.cipherName, it)
startForegroundService(intent)
}
}
.handleErrorWith {
ioUnit()