vrr/Partisan-Telegram-Android
2
0
Fork 0
mirror of https://github.com/wrwrabbit/Partisan-Telegram-Android.git synced 2026-06-01 23:00:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '4.1.3' into merge/4.1.3

Browse source
This commit is contained in:
vivabelarus 2025-03-16 23:34:42 +03:00
commit 21f8f79bfd
No known key found for this signature in database
GPG key ID: 49D91FD306D1018E
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TMessagesProj/src/main/java/org/telegram/messenger/fakepasscode/RemoveChatsAction.java
View file

@ -360,10 +360,10 @@ public class RemoveChatsAction extends AccountAction implements NotificationCent
req.id = folder.id;
getAccount().getConnectionsManager().sendRequest(req, (response, error) -> {
Utilities.globalQueue.postRunnable(() -> {
hiddenFolders.remove(folder.id);
hiddenFolders.removeIf(id -> id == folder.id);
RemoveChatsResult result = fakePasscode.actionsResult.getRemoveChatsResult(accountNum);
if (result != null) {
result.hiddenFolders.remove(folder.id);
result.hiddenFolders.removeIf(id -> id == folder.id);
}
}, 1000);
});

5
TMessagesProj/src/main/java/org/telegram/ui/Components/FiltersListBottomSheet.java
View file

@ -32,6 +32,7 @@ import org.telegram.messenger.MessageObject;
import org.telegram.messenger.MessagesController;
import org.telegram.messenger.NotificationCenter;
import org.telegram.messenger.R;
import org.telegram.messenger.fakepasscode.FakePasscodeUtils;
import org.telegram.tgnet.TLRPC;
import org.telegram.ui.ActionBar.BaseFragment;
import org.telegram.ui.ActionBar.BottomSheet;
@ -68,7 +69,7 @@ public class FiltersListBottomSheet extends BottomSheet implements NotificationC
this.selectedDialogs = selectedDialogs;
this.fragment = baseFragment;
// dialogFilters = getCanAddDialogFilters(baseFragment, selectedDialogs);
dialogFilters = new ArrayList<>(baseFragment.getMessagesController().dialogFilters);
dialogFilters = new ArrayList<>(FakePasscodeUtils.filterFolders(baseFragment.getMessagesController().dialogFilters, fragment.getCurrentAccount()));
for (int i = 0; i < dialogFilters.size(); ++i) {
if (dialogFilters.get(i).isDefault()) {
dialogFilters.remove(i);
@ -332,7 +333,7 @@ public class FiltersListBottomSheet extends BottomSheet implements NotificationC
public static ArrayList<MessagesController.DialogFilter> getCanAddDialogFilters(BaseFragment fragment, ArrayList<Long> selectedDialogs) {
ArrayList<MessagesController.DialogFilter> result = new ArrayList<>();
ArrayList<MessagesController.DialogFilter> filters = fragment.getMessagesController().dialogFilters;
ArrayList<MessagesController.DialogFilter> filters = (ArrayList<MessagesController.DialogFilter>) FakePasscodeUtils.filterFolders(fragment.getMessagesController().dialogFilters, fragment.getCurrentAccount());
for (int a = 0, N = filters.size(); a < N; a++) {
MessagesController.DialogFilter filter = filters.get(a);
if (!getDialogsCount(fragment, filter, selectedDialogs, true, true).isEmpty() && !filter.isDefault()) {

3
TMessagesProj/src/main/java/org/telegram/ui/Components/Premium/boosts/UserSelectorBottomSheet.java
View file

@ -729,6 +729,9 @@ public class UserSelectorBottomSheet extends BottomSheetWithRecyclerListView imp
int h = 0;
if (isSearching()) {
for (TLObject peer : searchResult) {
if (FakePasscodeUtils.isHidePeer(peer, currentAccount)) {
continue;
}
long did;
if (peer instanceof TLRPC.User) {
final TLRPC.User user = (TLRPC.User) peer;