fix: ignore cards using unsupported protocols (#1)

Author: jeanpierrefortune

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.1.4] - 2024-02-21
+### Fixed
+- Cards using unsupported contactless protocols are now ignored.
+
 ## [2.1.3] - 2024-02-06
 ### Fixed
 - Card scanning process. The RF module is now enabled/disabled in addition to the 
@@ -51,8 +55,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [1.0.0] - 2020-12-18
 This is the initial release.
 
-[unreleased]: https://github.com/calypsonet/keyple-plugin-cna-bluebird-specific-nfc-java-lib/compare/2.1.3...HEAD
-[2.1.3]: https://github.com/calypsonet/keyple-plugin-cna-bluebird-specific-nfc-java-lib/compare/2.1.3...2.1.2
+[unreleased]: https://github.com/calypsonet/keyple-plugin-cna-bluebird-specific-nfc-java-lib/compare/2.1.4...HEAD
+[2.1.4]: https://github.com/calypsonet/keyple-plugin-cna-bluebird-specific-nfc-java-lib/compare/2.1.3...2.1.4
+[2.1.3]: https://github.com/calypsonet/keyple-plugin-cna-bluebird-specific-nfc-java-lib/compare/2.1.2...2.1.3
 [2.1.2]: https://github.com/calypsonet/keyple-plugin-cna-bluebird-specific-nfc-java-lib/compare/2.1.1...2.1.2
 [2.1.1]: https://github.com/calypsonet/keyple-plugin-cna-bluebird-specific-nfc-java-lib/compare/2.1.0...2.1.1
 [2.1.0]: https://github.com/calypsonet/keyple-plugin-cna-bluebird-specific-nfc-java-lib/compare/2.0.0...2.1.0

bluebird-plugin-mock/src/main/kotlin/org/calypsonet/keyple/plugin/bluebird/BluebirdSupportContactlessProtocols.kt

@@ -13,22 +13,19 @@ package org.calypsonet.keyple.plugin.bluebird
 
 enum class BluebirdSupportContactlessProtocols constructor(val value: Int) {
   ISO_14443_4_A(0x01),
+  ISO_14443_4_A_SKY_ECP(0x81),
   ISO_14443_4_B(0x02),
-  INNOVATRON_B_PRIME(0x04),
-  SRT512(0x08),
-  MIFARE_CLASSIC(0x10),
-  MIFARE_ULTRALIGHT(0x20),
-  ISO14443_4_SKY_ECP_A(0x81),
-  ISO14443_4_SKY_ECP_B(0x82);
+  ISO_14443_4_B_SKY_ECP(0x82),
+  INNOVATRON_B_PRIME(0x04);
 
   companion object {
-    fun fromValue(value: Int): BluebirdSupportContactlessProtocols {
+    fun fromValue(value: Int): BluebirdSupportContactlessProtocols? {
       for (protocol in values()) {
         if (protocol.value == value) {
           return protocol
         }
       }
-      throw IllegalArgumentException("BluebirdSupportContactlessProtocols '$value' is not defined")
+      return null
     }
   }
 }

bluebird-plugin/src/main/kotlin/org/calypsonet/keyple/plugin/bluebird/BluebirdContactlessReaderAdapter.kt

@@ -382,11 +382,14 @@ internal class BluebirdContactlessReaderAdapter(activity: Activity) :
             if (ExtNfcReader.Broadcast.EXTNFC_DETECTED_ACTION == intent.action) {
               listener?.let {
                 val cardType = intent.getIntExtra(ExtNfcReader.Broadcast.EXTNFC_CARD_TYPE_KEY, -1)
-                val tag =
-                    Tag(
-                        BluebirdSupportContactlessProtocols.fromValue(cardType),
-                        intent.getByteArrayExtra(ExtNfcReader.Broadcast.EXTNFC_CARD_DATA_KEY))
-                it(NfcResultSuccess(tag))
+                val protocol = BluebirdSupportContactlessProtocols.fromValue(cardType)
+                protocol?.let {
+                  val tag =
+                      Tag(
+                          protocol,
+                          intent.getByteArrayExtra(ExtNfcReader.Broadcast.EXTNFC_CARD_DATA_KEY))
+                  it(NfcResultSuccess(tag))
+                }
               }
             }
           }

bluebird-plugin/src/main/kotlin/org/calypsonet/keyple/plugin/bluebird/BluebirdSupportContactlessProtocols.kt

@@ -26,13 +26,13 @@ enum class BluebirdSupportContactlessProtocols constructor(val value: Int) {
   INNOVATRON_B_PRIME(0x04);
 
   companion object {
-    fun fromValue(value: Int): BluebirdSupportContactlessProtocols {
+    fun fromValue(value: Int): BluebirdSupportContactlessProtocols? {
       for (protocol in values()) {
         if (protocol.value == value) {
           return protocol
         }
       }
-      throw IllegalArgumentException("BluebirdSupportContactlessProtocols '$value' is not defined")
+      return null
     }
   }
 }

gradle.properties

@@ -1,7 +1,7 @@
 group = org.calypsonet.keyple
 title = Keyple Plugin CNA Bluebird Specific NFC Java Lib
 description = Keyple add-on to manage Bluebird Specific NFC readers
-version = 2.1.3
+version = 2.1.4
 archivesBaseName = keyple-plugin-cna-bluebird-specific-nfc-java-lib
 
 javaSourceLevel = 1.6