Commit dcd2553d authored by Thomas's avatar Thomas
Browse files

Merge branch 'Fix_537' into develop

parents 361a2452 e212b395

app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java

+3 −1
Original line number Diff line number Diff line
@@ -985,7 +985,9 @@ public class Helper { 
                ft.commitAllowingStateLoss();

            }

        }

        if(!fragmentManager.isDestroyed()) {

            fragmentManager.executePendingTransactions();

        }

        return fragment;

    }

app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java

+7 −5
Original line number Diff line number Diff line
@@ -1062,12 +1062,14 @@ public class SpannableHelper { 


        popupHashtagsBinding.muteTag.setOnClickListener(v -> {

            Filter fedilabFilter = null;

            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

            if (fedilabFilter == null) {

                Filter.FilterParams filterParams = new Filter.FilterParams();
@@ -1081,7 +1083,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);

                            }

app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTimeline.java

+3 −1
Original line number Diff line number Diff line
@@ -514,7 +514,9 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter. 
            initializeView();

            needToCallResume = false;

        }

        try {

            ContextCompat.registerReceiver(requireActivity(), receive_action, new IntentFilter(Helper.RECEIVE_STATUS_ACTION), ContextCompat.RECEIVER_NOT_EXPORTED);

        }catch (Exception ignored){}

    }



    /**

app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/TimelinesVM.java

+9 −1
Original line number Diff line number Diff line
@@ -104,15 +104,23 @@ public class TimelinesVM extends AndroidViewModel { 




    private static void sortDesc(List<Status> statusList) {

        if(statusList == null) {

            return;

        }

        Collections.sort(statusList, (obj1, obj2) -> obj2.id.compareToIgnoreCase(obj1.id));

    }



    public static void sortAsc(List<Status> statusList) {

        if(statusList == null) {

            return;

        }

        Collections.sort(statusList, (obj1, obj2) -> obj1.id.compareToIgnoreCase(obj2.id));

    }





    private static void sortDescConv(List<Conversation> conversationList) {

        if(conversationList == null) {

            return;

        }

        Collections.sort(conversationList, (obj1, obj2) -> obj2.id.compareToIgnoreCase(obj1.id));

    }