From c01895f6abcdc51c2c732b3c453cb228acf5dd07 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Thu, 27 Dec 2018 14:15:54 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../presentation/activity/MainActivity.kt     |  3 ---
 .../activity/SignPaymentActivity.kt           | 21 ++++++++++++++++---
 .../dialog/WaitSecurityDelayDialogNew.kt      | 12 +++++------
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt
index 28c4231e80..2978ee8a4f 100644
--- a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt
@@ -85,9 +85,6 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-//        val waitSecurityDelayDialogNew = WaitSecurityDelayDialogNew()
-//        waitSecurityDelayDialogNew.show(supportFragmentManager, WaitSecurityDelayDialogNew.TAG)
-
         App.getNavigatorComponent().inject(this)
 
         requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
diff --git a/app/src/main/java/com/tangem/presentation/activity/SignPaymentActivity.kt b/app/src/main/java/com/tangem/presentation/activity/SignPaymentActivity.kt
index 0763437609..3cac8e6a19 100644
--- a/app/src/main/java/com/tangem/presentation/activity/SignPaymentActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/SignPaymentActivity.kt
@@ -20,12 +20,14 @@ import com.tangem.domain.wallet.CoinEngineFactory
 import com.tangem.domain.wallet.TangemContext
 import com.tangem.presentation.dialog.NoExtendedLengthSupportDialog
 import com.tangem.presentation.dialog.WaitSecurityDelayDialog
+import com.tangem.presentation.dialog.WaitSecurityDelayDialogNew
 import com.tangem.tangemcard.reader.CardProtocol
 import com.tangem.tangemcard.android.reader.NfcManager
 import com.tangem.tangemcard.android.reader.NfcReader
 import com.tangem.tangemcard.data.asBundle
 import com.tangem.tangemcard.tasks.SignTask
 import com.tangem.tangemcard.util.Util
+import com.tangem.util.LOG
 import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.activity_sign_payment.*
 
@@ -252,16 +254,29 @@ class SignPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card
         }, 500)
     }
 
-    override fun onReadWait(msec: Int) {
-        WaitSecurityDelayDialog.onReadWait(this, msec)
-    }
+    private val waitSecurityDelayDialogNew = WaitSecurityDelayDialogNew()
 
     override fun onReadBeforeRequest(timeout: Int) {
+        LOG.i(TAG, "onReadBeforeRequest timeout $timeout")
         WaitSecurityDelayDialog.onReadBeforeRequest(this, timeout)
+
     }
 
     override fun onReadAfterRequest() {
+        LOG.i(TAG, "onReadAfterRequest")
         WaitSecurityDelayDialog.onReadAfterRequest(this)
+
     }
 
+    override fun onReadWait(msec: Int) {
+        LOG.i(TAG, "onReadWait msec $msec")
+        WaitSecurityDelayDialog.onReadWait(this, msec)
+
+
+    }
+
+
+
+
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialogNew.kt b/app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialogNew.kt
index c400be56a8..0b08c8e5ea 100644
--- a/app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialogNew.kt
+++ b/app/src/main/java/com/tangem/presentation/dialog/WaitSecurityDelayDialogNew.kt
@@ -7,7 +7,6 @@ import android.os.Bundle
 import android.support.v7.app.AppCompatDialogFragment
 import android.widget.ProgressBar
 import com.tangem.wallet.R
-import kotlinx.android.synthetic.main.dialog_wait_pin2.*
 import java.util.*
 
 class WaitSecurityDelayDialogNew : AppCompatDialogFragment() {
@@ -31,11 +30,8 @@ class WaitSecurityDelayDialogNew : AppCompatDialogFragment() {
         val inflater = activity!!.layoutInflater
         val v = inflater.inflate(R.layout.dialog_wait_pin2, null)
 
-        isCancelable = false
-
         pb = v.findViewById(R.id.progressBar)
 
-
         pb.max = msTimeout
         pb.progress = msProgress
 
@@ -67,7 +63,8 @@ class WaitSecurityDelayDialogNew : AppCompatDialogFragment() {
             override fun run() {
                 setup(timeout, DELAY_BEFORE_SHOW_DIALOG)
                 isCancelable = false
-                show(activity?.supportFragmentManager, TAG)
+//                if (!isVisible)
+                    show(activity?.supportFragmentManager, TAG)
             }
         }, DELAY_BEFORE_SHOW_DIALOG.toLong())
 
@@ -96,7 +93,8 @@ class WaitSecurityDelayDialogNew : AppCompatDialogFragment() {
             // 1000ms - card delay notification interval
             setup(msec + 1000, 1000)
             isCancelable = false
-            show(activity?.supportFragmentManager, TAG)
+//            if (!isVisible)
+                show(activity?.supportFragmentManager, TAG)
 
         } else
             setRemainingTimeout(msec)
@@ -119,7 +117,7 @@ class WaitSecurityDelayDialogNew : AppCompatDialogFragment() {
             } else {
                 val newProgress = pb.max - msec
                 if (pb.max > progress)
-                    progressBar.progress = newProgress
+                    pb.progress = newProgress
                 else
                     pb.max = progress + msec
             }