Last minor review comments addressed

briar-android/src/org/briarproject/android/forum/ForumActivity.java

@@ -36,7 +36,7 @@ import static android.widget.Toast.LENGTH_SHORT;
 import static org.briarproject.api.forum.ForumConstants.MAX_FORUM_POST_BODY_LENGTH;
 
 public class ForumActivity extends
-		ThreadListActivity<Forum, ForumItem, ForumPostHeader, ThreadItemAdapter<ForumItem>> {
+		ThreadListActivity<Forum, ForumItem, ForumPostHeader> {
 
 	private static final int REQUEST_FORUM_SHARED = 3;
 

briar-android/src/org/briarproject/android/privategroup/conversation/GroupActivity.java

@@ -22,7 +22,7 @@ import javax.inject.Inject;
 import static org.briarproject.api.privategroup.PrivateGroupConstants.MAX_GROUP_POST_BODY_LENGTH;
 
 public class GroupActivity extends
-		ThreadListActivity<PrivateGroup, GroupMessageItem, GroupMessageHeader, GroupMessageAdapter> {
+		ThreadListActivity<PrivateGroup, GroupMessageItem, GroupMessageHeader> {
 
 	@Inject
 	GroupController controller;

briar-android/src/org/briarproject/android/privategroup/conversation/GroupMessageAdapter.java

@@ -10,7 +10,7 @@ import android.view.ViewGroup;
 import org.briarproject.R;
 import org.briarproject.android.threaded.BaseThreadItemViewHolder;
 import org.briarproject.android.threaded.ThreadItemAdapter;
-import org.briarproject.android.threaded.ThreadItemViewHolder;
+import org.briarproject.android.threaded.ThreadPostViewHolder;
 
 @UiThread
 public class GroupMessageAdapter extends ThreadItemAdapter<GroupMessageItem> {
@@ -34,9 +34,9 @@ public class GroupMessageAdapter extends ThreadItemAdapter<GroupMessageItem> {
 		View v = LayoutInflater.from(parent.getContext())
 				.inflate(type, parent, false);
 		if (type == R.layout.list_item_thread_notice) {
-			return new JoinMessageItemHolder(v);
+			return new JoinMessageItemViewHolder(v);
 		}
-		return new ThreadItemViewHolder<>(v);
+		return new ThreadPostViewHolder<>(v);
 	}
 
 }

briar-android/src/org/briarproject/android/privategroup/conversation/JoinMessageItemHolder.java → briar-android/src/org/briarproject/android/privategroup/conversation/JoinMessageItemViewHolder.java

@@ -11,10 +11,10 @@ import org.briarproject.api.nullsafety.NotNullByDefault;
 
 @UiThread
 @NotNullByDefault
-public class JoinMessageItemHolder
+public class JoinMessageItemViewHolder
 		extends BaseThreadItemViewHolder<GroupMessageItem> {
 
-	public JoinMessageItemHolder(View v) {
+	public JoinMessageItemViewHolder(View v) {
 		super(v);
 	}
 

briar-android/src/org/briarproject/android/threaded/ThreadItemAdapter.java

@@ -50,7 +50,7 @@ public class ThreadItemAdapter<I extends ThreadItem>
 			ViewGroup parent, int viewType) {
 		View v = LayoutInflater.from(parent.getContext())
 				.inflate(R.layout.list_item_thread, parent, false);
-		return new ThreadItemViewHolder<>(v);
+		return new ThreadPostViewHolder<>(v);
 	}
 
 	@Override

briar-android/src/org/briarproject/android/threaded/ThreadListActivity.java

@@ -35,7 +35,7 @@ import static android.support.design.widget.Snackbar.make;
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 
-public abstract class ThreadListActivity<G extends NamedGroup, I extends ThreadItem, H extends PostHeader, A extends ThreadItemAdapter<I>>
+public abstract class ThreadListActivity<G extends NamedGroup, I extends ThreadItem, H extends PostHeader>
 		extends BriarActivity
 		implements ThreadListListener<H>, TextInputListener,
 		ThreadItemListener<I> {
@@ -46,7 +46,7 @@ public abstract class ThreadListActivity<G extends NamedGroup, I extends ThreadI
 	private static final Logger LOG =
 			Logger.getLogger(ThreadListActivity.class.getName());
 
-	protected A adapter;
+	protected ThreadItemAdapter<I> adapter;
 	protected BriarRecyclerView list;
 	protected TextInputView textInput;
 	protected GroupId groupId;
@@ -88,7 +88,8 @@ public abstract class ThreadListActivity<G extends NamedGroup, I extends ThreadI
 	@LayoutRes
 	protected abstract int getLayout();
 
-	protected abstract A createAdapter(LinearLayoutManager layoutManager);
+	protected abstract ThreadItemAdapter<I> createAdapter(
+			LinearLayoutManager layoutManager);
 
 	protected void loadNamedGroup() {
 		getController().loadNamedGroup(

briar-android/src/org/briarproject/android/threaded/ThreadItemViewHolder.java → briar-android/src/org/briarproject/android/threaded/ThreadPostViewHolder.java

@@ -14,14 +14,14 @@ import static android.view.View.VISIBLE;
 
 @UiThread
 @NotNullByDefault
-public class ThreadItemViewHolder<I extends ThreadItem>
+public class ThreadPostViewHolder<I extends ThreadItem>
 		extends BaseThreadItemViewHolder<I> {
 
 	private final TextView  lvlText, repliesText;
 	private final View[] lvls;
 	private final View chevron, replyButton;
 
-	public ThreadItemViewHolder(View v) {
+	public ThreadPostViewHolder(View v) {
 		super(v);
 
 		lvlText = (TextView) v.findViewById(R.id.nested_line_text);