From c0269fcfa876b9c5cf309b2006462b4d09c5ef95 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 28 七月 2021 18:09:02 +0800
Subject: [PATCH] 包名及目录修改
---
EventBus/src/de/greenrobot/event/util/ErrorDialogManager.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/EventBus/src/de/greenrobot/event/util/ErrorDialogManager.java b/EventBus/src/de/greenrobot/event/util/ErrorDialogManager.java
index cee7c6a..d407f82 100644
--- a/EventBus/src/de/greenrobot/event/util/ErrorDialogManager.java
+++ b/EventBus/src/de/greenrobot/event/util/ErrorDialogManager.java
@@ -5,10 +5,10 @@
import android.app.Application;
import android.os.Build;
import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
import android.util.Log;
import de.greenrobot.event.EventBus;
@@ -76,7 +76,7 @@
existingFragment.dismiss();
}
- android.support.v4.app.DialogFragment errorFragment = (android.support.v4.app.DialogFragment) factory
+ DialogFragment errorFragment = (DialogFragment) factory
.prepareErrorFragment(event, finishAfterDialog, argumentsForErrorDialog);
if (errorFragment != null) {
errorFragment.show(fm, TAG_ERROR_DIALOG);
@@ -234,10 +234,8 @@
private static boolean isInExecutionScope(Object executionScope, ThrowableFailureEvent event) {
if (event != null) {
Object eventExecutionScope = event.getExecutionScope();
- if (eventExecutionScope != null && !eventExecutionScope.equals(executionScope)) {
- // Event not in our scope, do nothing
- return false;
- }
+ // Event not in our scope, do nothing
+ return eventExecutionScope == null || eventExecutionScope.equals(executionScope);
}
return true;
}
--
Gitblit v1.8.0