Fix transfer manager initialization causing app lock up on NFC tap.

+ fixed in AppVerifier. + fixed in SimpleVerifier. + fixed in Wallet Reader. Tested manually. Tap with the phone running Wallet. Signed-off-by: koukarine <[email protected]>
openwallet-foundation-labs · Jan 29, 2025 · 4105ca6 · 4105ca6
1 parent 436f374
commit 4105ca6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/appverifier/src/main/java/com/android/mdl/appreader/fragment/RequestOptionsFragment.kt b/appverifier/src/main/java/com/android/mdl/appreader/fragment/RequestOptionsFragment.kt
@@ -237,7 +237,6 @@ class RequestOptionsFragment() : Fragment() {
             // Always call to cancel any connection that could be on progress
             transferManager.disconnect()
         }
-        transferManager.initVerificationHelper()
         observeTransferManager()
     }
 
@@ -301,6 +300,7 @@ class RequestOptionsFragment() : Fragment() {
         checkRequiredPermissions()
         val adapter = NfcAdapter.getDefaultAdapter(requireContext())
         if (adapter != null) {
+            transferManager.initVerificationHelper()
             transferManager.setNdefDeviceEngagement(
                 adapter,
                 requireActivity()

diff --git a/...es/simple-verifier/src/main/java/com/android/identity/simple_verifier/MdocReaderPrompt.kt b/...es/simple-verifier/src/main/java/com/android/identity/simple_verifier/MdocReaderPrompt.kt
@@ -325,6 +325,11 @@ class MdocReaderPrompt(
         verification.disconnect()
         super.onDismiss(dialog)
     }
+
+    override fun onResume() {
+        super.onResume()
+        initializeWithContext()
+    }
 }
 
 @Composable

diff --git a/...rc/main/java/com/android/identity_credential/wallet/ui/destination/reader/ReaderScreen.kt b/...rc/main/java/com/android/identity_credential/wallet/ui/destination/reader/ReaderScreen.kt
@@ -118,7 +118,7 @@ fun ReaderScreen(
     val lifecycleOwner = LocalLifecycleOwner.current
     DisposableEffect(lifecycleOwner) {
         val observer = LifecycleEventObserver { _, event ->
-            if (event == Lifecycle.Event.ON_START) {
+            if (event == Lifecycle.Event.ON_START || event == Lifecycle.Event.ON_RESUME) {
                 model.startRequest(
                     activity,
                     availableRequests[0].second,