narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

finish of backlog only for one particular account

Browse source
This commit is contained in:
Daniel Gultsch 2017-01-12 20:56:27 +01:00
parent 585a538340
commit fd7216b6a0
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
View file

@ -224,7 +224,7 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
this.finalizeQuery(query, done); this.finalizeQuery(query, done);
Log.d(Config.LOGTAG,query.getAccount().getJid().toBareJid()+": finished mam after "+query.getTotalCount()+" messages. messages left="+Boolean.toString(!done)); Log.d(Config.LOGTAG,query.getAccount().getJid().toBareJid()+": finished mam after "+query.getTotalCount()+" messages. messages left="+Boolean.toString(!done));
if (query.getWith() == null && query.getMessageCount() > 0) { if (query.getWith() == null && query.getMessageCount() > 0) {
mXmppConnectionService.getNotificationService().finishBacklog(true); mXmppConnectionService.getNotificationService().finishBacklog(true,query.getAccount());
} }
} else { } else {
final Query nextQuery; final Query nextQuery;

19
src/main/java/eu/siacs/conversations/services/NotificationService.java
View file

@ -100,13 +100,28 @@ public class NotificationService {
} }
} }
public void finishBacklog(boolean notify) { public void finishBacklog(boolean notify, Account account) {
synchronized (notifications) { synchronized (notifications) {
mXmppConnectionService.updateUnreadCountBadge(); mXmppConnectionService.updateUnreadCountBadge();
updateNotification(notify); if (account == null || !notify) {
updateNotification(notify);
} else {
boolean hasPendingMessages = false;
for(ArrayList<Message> messages : notifications.values()) {
if (messages.size() > 0 && messages.get(0).getConversation().getAccount() == account) {
hasPendingMessages = true;
break;
}
}
updateNotification(hasPendingMessages);
}
} }
} }
public void finishBacklog(boolean notify) {
finishBacklog(notify,null);
}
private void pushToStack(final Message message) { private void pushToStack(final Message message) {
final String conversationUuid = message.getConversationUuid(); final String conversationUuid = message.getConversationUuid();
if (notifications.containsKey(conversationUuid)) { if (notifications.containsKey(conversationUuid)) {