OpenSource/Telegram-Android
OpenSource/Telegram-Android
1
0
Fork 0
mirror of https://github.com/DrKLO/Telegram.git synced 2024-12-22 14:35:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Bug fixes

Browse source
This commit is contained in:
DrKLO 2016-05-25 16:27:33 -07:00
parent 85239ed7cf
commit f563fbbb05
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
View file

@ -5787,7 +5787,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
} }
} }
long dialog_id = -update.channel_id; long dialog_id = -message.to_id.channel_id;
Integer value = dialogs_read_inbox_max.get(dialog_id); Integer value = dialogs_read_inbox_max.get(dialog_id);
if (value == null) { if (value == null) {
value = MessagesStorage.getInstance().getDialogReadInboxMax(dialog_id); value = MessagesStorage.getInstance().getDialogReadInboxMax(dialog_id);

5
TMessagesProj/src/main/java/org/telegram/messenger/NotificationsController.java
View file

@ -411,12 +411,15 @@ public class NotificationsController {
Boolean value = settingsCache.get(dialog_id); Boolean value = settingsCache.get(dialog_id);
boolean isChat = (int) dialog_id < 0; boolean isChat = (int) dialog_id < 0;
popup = (int)dialog_id == 0 ? 0 : preferences.getInt(isChat ? "popupGroup" : "popupAll", 0); popup = (int) dialog_id == 0 ? 0 : preferences.getInt(isChat ? "popupGroup" : "popupAll", 0);
if (value == null) { if (value == null) {
int notifyOverride = getNotifyOverride(preferences, dialog_id); int notifyOverride = getNotifyOverride(preferences, dialog_id);
value = !(notifyOverride == 2 || (!preferences.getBoolean("EnableAll", true) || isChat && !preferences.getBoolean("EnableGroup", true)) && notifyOverride == 0); value = !(notifyOverride == 2 || (!preferences.getBoolean("EnableAll", true) || isChat && !preferences.getBoolean("EnableGroup", true)) && notifyOverride == 0);
settingsCache.put(dialog_id, value); settingsCache.put(dialog_id, value);
} }
if (popup != 0 && messageObject.messageOwner.to_id.channel_id != 0 && !messageObject.isMegagroup()) {
popup = 0;
}
if (value) { if (value) {
if (popup != 0) { if (popup != 0) {
popupArray.add(0, messageObject); popupArray.add(0, messageObject);