diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java index f9deb578e..63d769154 100644 --- a/src/org/thoughtcrime/securesms/ConversationActivity.java +++ b/src/org/thoughtcrime/securesms/ConversationActivity.java @@ -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); diff --git a/src/org/thoughtcrime/securesms/ConversationFragment.java b/src/org/thoughtcrime/securesms/ConversationFragment.java index 9afffc9f2..5706e2ed5 100644 --- a/src/org/thoughtcrime/securesms/ConversationFragment.java +++ b/src/org/thoughtcrime/securesms/ConversationFragment.java @@ -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(); } }