moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-16 22:05:07 -05:00
Code Issues Releases Wiki Activity

synchronization for notification

Browse Source
This commit is contained in:
iNPUTmice 2014-10-15 14:33:13 +02:00
parent 1428628a5d
commit f063b1c063
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/eu/siacs/conversations/services/NotificationService.java
View File

@ -43,15 +43,16 @@ public class NotificationService {
.getSystemService(Context.NOTIFICATION_SERVICE); .getSystemService(Context.NOTIFICATION_SERVICE);
} }
public synchronized void push(Message message) { public void push(Message message) {
PowerManager pm = (PowerManager) mXmppConnectionService PowerManager pm = (PowerManager) mXmppConnectionService
.getSystemService(Context.POWER_SERVICE); .getSystemService(Context.POWER_SERVICE);
boolean isScreenOn = pm.isScreenOn(); boolean isScreenOn = pm.isScreenOn();
if (this.mIsInForeground && isScreenOn if (this.mIsInForeground && isScreenOn
&& this.mOpenConversation == message.getConversation()) { && this.mOpenConversation == message.getConversation()) {
return; return;
} }
synchronized (notifications) {
String conversationUuid = message.getConversationUuid(); String conversationUuid = message.getConversationUuid();
if (notifications.containsKey(conversationUuid)) { if (notifications.containsKey(conversationUuid)) {
notifications.get(conversationUuid).add(message); notifications.get(conversationUuid).add(message);
@ -60,17 +61,22 @@ public class NotificationService {
mList.add(message); mList.add(message);
notifications.put(conversationUuid, mList); notifications.put(conversationUuid, mList);
} }
}
updateNotification((!(this.mIsInForeground && this.mOpenConversation == null) || !isScreenOn) updateNotification((!(this.mIsInForeground && this.mOpenConversation == null) || !isScreenOn)
&& !inGracePeriod()); && !inGracePeriod());
} }
public void clear() { public void clear() {
synchronized (notifications) {
notifications.clear(); notifications.clear();
}
updateNotification(false); updateNotification(false);
} }
public void clear(Conversation conversation) { public void clear(Conversation conversation) {
synchronized (notifications) {
notifications.remove(conversation.getUuid()); notifications.remove(conversation.getUuid());
}
updateNotification(false); updateNotification(false);
} }