@digitalshieldfe/react-native-backup-card-sdk 0.1.1 → 0.1.2

package/android/src/main/java/com/ziancube/reactnativebackupcardsdk/BackupCardSdkModule.kt

@@ -50,8 +50,8 @@ fun ByteArray?.toWritableArrayOrNull(): WritableArray? {
 class BackupCardSdkModule(val reactContext: ReactApplicationContext) :
         NativeBackupCardSdkSpec(reactContext) ,LifecycleEventListener
 {
-  private lateinit var backupCardSdk: BackupCardSdk
-  private val tag = "BackupCardSdkModule"
+  private var backupCardSdk: BackupCardSdk? = null
+  private var listenersRegistered = false
   private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
   override fun invalidate() {
     super.invalidate()
@@ -61,18 +61,17 @@ class BackupCardSdkModule(val reactContext: ReactApplicationContext) :
           object : BaseActivityEventListener() {
             override fun onNewIntent(intent: Intent) {
               super.onNewIntent(intent)
-              backupCardSdk.handleIntent(intent)
+              backupCardSdk?.handleIntent(intent)
             }
           }
 
-  override fun initialize() {
-    super.initialize()
+  private fun ensureInitialized(): Boolean {
+    if (backupCardSdk != null) {
+      return true
+    }
     Utils.init(reactContext)
     Utils.getActivityLifecycle()
-    val activity = Utils.getTopActivity()
-    if (activity == null) {
-      return
-    }
+    val activity = Utils.getTopActivity() ?: return false
     val apduLogger =
             object : ApduLogger {
               override fun log(message: String, isSent: Boolean, isSuccess: Boolean) {
@@ -98,55 +97,86 @@ class BackupCardSdkModule(val reactContext: ReactApplicationContext) :
               }
             }
     backupCardSdk = BackupCardSdk(activity, apduLogger, nfcTouchListener)
-    reactContext.addActivityEventListener(mActivityEventListener)
-    reactContext.addLifecycleEventListener(this)
+    if (!listenersRegistered) {
+      reactContext.addActivityEventListener(mActivityEventListener)
+      reactContext.addLifecycleEventListener(this)
+      listenersRegistered = true
+    }
+    return true
+  }
+
+  private fun requireSdk(promise: Promise): BackupCardSdk? {
+    if (!ensureInitialized()) {
+      promise.reject("E_NO_ACTIVITY", "BackupCardSdk requires a foreground Activity")
+      return null
+    }
+    return backupCardSdk
+  }
+
+  override fun initialize() {
+    super.initialize()
+    ensureInitialized()
   }
 
   companion object {
     const val NAME = NativeBackupCardSdkSpec.NAME
   }
 
-  override fun getCardInfo(promise: Promise) =
-        promise.launchSuspend(
-                block = { backupCardSdk.getCardInfo() },
-                transform = { info -> info?.toWritableMap() }
-        )
+  override fun getCardInfo(promise: Promise) {
+    val sdk = requireSdk(promise) ?: return
+    promise.launchSuspend(
+            block = { sdk.getCardInfo() },
+            transform = { info -> info?.toWritableMap() }
+    )
+  }
 
-    override fun resetCard(promise: Promise) =
-      promise.launchSuspend(
-          block = { backupCardSdk.resetCard() },
-          transform = { result -> result }
-      )
+  override fun resetCard(promise: Promise) {
+    val sdk = requireSdk(promise) ?: return
+    promise.launchSuspend(
+        block = { sdk.resetCard() },
+        transform = { result -> result }
+    )
+  }
 
-      override fun activateCard(pwd: String, promise: Promise) =
-        promise.launchSuspend(
-          block = { backupCardSdk.activateCard(pwd) },
-          transform = { result -> result }
-        )
+  override fun activateCard(pwd: String, promise: Promise) {
+    val sdk = requireSdk(promise) ?: return
+    promise.launchSuspend(
+      block = { sdk.activateCard(pwd) },
+      transform = { result -> result }
+    )
+  }
 
-      override fun changePin(oldPin: String, newPin: String, promise: Promise) =
-        promise.launchSuspend(
-          block = { backupCardSdk.changePin(oldPin, newPin) },
-          transform = { result -> result }
-        )
+  override fun changePin(oldPin: String, newPin: String, promise: Promise) {
+    val sdk = requireSdk(promise) ?: return
+    promise.launchSuspend(
+      block = { sdk.changePin(oldPin, newPin) },
+      transform = { result -> result }
+    )
+  }
 
-      override fun checkSlotEmpty(slotId: Double, pwd: String, promise: Promise) =
-        promise.launchSuspend(
-          block = { backupCardSdk.checkSlotEmpty(slotId.toInt(), pwd) },
-          transform = { result -> result }
-        )
+  override fun checkSlotEmpty(slotId: Double, pwd: String, promise: Promise) {
+    val sdk = requireSdk(promise) ?: return
+    promise.launchSuspend(
+      block = { sdk.checkSlotEmpty(slotId.toInt(), pwd) },
+      transform = { result -> result }
+    )
+  }
 
-      override fun writeSlot(slotIndex: Double, data: ReadableArray, pwd: String, promise: Promise) =
-        promise.launchSuspend(
-          block = { backupCardSdk.writeSlot(slotIndex.toInt(), data.toByteArray(), pwd) },
-          transform = { result -> result }
-        )
+  override fun writeSlot(slotIndex: Double, data: ReadableArray, pwd: String, promise: Promise) {
+    val sdk = requireSdk(promise) ?: return
+    promise.launchSuspend(
+      block = { sdk.writeSlot(slotIndex.toInt(), data.toByteArray(), pwd) },
+      transform = { result -> result }
+    )
+  }
 
-      override fun readSlot(slotIndex: Double, pwd: String, promise: Promise) =
-        promise.launchSuspend(
-          block = { backupCardSdk.readSlot(slotIndex.toInt(), pwd) },
-          transform = { result -> result.toWritableArrayOrNull() }
-        )
+  override fun readSlot(slotIndex: Double, pwd: String, promise: Promise) {
+    val sdk = requireSdk(promise) ?: return
+    promise.launchSuspend(
+      block = { sdk.readSlot(slotIndex.toInt(), pwd) },
+      transform = { result -> result.toWritableArrayOrNull() }
+    )
+  }
 
 
 
@@ -170,14 +200,16 @@ class BackupCardSdkModule(val reactContext: ReactApplicationContext) :
   }
 
   override fun onHostResume() {
-    backupCardSdk.onActivityResumed()
+    if (ensureInitialized()) {
+      backupCardSdk?.onActivityResumed()
+    }
   }
 
   override fun onHostPause() {
-    backupCardSdk.onActivityPaused()
+    backupCardSdk?.onActivityPaused()
   }
 
   override fun onHostDestroy() {
-    backupCardSdk.onActivityDestroyed()
+    backupCardSdk?.onActivityDestroyed()
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitalshieldfe/react-native-backup-card-sdk",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "ds react-native backup-card sdk",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",