From 607f3373eadb4902608479e72a34846489a3f3c6 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 25 Jan 2019 06:48:46 +0000 Subject: [PATCH] Prevent crash --- .../main/java/eu/faircode/email/FragmentMessages.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 4dbea83078..2f3c7eba34 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -295,12 +295,15 @@ public class FragmentMessages extends FragmentBase { selectionTracker.addObserver(new SelectionTracker.SelectionObserver() { @Override public void onSelectionChanged() { - // Workaround AndroidX bug + SelectionTracker tracker = selectionTracker; + if (tracker == null) + return; + FragmentActivity activity = getActivity(); if (activity != null) { try { ViewModelMessages modelMessages = ViewModelProviders.of(activity).get(ViewModelMessages.class); - if (selectionTracker.hasSelection()) + if (tracker.hasSelection()) modelMessages.removeObservers(viewType, getViewLifecycleOwner()); else modelMessages.observe(viewType, getViewLifecycleOwner(), observer); @@ -312,7 +315,7 @@ public class FragmentMessages extends FragmentBase { activity.invalidateOptionsMenu(); } - if (selectionTracker.hasSelection()) { + if (tracker.hasSelection()) { swipeRefresh.setEnabled(false); fabMore.show(); } else {