diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java b/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java index 99812a5d..fd808edd 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java +++ b/app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java @@ -1052,10 +1052,12 @@ public class SpannableHelper { popupHashtagsBinding.muteTag.setOnClickListener(v -> { Filter fedilabFilter = null; - for (Filter filter : MainActivity.mainFilters) { - if (filter.title.equals(Helper.FEDILAB_MUTED_HASHTAGS)) { - fedilabFilter = filter; - break; + if(MainActivity.mainFilters != null) { + for (Filter filter : MainActivity.mainFilters) { + if (filter.title.equals(Helper.FEDILAB_MUTED_HASHTAGS)) { + fedilabFilter = filter; + break; + } } } //Filter for Fedilab doesn't exist we have to create it @@ -1071,7 +1073,7 @@ public class SpannableHelper { FiltersVM filtersVM = new ViewModelProvider((ViewModelStoreOwner) context).get(FiltersVM.class); filtersVM.addFilter(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, filterParams) .observe((LifecycleOwner) context, filter -> { - if (filter != null) { + if (filter != null && MainActivity.mainFilters != null) { MainActivity.mainFilters.add(filter); addTagToFilter(context, tag, status, filter); } diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTimeline.java b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTimeline.java index 6aa76fe9..712f170c 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTimeline.java +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTimeline.java @@ -514,7 +514,9 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter. initializeView(); needToCallResume = false; } - ContextCompat.registerReceiver(requireActivity(), receive_action, new IntentFilter(Helper.RECEIVE_STATUS_ACTION), ContextCompat.RECEIVER_NOT_EXPORTED); + try { + ContextCompat.registerReceiver(requireActivity(), receive_action, new IntentFilter(Helper.RECEIVE_STATUS_ACTION), ContextCompat.RECEIVER_NOT_EXPORTED); + }catch (Exception ignored){} } /** diff --git a/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/TimelinesVM.java b/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/TimelinesVM.java index 92c5a351..b7dbce39 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/TimelinesVM.java +++ b/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/TimelinesVM.java @@ -104,15 +104,23 @@ public class TimelinesVM extends AndroidViewModel { private static void sortDesc(List statusList) { + if(statusList == null) { + return; + } Collections.sort(statusList, (obj1, obj2) -> obj2.id.compareToIgnoreCase(obj1.id)); } public static void sortAsc(List statusList) { + if(statusList == null) { + return; + } Collections.sort(statusList, (obj1, obj2) -> obj1.id.compareToIgnoreCase(obj2.id)); } - private static void sortDescConv(List conversationList) { + if(conversationList == null) { + return; + } Collections.sort(conversationList, (obj1, obj2) -> obj2.id.compareToIgnoreCase(obj1.id)); }