Fido: returns when no key is found

p1gp1g · mar-v-in · commit 37d2a8069897 · 2025-09-16T15:49:32.000+02:00
diff --git a/play-services-fido/core/src/main/kotlin/org/microg/gms/fido/core/transport/nfc/NfcTransportHandler.kt b/play-services-fido/core/src/main/kotlin/org/microg/gms/fido/core/transport/nfc/NfcTransportHandler.kt
@@ -112,7 +112,8 @@ class NfcTransportHandler(private val activity: Activity, callback: TransportHan
         }
         try {
             (activity as OnNewIntentProvider).addOnNewIntentListener(newIntentListener)
-            while (true) {
+            var ex: Exception? = null
+            for (i in 1..2) {
                 val tag = waitForNewNfcTag(adapter)
                 try {
                     return handle(options, callerPackage, tag, pinRequested, pin)
@@ -124,8 +125,10 @@ class NfcTransportHandler(private val activity: Activity, callback: TransportHan
                     throw e
                 } catch (e: Exception) {
                     Log.w(TAG, e)
+                    ex = e
                 }
             }
+            throw ex ?: Exception("Unknown exception")
         } finally {
             (activity as OnNewIntentProvider).removeOnNewIntentListener(newIntentListener)
         }

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,8 @@ class NfcTransportHandler(private val activity: Activity, callback: TransportHan`
`112`	`112`	`}`
`113`	`113`	`try {`
`114`	`114`	`(activity as OnNewIntentProvider).addOnNewIntentListener(newIntentListener)`
`115`		`- while (true) {`
	`115`	`+ var ex: Exception? = null`
	`116`	`+ for (i in 1..2) {`
`116`	`117`	`val tag = waitForNewNfcTag(adapter)`
`117`	`118`	`try {`
`118`	`119`	`return handle(options, callerPackage, tag, pinRequested, pin)`
`@@ -124,8 +125,10 @@ class NfcTransportHandler(private val activity: Activity, callback: TransportHan`
`124`	`125`	`throw e`
`125`	`126`	`} catch (e: Exception) {`
`126`	`127`	`Log.w(TAG, e)`
	`128`	`+ ex = e`
`127`	`129`	`}`
`128`	`130`	`}`
	`131`	`+ throw ex ?: Exception("Unknown exception")`
`129`	`132`	`} finally {`
`130`	`133`	`(activity as OnNewIntentProvider).removeOnNewIntentListener(newIntentListener)`
`131`	`134`	`}`