From 7a486e442622dbfcd4951a16edd8796517a59d61 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 14 Jun 2022 12:43:29 +0200 Subject: [PATCH] Improved error message --- .../java/eu/faircode/email/SimpleTask.java | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/SimpleTask.java b/app/src/main/java/eu/faircode/email/SimpleTask.java index 3f245b7498..6b325cfae0 100644 --- a/app/src/main/java/eu/faircode/email/SimpleTask.java +++ b/app/src/main/java/eu/faircode/email/SimpleTask.java @@ -249,21 +249,16 @@ public abstract class SimpleTask implements LifecycleObserver { Field mFragment = owner.getClass().getDeclaredField("mFragment"); mFragment.setAccessible(true); Fragment fragment = (Fragment) mFragment.get(owner); - if (fragment != null) { - if (fragment.getActivity() == null) { - Log.w("Fragment without activity" + - " task=" + name + - " fragment=" + fragment.getClass().getName() + - " lifecycle=" + owner.getLifecycle().getCurrentState()); - return; - } - if (fragment.getContext() == null) { - Log.w("Fragment without context" + - " task=" + name + - " fragment=" + fragment.getClass().getName() + - " lifecycle=" + owner.getLifecycle().getCurrentState()); - return; - } + if (fragment != null && + (fragment.getContext() == null || fragment.getActivity() == null)) { + // Since deliver is executed for resumed fragments only, this should never happen + Log.e("Fragment without activity" + + " task=" + name + + " context=" + (fragment.getContext() != null) + + " activity=" + (fragment.getActivity() != null) + + " fragment=" + fragment.getClass().getName() + + " lifecycle=" + owner.getLifecycle().getCurrentState()); + return; } } catch (Throwable ex) { Log.w(ex);