Parcourir la source

Merge pull request #158 from WeiXiaoMin/master

bugfix: 修复WaitDialog有时候不显示的bug。
Kongzue il y a 3 ans
Parent
commit
42e52036ef

+ 2 - 2
DialogX/src/main/java/com/kongzue/dialogx/dialogs/WaitDialog.java

@@ -879,14 +879,14 @@ public class WaitDialog extends BaseDialog {
         if (getContext() != null && getContext() instanceof Activity && getInstance((Activity) getContext()) != null) {
             return false;
         }
-        return me == null || me.get() == null || (me.get().getActivity() != null && me.get().getActivity() != getContext());
+        return me == null || me.get() == null || me.get().getActivity() == null || me.get().getActivity() != getContext();
     }
     
     protected static boolean noInstance(Activity activity) {
         if (getContext() != null && getInstance(activity) != null) {
             return false;
         }
-        return me == null || me.get() == null || (me.get().getActivity() != null && me.get().getActivity() != activity);
+        return me == null || me.get() == null || me.get().getActivity() == null || me.get().getActivity() != activity;
     }
     
     public static WaitDialog getInstanceNotNull(Activity activity) {