From b657c7f34790b460e8eef7a6cd3f38afd815dd67 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 8 Jun 2021 09:51:23 -0300
Subject: [PATCH] Ignore NoSuchGroupException when storing MessageId of thread
 position for removed group

---
 .../briar/android/threaded/ThreadListViewModel.java          | 5 +++++
 1 file changed, 5 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 b48063f39..88a4b0fce 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
@@ -5,6 +5,7 @@ import android.app.Application;
 import org.briarproject.bramble.api.crypto.CryptoExecutor;
 import org.briarproject.bramble.api.db.DatabaseExecutor;
 import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.db.NoSuchGroupException;
 import org.briarproject.bramble.api.db.TransactionManager;
 import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.event.EventBus;
@@ -215,11 +216,15 @@ public abstract class ThreadListViewModel<I extends ThreadItem>
 		return replyId;
 	}
 
+	@UiThread
 	void storeMessageId(@Nullable MessageId messageId) {
 		if (messageId != null) {
 			runOnDbThread(() -> {
 				try {
 					messageTracker.storeMessageId(groupId, messageId);
+				} catch (NoSuchGroupException e) {
+					// This can happen when the activity is closed
+					// after deleting the group. So just ignore this case.
 				} catch (DbException e) {
 					handleException(e);
 				}