UI for Sharing Blogs

This commit refactors the code for sharing forums,
so it can be used for sharing blogs as well.

It does not yet include code for responding to blog invitations.

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

@@ -1,127 +0,0 @@
-package org.briarproject.android.forum;
-
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.ColorFilter;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffColorFilter;
-import android.os.Build;
-import android.support.v4.content.ContextCompat;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CheckBox;
-import android.widget.TextView;
-
-import org.briarproject.R;
-import org.briarproject.android.contact.BaseContactListAdapter;
-import org.briarproject.android.contact.ContactListItem;
-import org.briarproject.api.contact.ContactId;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import static android.view.View.GONE;
-import static android.view.View.VISIBLE;
-
-class ContactSelectorAdapter
-		extends BaseContactListAdapter<ContactSelectorAdapter.SelectableContactHolder> {
-
-	private final ColorFilter grayColorFilter;
-
-	ContactSelectorAdapter(Context context,
-			OnItemClickListener listener) {
-
-		super(context, listener);
-		if (Build.VERSION.SDK_INT >= 11) {
-			grayColorFilter = null;
-		} else {
-			// Overlay the background colour at 75% opacity
-			int bg = ContextCompat.getColor(context, R.color.window_background);
-			int alpha = (int) (255 * 0.75f);
-			int red = Color.red(bg);
-			int green = Color.green(bg);
-			int blue = Color.blue(bg);
-			bg = Color.argb(alpha, red, green, blue);
-			grayColorFilter = new PorterDuffColorFilter(bg,
-					PorterDuff.Mode.SRC_OVER);
-		}
-	}
-
-	@Override
-	public SelectableContactHolder onCreateViewHolder(ViewGroup viewGroup,
-			int i) {
-		View v = LayoutInflater.from(ctx).inflate(
-				R.layout.list_item_selectable_contact, viewGroup, false);
-
-		return new SelectableContactHolder(v);
-	}
-
-	@Override
-	public void onBindViewHolder(SelectableContactHolder ui, int position) {
-		super.onBindViewHolder(ui, position);
-
-		SelectableContactListItem item =
-				(SelectableContactListItem) getItem(position);
-
-		if (item.isSelected()) {
-			ui.checkBox.setChecked(true);
-		} else {
-			ui.checkBox.setChecked(false);
-		}
-
-		if (item.isDisabled()) {
-			// we share this forum already with that contact
-			ui.layout.setEnabled(false);
-			ui.shared.setVisibility(VISIBLE);
-			grayOutItem(ui, true);
-		} else {
-			ui.layout.setEnabled(true);
-			ui.shared.setVisibility(GONE);
-			grayOutItem(ui, false);
-		}
-	}
-
-	Collection<ContactId> getSelectedContactIds() {
-		Collection<ContactId> selected = new ArrayList<>();
-
-		for (int i = 0; i < contacts.size(); i++) {
-			SelectableContactListItem item =
-					(SelectableContactListItem) contacts.get(i);
-			if (item.isSelected()) selected.add(item.getContact().getId());
-		}
-
-		return selected;
-	}
-
-	static class SelectableContactHolder
-			extends BaseContactListAdapter.BaseContactHolder {
-
-		private final CheckBox checkBox;
-		private final TextView shared;
-
-		SelectableContactHolder(View v) {
-			super(v);
-
-			checkBox = (CheckBox) v.findViewById(R.id.checkBox);
-			shared = (TextView) v.findViewById(R.id.infoView);
-		}
-	}
-
-	@Override
-	public int compareContactListItems(ContactListItem c1, ContactListItem c2) {
-		return compareByName(c1, c2);
-	}
-
-	private void grayOutItem(SelectableContactHolder ui, boolean gray) {
-		if (Build.VERSION.SDK_INT >= 11) {
-			float alpha = gray ? 0.25f : 1f;
-			ui.avatar.setAlpha(alpha);
-			ui.name.setAlpha(alpha);
-			ui.checkBox.setAlpha(alpha);
-		} else {
-			if (gray) ui.avatar.setColorFilter(grayColorFilter);
-			else ui.avatar.clearColorFilter();
-		}
-	}
-}

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

