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

Fix some issues

Browse source 
https://github.com/DrKLO/Telegram/issues/468
https://github.com/DrKLO/Telegram/issues/464
https://github.com/DrKLO/Telegram/issues/394
https://github.com/DrKLO/Telegram/issues/334
This commit is contained in:
DrKLO 2014-07-11 01:15:39 +04:00
parent 172ded5ea5
commit f44955380f
20 changed files with 272 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

31
TMessagesProj/src/main/java/org/telegram/android/NotificationsController.java
View file

@ -501,30 +501,27 @@ public class NotificationsController {
continue;
}
Integer currentCount = pushDialogs.get(dialog_id);
if (currentCount == null) {
currentCount = 0;
}
pushDialogs.put(dialog_id, ++currentCount);
pushMessagesDict.put(messageObject.messageOwner.id, messageObject);
Boolean value = settingsCache.get(dialog_id);
boolean isChat = (int)dialog_id < 0;
popup = preferences.getInt(isChat ? "popupGroup" : "popupAll", 0);
if (value == null) {
int notify_override = preferences.getInt("notify2_" + dialog_id, 0);
boolean isChat = (int)dialog_id < 0;
if (notify_override == 2 || (!preferences.getBoolean("EnableAll", true) || isChat && !preferences.getBoolean("EnableGroup", true)) && notify_override == 0) {
value = false;
} else {
popup = preferences.getInt(isChat ? "popupGroup" : "popupAll", 0);
value = popup != 0;
}
value = !(notify_override == 2 || (!preferences.getBoolean("EnableAll", true) || isChat && !preferences.getBoolean("EnableGroup", true)) && notify_override == 0);
settingsCache.put(dialog_id, value);
}
if (value) {
popupMessages.add(0, messageObject);
if (popup != 0) {
popupMessages.add(0, messageObject);
}
pushMessagesDict.put(messageObject.messageOwner.id, messageObject);
pushMessages.add(0, messageObject);
Integer currentCount = pushDialogs.get(dialog_id);
if (currentCount == null) {
currentCount = 0;
}
pushDialogs.put(dialog_id, ++currentCount);
}
pushMessagesDict.put(messageObject.messageOwner.id, messageObject);
pushMessages.add(0, messageObject);
}
if (!popupMessages.isEmpty() && oldCount != popupMessages.size()) {