From 5159593825e7c9950bb8a13df316f9fc69936add Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 19 Feb 2021 14:17:21 -0300
Subject: [PATCH] Don't add new item when the existing ones haven't loaded

---
 .../briar/android/threaded/ThreadListViewModel.java           | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListViewModel.java
index 06100d636..5ea8f0f43 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListViewModel.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListViewModel.java
@@ -197,6 +197,10 @@ public abstract class ThreadListViewModel<I extends ThreadItem>
 	 */
 	@UiThread
 	protected void addItem(I item, boolean scrollToItem) {
+		// If items haven't loaded, we need to wait until they have.
+		// Since this was a R/W DB transaction, the load will pick up this item.
+		if (items.getValue() == null) return;
+
 		messageTree.add(item);
 		if (scrollToItem) this.scrollToItem.set(item.getId());
 		items.setValue(new LiveResult<>(messageTree.depthFirstOrder()));