NFC-83 Remove CoroutineScope(Main) from NFCViewModel. Disable NFC reader in ViewModel onCleared

Author: SanderKondratjevNortal

app/src/main/kotlin/ee/ria/DigiDoc/viewmodel/NFCViewModel.kt

@@ -58,7 +58,6 @@ import ee.ria.DigiDoc.utilsLib.extensions.clearSensitive
 import ee.ria.DigiDoc.utilsLib.logging.LoggingUtil.Companion.debugLog
 import ee.ria.DigiDoc.utilsLib.logging.LoggingUtil.Companion.errorLog
 import ee.ria.libdigidocpp.ExternalSigner
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
@@ -256,9 +255,8 @@ class NFCViewModel
                     nfcSmartCardReaderManager.startDiscovery(activity) { nfcReader, exc ->
                         if ((nfcReader != null) && (exc == null)) {
                             try {
-                                CoroutineScope(Main).launch {
-                                    _message.postValue(R.string.signature_update_nfc_detected)
-                                }
+                                _message.postValue(R.string.signature_update_nfc_detected)
+
                                 val card = TokenWithPace.create(nfcReader)
                                 card.tunnel(canNumber)
                                 val signerCert = card.certificate(CertificateType.SIGNING)
@@ -285,11 +283,9 @@ class NFCViewModel
                                     signatureArray,
                                 )
 
-                                CoroutineScope(Main).launch {
-                                    _shouldResetPIN.postValue(true)
-                                    _signStatus.postValue(true)
-                                    _signedContainer.postValue(container)
-                                }
+                                _shouldResetPIN.postValue(true)
+                                _signStatus.postValue(true)
+                                _signedContainer.postValue(container)
                             } catch (ex: SmartCardReaderException) {
                                 handlePin2SmartCardReaderException(ex, pinType)
                             } catch (ex: Exception) {
@@ -350,9 +346,8 @@ class NFCViewModel
                     nfcSmartCardReaderManager.startDiscovery(activity) { nfcReader, exc ->
                         if ((nfcReader != null) && (exc == null)) {
                             try {
-                                CoroutineScope(Main).launch {
-                                    _message.postValue(R.string.signature_update_nfc_detected)
-                                }
+                                _message.postValue(R.string.signature_update_nfc_detected)
+
                                 val card = TokenWithPace.create(nfcReader)
                                 card.tunnel(canNumber)
 
@@ -374,11 +369,10 @@ class NFCViewModel
                                         configurationRepository,
                                     )
                                 pin1Code.clearSensitive()
-                                CoroutineScope(Main).launch {
-                                    _shouldResetPIN.postValue(true)
-                                    _decryptStatus.postValue(true)
-                                    _cryptoContainer.postValue(decryptedContainer)
-                                }
+
+                                _shouldResetPIN.postValue(true)
+                                _decryptStatus.postValue(true)
+                                _cryptoContainer.postValue(decryptedContainer)
                             } catch (ex: SmartCardReaderException) {
                                 _decryptStatus.postValue(false)
                                 handlePin1SmartCardReaderException(ex, pinType)
@@ -506,9 +500,7 @@ class NFCViewModel
                 nfcSmartCardReaderManager.startDiscovery(activity) { nfcReader, exc ->
                     if ((nfcReader != null) && (exc == null)) {
                         try {
-                            CoroutineScope(Main).launch {
-                                _message.postValue(R.string.signature_update_nfc_detected)
-                            }
+                            _message.postValue(R.string.signature_update_nfc_detected)
 
                             val card = TokenWithPace.create(nfcReader)
                             card.tunnel(canNumber)
@@ -522,13 +514,9 @@ class NFCViewModel
                                 )
 
                             pin1Code.clearSensitive()
-                            debugLog(logTag, "Auth certificate: " + Base64.getEncoder().encodeToString(authCert))
-                            debugLog(logTag, "Auth signature: " + Hex.toHexString(signatureArray))
 
-                            CoroutineScope(Main).launch {
-                                _shouldResetPIN.postValue(true)
-                                _webEidAuthResult.postValue(Triple(authCert, signingCert, signatureArray))
-                            }
+                            _shouldResetPIN.postValue(true)
+                            _webEidAuthResult.postValue(Triple(authCert, signingCert, signatureArray))
                         } catch (ex: SmartCardReaderException) {
                             handlePin1SmartCardReaderException(ex, pinType)
                         } catch (ex: Exception) {
@@ -574,19 +562,15 @@ class NFCViewModel
                 nfcSmartCardReaderManager.startDiscovery(activity) { nfcReader, exc ->
                     if ((nfcReader != null) && (exc == null)) {
                         try {
-                            CoroutineScope(Main).launch {
-                                _message.postValue(R.string.signature_update_nfc_detected)
-                            }
+                            _message.postValue(R.string.signature_update_nfc_detected)
 
                             val card = TokenWithPace.create(nfcReader)
                             card.tunnel(canNumber)
 
                             val signingCert = card.certificate(CertificateType.SIGNING)
                             val signingCertB64 = Base64.getEncoder().encodeToString(signingCert)
 
-                            CoroutineScope(Main).launch {
-                                _webEidCertificateResult.postValue(signingCertB64)
-                            }
+                            _webEidCertificateResult.postValue(signingCertB64)
                         } catch (ex: SmartCardReaderException) {
                             if (ex.message?.contains("TagLostException") == true) {
                                 _errorState.postValue(Triple(R.string.signature_update_nfc_tag_lost, null, null))
@@ -646,23 +630,20 @@ class NFCViewModel
                 nfcSmartCardReaderManager.startDiscovery(activity) { nfcReader, exc ->
                     if ((nfcReader != null) && (exc == null)) {
                         try {
-                            CoroutineScope(Main).launch {
-                                _message.postValue(R.string.signature_update_nfc_detected)
-                            }
+                            _message.postValue(R.string.signature_update_nfc_detected)
+
                             val card = TokenWithPace.create(nfcReader)
                             card.tunnel(canNumber)
                             val signerCert = card.certificate(CertificateType.SIGNING)
                             val signerCertB64 = Base64.getEncoder().encodeToString(signerCert)
                             val hashBytes = Base64.getDecoder().decode(hash)
                             val (_, signatureArray) = idCardService.sign(card, pin2Code, hashBytes)
 
-                            CoroutineScope(Main).launch {
-                                _shouldResetPIN.postValue(true)
-                                _signStatus.postValue(true)
-                                _webEidSignResult.postValue(
-                                    Triple(signerCertB64, signatureArray, responseUri),
-                                )
-                            }
+                            _shouldResetPIN.postValue(true)
+                            _signStatus.postValue(true)
+                            _webEidSignResult.postValue(
+                                Triple(signerCertB64, signatureArray, responseUri),
+                            )
                         } catch (ex: SmartCardReaderException) {
                             handlePin2SmartCardReaderException(ex, pinType)
                         } catch (ex: Exception) {
@@ -906,4 +887,9 @@ class NFCViewModel
                 errorLog(logTag, "Exception: ${ex.message}", ex)
             }
         }
+
+        override fun onCleared() {
+            super.onCleared()
+            nfcSmartCardReaderManager.disableNfcReaderMode()
+        }
     }