@@ -1,243 +0,0 @@
-package org.briarproject.android.forum;
-
-import android.content.Context;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.transition.Fade;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-
-import org.briarproject.R;
-import org.briarproject.android.ActivityComponent;
-import org.briarproject.android.contact.BaseContactListAdapter;
-import org.briarproject.android.contact.ContactListItem;
-import org.briarproject.android.fragment.BaseFragment;
-import org.briarproject.android.util.BriarRecyclerView;
-import org.briarproject.api.contact.Contact;
-import org.briarproject.api.contact.ContactId;
-import org.briarproject.api.contact.ContactManager;
-import org.briarproject.api.db.DbException;
-import org.briarproject.api.forum.ForumSharingManager;
-import org.briarproject.api.identity.IdentityManager;
-import org.briarproject.api.identity.LocalAuthor;
-import org.briarproject.api.sync.GroupId;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.logging.Logger;
-
-import javax.inject.Inject;
-
-import static java.util.logging.Level.INFO;
-import static java.util.logging.Level.WARNING;
-import static org.briarproject.android.forum.ShareForumActivity.CONTACTS;
-import static org.briarproject.android.forum.ShareForumActivity.getContactsFromIds;
-import static org.briarproject.api.sharing.SharingConstants.GROUP_ID;
-
-public class ContactSelectorFragment extends BaseFragment implements
-		BaseContactListAdapter.OnItemClickListener {
-
-	public final static String TAG = "ContactSelectorFragment";
-
-	private static final Logger LOG =
-			Logger.getLogger(ContactSelectorFragment.class.getName());
-
-	private ShareForumActivity shareForumActivity;
-	private Menu menu;
-	private BriarRecyclerView list;
-	private ContactSelectorAdapter adapter;
-	private Collection<ContactId> selectedContacts;
-
-	// Fields that are accessed from background threads must be volatile
-	@Inject
-	protected volatile ContactManager contactManager;
-	@Inject
-	protected volatile IdentityManager identityManager;
-	@Inject
-	protected volatile ForumSharingManager forumSharingManager;
-
-	protected volatile GroupId groupId;
-
-	public static ContactSelectorFragment newInstance(GroupId groupId) {
-
-		Bundle args = new Bundle();
-		args.putByteArray(GROUP_ID, groupId.getBytes());
-		ContactSelectorFragment fragment = new ContactSelectorFragment();
-		fragment.setArguments(args);
-		return fragment;
-	}
-
-	@Override
-	public void injectFragment(ActivityComponent component) {
-		component.inject(this);
-	}
-
-	@Override
-	public void onAttach(Context context) {
-		super.onAttach(context);
-		try {
-			shareForumActivity = (ShareForumActivity) context;
-		} catch (ClassCastException e) {
-			throw new InstantiationError(
-					"This fragment is only meant to be attached to the ShareForumActivity");
-		}
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-
-		setHasOptionsMenu(true);
-		groupId = new GroupId(getArguments().getByteArray(GROUP_ID));
-		if (groupId == null) throw new IllegalStateException("No GroupId");
-	}
-
-	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container,
-			Bundle savedInstanceState) {
-
-		View contentView = inflater.inflate(
-				R.layout.introduction_contact_chooser, container, false);
-
-		if (Build.VERSION.SDK_INT >= 21) {
-			setExitTransition(new Fade());
-		}
-
-		adapter = new ContactSelectorAdapter(getActivity(), this);
-
-		list = (BriarRecyclerView) contentView.findViewById(R.id.contactList);
-		list.setLayoutManager(new LinearLayoutManager(getActivity()));
-		list.setAdapter(adapter);
-		list.setEmptyText(getString(R.string.no_contacts));
-
-		// restore selected contacts if available
-		if (savedInstanceState != null) {
-			ArrayList<Integer> intContacts =
-					savedInstanceState.getIntegerArrayList(CONTACTS);
-			selectedContacts = ShareForumActivity.getContactsFromIntegers(
-					intContacts);
-		}
-
-		return contentView;
-	}
-
-	@Override
-	public void onResume() {
-		super.onResume();
-
-		if (selectedContacts != null)
-			loadContacts(Collections.unmodifiableCollection(selectedContacts));
-		else loadContacts(null);
-	}
-
-	@Override
-	public void onSaveInstanceState(Bundle outState) {
-		if (adapter != null) {
-			selectedContacts = adapter.getSelectedContactIds();
-			outState.putIntegerArrayList(CONTACTS,
-					getContactsFromIds(selectedContacts));
-		}
-	}
-
-	@Override
-	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-		inflater.inflate(R.menu.forum_share_actions, menu);
-		super.onCreateOptionsMenu(menu, inflater);
-		this.menu = menu;
-		// hide sharing action initially, if no contact is selected
-		updateMenuItem();
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(final MenuItem item) {
-		// Handle presses on the action bar items
-		switch (item.getItemId()) {
-			case android.R.id.home:
-				shareForumActivity.onBackPressed();
-				return true;
-			case R.id.action_share_forum:
-				selectedContacts = adapter.getSelectedContactIds();
-				shareForumActivity.showMessageScreen(groupId, selectedContacts);
-				return true;
-			default:
-				return super.onOptionsItemSelected(item);
-		}
-	}
-
-	@Override
-	public String getUniqueTag() {
-		return TAG;
-	}
-
-	@Override
-	public void onItemClick(View view, ContactListItem item) {
-		((SelectableContactListItem) item).toggleSelected();
-		adapter.notifyItemChanged(adapter.findItemPosition(item), item);
-
-		updateMenuItem();
-	}
-
-	private void loadContacts(final Collection<ContactId> selection) {
-		shareForumActivity.runOnDbThread(new Runnable() {
-			@Override
-			public void run() {
-				try {
-					long now = System.currentTimeMillis();
-					List<ContactListItem> contacts = new ArrayList<>();
-
-					for (Contact c : contactManager.getActiveContacts()) {
-						LocalAuthor localAuthor = identityManager
-								.getLocalAuthor(c.getLocalAuthorId());
-						// was this contact already selected?
-						boolean selected = selection != null &&
-								selection.contains(c.getId());
-						// do we have already some sharing with that contact?
-						boolean disabled =
-								!forumSharingManager.canBeShared(groupId, c);
-						contacts.add(new SelectableContactListItem(c,
-								localAuthor, groupId, selected, disabled));
-					}
-					long duration = System.currentTimeMillis() - now;
-					if (LOG.isLoggable(INFO))
-						LOG.info("Load took " + duration + " ms");
-					displayContacts(Collections.unmodifiableList(contacts));
-				} catch (DbException e) {
-					displayContacts(Collections.<ContactListItem>emptyList());
-					if (LOG.isLoggable(WARNING))
-						LOG.log(WARNING, e.toString(), e);
-				}
-			}
-		});
-	}
-
-	private void displayContacts(final List<ContactListItem> contacts) {
-		shareForumActivity.runOnUiThread(new Runnable() {
-			@Override
-			public void run() {
-				if (!contacts.isEmpty()) adapter.addAll(contacts);
-				else list.showData();
-				updateMenuItem();
-			}
-		});
-	}
-
-	private void updateMenuItem() {
-		if (menu == null) return;
-		MenuItem item = menu.findItem(R.id.action_share_forum);
-		if (item == null) return;
-
-		selectedContacts = adapter.getSelectedContactIds();
-		if (selectedContacts.size() > 0) {
-			item.setVisible(true);
-		} else {
-			item.setVisible(false);
-		}
-	}
-}

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

