mirrors/Fedilab
1
0
Fork 1
mirror of https://codeberg.org/tom79/Fedilab.git synced 2025-09-15 08:20:18 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'Fix_537' into develop

Browse source
This commit is contained in:
Thomas 2025-08-22 15:37:01 +02:00
commit dcd2553d40
4 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java
View file

@ -985,7 +985,9 @@ public class Helper {
ft.commitAllowingStateLoss(); ft.commitAllowingStateLoss();
} }
} }
fragmentManager.executePendingTransactions(); if(!fragmentManager.isDestroyed()) {
fragmentManager.executePendingTransactions();
}
return fragment; return fragment;
} }

12
app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java
View file

@ -1062,10 +1062,12 @@ public class SpannableHelper {
popupHashtagsBinding.muteTag.setOnClickListener(v -> { popupHashtagsBinding.muteTag.setOnClickListener(v -> {
Filter fedilabFilter = null; Filter fedilabFilter = null;
for (Filter filter : MainActivity.mainFilters) { if(MainActivity.mainFilters != null) {
if (filter.title.equals(Helper.FEDILAB_MUTED_HASHTAGS)) { for (Filter filter : MainActivity.mainFilters) {
fedilabFilter = filter; if (filter.title.equals(Helper.FEDILAB_MUTED_HASHTAGS)) {
break; fedilabFilter = filter;
break;
}
} }
} }
//Filter for Fedilab doesn't exist we have to create it //Filter for Fedilab doesn't exist we have to create it
@ -1081,7 +1083,7 @@ public class SpannableHelper {
FiltersVM filtersVM = new ViewModelProvider((ViewModelStoreOwner) context).get(FiltersVM.class); FiltersVM filtersVM = new ViewModelProvider((ViewModelStoreOwner) context).get(FiltersVM.class);
filtersVM.addFilter(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, filterParams) filtersVM.addFilter(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, filterParams)
.observe((LifecycleOwner) context, filter -> { .observe((LifecycleOwner) context, filter -> {
if (filter != null) { if (filter != null && MainActivity.mainFilters != null) {
MainActivity.mainFilters.add(filter); MainActivity.mainFilters.add(filter);
addTagToFilter(context, tag, status, filter); addTagToFilter(context, tag, status, filter);
} }

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

@ -514,7 +514,9 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.
initializeView(); initializeView();
needToCallResume = false; 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){}
} }
/** /**

10
app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/TimelinesVM.java
View file

@ -104,15 +104,23 @@ public class TimelinesVM extends AndroidViewModel {
private static void sortDesc(List<Status> statusList) { private static void sortDesc(List<Status> statusList) {
if(statusList == null) {
return;
}
Collections.sort(statusList, (obj1, obj2) -> obj2.id.compareToIgnoreCase(obj1.id)); Collections.sort(statusList, (obj1, obj2) -> obj2.id.compareToIgnoreCase(obj1.id));
} }
public static void sortAsc(List<Status> statusList) { public static void sortAsc(List<Status> statusList) {
if(statusList == null) {
return;
}
Collections.sort(statusList, (obj1, obj2) -> obj1.id.compareToIgnoreCase(obj2.id)); Collections.sort(statusList, (obj1, obj2) -> obj1.id.compareToIgnoreCase(obj2.id));
} }
private static void sortDescConv(List<Conversation> conversationList) { private static void sortDescConv(List<Conversation> conversationList) {
if(conversationList == null) {
return;
}
Collections.sort(conversationList, (obj1, obj2) -> obj2.id.compareToIgnoreCase(obj1.id)); Collections.sort(conversationList, (obj1, obj2) -> obj2.id.compareToIgnoreCase(obj1.id));
} }