moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-12-26 01:09:13 -05:00
Code Issues Releases Wiki Activity

notify on mam catchup messages

Browse Source
This commit is contained in:
Daniel Gultsch 2015-12-10 23:05:11 +01:00
parent 2262921ff4
commit 55c1129a65
4 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/eu/siacs/conversations/parser/MessageParser.java
View File

@ -397,15 +397,21 @@ public class MessageParser extends AbstractParser implements
}
conversation.add(message);
if (query != null) {
query.incrementMessageCount();
} else {
if (query == null || query.getWith() == null) { //either no mam or catchup
if (status == Message.STATUS_SEND || status == Message.STATUS_SEND_RECEIVED) {
mXmppConnectionService.markRead(conversation);
account.activateGracePeriod();
if (query == null) {
account.activateGracePeriod();
}
} else {
message.markUnread();
}
}
if (query != null) {
query.incrementMessageCount();
} else {
mXmppConnectionService.updateConversationUi();
}
@ -445,7 +451,11 @@ public class MessageParser extends AbstractParser implements
if (message.trusted() && message.treatAsDownloadable() != Message.Decision.NEVER && manager.getAutoAcceptFileSize() > 0) {
manager.createNewDownloadConnection(message);
} else if (!message.isRead()) {
mXmppConnectionService.getNotificationService().push(message);
if (query == null) {
mXmppConnectionService.getNotificationService().push(message);
} else if (query.getWith() == null) { // mam catchup
mXmppConnectionService.getNotificationService().pushFromBacklog(message);
}
}
} else { //no body
if (isTypeGroupChat) {

3
src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
View File

@ -218,6 +218,9 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
if (complete || relevant == null || abort) {
this.finalizeQuery(query);
Log.d(Config.LOGTAG,query.getAccount().getJid().toBareJid().toString()+": finished mam after "+query.getTotalCount()+" messages");
if (query.getWith() == null && query.getTotalCount() > 0) {
mXmppConnectionService.getNotificationService().finishBacklog(true);
}
} else {
final Query nextQuery;
if (query.getPagingOrder() == PagingOrder.NORMAL) {

4
src/main/java/eu/siacs/conversations/services/NotificationService.java
View File

@ -119,10 +119,10 @@ public class NotificationService {
}
}
public void finishBacklog() {
public void finishBacklog(boolean notify) {
synchronized (notifications) {
mXmppConnectionService.updateUnreadCountBadge();
updateNotification(false);
updateNotification(notify);
}
}

2
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View File

@ -1107,7 +1107,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
}
});
}
mNotificationService.finishBacklog();
mNotificationService.finishBacklog(false);
mRestoredFromDatabase = true;
Log.d(Config.LOGTAG, "restored all messages");
updateConversationUi();