Merge PR #1690

Yubico · Sep 13, 2024 · 1d69a3c · 1d69a3c
2 parents aa485d4 + e12c9a4
commit 1d69a3c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/android/app/src/main/kotlin/com/yubico/authenticator/MainActivity.kt b/android/app/src/main/kotlin/com/yubico/authenticator/MainActivity.kt
@@ -129,10 +129,11 @@ class MainActivity : FlutterFragmentActivity() {
 
         allowScreenshots(false)
 
-        yubikit = YubiKitManager(
-            UsbYubiKeyManager(this),
+        val nfcManager = if (NfcAdapter.getDefaultAdapter(this) != null) {
             NfcYubiKeyManager(this, NfcStateDispatcher(nfcStateListener))
-        )
+        } else null
+
+        yubikit = YubiKitManager(UsbYubiKeyManager(this), nfcManager)
     }
 
     override fun onNewIntent(intent: Intent) {