Merge branch '426-forum-improvements' into 'master'

Forum improvements

Forum Activity improvements:

* Orientation changes now restore the activity properly, e.g. input text and state is retained
* Snack bar is now, when appropriate, clickable
* The bottom divider is no longer visible for the bottom entry
* Code refactoring for improved simplicity and less redundancy
* Timestamp check to ensure that new posts are not older than the latest post

Closes #426 
Closes #423 
Closes #424 

See merge request !218

briar-android/res/layout/forum_discussion_cell.xml

@@ -18,7 +18,7 @@
 			android:layout_width="@dimen/forum_nested_line_width"
 			android:layout_height="match_parent"
 			android:visibility="gone"
-			tools:visibility="showingDescendants"/>
+			tools:visibility="visible"/>
 
 		<View
 			android:id="@+id/nested_line_2"
@@ -161,12 +161,12 @@
 			tools:src="@drawable/trust_indicator_verified"/>
 
 		<View
-			android:id="@+id/bottom_divider"
+			android:id="@+id/top_divider"
 			style="@style/Divider.ForumList"
 			android:layout_width="match_parent"
 			android:layout_height="@dimen/margin_separator"
 			android:layout_alignLeft="@id/text"
-			android:layout_below="@id/btn_reply"/>
+			android:layout_alignParentTop="true"/>
 
 	</RelativeLayout>
 

briar-android/res/values/strings.xml

@@ -76,6 +76,7 @@
 		<item quantity="one">%d forum shared by contacts</item>
 		<item quantity="other">%d forums shared by contacts</item>
 	</plurals>
+	<string name="show">Show</string>
 	<string name="show_forums">Show</string>
 	<string name="forum_leave">Leave Forum</string>
 	<string name="forum_left_toast">Left Forum</string>

briar-android/src/org/briarproject/android/BaseActivity.java

@@ -12,6 +12,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
+import static android.view.inputmethod.InputMethodManager.SHOW_FORCED;
 import static android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT;
 import static org.briarproject.android.TestingConstants.PREVENT_SCREENSHOTS;
 
@@ -82,6 +83,11 @@ public abstract class BaseActivity extends AppCompatActivity {
 		}
 	}
 
