From 4ee4905e067ead386be799dbd5e64756b0b925aa Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 15 May 2019 16:45:53 -0300
Subject: [PATCH] [android] migrate added conversation header to new LiveEvent

---
 .../android/conversation/ConversationActivity.java  |  3 +--
 .../android/conversation/ConversationViewModel.java | 13 ++++---------
 2 files changed, 5 insertions(+), 11 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 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<Boolean> contactDeleted =
 			new MutableLiveData<>();
-	private final MutableLiveData<PrivateMessageHeader> addedHeader =
-			new MutableLiveData<>();
+	private final MutableLiveEvent<PrivateMessageHeader> 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<PrivateMessageHeader> getAddedPrivateMessage() {
+	LiveEvent<PrivateMessageHeader> getAddedPrivateMessage() {
 		return addedHeader;
 	}