Change Available Forums into Forum Invitations

briar-android/AndroidManifest.xml

@@ -99,8 +99,8 @@
 		</activity>
 
 		<activity
-			android:name=".android.forum.AvailableForumsActivity"
+			android:name=".android.forum.ForumInvitationsActivity"
-			android:label="@string/available_forums_title"
+			android:label="@string/forum_invitations_title"
 			android:parentActivityName=".android.NavDrawerActivity">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"

briar-android/res/layout/list_item_available_forum.xml

@@ -6,8 +6,8 @@
 	android:layout_height="wrap_content"
 	android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 	android:layout_marginStart="@dimen/listitem_horizontal_margin"
-	android:paddingTop="@dimen/listitem_horizontal_margin"
+	android:background="?attr/selectableItemBackground"
-	android:background="?attr/selectableItemBackground">
+	android:paddingTop="@dimen/listitem_horizontal_margin">
 
 	<org.briarproject.android.util.TextAvatarView
 		android:id="@+id/avatarView"
@@ -22,10 +22,12 @@
 		android:id="@+id/forumNameView"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:layout_toEndOf="@+id/avatarView"
 		android:layout_toRightOf="@+id/avatarView"
 		android:maxLines="2"
-		android:textColor="@android:color/primary_text_light"
+		android:textColor="@color/briar_primary"
 		android:textSize="@dimen/text_size_medium"
 		tools:text="This is a name of a forum that is available"/>
 
@@ -34,38 +36,55 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_below="@+id/forumNameView"
-		android:layout_marginBottom="-8dp"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginRight="@dimen/listitem_horizontal_margin"
 		android:layout_toEndOf="@+id/avatarView"
 		android:layout_toRightOf="@+id/avatarView"
 		android:paddingTop="@dimen/margin_medium"
-		android:textColor="@android:color/secondary_text_light"
+		android:textColor="@color/briar_text_secondary"
 		android:textSize="@dimen/text_size_small"
 		tools:text="Shared by Megalox"/>
 
+	<TextView
+		android:id="@+id/forumSubscribedView"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/sharedByView"
+		android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+		android:layout_marginRight="@dimen/listitem_horizontal_margin"
+		android:paddingTop="@dimen/margin_medium"
+		android:text="@string/forum_invitation_exists"
+		android:textColor="@color/briar_text_tertiary"
+		android:textSize="@dimen/text_size_small"
+		tools:visibility="visible"/>
+
 	<Button
 		android:id="@+id/acceptButton"
 		style="@style/BriarButtonFlat.Positive"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:text="@string/dialog_button_accept"
+		android:layout_alignParentEnd="true"
-		android:layout_below="@+id/sharedByView"
 		android:layout_alignParentRight="true"
-		android:layout_alignParentEnd="true"/>
+		android:layout_below="@+id/forumSubscribedView"
+		android:layout_marginTop="-8dp"
+		android:text="@string/dialog_button_accept"/>
 
 	<Button
 		android:id="@+id/declineButton"
 		style="@style/BriarButtonFlat.Negative"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:text="@string/dialog_button_decline"
+		android:layout_below="@+id/forumSubscribedView"
-		android:layout_below="@+id/sharedByView"
+		android:layout_marginTop="-8dp"
 		android:layout_toLeftOf="@+id/acceptButton"
-		android:layout_toStartOf="@+id/acceptButton"/>
+		android:layout_toStartOf="@+id/acceptButton"
+		android:text="@string/dialog_button_decline"/>
 
-	<View style="@style/Divider.ForumList"
+	<View
-	      android:layout_below="@+id/acceptButton"
+		style="@style/Divider.ForumList"
-	      android:layout_alignParentLeft="true"
+		android:layout_alignParentLeft="true"
-	      android:layout_alignParentStart="true"/>
+		android:layout_alignParentStart="true"
+		android:layout_below="@+id/acceptButton"/>
 
 </RelativeLayout>
 

briar-android/res/layout/list_item_forum_invitation_in.xml

@@ -51,7 +51,7 @@
 			android:layout_alignEnd="@+id/introductionText"
 			android:layout_alignRight="@+id/introductionText"
 			android:layout_below="@+id/introductionText"
-			android:text="@string/forum_show_available"/>
+			android:text="@string/forum_show_invitations"/>
 
 	</RelativeLayout>
 

briar-android/res/values-pt-rBR/strings.xml

@@ -99,7 +99,7 @@
   <string name="forum_share_message">Você pode escrever um convite que será enviado aos contatos selecionados.</string>
   <string name="forum_invitation_received">%1$s compartilhou o fórum \"%2$s\" com você.</string>
   <string name="forum_invitation_sent">Você compartilhou o fórum \"%1$s\" com %2$s.</string>
