From f9d312a632e02f694733d6dc857bc83a0467642b Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Fri, 26 Feb 2021 13:22:57 -0300 Subject: [PATCH] Replace all messages when re-loading to ensure that messages deleted in the meantime get removed --- .../briar/android/conversation/ConversationActivity.java | 2 +- .../briar/android/conversation/ConversationAdapter.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java index 5ce686a9b..fdd303144 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java @@ -573,7 +573,7 @@ public class ConversationActivity extends BriarActivity this::showImageOnboarding); } List items = createItems(headers); - adapter.addAll(items); + adapter.replaceAll(items); list.showData(); if (layoutManagerState == null) { scrollToBottom(); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationAdapter.java index 2e8d81d82..73d2a5f13 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationAdapter.java @@ -120,11 +120,11 @@ class ConversationAdapter } @Override - public void addAll(Collection itemsToAdd) { + public void replaceAll(Collection itemsToReplace) { items.beginBatchedUpdates(); // there can be items already in the adapter // SortedList takes care of duplicates and detecting changed items - items.addAll(itemsToAdd); + items.replaceAll(itemsToReplace); updateTimersInBatch(); items.endBatchedUpdates(); }