avoid unnecessary chat updates by filtering event-chat-id correctly

This commit is contained in:
B. Petersen
2020-09-20 16:28:54 +02:00
parent 41603e6688
commit 33fccc6d52
2 changed files with 24 additions and 7 deletions
@@ -1452,8 +1452,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
@Override
public void handleEvent(DcEvent event) {
int eventId = event.getId();
if (eventId == DcContext.DC_EVENT_CHAT_MODIFIED
|| eventId == DcContext.DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED
if ((eventId == DcContext.DC_EVENT_CHAT_MODIFIED && event.getData1Int() == chatId)
|| (eventId == DcContext.DC_EVENT_CHAT_EPHEMERAL_TIMER_MODIFIED && event.getData1Int() == chatId)
|| eventId == DcContext.DC_EVENT_CONTACTS_CHANGED) {
dcChat = dcContext.getChat(chatId);
titleView.setTitle(glideRequests, dcChat);
@@ -842,10 +842,29 @@ public class ConversationFragment extends Fragment
@Override
public void handleEvent(DcEvent event) {
int eventId = event.getId();
switch (event.getId()) {
case DcContext.DC_EVENT_MSGS_CHANGED:
if (event.getData1Int() == 0 // deleted messages or batch insert
|| event.getData1Int() == chatId) {
reloadList();
}
break;
if (eventId == DcContext.DC_EVENT_CHAT_MODIFIED) {
updateLocationButton();
case DcContext.DC_EVENT_INCOMING_MSG:
case DcContext.DC_EVENT_MSG_DELIVERED:
case DcContext.DC_EVENT_MSG_FAILED:
case DcContext.DC_EVENT_MSG_READ:
if (event.getData1Int() == chatId) {
reloadList();
}
break;
case DcContext.DC_EVENT_CHAT_MODIFIED:
if (event.getData1Int() == chatId) {
updateLocationButton();
reloadList();
}
break;
}
// removing the "new message" marker on incoming messages may be a bit unexpected,
@@ -854,7 +873,5 @@ public class ConversationFragment extends Fragment
/*if (eventId == DcContext.DC_EVENT_INCOMING_MSG && isResumed()) {
setLastSeen(-1);
}*/
reloadList();
}
}