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

added a few todos to source code

Browse source
This commit is contained in:
Daniel Gultsch 2018-01-15 11:13:35 +01:00
parent b137681f86
commit 5d11fe7dc6
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/parser/MessageParser.java
View file

@ -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());

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

@ -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);
}