Debugging close() logic

VivoKey · May 24, 2024 · 4108975 · 4108975
1 parent 3829304
commit 4108975
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 15 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -13,8 +13,8 @@ android {
         applicationId = "com.hoker.intra_example"
         minSdk = 28
         targetSdk = 34
-        versionCode = 23
-        versionName = "1.1.5"
+        versionCode = 24
+        versionName = "1.1.6"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

diff --git a/intra/build.gradle.kts b/intra/build.gradle.kts
@@ -61,7 +61,7 @@ afterEvaluate {
                 from(components["release"])
                 groupId = "com.github.CarbideCowboy"
                 artifactId = "Intra"
-                version = "1.1.5"
+                version = "1.1.6"
             }
         }
     }

diff --git a/intra/src/main/java/com/carbidecowboy/intra/data/IsodepControllerImpl.kt b/intra/src/main/java/com/carbidecowboy/intra/data/IsodepControllerImpl.kt
@@ -59,7 +59,11 @@ class IsodepControllerImpl @Inject constructor(
     }
 
     override suspend fun close() {
-        isoDep?.close()
+        try {
+            isoDep?.close()
+        } catch(e: Exception) {
+            Log.d(this::class.java.simpleName, "Tag was out of date")
+        }
         isoDep = null
         stopConnectionCheckJob()
         _connectionStatus.emit(false)

diff --git a/intra/src/main/java/com/carbidecowboy/intra/data/NfcAControllerImpl.kt b/intra/src/main/java/com/carbidecowboy/intra/data/NfcAControllerImpl.kt
@@ -43,13 +43,15 @@ class NfcAControllerImpl @Inject constructor(
     }
 
     override suspend fun close() {
-        nfcA?.let {
-            it.close()
-            stopConnectionCheckJob()
-            nfcA = null
-            Log.i("ApexConnection", "----NFC_A CLOSED")
-            _connectionStatus.emit(false)
+        try {
+            nfcA?.close()
+        } catch(e: Exception) {
+            Log.d(this::class.java.simpleName, "Tag was out of date")
         }
+        stopConnectionCheckJob()
+        nfcA = null
+        Log.i("ApexConnection", "----NFC_A CLOSED")
+        _connectionStatus.emit(false)
     }
 
     override suspend fun getAtr(): OperationResult<ByteArray?> {

diff --git a/intra/src/main/java/com/carbidecowboy/intra/data/NfcVControllerImpl.kt b/intra/src/main/java/com/carbidecowboy/intra/data/NfcVControllerImpl.kt
@@ -54,12 +54,14 @@ class NfcVControllerImpl @Inject constructor(
     }
 
     override suspend fun close() {
-        nfcV?.let {
-            it.close()
-            stopConnectionCheckJob()
-            nfcV = null
-            _connectionStatus.emit(false)
+        try {
+            nfcV?.close()
+        } catch(e: Exception) {
+            Log.d(this::class.java.simpleName, "Tag was out of date")
         }
+        stopConnectionCheckJob()
+        nfcV = null
+        _connectionStatus.emit(false)
     }
 
     override suspend fun getAts(): OperationResult<ByteArray?> {