mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Prevent crash

This commit is contained in:
M66B 2019-01-25 06:48:46 +00:00
parent 1f82015652
commit 607f3373ea
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@ -295,12 +295,15 @@ public class FragmentMessages extends FragmentBase {
selectionTracker.addObserver(new SelectionTracker.SelectionObserver() { selectionTracker.addObserver(new SelectionTracker.SelectionObserver() {
@Override @Override
public void onSelectionChanged() { public void onSelectionChanged() {
// Workaround AndroidX bug SelectionTracker tracker = selectionTracker;
if (tracker == null)
return;
FragmentActivity activity = getActivity(); FragmentActivity activity = getActivity();
if (activity != null) { if (activity != null) {
try { try {
ViewModelMessages modelMessages = ViewModelProviders.of(activity).get(ViewModelMessages.class); ViewModelMessages modelMessages = ViewModelProviders.of(activity).get(ViewModelMessages.class);
if (selectionTracker.hasSelection()) if (tracker.hasSelection())
modelMessages.removeObservers(viewType, getViewLifecycleOwner()); modelMessages.removeObservers(viewType, getViewLifecycleOwner());
else else
modelMessages.observe(viewType, getViewLifecycleOwner(), observer); modelMessages.observe(viewType, getViewLifecycleOwner(), observer);
@ -312,7 +315,7 @@ public class FragmentMessages extends FragmentBase {
activity.invalidateOptionsMenu(); activity.invalidateOptionsMenu();
} }
if (selectionTracker.hasSelection()) { if (tracker.hasSelection()) {
swipeRefresh.setEnabled(false); swipeRefresh.setEnabled(false);
fabMore.show(); fabMore.show();
} else { } else {