-  <string name="forum_show_available">Mostrar fóruns disponíveis</string>
+  <string name="forum_show_invitations">Mostrar fóruns disponíveis</string>
   <string name="forum_compose_post">Nova postagem em fórum</string>
   <string name="from">De:</string>
   <string name="anonymous">Anônimo</string>

briar-android/res/values/strings.xml

@@ -101,7 +101,7 @@
 	<string name="forum_share_message">You may compose an optional invitation message that will be sent to the selected contacts.</string>
 	<string name="forum_invitation_received">%1$s has shared the forum \"%2$s\" with you.</string>
 	<string name="forum_invitation_sent">You have shared the forum \"%1$s\" with %2$s.</string>
-	<string name="forum_show_available">Show Available Forums</string>
+	<string name="forum_show_invitations">Show Forum Invitations</string>
 	<string name="forum_compose_post">New Forum Post</string>
 	<string name="from">From:</string>
 	<string name="anonymous">Anonymous</string>
@@ -110,7 +110,8 @@
 	<string name="create_identity_button">Create Identity</string>
 	<string name="identity_created_toast">Identity created</string>
 	<string name="forum_post_hint">Type forum post</string>
-	<string name="available_forums_title">Available Forums</string>
+	<string name="forum_invitations_title">Forum Invitations</string>
+	<string name="forum_invitation_exists">You accepted an invitation for this forum earlier, but you can accept more to strengthen the communication network of this forum.</string>
 	<string name="forum_joined_toast">Joined Forum</string>
 	<string name="forum_declined_toast">Forum Invitation Declined</string>
 	<string name="shared_by_format">Shared by %s</string>

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

@@ -5,7 +5,7 @@ import android.app.Activity;
 import org.briarproject.android.blogs.MyBlogsFragment;
 import org.briarproject.android.contact.ContactListFragment;
 import org.briarproject.android.contact.ConversationActivity;
-import org.briarproject.android.forum.AvailableForumsActivity;
+import org.briarproject.android.forum.ForumInvitationsActivity;
 import org.briarproject.android.forum.ContactSelectorFragment;
 import org.briarproject.android.forum.CreateForumActivity;
 import org.briarproject.android.forum.ForumActivity;
@@ -54,7 +54,7 @@ public interface ActivityComponent {
 
 	void inject(CreateIdentityActivity activity);
 
-	void inject(AvailableForumsActivity activity);
+	void inject(ForumInvitationsActivity activity);
 
 	void inject(CreateForumActivity activity);
 

briar-android/src/org/briarproject/android/contact/ConversationAdapter.java

@@ -13,7 +13,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import org.briarproject.R;
-import org.briarproject.android.forum.AvailableForumsActivity;
+import org.briarproject.android.forum.ForumInvitationsActivity;
 import org.briarproject.android.util.AndroidUtils;
 import org.briarproject.api.clients.SessionId;
 import org.briarproject.api.forum.ForumInvitationMessage;
@@ -322,7 +322,7 @@ class ConversationAdapter extends RecyclerView.Adapter {
 							@Override
 							public void onClick(View v) {
 								Intent intent = new Intent(ctx,
-										AvailableForumsActivity.class);
+										ForumInvitationsActivity.class);
 								ctx.startActivity(intent);
 							}
 						});

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

@@ -1,23 +0,0 @@
-package org.briarproject.android.forum;
-
-import org.briarproject.api.contact.Contact;
-import org.briarproject.api.forum.Forum;
-
-import java.util.Collection;
-
-class AvailableForumsItem {
-
-	private final ForumContacts forumContacts;
-
-	AvailableForumsItem(ForumContacts forumContacts) {
-		this.forumContacts = forumContacts;
-	}
-
-	Forum getForum() {
-		return forumContacts.getForum();
-	}
-
-	Collection<Contact> getContacts() {
-		return forumContacts.getContacts();
-	}
-}

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

@@ -17,16 +17,19 @@ import org.briarproject.util.StringUtils;
 import java.util.ArrayList;
 import java.util.Collection;
 
