lynx
/
NekoX
mirror of https://github.com/NekoX-Dev/NekoX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

喵

This commit is contained in:
世界 2020-04-01 20:31:43 +08:00
parent b345ec6784
commit c607877a9a
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
4 changed files with 39 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TMessagesProj/src/main/java/org/telegram/messenger/AndroidUtilities.java
View File

@ -2792,7 +2792,7 @@ public class AndroidUtilities {
} else if (a == 4) {
text = password;
detail = LocaleController.getString("UseProxyPassword", R.string.UseProxyPassword);
} else if (a == 5) {
} else {
text = LocaleController.getString("Checking", R.string.Checking);
detail = LocaleController.getString("Checking", R.string.Checking);
}

80
TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
View File

@ -319,16 +319,16 @@ public class MessagesController extends BaseController implements NotificationCe
public TLRPC.SendMessageAction action;
}
public static int DIALOG_FILTER_FLAG_CONTACTS = 0x00000001;
public static int DIALOG_FILTER_FLAG_NON_CONTACTS = 0x00000002;
public static int DIALOG_FILTER_FLAG_GROUPS = 0x00000004;
public static int DIALOG_FILTER_FLAG_CHANNELS = 0x00000008;
public static int DIALOG_FILTER_FLAG_BOTS = 0x00000010;
public static int DIALOG_FILTER_FLAG_EXCLUDE_MUTED = 0x00000020;
public static int DIALOG_FILTER_FLAG_EXCLUDE_READ = 0x00000040;
public static int DIALOG_FILTER_FLAG_EXCLUDE_ARCHIVED = 0x00000080;
public static int DIALOG_FILTER_FLAG_ONLY_ARCHIVED = 0x00000100;
public static int DIALOG_FILTER_FLAG_ALL_CHATS = DIALOG_FILTER_FLAG_CONTACTS | DIALOG_FILTER_FLAG_NON_CONTACTS | DIALOG_FILTER_FLAG_GROUPS | DIALOG_FILTER_FLAG_CHANNELS | DIALOG_FILTER_FLAG_BOTS;
public static int DIALOG_FILTER_FLAG_CONTACTS = 0x00000001;
public static int DIALOG_FILTER_FLAG_NON_CONTACTS = 0x00000002;
public static int DIALOG_FILTER_FLAG_GROUPS = 0x00000004;
public static int DIALOG_FILTER_FLAG_CHANNELS = 0x00000008;
public static int DIALOG_FILTER_FLAG_BOTS = 0x00000010;
public static int DIALOG_FILTER_FLAG_EXCLUDE_MUTED = 0x00000020;
public static int DIALOG_FILTER_FLAG_EXCLUDE_READ = 0x00000040;
public static int DIALOG_FILTER_FLAG_EXCLUDE_ARCHIVED = 0x00000080;
public static int DIALOG_FILTER_FLAG_ONLY_ARCHIVED = 0x00000100;
public static int DIALOG_FILTER_FLAG_ALL_CHATS = DIALOG_FILTER_FLAG_CONTACTS | DIALOG_FILTER_FLAG_NON_CONTACTS | DIALOG_FILTER_FLAG_GROUPS | DIALOG_FILTER_FLAG_CHANNELS | DIALOG_FILTER_FLAG_BOTS;
public static class DialogFilter {
@ -374,46 +374,36 @@ public class MessagesController extends BaseController implements NotificationCe
} else if (dialog1.unread_count > 0 && dialog2.unread_count == 0) {
return -1;
} else if (dialog1.unread_count > 0 && dialog2.unread_count > 0) {
if (is2user && !ArraysKt.contains(NekoXConfig.DEVELOPER_IDS, (int) dialog1.id) &&
ArraysKt.contains(NekoXConfig.DEVELOPER_IDS, (int) dialog2.id)
) {
return 1;
} else if (is1user && ArraysKt.contains(NekoXConfig.DEVELOPER_IDS, (int) dialog1.id) &&
!ArraysKt.contains(NekoXConfig.DEVELOPER_IDS, (int) dialog2.id)) {
return -1;
} else if (is1user && is2user &&
ArraysKt.contains(NekoXConfig.DEVELOPER_IDS, (int) dialog1.id) &&
ArraysKt.contains(NekoXConfig.DEVELOPER_IDS, (int) dialog2.id))
if (NekoXConfig.sortByUnmuted) {
if (!isDialogMuted(dialog1.id) && isDialogMuted(dialog2.id)) {
return 1;
} else if (isDialogMuted(dialog1.id) && !isDialogMuted(dialog2.id)) {
return -1;
} else if (!isDialogMuted(dialog1.id) && !isDialogMuted(dialog2.id)) {
if (NekoXConfig.sortByUser) {
if (!is1user && is2user) {
return 1;
} else if (is1user && !is2user) {
return -1;
} else if (is1user && is2user) {
if (NekoXConfig.sortByContacts) {
boolean is1contact = is1user && getContactsController().isContact((int) dialog1.id);
boolean is2contact = is2user && getContactsController().isContact((int) dialog2.id);
if (!is1contact && is2contact) {
return 1;
} else if (is1contact && !is2contact) {
return -1;
}
if (NekoXConfig.sortByUnmuted) {
if (isDialogMuted(dialog1.id) && !isDialogMuted(dialog2.id)) {
return 1;
} else if (!isDialogMuted(dialog1.id) && isDialogMuted(dialog2.id)) {
return -1;
} else if (!isDialogMuted(dialog1.id) && !isDialogMuted(dialog2.id)) {
if (NekoXConfig.sortByUser) {
if (!is1user && is2user) {
return 1;
} else if (is1user && !is2user) {
return -1;
} else if (is1user && is2user) {
if (NekoXConfig.sortByContacts) {
boolean is1contact = is1user && getContactsController().isContact((int) dialog1.id);
boolean is2contact = is2user && getContactsController().isContact((int) dialog2.id);
if (!is1contact && is2contact) {
return 1;
} else if (is1contact && !is2contact) {
return -1;
}
}
}
}
}
}
}
} else if (NekoXConfig.sortByUnmuted) {
if (dialog1.unread_count == 0 && dialog2.unread_count > 0 && !isDialogMuted(dialog2.id)) {
if (dialog1.unread_count == 0 && dialog2.unread_count > 0 && isDialogMuted(dialog1.id) && !isDialogMuted(dialog2.id)) {
return 1;
} else if (dialog1.unread_count > 0 && dialog2.unread_count == 0 && !isDialogMuted(dialog1.id)) {
} else if (dialog1.unread_count > 0 && dialog2.unread_count == 0 && !isDialogMuted(dialog1.id)&& isDialogMuted(dialog2.id)) {
return -1;
} else if (dialog1.unread_count > 0 && dialog2.unread_count > 0 && !isDialogMuted(dialog1.id) && !isDialogMuted(dialog2.id)) {
if (NekoXConfig.sortByUser) {
@ -1975,7 +1965,7 @@ public class MessagesController extends BaseController implements NotificationCe
oldUser.photo = user.photo;
oldUser.flags |= 32;
} else {
oldUser.flags = oldUser.flags &~ 32;
oldUser.flags = oldUser.flags & ~32;
oldUser.photo = null;
}
}
@ -2009,7 +1999,7 @@ public class MessagesController extends BaseController implements NotificationCe
user.photo = oldUser.photo;
user.flags |= 32;
} else {
user.flags = user.flags &~ 32;
user.flags = user.flags & ~32;
user.photo = null;
}
users.put(user.id, user);
@ -2073,7 +2063,7 @@ public class MessagesController extends BaseController implements NotificationCe
oldChat.username = chat.username;
oldChat.flags |= 64;
} else {
oldChat.flags = oldChat.flags &~ 64;
oldChat.flags = oldChat.flags & ~64;
oldChat.username = null;
}
if (chat.participants_count != 0) {

12
TMessagesProj/src/main/java/org/telegram/messenger/MessagesStorage.java
View File

@ -1769,9 +1769,6 @@ public class MessagesStorage extends BaseController {
int idx2 = muted ? 1 : 0;
if (muted) {
mutedDialogs.put(user.id, true);
if (NekoXConfig.ignoreMutedCount) {
continue;
}
}
if (user.bot) {
bots[idx1][idx2]++;
@ -1805,9 +1802,6 @@ public class MessagesStorage extends BaseController {
int idx2 = muted ? 1 : 0;
if (muted) {
mutedDialogs.put(user.id, true);
if (NekoXConfig.ignoreMutedCount) {
continue;
}
}
if (user.self || user.contact) {
contacts[idx1][idx2]++;
@ -1833,9 +1827,6 @@ public class MessagesStorage extends BaseController {
int idx2 = muted && dialogsWithMentions.indexOfKey(-chat.id) < 0 ? 1 : 0;
if (muted) {
mutedDialogs.put(-chat.id, true);
if (NekoXConfig.ignoreMutedCount) {
continue;
}
}
if (ChatObject.isChannel(chat) && !chat.megagroup) {
channels[idx1][idx2]++;
@ -1863,6 +1854,9 @@ public class MessagesStorage extends BaseController {
continue;
}
flags = filter.flags;
if ((flags & MessagesController.DIALOG_FILTER_FLAG_EXCLUDE_MUTED) == 0) {
flags |= MessagesController.DIALOG_FILTER_FLAG_EXCLUDE_MUTED;
}
} else {
filter = null;
flags = MessagesController.DIALOG_FILTER_FLAG_ALL_CHATS;

1
TMessagesProj/src/main/java/org/telegram/ui/ProxyListActivity.java
View File

@ -343,7 +343,6 @@ public class ProxyListActivity extends BaseFragment implements NotificationCente
showDialog(builder.create());
}
});