fix android timeout bug

Author: w-ensink

android/src/main/kotlin/im/nfc/flutter_nfc_kit/FlutterNfcKitPlugin.kt

@@ -8,6 +8,7 @@ import android.nfc.NfcAdapter
 import android.nfc.NfcAdapter.*
 import android.nfc.Tag
 import android.nfc.tech.*
+import android.os.Bundle
 import android.os.Handler
 import android.os.HandlerThread
 import android.os.Looper
@@ -86,13 +87,13 @@ class FlutterNfcKitPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
                     Log.e(TAG, "$desc error", ex)
                     val excMessage = ex.localizedMessage
                     when (ex) {
-                        is IOException -> result?.error("500", "Communication error", excMessage)
-                        is SecurityException -> result?.error("503", "Tag already removed", excMessage)
-                        is FormatException -> result?.error("400", "NDEF format error", excMessage)
-                        is InvocationTargetException -> result?.error("500", "Communication error", excMessage)
-                        is IllegalArgumentException -> result?.error("400", "Command format error", excMessage)
-                        is NoSuchMethodException -> result?.error("405", "Transceive not supported for this type of card", excMessage)
-                        else -> result?.error("500", "Unhandled error", excMessage)
+                        is IOException -> result.error("500", "Communication error", excMessage)
+                        is SecurityException -> result.error("503", "Tag already removed", excMessage)
+                        is FormatException -> result.error("400", "NDEF format error", excMessage)
+                        is InvocationTargetException -> result.error("500", "Communication error", excMessage)
+                        is IllegalArgumentException -> result.error("400", "Command format error", excMessage)
+                        is NoSuchMethodException -> result.error("405", "Transceive not supported for this type of card", excMessage)
+                        else -> result.error("500", "Unhandled error", excMessage)
                     }
                 }
             }
@@ -141,7 +142,7 @@ class FlutterNfcKitPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
                         tagTechnology = isoDep
                         // historicalBytes() may return null but is wrongly typed as ByteArray!
                         // https://developer.android.com/reference/kotlin/android/nfc/tech/IsoDep#gethistoricalbytes
-                        historicalBytes = (isoDep.historicalBytes as ByteArray?)?.toHexString() ?: ""
+                        historicalBytes = isoDep.historicalBytes?.toHexString() ?: ""
                     }
                     tag.techList.contains(MifareClassic::class.java.name) -> {
                         standard = "ISO 14443-3 (Type A)"
@@ -604,7 +605,12 @@ class FlutterNfcKitPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
             result.success(jsonResult)
         }
 
-        nfcAdapter.enableReaderMode(activity.get(), pollHandler, technologies, null)
+        // The EXTRA_READER_PRESENCE_CHECK_DELAY is for fixing an obscure bug with
+        // some Android versions like LineageOS 17.1 that caused the PACE authentication to fail.
+        // See https://github.com/privacybydesign/vcmrtd/issues/91 for more info.
+        val options = Bundle()
+        options.putInt(EXTRA_READER_PRESENCE_CHECK_DELAY, 2000)
+        nfcAdapter.enableReaderMode(activity.get(), pollHandler, technologies, options)
     }
 
     private class MethodResultWrapper(result: Result) : Result {