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

Rename ForumItem to ForumPostItem

Browse Source
This commit is contained in:
Torsten Grote
2021-01-05 12:11:22 -03:00
parent 3b02797639
commit 921e952b05
6 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
briar-android/src/main/java/org/briarproject/briar/android/forum/ForumActivity.java
View File

@@ -38,7 +38,7 @@ import static org.briarproject.briar.api.forum.ForumConstants.MAX_FORUM_POST_TEX
@MethodsNotNullByDefault
@ParametersNotNullByDefault
public class ForumActivity extends
ThreadListActivity<Forum, ForumItem, ThreadItemAdapter<ForumItem>>
ThreadListActivity<Forum, ForumPostItem, ThreadItemAdapter<ForumPostItem>>
implements ForumListener {
@Inject
@@ -50,7 +50,7 @@ public class ForumActivity extends
}
@Override
protected ThreadListController<Forum, ForumItem> getController() {
protected ThreadListController<Forum, ForumPostItem> getController() {
return forumController;
}
@@ -82,7 +82,7 @@ public class ForumActivity extends
}
@Override
protected ThreadItemAdapter<ForumItem> createAdapter(
protected ThreadItemAdapter<ForumPostItem> createAdapter(
LinearLayoutManager layoutManager) {
return new ThreadItemAdapter<>(this, layoutManager);
}

4
briar-android/src/main/java/org/briarproject/briar/android/forum/ForumController.java
View File

@@ -8,9 +8,9 @@ import org.briarproject.briar.api.forum.Forum;
import androidx.annotation.UiThread;
@NotNullByDefault
interface ForumController extends ThreadListController<Forum, ForumItem> {
interface ForumController extends ThreadListController<Forum, ForumPostItem> {
interface ForumListener extends ThreadListListener<ForumItem> {
interface ForumListener extends ThreadListListener<ForumPostItem> {
@UiThread
void onForumLeft(ContactId c);
}

12
briar-android/src/main/java/org/briarproject/briar/android/forum/ForumControllerImpl.java
View File

@@ -43,7 +43,7 @@ import static org.briarproject.bramble.util.LogUtils.logException;
@NotNullByDefault
class ForumControllerImpl extends
ThreadListControllerImpl<Forum, ForumItem, ForumPostHeader, ForumPost, ForumListener>
ThreadListControllerImpl<Forum, ForumPostItem, ForumPostHeader, ForumPost, ForumListener>
implements ForumController {
private static final Logger LOG =
@@ -138,8 +138,8 @@ class ForumControllerImpl extends
@Override
public void createAndStoreMessage(String text,
@Nullable ForumItem parentItem,
ResultExceptionHandler<ForumItem, DbException> handler) {
@Nullable ForumPostItem parentItem,
ResultExceptionHandler<ForumPostItem, DbException> handler) {
runOnDbThread(() -> {
try {
LocalAuthor author = identityManager.getLocalAuthor();
@@ -158,7 +158,7 @@ class ForumControllerImpl extends
private void createMessage(String text, long timestamp,
@Nullable MessageId parentId, LocalAuthor author,
ResultExceptionHandler<ForumItem, DbException> handler) {
ResultExceptionHandler<ForumPostItem, DbException> handler) {
cryptoExecutor.execute(() -> {
LOG.info("Creating forum post...");
ForumPost msg = forumManager.createLocalPost(getGroupId(), text,
@@ -178,8 +178,8 @@ class ForumControllerImpl extends
}
@Override
protected ForumItem buildItem(ForumPostHeader header, String text) {
return new ForumItem(header, text);
protected ForumPostItem buildItem(ForumPostHeader header, String text) {
return new ForumPostItem(header, text);
}
}

8
briar-android/src/main/java/org/briarproject/briar/android/forum/ForumItem.java → briar-android/src/main/java/org/briarproject/briar/android/forum/ForumPostItem.java
View File

@@ -10,15 +10,15 @@ import javax.annotation.Nullable;
import javax.annotation.concurrent.NotThreadSafe;
@NotThreadSafe
class ForumItem extends ThreadItem {
class ForumPostItem extends ThreadItem {
ForumItem(ForumPostHeader h, String text) {
ForumPostItem(ForumPostHeader h, String text) {
super(h.getId(), h.getParentId(), text, h.getTimestamp(), h.getAuthor(),
h.getAuthorInfo(), h.isRead());
}
ForumItem(MessageId messageId, @Nullable MessageId parentId, String text,
long timestamp, Author author, AuthorInfo authorInfo) {
ForumPostItem(MessageId messageId, @Nullable MessageId parentId,
String text, long timestamp, Author author, AuthorInfo authorInfo) {
super(messageId, parentId, text, timestamp, author, authorInfo, true);
}

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

@@ -25,7 +25,6 @@ import org.robolectric.annotation.Config;
import java.util.Arrays;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertTrue;
import static org.briarproject.bramble.api.identity.AuthorInfo.Status.UNKNOWN;
import static org.briarproject.bramble.test.TestUtils.getAuthor;
import static org.briarproject.bramble.test.TestUtils.getRandomId;
@@ -68,7 +67,7 @@ public class ForumActivityTest {
private TestForumActivity forumActivity;
@Captor
private ArgumentCaptor<UiResultExceptionHandler<ThreadItemList<ForumItem>, DbException>>
private ArgumentCaptor<UiResultExceptionHandler<ThreadItemList<ForumPostItem>, DbException>>
rc;
@Before
@@ -80,42 +79,42 @@ public class ForumActivityTest {
intent).create().start().resume().get();
}
private ThreadItemList<ForumItem> getDummyData() {
ForumItem[] forumItems = new ForumItem[6];
for (int i = 0; i < forumItems.length; i++) {
private ThreadItemList<ForumPostItem> getDummyData() {
ForumPostItem[] forumPostItems = new ForumPostItem[6];
for (int i = 0; i < forumPostItems.length; i++) {
Author author = getAuthor();
String text = getRandomString(MAX_FORUM_POST_TEXT_LENGTH);
forumItems[i] = new ForumItem(MESSAGE_IDS[i], PARENT_IDS[i],
forumPostItems[i] = new ForumPostItem(MESSAGE_IDS[i], PARENT_IDS[i],
text, System.currentTimeMillis(), author,
new AuthorInfo(UNKNOWN));
forumItems[i].setLevel(LEVELS[i]);
forumPostItems[i].setLevel(LEVELS[i]);
}
ThreadItemList<ForumItem> list = new ThreadItemListImpl<>();
list.addAll(Arrays.asList(forumItems));
ThreadItemList<ForumPostItem> list = new ThreadItemListImpl<>();
list.addAll(Arrays.asList(forumPostItems));
return list;
}
@Test
public void testNestedEntries() {
ForumController mc = forumActivity.getController();
ThreadItemList<ForumItem> dummyData = getDummyData();
ThreadItemList<ForumPostItem> dummyData = getDummyData();
verify(mc, times(1)).loadItems(rc.capture());
rc.getValue().onResult(dummyData);
ThreadItemAdapter<ForumItem> adapter = forumActivity.getAdapter();
ThreadItemAdapter<ForumPostItem> adapter = forumActivity.getAdapter();
Assert.assertNotNull(adapter);
assertEquals(6, adapter.getItemCount());
assertTrue(dummyData.get(0).getText()
.equals(adapter.getItemAt(0).getText()));
assertTrue(dummyData.get(1).getText()
.equals(adapter.getItemAt(1).getText()));
assertTrue(dummyData.get(2).getText()
.equals(adapter.getItemAt(2).getText()));
assertTrue(dummyData.get(3).getText()
.equals(adapter.getItemAt(3).getText()));
assertTrue(dummyData.get(4).getText()
.equals(adapter.getItemAt(4).getText()));
assertTrue(dummyData.get(5).getText()
.equals(adapter.getItemAt(5).getText()));
assertEquals(dummyData.get(0).getText(),
adapter.getItemAt(0).getText());
assertEquals(dummyData.get(1).getText(),
adapter.getItemAt(1).getText());
assertEquals(dummyData.get(2).getText(),
adapter.getItemAt(2).getText());
assertEquals(dummyData.get(3).getText(),
adapter.getItemAt(3).getText());
assertEquals(dummyData.get(4).getText(),
adapter.getItemAt(4).getText());
assertEquals(dummyData.get(5).getText(),
adapter.getItemAt(5).getText());
}
}

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

@@ -27,7 +27,7 @@ public class TestForumActivity extends ForumActivity {
return forumController;
}
public ThreadItemAdapter<ForumItem> getAdapter() {
public ThreadItemAdapter<ForumPostItem> getAdapter() {
return adapter;
}