0.0.41.beta16..

kongzue · Aug 7, 2021 · 33e50f5 · 33e50f5
1 parent 733fb4a
commit 33e50f5
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/DialogX/src/main/java/com/kongzue/dialogx/interfaces/BaseDialog.java b/DialogX/src/main/java/com/kongzue/dialogx/interfaces/BaseDialog.java
@@ -90,13 +90,16 @@ protected static void error(Object o) {
     }
 
     public static void onActivityResume(Activity activity) {
-        if (runningDialogList!=null) {
-            for (BaseDialog baseDialog : runningDialogList) {
+        if (runningDialogList != null) {
+            CopyOnWriteArrayList<BaseDialog> copyOnWriteList = new CopyOnWriteArrayList<>(runningDialogList);
+            for (int i = copyOnWriteList.size() - 1; i >= 0; i--) {
+                BaseDialog baseDialog = copyOnWriteList.get(i);
                 if (baseDialog.getActivity() == activity && baseDialog.isShow && baseDialog.getDialogView() != null) {
                     View boxRoot = baseDialog.getDialogView().findViewById(R.id.box_root);
                     if (boxRoot != null) {
                         log("DialogX: boxRoot is requestFocus.");
                         boxRoot.requestFocus();
+                        return;
                     }
                 }
             }