From cdec29f5a91780c8574e646ef85cbabb40a535d2 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Tue, 27 Dec 2022 22:20:30 +0100
Subject: [PATCH] fix crash in NfcTransport.isConnected

---
 .../keychain/securitytoken/NfcTransport.java              | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/NfcTransport.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/NfcTransport.java
index 41fd2f6ef..99441984a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/NfcTransport.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/NfcTransport.java
@@ -82,7 +82,13 @@ public class NfcTransport implements Transport {
 
     @Override
     public boolean isConnected() {
-        return mIsoCard != null && mIsoCard.isConnected();
+        try {
+            return mIsoCard != null && mIsoCard.isConnected();
+        } catch (SecurityException e) {
+            // We sometimes get this here after token is disconnected:
+            // java.lang.SecurityException: Permission Denial: Tag ( ID: 04 17 37 B3 71 24 80 ) is out of date
+            return false;
+        }
     }
 
     /**