Merge pull request #420 from tangem/merge_5.18_dev

Merge 5.18 dev
tangem · Nov 14, 2024 · 3d234c9 · 3d234c9
2 parents a07ade0 + ec5c194
commit 3d234c9
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 9 deletions.
diff --git a/tangem-sdk-android/src/main/java/com/tangem/sdk/DefaultSessionViewDelegate.kt b/tangem-sdk-android/src/main/java/com/tangem/sdk/DefaultSessionViewDelegate.kt
@@ -47,7 +47,7 @@ class DefaultSessionViewDelegate(
         iconScanRes: Int?,
         productType: ProductType,
     ) {
-        Log.view { "session started" }
+        Log.view { "onSessionStarted" }
         createAndShowState(
             state = SessionViewDelegateState.Ready(formatCardId(cardId), productType),
             enableHowTo = enableHowTo,
@@ -60,7 +60,7 @@ class DefaultSessionViewDelegate(
     private fun checkNfcEnabled() {
         Log.view { "checkNfcEnabled" }
         // workaround to delay checking isNfcEnabled to let nfcManager become enabled state after enableReaderMode
-        postUI(msTime = 700) {
+        postUI(msTime = DIALOG_NFC_DELAY) {
             Log.view { "checkNfcEnabled isNfcEnabled=${nfcManager.isNfcEnabled}" }
             if (!nfcManager.isNfcEnabled) {
                 nfcEnableDialog?.cancel()
@@ -182,18 +182,39 @@ class DefaultSessionViewDelegate(
         message: ViewDelegateMessage? = null,
         iconScanRes: Int? = null,
     ) {
+        Log.view { "createAndShowState" }
+        // Under the hood dialog dismiss could work async and new dialog could be created
+        // before old one is dismissed, that leads to 2 dialogs on screen.
+        // Create new one in onDismiss callback
         postUI {
-            readingDialog?.let(NfcSessionDialog::dismissInternal)
-
-            with(createReadingDialog(activity, iconScanRes)) {
-                showHowTo(enableHowTo)
-                setInitialMessage(message)
-                setScanImage(sdkConfig.scanTagImage)
-                show(state)
+            if (readingDialog != null) {
+                readingDialog?.setOnDismissListener {
+                    Log.view { "old readingDialog onDismiss callback" }
+                    createAndConfigureDialog(state, enableHowTo, message, iconScanRes)
+                }
+                readingDialog?.dismissInternal()
+            } else {
+                Log.view { "createAndConfigDialog" }
+                createAndConfigureDialog(state, enableHowTo, message, iconScanRes)
             }
         }
     }
 
+    private fun createAndConfigureDialog(
+        state: SessionViewDelegateState,
+        enableHowTo: Boolean,
+        message: ViewDelegateMessage? = null,
+        iconScanRes: Int? = null,
+    ) {
+        with(createReadingDialog(activity, iconScanRes)) {
+            Log.view { "createReadingDialog readingDialog $this" }
+            showHowTo(enableHowTo)
+            setInitialMessage(message)
+            setScanImage(sdkConfig.scanTagImage)
+            show(state)
+        }
+    }
+
     private fun createReadingDialog(activity: Activity, iconScanRes: Int? = null): NfcSessionDialog {
         Log.view { "createReadingDialog" }
         return NfcSessionDialog(
@@ -223,4 +244,8 @@ class DefaultSessionViewDelegate(
         val formatter = CardIdFormatter(sdkConfig.cardIdDisplayFormat)
         return formatter.getFormattedCardId(cardId)
     }
+
+    companion object {
+        private const val DIALOG_NFC_DELAY = 800L
+    }
 }
diff --git a/tangem-sdk-android/src/main/java/com/tangem/sdk/ui/BaseSdkDialog.kt b/tangem-sdk-android/src/main/java/com/tangem/sdk/ui/BaseSdkDialog.kt
@@ -52,6 +52,7 @@ open class BaseSdkDialog(context: Context) : BottomSheetDialog(context) {
     }
 
     override fun dismiss() {
+        Log.view { "dismiss" }
         if (!isDismissedProgrammatically.get()) {
             // call it only if dismiss() called by system and not from dismissInternal()
             stateWidgets.forEach { it.onBottomSheetDismiss() }
@@ -67,6 +68,7 @@ open class BaseSdkDialog(context: Context) : BottomSheetDialog(context) {
      * StateWidget.onBottomSheetDismiss() callback
      */
     fun dismissInternal() {
+        Log.view { "dismissInternal" }
         isDismissedProgrammatically.set(true)
         dismiss()
     }