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

fixed regression that caused ui to redraw a lot

Browse source
This commit is contained in:
Daniel Gultsch 2016-02-16 14:22:21 +01:00
parent 726393f8da
commit 86b1865eec
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View file

@ -2726,7 +2726,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
return null; return null;
} }
public void markRead(final Conversation conversation) { public boolean markRead(final Conversation conversation) {
mNotificationService.clear(conversation); mNotificationService.clear(conversation);
final List<Message> readMessages = conversation.markRead(); final List<Message> readMessages = conversation.markRead();
if (readMessages.size() > 0) { if (readMessages.size() > 0) {
@ -2739,8 +2739,11 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
} }
}; };
mDatabaseExecutor.execute(runnable); mDatabaseExecutor.execute(runnable);
updateUnreadCountBadge();
return true;
} else {
return false;
} }
updateUnreadCountBadge();
} }
public synchronized void updateUnreadCountBadge() { public synchronized void updateUnreadCountBadge() {
@ -2758,7 +2761,9 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
public void sendReadMarker(final Conversation conversation) { public void sendReadMarker(final Conversation conversation) {
final Message markable = conversation.getLatestMarkableMessage(); final Message markable = conversation.getLatestMarkableMessage();
this.markRead(conversation); if (this.markRead(conversation)) {
updateConversationUi();
}
if (confirmMessages() && markable != null && markable.getRemoteMsgId() != null) { if (confirmMessages() && markable != null && markable.getRemoteMsgId() != null) {
Log.d(Config.LOGTAG, conversation.getAccount().getJid().toBareJid() + ": sending read marker to " + markable.getCounterpart().toString()); Log.d(Config.LOGTAG, conversation.getAccount().getJid().toBareJid() + ": sending read marker to " + markable.getCounterpart().toString());
Account account = conversation.getAccount(); Account account = conversation.getAccount();
@ -2766,7 +2771,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
MessagePacket packet = mMessageGenerator.confirm(account, to, markable.getRemoteMsgId()); MessagePacket packet = mMessageGenerator.confirm(account, to, markable.getRemoteMsgId());
this.sendMessagePacket(conversation.getAccount(), packet); this.sendMessagePacket(conversation.getAccount(), packet);
} }
updateConversationUi();
} }
public SecureRandom getRNG() { public SecureRandom getRNG() {