@@ -33,6 +33,8 @@ import org.briarproject.android.ActivityComponent;
 import org.briarproject.android.BriarActivity;
 import org.briarproject.android.api.AndroidNotificationManager;
 import org.briarproject.android.controller.handler.UiResultHandler;
+import org.briarproject.android.sharing.ShareActivity;
+import org.briarproject.android.sharing.SharingStatusActivity;
 import org.briarproject.android.util.AndroidUtils;
 import org.briarproject.android.util.BriarRecyclerView;
 import org.briarproject.android.util.TrustIndicatorView;
@@ -57,6 +59,8 @@ import static android.view.View.GONE;
 import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
 import static android.widget.Toast.LENGTH_SHORT;
+import static org.briarproject.android.sharing.ShareActivity.FORUM;
+import static org.briarproject.android.sharing.ShareActivity.SHAREABLE;
 
 public class ForumActivity extends BriarActivity implements
 		ForumController.ForumPostListener {
@@ -220,15 +224,16 @@ public class ForumActivity extends BriarActivity implements
 				showTextInput(null);
 				return true;
 			case R.id.action_forum_share:
-				Intent i2 = new Intent(this, ShareForumActivity.class);
+				Intent i2 = new Intent(this, ShareActivity.class);
 				i2.setFlags(FLAG_ACTIVITY_CLEAR_TOP | FLAG_ACTIVITY_SINGLE_TOP);
 				i2.putExtra(GROUP_ID, groupId.getBytes());
+				i2.putExtra(SHAREABLE, FORUM);
 				ActivityCompat
 						.startActivityForResult(this, i2, REQUEST_FORUM_SHARED,
 								options.toBundle());
 				return true;
 			case R.id.action_forum_sharing_status:
-				Intent i3 = new Intent(this, ForumSharingStatusActivity.class);
+				Intent i3 = new Intent(this, SharingStatusActivity.class);
 				i3.setFlags(FLAG_ACTIVITY_CLEAR_TOP | FLAG_ACTIVITY_SINGLE_TOP);
 				i3.putExtra(GROUP_ID, groupId.getBytes());
 				ActivityCompat.startActivity(this, i3, options.toBundle());

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

@@ -1,169 +0,0 @@
-package org.briarproject.android.forum;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.view.MenuItem;
-
-import org.briarproject.R;
-import org.briarproject.android.ActivityComponent;
-import org.briarproject.android.BriarActivity;
-import org.briarproject.android.contact.ContactListItem;
-import org.briarproject.android.util.BriarRecyclerView;
-import org.briarproject.api.contact.Contact;
-import org.briarproject.api.db.DbException;
-import org.briarproject.api.forum.ForumSharingManager;
-import org.briarproject.api.identity.IdentityManager;
-import org.briarproject.api.identity.LocalAuthor;
-import org.briarproject.api.sync.GroupId;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.logging.Logger;
-
-import javax.inject.Inject;
-
-import static java.util.logging.Level.WARNING;
-
-public class ForumSharingStatusActivity extends BriarActivity {
-
-	private GroupId groupId;
-	private BriarRecyclerView sharedByList, sharedWithList;
-	private ForumSharingStatusAdapter sharedByAdapter, sharedWithAdapter;
-
-	// Fields that are accessed from background threads must be volatile
-	@Inject
-	protected volatile ForumSharingManager forumSharingManager;
-	@Inject
-	protected volatile IdentityManager identityManager;
-
-	public final static String TAG = "ForumSharingStatusActivity";
-	private static final Logger LOG = Logger.getLogger(TAG);
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-
-		setContentView(R.layout.activity_forum_sharing_status);
-
-		Intent i = getIntent();
-		byte[] b = i.getByteArrayExtra(GROUP_ID);
-		if (b == null) throw new IllegalStateException("No GroupId");
-		groupId = new GroupId(b);
-
-		sharedByList = (BriarRecyclerView) findViewById(R.id.sharedByView);
-		sharedByAdapter = new ForumSharingStatusAdapter(this);
-		sharedByList.setLayoutManager(new LinearLayoutManager(this));
-		sharedByList.setAdapter(sharedByAdapter);
-		sharedByList.setEmptyText(getString(R.string.nobody));
-
-		sharedWithList = (BriarRecyclerView) findViewById(R.id.sharedWithView);
-		sharedWithAdapter = new ForumSharingStatusAdapter(this);
-		sharedWithList.setLayoutManager(new LinearLayoutManager(this));
-		sharedWithList.setAdapter(sharedWithAdapter);
-		sharedWithList.setEmptyText(getString(R.string.nobody));
-	}
-
-	@Override
-	public void onResume() {
-		super.onResume();
-
-		loadSharedBy();
-		loadSharedWith();
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(final MenuItem item) {
-		// Handle presses on the action bar items
-		switch (item.getItemId()) {
-			case android.R.id.home:
-				onBackPressed();
-				return true;
-			default:
-				return super.onOptionsItemSelected(item);
-		}
-	}
-
-	@Override
-	public void injectActivity(ActivityComponent component) {
-		component.inject(this);
-	}
-
-	private void loadSharedBy() {
-		dbController.runOnDbThread(new Runnable() {
-			@Override
-			public void run() {
-				List<ContactListItem> contactItems = new ArrayList<>();
-				try {
-					Collection<Contact> contacts =
-							forumSharingManager.getSharedBy(groupId);
-					for (Contact c : contacts) {
-						LocalAuthor localAuthor = identityManager
-								.getLocalAuthor(c.getLocalAuthorId());
-						ContactListItem item =
-								new ContactListItem(c, localAuthor, false, null,
-										null);
-						contactItems.add(item);
-					}
-				} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
-						LOG.log(WARNING, e.toString(), e);
-				}
-				displaySharedBy(contactItems);
-			}
-		});
-	}
-
-	private void displaySharedBy(final List<ContactListItem> contacts) {
-		runOnUiThread(new Runnable() {
-			@Override
-			public void run() {
-				if (contacts.isEmpty()) {
-					sharedByList.showData();
-				} else {
-					sharedByAdapter.addAll(contacts);
-				}
-			}
-		});
-	}
-
-	private void loadSharedWith() {
-		dbController.runOnDbThread(new Runnable() {
-			@Override
-			public void run() {
-				List<ContactListItem> contactItems = new ArrayList<>();
-				try {
-					Collection<Contact> contacts =
-							forumSharingManager.getSharedWith(groupId);
-					for (Contact c : contacts) {
-						LocalAuthor localAuthor = identityManager
-								.getLocalAuthor(c.getLocalAuthorId());
-						ContactListItem item =
-								new ContactListItem(c, localAuthor, false, null,
-										null);
-						contactItems.add(item);
-					}
-				} catch (DbException e) {
-					if (LOG.isLoggable(WARNING))
-						LOG.log(WARNING, e.toString(), e);
-				}
-				displaySharedWith(contactItems);
-			}
-		});
-	}
-
-	private void displaySharedWith(final List<ContactListItem> contacts) {
-		runOnUiThread(new Runnable() {
-			@Override
-			public void run() {
-				if (contacts.isEmpty()) {
-					sharedWithList.showData();
-				} else {
-					sharedWithAdapter.addAll(contacts);
-				}
-			}
-		});
-	}
-
-}

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

