From d598b6ed4405ca64c1675c3534dfa3b922302b78 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Mon, 26 Jun 2017 16:21:25 +0100
Subject: [PATCH 1/2] Load messages each time activity starts.

---
 .../briarproject/briar/android/threaded/ThreadListActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java
index 891615e02..c79b711b7 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java
@@ -142,7 +142,6 @@ public abstract class ThreadListActivity<G extends NamedGroup, A extends ThreadI
 			if (replyIdBytes != null) replyId = new MessageId(replyIdBytes);
 		}
 
-		loadItems();
 		sharingController.setSharingListener(this);
 		loadSharingContacts();
 	}
@@ -239,6 +238,7 @@ public abstract class ThreadListActivity<G extends NamedGroup, A extends ThreadI
 	public void onStart() {
 		super.onStart();
 		sharingController.onStart();
+		loadItems();
 		list.startPeriodicUpdate();
 	}
 

From 0dc62cbbdcdc67afc4d32c1c0d71d49f8f217b01 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Fri, 30 Jun 2017 10:01:35 +0100
Subject: [PATCH 2/2] Fixed a test.

---
 .../org/briarproject/briar/android/forum/ForumActivityTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/briar-android/src/test/java/org/briarproject/briar/android/forum/ForumActivityTest.java b/briar-android/src/test/java/org/briarproject/briar/android/forum/ForumActivityTest.java
index 96ffc88eb..fe5d064c3 100644
--- a/briar-android/src/test/java/org/briarproject/briar/android/forum/ForumActivityTest.java
+++ b/briar-android/src/test/java/org/briarproject/briar/android/forum/ForumActivityTest.java
@@ -89,7 +89,7 @@ public class ForumActivityTest {
 		Intent intent = new Intent();
 		intent.putExtra("briar.GROUP_ID", TestUtils.getRandomId());
 		forumActivity = Robolectric.buildActivity(TestForumActivity.class)
-				.withIntent(intent).create().resume().get();
+				.withIntent(intent).create().start().resume().get();
 	}
 
 	private ThreadItemList<ForumItem> getDummyData() {