Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 06:09:55 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '963-load-thread-list-messages-on-start' into 'master'

Browse Source 
Load messages each time activity starts

See merge request !547
This commit is contained in:
Torsten Grote
2017-06-30 20:53:13 +00:00
parent d24de68d64 0dc62cbbdc
commit 46982897f0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java
View File

@@ -142,7 +142,6 @@ public abstract class ThreadListActivity<G extends NamedGroup, A extends ThreadI
if (replyIdBytes != null) replyId = new MessageId(replyIdBytes); if (replyIdBytes != null) replyId = new MessageId(replyIdBytes);
} }
loadItems();
sharingController.setSharingListener(this); sharingController.setSharingListener(this);
loadSharingContacts(); loadSharingContacts();
} }
@@ -239,6 +238,7 @@ public abstract class ThreadListActivity<G extends NamedGroup, A extends ThreadI
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
sharingController.onStart(); sharingController.onStart();
loadItems();
list.startPeriodicUpdate(); list.startPeriodicUpdate();
} }

2
briar-android/src/test/java/org/briarproject/briar/android/forum/ForumActivityTest.java
View File

@@ -89,7 +89,7 @@ public class ForumActivityTest {
Intent intent = new Intent(); Intent intent = new Intent();
intent.putExtra("briar.GROUP_ID", TestUtils.getRandomId()); intent.putExtra("briar.GROUP_ID", TestUtils.getRandomId());
forumActivity = Robolectric.buildActivity(TestForumActivity.class) forumActivity = Robolectric.buildActivity(TestForumActivity.class)
.withIntent(intent).create().resume().get(); .withIntent(intent).create().start().resume().get();
} }
private ThreadItemList<ForumItem> getDummyData() { private ThreadItemList<ForumItem> getDummyData() {