@@ -1,36 +0,0 @@
-package org.briarproject.android.forum;
-
-import android.content.Context;
-import android.support.v4.content.ContextCompat;
-import android.text.format.DateUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import org.briarproject.R;
-import org.briarproject.android.contact.BaseContactListAdapter;
-import org.briarproject.android.contact.ContactListItem;
-
-public class ForumSharingStatusAdapter
-		extends BaseContactListAdapter<BaseContactListAdapter.BaseContactHolder> {
-
-	public ForumSharingStatusAdapter(Context context) {
-		super(context, null);
-	}
-
-	@Override
-	public BaseContactHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
-		View v = LayoutInflater.from(viewGroup.getContext()).inflate(
-				R.layout.list_item_contact_small, viewGroup, false);
-
-		return new BaseContactHolder(v);
-	}
-
-	@Override
-	public int compareContactListItems(ContactListItem c1, ContactListItem c2) {
-		return compareByName(c1, c2);
-	}
-
-}

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

@@ -1,41 +0,0 @@
-package org.briarproject.android.forum;
-
-import org.briarproject.android.contact.ContactListItem;
-import org.briarproject.android.contact.ConversationItem;
-import org.briarproject.api.contact.Contact;
-import org.briarproject.api.identity.LocalAuthor;
-import org.briarproject.api.sync.GroupId;
-
-import java.util.Collections;
-
-// This class is not thread-safe
-public class SelectableContactListItem extends ContactListItem {
-
-	private boolean selected, disabled;
-
-	public SelectableContactListItem(Contact contact, LocalAuthor localAuthor,
-			GroupId groupId, boolean selected, boolean disabled) {
-
-		super(contact, localAuthor, false, groupId,
-				Collections.<ConversationItem>emptyList());
-
-		this.selected = selected;
-		this.disabled = disabled;
-	}
-
-	public void setSelected(boolean selected) {
-		this.selected = selected;
-	}
-
-	public boolean isSelected() {
-		return selected;
-	}
-
-	public void toggleSelected() {
-		selected = !selected;
-	}
-
-	public boolean isDisabled() {
-		return disabled;
-	}
-}

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

