feat: return samId from readCardId

Author: genesisxyz

android/src/main/java/com/pos/CardManager.kt

@@ -8,6 +8,7 @@ import com.pos.calypso.*
 
 
 abstract class CardManager {
+  protected lateinit var samId: String
   protected lateinit var cardId: String
 
   protected var samIsConnected = false
@@ -54,7 +55,10 @@ abstract class CardManager {
       waitForCard()
       connectCard()
       if (cardIsConnected) {
-        promise.resolve(cardId)
+        val map = Arguments.createMap()
+        map.putString("samId", samId)
+        map.putString("cardId", cardId)
+        promise.resolve(map)
       } else {
         promise.reject(PosException(PosException.CARD_NOT_PRESENT, "Card not connected"))
       }

android/src/main/java/com/pos/Famoco.kt

@@ -19,7 +19,6 @@ import kotlin.coroutines.resumeWithException
 
 
 class Famoco(private val reactContext: ReactApplicationContext) : CardManager() {
-  private lateinit var samId: String
   private lateinit var samCard: Card
   private lateinit var rfCard: Card
 

android/src/main/java/com/pos/Telpo.kt

@@ -9,17 +9,14 @@ import android.nfc.tech.IsoDep
 import android.os.Build
 import com.cloudpos.DeviceException
 import com.facebook.react.bridge.*
-import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.pos.byteUtils.ByteConvertStringUtil
-import com.pos.calypso.CardReadRecordsBuilder
 import com.telpo.tps550.api.reader.SmartCardReader
 import kotlinx.coroutines.*
 import java.io.IOException
 
 class Telpo(private val reactContext: ReactApplicationContext) : CardManager(), LifecycleEventListener {
 
   private lateinit var samReader: SmartCardReader
-  private lateinit var samId: String
   private var isoDep: IsoDep? = null
 
   private var nfcAdapter: NfcAdapter? = null
@@ -187,13 +184,16 @@ class Telpo(private val reactContext: ReactApplicationContext) : CardManager(),
 
   override fun connectSam() {
     if (samIsConnected) return
-    // TODO: manage return of open and iccPowerOn
     val isOpen = samReader.open()
     val isIccPowerOn = samReader.iccPowerOn()
 
     if (!isOpen || !isIccPowerOn) {
       throw PosException(PosException.SAM_CONNECT_FAIL, "Cannot connect to SAM")
     }
+
+    val tempSamId = samReader.atrString
+    if (tempSamId != null) samId = tempSamId.substring(24, 32)
+
     samIsConnected = true
   }
 

src/PosSam.ts

@@ -33,7 +33,7 @@ export function close() {
   return PosSam.close();
 }
 
-export async function readCardId(): Promise<string> {
+export async function readCardId(): Promise<{ samId: string; cardId: string }> {
   return await PosSam.readCardId();
 }