mirror of https://github.com/M66B/FairEmail.git
Prevent crash
This commit is contained in:
parent
1f82015652
commit
607f3373ea
|
@ -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 {
|
||||||
|
|
Loading…
Reference in New Issue