@@ -1,109 +0,0 @@
-package org.briarproject.android.forum;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-
-import org.briarproject.R;
-import org.briarproject.android.ActivityComponent;
-import org.briarproject.android.BriarActivity;
-import org.briarproject.android.fragment.BaseFragment;
-import org.briarproject.api.contact.ContactId;
-import org.briarproject.api.sync.GroupId;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-// TODO extend the BriarFragmentActivity ?
-public class ShareForumActivity extends BriarActivity implements
-		BaseFragment.BaseFragmentListener {
-
-	public final static String CONTACTS = "contacts";
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-
-		setContentView(R.layout.activity_share_forum);
-
-		Intent i = getIntent();
-		byte[] b = i.getByteArrayExtra(GROUP_ID);
-		if (b == null) throw new IllegalStateException("No GroupId");
-		GroupId groupId = new GroupId(b);
-
-		if (savedInstanceState == null) {
-			ContactSelectorFragment contactSelectorFragment =
-					ContactSelectorFragment.newInstance(groupId);
-			getSupportFragmentManager().beginTransaction()
-					.add(R.id.shareForumContainer, contactSelectorFragment)
-					.commit();
-		}
-	}
-
-	@Override
-	public void injectActivity(ActivityComponent component) {
-		component.inject(this);
-	}
-
-	public void showMessageScreen(GroupId groupId,
-			Collection<ContactId> contacts) {
-
-		ShareForumMessageFragment messageFragment =
-				ShareForumMessageFragment.newInstance(groupId, contacts);
-
-		getSupportFragmentManager().beginTransaction()
-				.setCustomAnimations(android.R.anim.fade_in,
-						android.R.anim.fade_out,
-						android.R.anim.slide_in_left,
-						android.R.anim.slide_out_right)
-				.replace(R.id.shareForumContainer, messageFragment,
-						ContactSelectorFragment.TAG)
-				.addToBackStack(null)
-				.commit();
-	}
-
-	public static ArrayList<Integer> getContactsFromIds(
-			Collection<ContactId> contacts) {
-
-		// transform ContactIds to Integers so they can be added to a bundle
-		ArrayList<Integer> intContacts = new ArrayList<>(contacts.size());
-		for (ContactId contactId : contacts) {
-			intContacts.add(contactId.getInt());
-		}
-		return intContacts;
-	}
-
-	public void sharingSuccessful(View v) {
-		setResult(RESULT_OK);
-		hideSoftKeyboard(v);
-		supportFinishAfterTransition();
-	}
-
-	protected static Collection<ContactId> getContactsFromIntegers(
-			ArrayList<Integer> intContacts) {
-
-		// turn contact integers from a bundle back to ContactIds
-		List<ContactId> contacts = new ArrayList<>(intContacts.size());
-		for (Integer c : intContacts) {
-			contacts.add(new ContactId(c));
-		}
-		return contacts;
-	}
-
-	@Override
-	public void showLoadingScreen(boolean isBlocking, int stringId) {
-		// this is handled by the recycler view in ContactSelectorFragment
-	}
-
-	@Override
-	public void hideLoadingScreen() {
-		// this is handled by the recycler view in ContactSelectorFragment
-	}
-
-	@Override
-	public void onFragmentCreated(String tag) {
-
-	}
-
-}

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

