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

Show join messages properly in the threaded conversation

Browse Source
This commit is contained in:
Torsten Grote
2016-10-21 12:36:40 -02:00
parent 349a34ffd8
commit 679b54b2b4
22 changed files with 274 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@ import org.briarproject.BuildConfig;
import org.briarproject.TestUtils;
import org.briarproject.android.TestBriarApplication;
import org.briarproject.android.controller.handler.UiResultExceptionHandler;
import org.briarproject.android.threaded.ThreadItemAdapter;
import org.briarproject.api.db.DbException;
import org.briarproject.api.identity.Author;
import org.briarproject.api.identity.AuthorId;
@@ -111,7 +112,7 @@ public class ForumActivityTest {
List<ForumItem> dummyData = getDummyData();
verify(mc, times(1)).loadItems(rc.capture());
rc.getValue().onResult(dummyData);
NestedForumAdapter adapter = forumActivity.getAdapter();
ThreadItemAdapter<ForumItem> adapter = forumActivity.getAdapter();
Assert.assertNotNull(adapter);
// Cascade close
assertEquals(6, adapter.getItemCount());

3
briar-android/test/java/org/briarproject/android/forum/TestForumActivity.java
View File

@@ -3,6 +3,7 @@ package org.briarproject.android.forum;
import org.briarproject.android.ActivityModule;
import org.briarproject.android.controller.BriarController;
import org.briarproject.android.controller.BriarControllerImpl;
import org.briarproject.android.threaded.ThreadItemAdapter;
import org.mockito.Mockito;
/**
@@ -15,7 +16,7 @@ public class TestForumActivity extends ForumActivity {
return forumController;
}
public NestedForumAdapter getAdapter() {
public ThreadItemAdapter<ForumItem> getAdapter() {
return adapter;
}