-class AvailableForumsAdapter extends
+import static android.view.View.GONE;
-		RecyclerView.Adapter<AvailableForumsAdapter.AvailableForumViewHolder> {
+import static android.view.View.VISIBLE;
+
+class ForumInvitationAdapter extends
+		RecyclerView.Adapter<ForumInvitationAdapter.AvailableForumViewHolder> {
 
 	private final Context ctx;
 	private final AvailableForumClickListener listener;
-	private final SortedList<AvailableForumsItem> forums =
+	private final SortedList<ForumInvitationItem> forums =
-			new SortedList<>(AvailableForumsItem.class,
+			new SortedList<>(ForumInvitationItem.class,
 					new SortedListCallBacks());
 
-	AvailableForumsAdapter(Context ctx, AvailableForumClickListener listener) {
+	ForumInvitationAdapter(Context ctx, AvailableForumClickListener listener) {
 		this.ctx = ctx;
 		this.listener = listener;
 	}
@@ -42,7 +45,7 @@ class AvailableForumsAdapter extends
 
 	@Override
 	public void onBindViewHolder(AvailableForumViewHolder ui, int position) {
-		final AvailableForumsItem item = getItem(position);
+		final ForumInvitationItem item = getItem(position);
 
 		ui.avatar.setText(item.getForum().getName().substring(0, 1));
 		ui.avatar.setBackgroundBytes(item.getForum().getId().getBytes());
@@ -54,6 +57,12 @@ class AvailableForumsAdapter extends
 		ui.sharedBy.setText(ctx.getString(R.string.shared_by_format,
 				StringUtils.join(names, ", ")));
 
+		if (item.isSubscribed()) {
+			ui.subscribed.setVisibility(VISIBLE);
+		} else {
+			ui.subscribed.setVisibility(GONE);
+		}
+
 		ui.accept.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
@@ -73,15 +82,15 @@ class AvailableForumsAdapter extends
 		return forums.size();
 	}
 
-	public AvailableForumsItem getItem(int position) {
+	public ForumInvitationItem getItem(int position) {
 		return forums.get(position);
 	}
 
-	public void add(AvailableForumsItem item) {
+	public void add(ForumInvitationItem item) {
 		forums.add(item);
 	}
 
-	public void addAll(Collection<AvailableForumsItem> list) {
+	public void addAll(Collection<ForumInvitationItem> list) {
 		forums.addAll(list);
 	}
 
@@ -89,32 +98,34 @@ class AvailableForumsAdapter extends
 		forums.clear();
 	}
 
-	protected static class AvailableForumViewHolder
+	static class AvailableForumViewHolder
 			extends RecyclerView.ViewHolder {
 
 		private final TextAvatarView avatar;
 		private final TextView name;
 		private final TextView sharedBy;
+		private final TextView subscribed;
 		private final Button accept;
 		private final Button decline;
 
-		public AvailableForumViewHolder(View v) {
+		AvailableForumViewHolder(View v) {
 			super(v);
 
 			avatar = (TextAvatarView) v.findViewById(R.id.avatarView);
 			name = (TextView) v.findViewById(R.id.forumNameView);
 			sharedBy = (TextView) v.findViewById(R.id.sharedByView);
+			subscribed = (TextView) v.findViewById(R.id.forumSubscribedView);
 			accept = (Button) v.findViewById(R.id.acceptButton);
 			decline = (Button) v.findViewById(R.id.declineButton);
 		}
 	}
 
 	private class SortedListCallBacks
-			extends SortedList.Callback<AvailableForumsItem> {
+			extends SortedList.Callback<ForumInvitationItem> {
 
 		@Override
-		public int compare(AvailableForumsItem o1,
+		public int compare(ForumInvitationItem o1,
-				AvailableForumsItem o2) {
+				ForumInvitationItem o2) {
 			return String.CASE_INSENSITIVE_ORDER
 					.compare(o1.getForum().getName(),
 							o2.getForum().getName());
@@ -141,21 +152,21 @@ class AvailableForumsAdapter extends
 		}
 
 		@Override
-		public boolean areContentsTheSame(AvailableForumsItem oldItem,
+		public boolean areContentsTheSame(ForumInvitationItem oldItem,
-				AvailableForumsItem newItem) {
+				ForumInvitationItem newItem) {
 			return oldItem.getForum().equals(newItem.getForum()) &&
 					oldItem.getContacts().equals(newItem.getContacts());
 		}
 
 		@Override
-		public boolean areItemsTheSame(AvailableForumsItem oldItem,
+		public boolean areItemsTheSame(ForumInvitationItem oldItem,
-				AvailableForumsItem newItem) {
+				ForumInvitationItem newItem) {
 			return oldItem.getForum().equals(newItem.getForum());
 		}
 	}
 
 
 	interface AvailableForumClickListener {
-		void onItemClick(AvailableForumsItem item, boolean accept);
+		void onItemClick(ForumInvitationItem item, boolean accept);
 	}
 }

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

@@ -5,13 +5,17 @@ import org.briarproject.api.forum.Forum;
 
 import java.util.Collection;
 
-class ForumContacts {
+class ForumInvitationItem {
 
 	private final Forum forum;
+	private final boolean subscribed;
 	private final Collection<Contact> contacts;
 
-	ForumContacts(Forum forum, Collection<Contact> contacts) {
+	ForumInvitationItem(Forum forum, boolean subscribed,
+			Collection<Contact> contacts) {
+
 		this.forum = forum;
+		this.subscribed = subscribed;
 		this.contacts = contacts;
 	}
 
@@ -19,6 +23,10 @@ class ForumContacts {
 		return forum;
 	}
 
+	public boolean isSubscribed() {
+		return subscribed;
+	}
+
 	Collection<Contact> getContacts() {
 		return contacts;
 	}

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

@@ -24,7 +24,6 @@ import org.briarproject.api.forum.ForumSharingManager;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 import java.util.logging.Logger;
 
 import javax.inject.Inject;
@@ -32,15 +31,15 @@ import javax.inject.Inject;
 import static android.widget.Toast.LENGTH_SHORT;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
-import static org.briarproject.android.forum.AvailableForumsAdapter.AvailableForumClickListener;
+import static org.briarproject.android.forum.ForumInvitationAdapter.AvailableForumClickListener;
 
-public class AvailableForumsActivity extends BriarActivity
+public class ForumInvitationsActivity extends BriarActivity
 		implements EventListener, AvailableForumClickListener {
 
 	private static final Logger LOG =
-			Logger.getLogger(AvailableForumsActivity.class.getName());
+			Logger.getLogger(ForumInvitationsActivity.class.getName());
 
-	private AvailableForumsAdapter adapter;
+	private ForumInvitationAdapter adapter;
 
 	// Fields that are accessed from background threads must be volatile
 	@Inject
@@ -56,7 +55,7 @@ public class AvailableForumsActivity extends BriarActivity
 
 		setContentView(R.layout.activity_available_forums);
 
-		adapter = new AvailableForumsAdapter(this, this);
+		adapter = new ForumInvitationAdapter(this, this);
 		BriarRecyclerView list =
 				(BriarRecyclerView) findViewById(R.id.availableForumsView);
 		list.setLayoutManager(new LinearLayoutManager(this));
@@ -80,21 +79,25 @@ public class AvailableForumsActivity extends BriarActivity
 			@Override
 			public void run() {
 				try {
-					Collection<ForumContacts> available = new ArrayList<>();
+					Collection<ForumInvitationItem> forums = new ArrayList<>();
 					long now = System.currentTimeMillis();
 					for (Forum f : forumSharingManager.getInvited()) {
+						boolean subscribed;
 						try {
-							Collection<Contact> c =
+							forumManager.getForum(f.getId());
-									forumSharingManager.getSharedBy(f.getId());
+							subscribed = true;
-							available.add(new ForumContacts(f, c));
 						} catch (NoSuchGroupException e) {
-							// Continue
+							subscribed = false;
 						}
+						Collection<Contact> c =
+								forumSharingManager.getSharedBy(f.getId());
+						forums.add(
+								new ForumInvitationItem(f, subscribed, c));
 					}
 					long duration = System.currentTimeMillis() - now;
 					if (LOG.isLoggable(INFO))
 						LOG.info("Load took " + duration + " ms");
-					displayForums(available);
+					displayForums(forums);
 				} catch (DbException e) {
 					if (LOG.isLoggable(WARNING))
 						LOG.log(WARNING, e.toString(), e);
@@ -103,20 +106,16 @@ public class AvailableForumsActivity extends BriarActivity
 		});
 	}
 
-	private void displayForums(final Collection<ForumContacts> available) {
+	private void displayForums(final Collection<ForumInvitationItem> forums) {
 		runOnUiThread(new Runnable() {
 			@Override
 			public void run() {
-				if (available.isEmpty()) {
+				if (forums.isEmpty()) {
 					LOG.info("No forums available, finishing");
 					finish();
 				} else {
 					adapter.clear();
-					List<AvailableForumsItem> list =
+					adapter.addAll(forums);
-							new ArrayList<>(available.size());
-					for (ForumContacts f : available)
-						list.add(new AvailableForumsItem(f));
-					adapter.addAll(list);
 				}
 			}
 		});
@@ -152,7 +151,7 @@ public class AvailableForumsActivity extends BriarActivity
 	}
 
 	@Override
-	public void onItemClick(AvailableForumsItem item, boolean accept) {
+	public void onItemClick(ForumInvitationItem item, boolean accept) {
 		respondToInvitation(item, accept);
 
 		// show toast
@@ -161,7 +160,7 @@ public class AvailableForumsActivity extends BriarActivity
 		Toast.makeText(this, res, LENGTH_SHORT).show();
 	}
 
-	private void respondToInvitation(final AvailableForumsItem item,
+	private void respondToInvitation(final ForumInvitationItem item,
 			final boolean accept) {
 		runOnDbThread(new Runnable() {
 			@Override

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

@@ -290,6 +290,6 @@ public class ForumListFragment extends BaseEventFragment implements
 	@Override
 	public void onClick(View view) {
 		// snackbar click
-		startActivity(new Intent(getContext(), AvailableForumsActivity.class));
+		startActivity(new Intent(getContext(), ForumInvitationsActivity.class));
 	}
 }