@@ -1,174 +0,0 @@
-package org.briarproject.android.forum;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.support.v7.app.ActionBar;
-import android.view.LayoutInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.Toast;
-
-import org.briarproject.R;
-import org.briarproject.android.ActivityComponent;
-import org.briarproject.android.fragment.BaseFragment;
-import org.briarproject.api.contact.ContactId;
-import org.briarproject.api.db.DbException;
-import org.briarproject.api.forum.ForumSharingManager;
-import org.briarproject.api.sync.GroupId;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.logging.Logger;
-
-import javax.inject.Inject;
-
-import static android.widget.Toast.LENGTH_SHORT;
-import static java.util.logging.Level.WARNING;
-import static org.briarproject.android.forum.ShareForumActivity.CONTACTS;
-import static org.briarproject.android.forum.ShareForumActivity.getContactsFromIds;
-import static org.briarproject.api.sharing.SharingConstants.GROUP_ID;
-
-public class ShareForumMessageFragment extends BaseFragment {
-
-	public final static String TAG = "IntroductionMessageFragment";
-
-	private static final Logger LOG =
-			Logger.getLogger(ShareForumMessageFragment.class.getName());
-
-	private ShareForumActivity shareForumActivity;
-	private ViewHolder ui;
-
-	// Fields that are accessed from background threads must be volatile
-	@Inject
-	protected volatile ForumSharingManager forumSharingManager;
-	private volatile GroupId groupId;
-	private volatile Collection<ContactId> contacts;
-
-	public static ShareForumMessageFragment newInstance(GroupId groupId, Collection<ContactId> contacts) {
-		Bundle args = new Bundle();
-		args.putByteArray(GROUP_ID, groupId.getBytes());
-		args.putIntegerArrayList(CONTACTS, getContactsFromIds(contacts));
-		ShareForumMessageFragment fragment = new ShareForumMessageFragment();
-		fragment.setArguments(args);
-		return fragment;
-	}
-
-	@Override
-	public void onAttach(Context context) {
-		super.onAttach(context);
-		try {
-			shareForumActivity = (ShareForumActivity) context;
-		} catch (ClassCastException e) {
-			throw new InstantiationError(
-					"This fragment is only meant to be attached to the ShareForumActivity");
-		}
-	}
-
-	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container,
-			Bundle savedInstanceState) {
-
-		// change toolbar text
-		ActionBar actionBar = shareForumActivity.getSupportActionBar();
-		if (actionBar != null) {
-			actionBar.setTitle(R.string.forum_share_button);
-		}
-
-		// allow for home button to act as back button
-		setHasOptionsMenu(true);
-
-		// inflate view
-		View v = inflater.inflate(R.layout.share_forum_message, container,
-				false);
-		ui = new ViewHolder(v);
-		ui.button.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				onButtonClick();
-			}
-		});
-
-		// get groupID and contactIDs from fragment arguments
-		groupId = new GroupId(getArguments().getByteArray(GROUP_ID));
-		ArrayList<Integer> intContacts =
-				getArguments().getIntegerArrayList(CONTACTS);
-		if (intContacts == null) throw new IllegalArgumentException();
-		contacts = ShareForumActivity.getContactsFromIntegers(intContacts);
-
-		return v;
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(final MenuItem item) {
-		switch (item.getItemId()) {
-			case android.R.id.home:
-				shareForumActivity.onBackPressed();
-				return true;
-			default:
-				return super.onOptionsItemSelected(item);
-		}
-	}
-
-	@Override
-	public String getUniqueTag() {
-		return TAG;
-	}
-
-	@Override
-	public void injectFragment(ActivityComponent component) {
-		component.inject(this);
-	}
-
-	public void onButtonClick() {
-		// disable button to prevent accidental double invitations
-		ui.button.setEnabled(false);
-
-		String msg = ui.message.getText().toString();
-		shareForum(msg);
-
-		// don't wait for the introduction to be made before finishing activity
-		shareForumActivity.sharingSuccessful(ui.message);
-	}
-
-	private void shareForum(final String msg) {
-		shareForumActivity.runOnDbThread(new Runnable() {
-			@Override
-			public void run() {
-				try {
-					for (ContactId c : contacts) {
-						forumSharingManager.sendInvitation(groupId, c,
-								msg);
-					}
-				} catch (DbException e) {
-					sharingError();
-					if (LOG.isLoggable(WARNING))
-						LOG.log(WARNING, e.toString(), e);
-				}
-			}
-		});
-	}
-
-	private void sharingError() {
-		shareForumActivity.runOnUiThread(new Runnable() {
-			@Override
-			public void run() {
-				Toast.makeText(shareForumActivity,
-						R.string.introduction_error, LENGTH_SHORT).show();
-			}
-		});
-	}
-
-	private static class ViewHolder {
-
-		private final EditText message;
-		private final Button button;
-
-		ViewHolder(View v) {
-			message = (EditText) v.findViewById(R.id.invitationMessageView);
-			button = (Button) v.findViewById(R.id.shareForumButton);
-		}
-	}
-}