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 925655815..dfbddcd7a 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 @@ -243,7 +243,7 @@ public class ConversationActivity extends BriarActivity requireNonNull(deleted); if (deleted) finish(); }); - viewModel.getAddedPrivateMessage().observe(this, + viewModel.getAddedPrivateMessage().observeEvent(this, this::onAddedPrivateMessage); setTransitionName(toolbarAvatar, getAvatarTransitionName(contactId)); @@ -678,7 +678,6 @@ public class ConversationActivity extends BriarActivity private void onAddedPrivateMessage(@Nullable PrivateMessageHeader h) { if (h == null) return; addConversationItem(h.accept(visitor)); - viewModel.onAddedPrivateMessageSeen(); } private void askToRemoveContact() { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java index 158e26e84..85a208228 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java @@ -97,8 +97,8 @@ public class ConversationViewModel extends AndroidViewModel new MutableLiveData<>(); private final MutableLiveData contactDeleted = new MutableLiveData<>(); - private final MutableLiveData addedHeader = - new MutableLiveData<>(); + private final MutableLiveEvent addedHeader = + new MutableLiveEvent<>(); @Inject ConversationViewModel(Application application, @@ -301,18 +301,13 @@ public class ConversationViewModel extends AndroidViewModel text != null, attachments); attachmentCreator.onAttachmentsSent(m.getMessage().getId()); // TODO add text to cache when available here - addedHeader.postValue(h); + addedHeader.postEvent(h); } catch (DbException e) { logException(LOG, WARNING, e); } }); } - @UiThread - void onAddedPrivateMessageSeen() { - addedHeader.setValue(null); - } - AttachmentRetriever getAttachmentRetriever() { return attachmentRetriever; } @@ -349,7 +344,7 @@ public class ConversationViewModel extends AndroidViewModel return contactDeleted; } - LiveData getAddedPrivateMessage() { + LiveEvent getAddedPrivateMessage() { return addedHeader; }