Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 05:39:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1947-forum-crash' into 'master'

Browse Source 
Don't add new thread items when the existing ones haven't loaded

Closes #1947

See merge request briar/briar!1375
This commit is contained in:
akwizgran
2021-02-19 17:27:38 +00:00
parent 6fbc82ee27 5159593825
commit e5b2275c82
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListViewModel.java
View File

@@ -197,6 +197,10 @@ public abstract class ThreadListViewModel<I extends ThreadItem>
*/ */
@UiThread @UiThread
protected void addItem(I item, boolean scrollToItem) { 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); messageTree.add(item);
if (scrollToItem) this.scrollToItem.set(item.getId()); if (scrollToItem) this.scrollToItem.set(item.getId());
items.setValue(new LiveResult<>(messageTree.depthFirstOrder())); items.setValue(new LiveResult<>(messageTree.depthFirstOrder()));