+	public void showSoftKeyboardForced(View view) {
+		Object o = getSystemService(INPUT_METHOD_SERVICE);
+		((InputMethodManager) o).showSoftInput(view, SHOW_FORCED);
+	}
+
 	public void showSoftKeyboard(View view) {
 		Object o = getSystemService(INPUT_METHOD_SERVICE);
 		((InputMethodManager) o).showSoftInput(view, SHOW_IMPLICIT);

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

@@ -1,7 +1,13 @@
 package org.briarproject.android.forum;
 
+import android.animation.Animator;
+import android.animation.ArgbEvaluator;
+import android.animation.ValueAnimator;
+import android.annotation.TargetApi;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.design.widget.Snackbar;
@@ -31,10 +37,13 @@ import org.briarproject.android.controller.handler.UiResultHandler;
 import org.briarproject.android.util.BriarRecyclerView;
 import org.briarproject.android.util.TrustIndicatorView;
 import org.briarproject.api.sync.GroupId;
+import org.briarproject.api.sync.MessageId;
 import org.briarproject.util.StringUtils;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.logging.Logger;
 
 import javax.inject.Inject;
@@ -43,6 +52,7 @@ import im.delight.android.identicons.IdenticonDrawable;
 
 import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
 import static android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP;
+import static android.support.v7.widget.RecyclerView.NO_POSITION;
 import static android.view.View.GONE;
 import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
@@ -58,6 +68,10 @@ public class ForumActivity extends BriarActivity implements
 	public static final String MIN_TIMESTAMP = "briar.MIN_TIMESTAMP";
 	private static final int REQUEST_FORUM_SHARED = 3;
 
+	private final static int UNDEFINED = -1;
+	private static final String KEY_INPUT_VISIBILITY = "inputVisibility";
+	private static final String KEY_REPLY_ID = "replyId";
+
 	@Inject
 	protected AndroidNotificationManager notificationManager;
 
@@ -76,7 +90,7 @@ public class ForumActivity extends BriarActivity implements
 	protected ForumAdapter forumAdapter;
 
 	@Override
-	public void onCreate(Bundle state) {
+	public void onCreate(final Bundle state) {
 		super.onCreate(state);
 
 		setContentView(R.layout.activity_forum);
@@ -96,6 +110,7 @@ public class ForumActivity extends BriarActivity implements
 		linearLayoutManager = new LinearLayoutManager(this);
 		recyclerView.setLayoutManager(linearLayoutManager);
 		recyclerView.showProgressBar();
+
 		forumController
 				.loadForum(groupId, new UiResultHandler<Boolean>(this) {
 					@Override
@@ -105,6 +120,13 @@ public class ForumActivity extends BriarActivity implements
 							forumAdapter = new ForumAdapter(
 									forumController.getForumEntries());
 							recyclerView.setAdapter(forumAdapter);
+							if (state != null) {
+								byte[] replyId =
+										state.getByteArray(KEY_REPLY_ID);
+								if (replyId != null) {
+									forumAdapter.setReplyEntryById(replyId);
+								}
+							}
 							recyclerView.showData();
 						} else {
 							// TODO Maybe an error dialog ?
@@ -114,12 +136,34 @@ public class ForumActivity extends BriarActivity implements
 				});
 	}
 
+	@Override
+	protected void onRestoreInstanceState(Bundle savedInstanceState) {
+		super.onRestoreInstanceState(savedInstanceState);
+		inputContainer
+				.setVisibility(
+						savedInstanceState.getBoolean(KEY_INPUT_VISIBILITY) ?
+								VISIBLE : GONE);
+	}
+
+
+	@Override
+	protected void onSaveInstanceState(Bundle outState) {
+		super.onSaveInstanceState(outState);
+		outState.putBoolean(KEY_INPUT_VISIBILITY,
+				inputContainer.getVisibility() == VISIBLE);
+		ForumEntry replyEntry = forumAdapter.getReplyEntry();
+		if (replyEntry != null) {
+			outState.putByteArray(KEY_REPLY_ID,
+					replyEntry.getMessageId().getBytes());
+		}
+	}
+
 	@Override
 	public void injectActivity(ActivityComponent component) {
 		component.inject(this);
 	}
 
-	private void displaySnackbar(int stringId) {
+	private void displaySnackbarShort(int stringId) {
 		Snackbar snackbar =
 				Snackbar.make(recyclerView, stringId, Snackbar.LENGTH_SHORT);
 		snackbar.getView().setBackgroundResource(R.color.briar_primary);
@@ -131,7 +175,7 @@ public class ForumActivity extends BriarActivity implements
 		super.onActivityResult(request, result, data);
 
 		if (request == REQUEST_FORUM_SHARED && result == RESULT_OK) {
-			displaySnackbar(R.string.forum_shared_snackbar);
+			displaySnackbarShort(R.string.forum_shared_snackbar);
 		}
 	}
 
@@ -154,15 +198,19 @@ public class ForumActivity extends BriarActivity implements
 		}
 	}
 
-	private void showTextInput(boolean isNewMessage) {
+	private void showTextInput(ForumEntry replyEntry) {
 		// An animation here would be an overkill because of the keyboard
 		// popping up.
-		inputContainer.setVisibility(View.VISIBLE);
+		// only clear the text when the input container was not visible
-		textInput.setText("");
+		if (inputContainer.getVisibility() != VISIBLE) {
+			inputContainer.setVisibility(VISIBLE);
+			textInput.setText("");
+		}
 		textInput.requestFocus();
-		textInput.setHint(isNewMessage ? R.string.forum_new_message_hint :
+		textInput.setHint(replyEntry == null ? R.string.forum_new_message_hint :
 				R.string.forum_message_reply_hint);
-		showSoftKeyboard(textInput);
+		showSoftKeyboardForced(textInput);
+		forumAdapter.setReplyEntry(replyEntry);
 	}
 
 	@Override
@@ -173,9 +221,7 @@ public class ForumActivity extends BriarActivity implements
 		// Handle presses on the action bar items
 		switch (item.getItemId()) {
 			case R.id.action_forum_compose_post:
-				if (inputContainer.getVisibility() != VISIBLE) {
+				showTextInput(null);
-					showTextInput(true);
-				}
 				return true;
 			case R.id.action_forum_share:
 				Intent i2 = new Intent(this, ShareForumActivity.class);
@@ -262,13 +308,25 @@ public class ForumActivity extends BriarActivity implements
 	@Override
 	public void addLocalEntry(int index, ForumEntry entry) {
 		forumAdapter.addEntry(index, entry, true);
-		displaySnackbar(R.string.forum_new_entry_posted);
+		displaySnackbarShort(R.string.forum_new_entry_posted);
 	}
 
 	@Override
-	public void addForeignEntry(int index, ForumEntry entry) {
+	public void addForeignEntry(final int index, final ForumEntry entry) {
 		forumAdapter.addEntry(index, entry, false);
-		displaySnackbar(R.string.forum_new_entry_received);
+		Snackbar snackbar =
+				Snackbar.make(recyclerView, R.string.forum_new_entry_received,
+						Snackbar.LENGTH_LONG);
+		snackbar.setActionTextColor(
+				ContextCompat.getColor(this, R.color.briar_button_positive));
+		snackbar.setAction(R.string.show, new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				forumAdapter.scrollToEntry(entry);
+			}
+		});
+		snackbar.getView().setBackgroundResource(R.color.briar_primary);
+		snackbar.show();
 	}
 
 	static class ForumViewHolder extends RecyclerView.ViewHolder {
@@ -279,7 +337,8 @@ public class ForumActivity extends BriarActivity implements
 		final TrustIndicatorView trust;
 		public final View chevron, replyButton;
 		public final ViewGroup cell;
-		public final View bottomDivider;
+		public final View topDivider;
+		public ValueAnimator highlightAnimator;
 
 		public ForumViewHolder(View v) {
 			super(v);
@@ -301,7 +360,7 @@ public class ForumActivity extends BriarActivity implements
 			chevron = v.findViewById(R.id.chevron);
 			replyButton = v.findViewById(R.id.btn_reply);
 			cell = (ViewGroup) v.findViewById(R.id.forum_cell);
-			bottomDivider = v.findViewById(R.id.bottom_divider);
+			topDivider = v.findViewById(R.id.top_divider);
 		}
 	}
 
@@ -312,6 +371,7 @@ public class ForumActivity extends BriarActivity implements
 		private ForumEntry replyEntry;
 		// temporary highlight
 		private ForumEntry addedEntry;
+		Map<ForumEntry, ValueAnimator> animatingEntries = new HashMap<>();
 
 		public ForumAdapter(@NonNull List<ForumEntry> forumEntries) {
 			this.forumEntries = forumEntries;
@@ -352,6 +412,11 @@ public class ForumActivity extends BriarActivity implements
 			addedEntry = entry;
 		}
 
+		public void scrollToEntry(ForumEntry entry) {
+			int visiblePos = getVisiblePos(entry);
+			linearLayoutManager.scrollToPositionWithOffset(visiblePos, 0);
+		}
+
 		private boolean hasDescendants(ForumEntry forumEntry) {
 			int i = forumEntries.indexOf(forumEntry);
 			if (i >= 0 && i < forumEntries.size() - 1) {
@@ -391,6 +456,16 @@ public class ForumActivity extends BriarActivity implements
 			return counter;
 		}
 
+		public void setReplyEntryById(byte[] id) {
+			MessageId messageId = new MessageId(id);
+			for (ForumEntry entry : forumEntries) {
+				if (entry.getMessageId().equals(messageId)) {
+					setReplyEntry(entry);
+					break;
+				}
+			}
+		}
+
 		public void setReplyEntry(ForumEntry entry) {
 			if (replyEntry != null) {
 				notifyItemChanged(getVisiblePos(replyEntry));
@@ -435,6 +510,16 @@ public class ForumActivity extends BriarActivity implements
 			List<Integer> indexList =
 					getSubTreeIndexes(visiblePos, forumEntry.getLevel());
 			if (!indexList.isEmpty()) {
+				if (Build.VERSION.SDK_INT >= 11) {
+					// stop animating children
+					for (int index : indexList) {
+						ValueAnimator anim =
+								animatingEntries.get(forumEntries.get(index));
+						if (anim != null && anim.isRunning()) {
+							anim.cancel();
+						}
+					}
+				}
 				if (indexList.size() == 1) {
 					notifyItemRemoved(indexList.get(0));
 				} else {
@@ -445,36 +530,16 @@ public class ForumActivity extends BriarActivity implements
 			forumEntry.setShowingDescendants(false);
 		}
 
-		public int getVisiblePos(ForumEntry entry) {
-			int visibleCounter = 0;
-			int levelLimit = -1;
-			for (int i = 0; i < forumEntries.size(); i++) {
-				ForumEntry forumEntry = forumEntries.get(i);
-				if (forumEntry.equals(entry)) {
-					return visibleCounter;
-				} else if (levelLimit >= 0 &&
-						levelLimit < forumEntry.getLevel()) {
-					// entry is in a hidden sub-tree
-					continue;
-				}
-				levelLimit = -1;
-				if (!forumEntry.isShowingDescendants()) {
-					levelLimit = forumEntry.getLevel();
-				}
-				visibleCounter++;
-			}
-			return -1;
-		}
 
 		@NonNull
 		public ForumEntry getVisibleEntry(int position) {
-			int levelLimit = -1;
+			int levelLimit = UNDEFINED;
 			for (ForumEntry forumEntry : forumEntries) {
 				if (levelLimit >= 0) {
 					if (forumEntry.getLevel() > levelLimit) {
 						continue;
 					}
-					levelLimit = -1;
+					levelLimit = UNDEFINED;
 				}
 				if (!forumEntry.isShowingDescendants()) {
 					levelLimit = forumEntry.getLevel();
@@ -486,6 +551,51 @@ public class ForumActivity extends BriarActivity implements
 			return null;
 		}
 
+		@TargetApi(Build.VERSION_CODES.HONEYCOMB)
+		private void animateFadeOut(final ForumViewHolder ui,
+				final ForumEntry addedEntry) {
+			ui.setIsRecyclable(false);
+			ValueAnimator anim = new ValueAnimator();
+			animatingEntries.put(addedEntry, anim);
+			ColorDrawable viewColor = (ColorDrawable) ui.cell.getBackground();
+			anim.setIntValues(viewColor.getColor(), ContextCompat
+					.getColor(ForumActivity.this,
+							R.color.window_background));
+			anim.setEvaluator(new ArgbEvaluator());
+			anim.addListener(new Animator.AnimatorListener() {
+				@Override
+				public void onAnimationStart(Animator animation) {
+
+				}
+
+				@Override
+				public void onAnimationEnd(Animator animation) {
+					ui.setIsRecyclable(true);
+					animatingEntries.remove(addedEntry);
+				}
+
+				@Override
+				public void onAnimationCancel(Animator animation) {
+					ui.setIsRecyclable(true);
+					animatingEntries.remove(addedEntry);
+				}
+
+				@Override
+				public void onAnimationRepeat(Animator animation) {
+
+				}
+			});
+			anim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+				@Override
+				public void onAnimationUpdate(ValueAnimator valueAnimator) {
+					ui.cell.setBackgroundColor(
+							(Integer) valueAnimator.getAnimatedValue());
+				}
+			});
+			anim.setDuration(5000);
+			anim.start();
+		}
+
 		@Override
 		public ForumViewHolder onCreateViewHolder(
 				ViewGroup parent, int viewType) {
@@ -504,6 +614,12 @@ public class ForumActivity extends BriarActivity implements
 			}
 			ui.textView.setText(data.getText());
 
+			if (position == 0) {
+				ui.topDivider.setVisibility(View.INVISIBLE);
+			} else {
+				ui.topDivider.setVisibility(View.VISIBLE);
+			}
+
 			for (int i = 0; i < ui.lvls.length; i++) {
 				ui.lvls[i].setVisibility(i < data.getLevel() ? VISIBLE : GONE);
 			}
@@ -555,9 +671,13 @@ public class ForumActivity extends BriarActivity implements
 						.getColor(ForumActivity.this,
 								R.color.forum_cell_highlight));
 			} else if (data.equals(addedEntry)) {
+
 				ui.cell.setBackgroundColor(ContextCompat
 						.getColor(ForumActivity.this,
 								R.color.forum_cell_highlight));
+				if (Build.VERSION.SDK_INT >= 11) {
+					animateFadeOut(ui, addedEntry);
+				}
 				addedEntry = null;
 			} else {
 				ui.cell.setBackgroundColor(ContextCompat
@@ -567,33 +687,36 @@ public class ForumActivity extends BriarActivity implements
 			ui.replyButton.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {
-					if (inputContainer.getVisibility() != VISIBLE) {
+					showTextInput(data);
-						showTextInput(false);
-					}
-					setReplyEntry(data);
 					linearLayoutManager
 							.scrollToPositionWithOffset(getVisiblePos(data), 0);
 				}
 			});
 		}
 
-		@Override
+		private int getVisiblePos(ForumEntry sEntry) {
-		public int getItemCount() {
 			int visibleCounter = 0;
-			int levelLimit = -1;
+			int levelLimit = UNDEFINED;
-			for (ForumEntry forumEntry : forumEntries) {
+			for (ForumEntry fEntry : forumEntries) {
 				if (levelLimit >= 0) {
-					if (forumEntry.getLevel() > levelLimit) {
+					if (fEntry.getLevel() > levelLimit) {
 						continue;
 					}
-					levelLimit = -1;
+					levelLimit = UNDEFINED;
 				}
-				if (!forumEntry.isShowingDescendants()) {
+				if (sEntry != null && sEntry.equals(fEntry)) {
-					levelLimit = forumEntry.getLevel();
+					return visibleCounter;
+				} else if (!fEntry.isShowingDescendants()) {
+					levelLimit = fEntry.getLevel();
 				}
 				visibleCounter++;
 			}
-			return visibleCounter;
+			return sEntry == null ? visibleCounter : NO_POSITION;
+		}
+
+		@Override
+		public int getItemCount() {
+			return getVisiblePos(null);
 		}
 	}
 

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

@@ -203,6 +203,7 @@ public class ForumControllerImpl extends DbControllerImpl
 				try {
 					if (data.getGroupId() == null ||
 							!data.getGroupId().equals(groupId)) {
+						data.clearAll();
 						data.setGroupId(groupId);
 						long now = System.currentTimeMillis();
 						data.setForum(forumManager.getForum(groupId));
@@ -236,6 +237,9 @@ public class ForumControllerImpl extends DbControllerImpl
 
 	@Override
 	public List<ForumEntry> getForumEntries() {
+		if (data.getForumEntries() != null) {
+			return data.getForumEntries();
+		}
 		Collection<ForumPostHeader> headers = data.getHeaders();
 		List<ForumEntry> forumEntries = new ArrayList<>();
 		Stack<MessageId> idStack = new Stack<>();
@@ -255,6 +259,7 @@ public class ForumControllerImpl extends DbControllerImpl
 					StringUtils.fromUtf8(data.getBody(h.getId())),
 					idStack.size()));
 		}
+		data.setForumEntries(forumEntries);
 		return forumEntries;
 	}
 
@@ -312,8 +317,19 @@ public class ForumControllerImpl extends DbControllerImpl
 	public void createPost(final byte[] body, final MessageId parentId) {
 		cryptoExecutor.execute(new Runnable() {
 			public void run() {
-				// Don't use an earlier timestamp than the newest post
 				long timestamp = System.currentTimeMillis();
+				long newestTimeStamp = 0;
+				Collection<ForumPostHeader> headers = data.getHeaders();
+				if (headers != null) {
+					for (ForumPostHeader h : headers) {
+						if (h.getTimestamp() > newestTimeStamp)
+							newestTimeStamp = h.getTimestamp();
+					}
+				}
+				// Don't use an earlier timestamp than the newest post
+				if (timestamp < newestTimeStamp) {
+					timestamp = newestTimeStamp;
+				}
 				ForumPost p;
 				try {
 					KeyParser keyParser = crypto.getSignatureKeyParser();

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

@@ -10,9 +10,9 @@ import org.briarproject.clients.MessageTreeImpl;
 
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
-
+import java.util.logging.Logger;
-import javax.inject.Inject;
 
 /**
  * This class is a singleton that defines the data that should persist, i.e.
@@ -27,14 +27,14 @@ public class ForumPersistentData {
 	private volatile LocalAuthor localAuthor;
 	private volatile Forum forum;
 	private volatile GroupId groupId;
+	private List<ForumEntry> forumEntries;
 
-	@Inject
+	private static final Logger LOG =
-	public ForumPersistentData() {
+			Logger.getLogger(ForumControllerImpl.class.getName());
 
-	}
 
 	public void clearAll() {
-		tree.clear();
+		clearHeaders();
 		bodyCache.clear();
 		localAuthor = null;
 		forum = null;
@@ -43,6 +43,7 @@ public class ForumPersistentData {
 
 	public void clearHeaders() {
 		tree.clear();
+		forumEntries = null;
 	}
 
 	public void addHeaders(Collection<ForumPostHeader> headers) {
@@ -85,4 +86,12 @@ public class ForumPersistentData {
 	public void setGroupId(GroupId groupId) {
 		this.groupId = groupId;
 	}
+
+	public List<ForumEntry> getForumEntries() {
+		return forumEntries;
+	}
+
+	public void setForumEntries(List<ForumEntry> forumEntries) {
+		this.forumEntries = forumEntries;
+	}
 }

briar-android/src/org/briarproject/android/util/CustomAnimations.java

@@ -1,16 +1,11 @@
 package org.briarproject.android.util;
 
 import android.animation.Animator;
-import android.animation.ArgbEvaluator;
 import android.animation.ValueAnimator;
 import android.annotation.SuppressLint;
-import android.graphics.drawable.ColorDrawable;
 import android.os.Build;
-import android.view.View;
 import android.view.ViewGroup;
 
-import org.briarproject.android.controller.handler.ResultHandler;
-
 import static android.view.View.GONE;
 import static android.view.View.MeasureSpec.UNSPECIFIED;
 import static android.view.View.VISIBLE;
@@ -26,49 +21,6 @@ public class CustomAnimations {
 		}
 	}
 
-	@SuppressLint("NewApi")
-	public static void animateColorTransition(final View view, int color,
-			int duration, final ResultHandler<Void> finishedCallback) {
-		// No soup for Gingerbread
-		if (Build.VERSION.SDK_INT < 11) {
-			return;
-		}
-		ValueAnimator anim = new ValueAnimator();
-		ColorDrawable viewColor = (ColorDrawable) view.getBackground();
-		anim.setIntValues(viewColor.getColor(), color);
-		anim.setEvaluator(new ArgbEvaluator());
-		anim.addListener(new Animator.AnimatorListener() {
-			@Override
-			public void onAnimationStart(Animator animation) {
-
-			}
-
-			@Override
-			public void onAnimationEnd(Animator animation) {
-				if (finishedCallback != null) finishedCallback.onResult(null);
-			}
-
-			@Override
-			public void onAnimationCancel(Animator animation) {
-
-			}
-
-			@Override
-			public void onAnimationRepeat(Animator animation) {
-
-			}
-		});
-		anim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-			@Override
-			public void onAnimationUpdate(ValueAnimator valueAnimator) {
-				view.setBackgroundColor((Integer)valueAnimator.getAnimatedValue());
-			}
-		});
-		anim.setDuration(duration);
-
-		anim.start();
-	}
-
 	private static void animateHeightGingerbread(ViewGroup viewGroup,
 			boolean isExtending) {
 		// No animations for Gingerbread