From cbcc3ee30ecf3d9d060d0c9b365794127aa829d1 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 11 Sep 2019 11:51:09 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .idea/navEditor.xml                           |  2 +-
 .../ui/dialog/WaitSecurityDelayDialog.java    | 54 ++++++++-----------
 2 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/.idea/navEditor.xml b/.idea/navEditor.xml
index 16f8dca67c..4548c6069e 100644
--- a/.idea/navEditor.xml
+++ b/.idea/navEditor.xml
@@ -313,7 +313,7 @@
                         </option>
                         <option name="myPositions">
                           <map>
-                            <entry key="action_purgeFragment_to_loadedWalletFragment">
+                            <entry key="action_purgeFragment_to_mainFragment">
                               <value>
                                 <LayoutPositions />
                               </value>
diff --git a/app/src/main/java/com/tangem/ui/dialog/WaitSecurityDelayDialog.java b/app/src/main/java/com/tangem/ui/dialog/WaitSecurityDelayDialog.java
index ff534b3758..b7a8555c3e 100644
--- a/app/src/main/java/com/tangem/ui/dialog/WaitSecurityDelayDialog.java
+++ b/app/src/main/java/com/tangem/ui/dialog/WaitSecurityDelayDialog.java
@@ -79,6 +79,9 @@ public class WaitSecurityDelayDialog extends DialogFragment {
     }
 
     public static void onReadBeforeRequest(final FragmentActivity activity, final int timeout) {
+        if (activity == null) return;
+
+        Log.e(TAG, "onReadBeforeRequest callback(" + timeout + ")");
         activity.runOnUiThread(() -> {
             if (timerToShowDelayDialog != null || timeout < delayBeforeShowDialog + minRemainingDelayToShowDialog)
                 return;
@@ -98,44 +101,31 @@ public class WaitSecurityDelayDialog extends DialogFragment {
     }
 
     public static void onReadAfterRequest(final Activity activity) {
-        activity.runOnUiThread(() -> {
-            if (timerToShowDelayDialog == null) return;
-            timerToShowDelayDialog.cancel();
-            timerToShowDelayDialog = null;
-        });
+        if (timerToShowDelayDialog == null) return;
+        timerToShowDelayDialog.cancel();
+        timerToShowDelayDialog = null;
     }
 
     public static void onReadWait(final FragmentActivity activity, final int msec) {
         Log.e(TAG, "onReadWait callback(" + msec + ")");
+        if (timerToShowDelayDialog != null) {
+            timerToShowDelayDialog.cancel();
+            timerToShowDelayDialog = null;
+        }
+
+        if (msec == 0 && instance != null) {
+            try {
+                instance.dismissAllowingStateLoss();
+                instance = null;
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+        if (activity == null) return;
+
         activity.runOnUiThread(() -> {
             Log.e(TAG, "onReadWait on ui thread(" + msec + ")");
-            if (timerToShowDelayDialog != null) {
-                timerToShowDelayDialog.cancel();
-                timerToShowDelayDialog = null;
-            }
-
-            if (msec == 0) {
-                if (instance != null) {
-                    if (instance.isAdded()) {
-                        instance.dismissAllowingStateLoss();
-                        instance = null;
-                    } else {
-                        Log.e(TAG, "onReadWait(0) with not added dialog");
-//                        instance.progressBar.postDelayed(() -> {
-//                            Log.e(TAG, "onReadWait(0) dismiss delayed");
-                        try {
-                            instance.dismissAllowingStateLoss();
-                            instance = null;
-                        }
-                        catch (Exception e)
-                        {
-                            e.printStackTrace();
-                        }
-//                        }, 10000);
-                    }
-                }
-                return;
-            }
 
             if (instance == null) {
                 if (msec > delayBeforeShowDialog + minRemainingDelayToShowDialog) {