Change summary
src/main/java/eu/siacs/conversations/parser/MessageParser.java | 2
src/main/java/eu/siacs/conversations/services/NotificationService.java | 2
2 files changed, 3 insertions(+), 1 deletion(-)
Detailed changes
@@ -741,7 +741,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
if (packet.fromAccount(account)) {
Conversation conversation = mXmppConnectionService.find(account, counterpart.toBareJid());
if (conversation != null && (query == null || query.isCatchup())) {
- mXmppConnectionService.markRead(conversation);
+ mXmppConnectionService.markRead(conversation); //TODO only mark messages read that are older than timestamp
}
} else if (isTypeGroupChat) {
Conversation conversation = mXmppConnectionService.find(account, counterpart.toBareJid());
@@ -225,8 +225,10 @@ public class NotificationService {
}
synchronized (notifications) {
markAsReadIfHasDirectReply(conversation);
+ //TODO: only update if something actually got removed?
notifications.remove(conversation.getUuid());
final NotificationManagerCompat notificationManager = NotificationManagerCompat.from(mXmppConnectionService);
+ //TODO on later androids (that have multiple Conversations) maybe canceling is enough + update summary notification
notificationManager.cancel(conversation.getUuid(), NOTIFICATION_ID);
updateNotification(false);
}