New design for second user testing

bramble-android/src/main/java/org/briarproject/bramble/battery/AndroidBatteryManager.java

@@ -19,7 +19,9 @@ import javax.inject.Inject;
 import static android.content.Intent.ACTION_BATTERY_CHANGED;
 import static android.content.Intent.ACTION_POWER_CONNECTED;
 import static android.content.Intent.ACTION_POWER_DISCONNECTED;
-import static android.os.BatteryManager.EXTRA_PLUGGED;
+import static android.os.BatteryManager.BATTERY_STATUS_CHARGING;
+import static android.os.BatteryManager.BATTERY_STATUS_FULL;
+import static android.os.BatteryManager.EXTRA_STATUS;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Logger.getLogger;
 
@@ -46,8 +48,9 @@ class AndroidBatteryManager implements BatteryManager, Service {
 		IntentFilter filter = new IntentFilter(ACTION_BATTERY_CHANGED);
 		Intent i = appContext.registerReceiver(null, filter);
 		if (i == null) return false;
-		int status = i.getIntExtra(EXTRA_PLUGGED, 0);
-		return status != 0;
+		int status = i.getIntExtra(EXTRA_STATUS, -1);
+		return status == BATTERY_STATUS_CHARGING ||
+				status == BATTERY_STATUS_FULL;
 	}
 
 	@Override

bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TorConstants.java

@@ -16,7 +16,6 @@ public interface TorConstants {
 	String PREF_TOR_NETWORK = "network2";
 	String PREF_TOR_PORT = "port";
 	String PREF_TOR_MOBILE = "useMobileData";
-	String PREF_TOR_ONLY_WHEN_CHARGING = "onlyWhenCharging";
 
 	int PREF_TOR_NETWORK_AUTOMATIC = 0;
 	int PREF_TOR_NETWORK_WITHOUT_BRIDGES = 1;

bramble-api/src/main/java/org/briarproject/bramble/api/versioning/ClientVersioningManager.java

@@ -38,13 +38,6 @@ public interface ClientVersioningManager {
 	Visibility getClientVisibility(Transaction txn, ContactId contactId,
 			ClientId clientId, int majorVersion) throws DbException;
 
-	/**
-	 * Returns the minor version of the given client that is supported by the
-	 * given contact, or -1 if the contact does not support the client.
-	 */
-	int getClientMinorVersion(Transaction txn, ContactId contactId,
-			ClientId clientId, int majorVersion) throws DbException;
-
 	interface ClientVersioningHook {
 
 		void onClientVisibilityChanging(Transaction txn, Contact c,

bramble-api/src/main/java/org/briarproject/bramble/util/StringUtils.java

@@ -153,4 +153,15 @@ public class StringUtils {
 		return new String(c);
 	}
 
+
+	public static String getRandomBase32String(int length) {
+		char[] c = new char[length];
+		for (int i = 0; i < length; i++) {
+			int character = random.nextInt(32);
+			if (character < 26) c[i] = (char) ('a' + character);
+			else c[i] = (char) ('2' + (character - 26));
+		}
+		return new String(c);
+	}
+
 }

bramble-core/src/main/java/org/briarproject/bramble/PriorityExecutor.java

@@ -1,67 +0,0 @@
-package org.briarproject.bramble;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.util.LinkedList;
-import java.util.Queue;
-import java.util.concurrent.Executor;
-
-import javax.annotation.concurrent.GuardedBy;
-
-@NotNullByDefault
-public class PriorityExecutor {
-
-	private final Object lock = new Object();
-	private final Executor delegate, high, low;
-	@GuardedBy("lock")
-	private final Queue<Runnable> highQueue = new LinkedList<>();
-	@GuardedBy("lock")
-	private final Queue<Runnable> lowQueue = new LinkedList<>();
-
-	@GuardedBy("lock")
-	private boolean isTaskRunning = false;
-
-	public PriorityExecutor(Executor delegate) {
-		this.delegate = delegate;
-		high = r -> submit(r, true);
-		low = r -> submit(r, false);
-	}
-
-	public Executor getHighPriorityExecutor() {
-		return high;
-	}
-
-	public Executor getLowPriorityExecutor() {
-		return low;
-	}
-
-	private void submit(Runnable r, boolean isHighPriority) {
-		Runnable wrapped = () -> {
-			try {
-				r.run();
-			} finally {
-				scheduleNext();
-			}
-		};
-		synchronized (lock) {
-			if (!isTaskRunning && highQueue.isEmpty() &&
-					(isHighPriority || lowQueue.isEmpty())) {
-				isTaskRunning = true;
-				delegate.execute(wrapped);
-			} else if (isHighPriority) {
-				highQueue.add(wrapped);
-			} else {
-				lowQueue.add(wrapped);
-			}
-		}
-	}
-
-	private void scheduleNext() {
-		synchronized (lock) {
-			Runnable next = highQueue.poll();
-			if (next == null) next = lowQueue.poll();
-			if (next == null) isTaskRunning = false;
-			else delegate.execute(next);
-		}
-	}
-}

bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java

@@ -69,7 +69,6 @@ import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_AUTOMATIC;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_NEVER;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_WITH_BRIDGES;
-import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_ONLY_WHEN_CHARGING;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_PORT;
 import static org.briarproject.bramble.api.plugin.TorConstants.PROP_ONION_V2;
 import static org.briarproject.bramble.api.plugin.TorConstants.PROP_ONION_V3;
@@ -649,10 +648,8 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			if (s.getNamespace().equals(ID.getString())) {
 				LOG.info("Tor settings updated");
 				settings = s.getSettings();
-				// Works around a bug introduced in Tor 0.3.4.8.
-				// https://trac.torproject.org/projects/tor/ticket/28027
-				// Could be replaced with callback.transportDisabled()
-				// when fixed.
+				// Works around a bug introduced in Tor 0.3.4.8. Could be
+				// replaced with callback.transportDisabled() when fixed.
 				disableNetwork();
 				updateConnectionStatus(networkManager.getNetworkStatus(),
 						batteryManager.isCharging());
@@ -688,8 +685,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			int network = settings.getInt(PREF_TOR_NETWORK,
 					PREF_TOR_NETWORK_AUTOMATIC);
 			boolean useMobile = settings.getBoolean(PREF_TOR_MOBILE, true);
-			boolean onlyWhenCharging =
-					settings.getBoolean(PREF_TOR_ONLY_WHEN_CHARGING, false);
 			boolean bridgesWork = circumventionProvider.doBridgesWork(country);
 			boolean automatic = network == PREF_TOR_NETWORK_AUTOMATIC;
 
@@ -704,12 +699,9 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 				if (!online) {
 					LOG.info("Disabling network, device is offline");
 					enableNetwork(false);
-				} else if (!charging && onlyWhenCharging) {
-					LOG.info("Disabling network, device is on battery");
-					enableNetwork(false);
 				} else if (network == PREF_TOR_NETWORK_NEVER ||
 						(!useMobile && !wifi)) {
-					LOG.info("Disabling network, device is using mobile data");
+					LOG.info("Disabling network due to setting");
 					enableNetwork(false);
 				} else if (automatic && blocked && !bridgesWork) {
 					LOG.info("Disabling network, country is blocked");

bramble-core/src/main/java/org/briarproject/bramble/versioning/ClientVersioningManagerImpl.java

@@ -89,9 +89,14 @@ class ClientVersioningManagerImpl implements ClientVersioningManager, Client,
 	public Visibility getClientVisibility(Transaction txn, ContactId contactId,
 			ClientId clientId, int majorVersion) throws DbException {
 		try {
-			LatestUpdates latest = findLatestUpdates(txn, contactId);
-			if (latest == null || latest.remote == null) return INVISIBLE;
+			Contact contact = db.getContact(txn, contactId);
+			Group g = getContactGroup(contact);
+			// Contact may be in the process of being added or removed, so
+			// contact group may not exist
+			if (!db.containsGroup(txn, g.getId())) return INVISIBLE;
+			LatestUpdates latest = findLatestUpdates(txn, g.getId());
 			if (latest.local == null) throw new DbException();
+			if (latest.remote == null) return INVISIBLE;
 			Update localUpdate = loadUpdate(txn, latest.local.messageId);
 			Update remoteUpdate = loadUpdate(txn, latest.remote.messageId);
 			Map<ClientMajorVersion, Visibility> visibilities =
@@ -105,24 +110,6 @@ class ClientVersioningManagerImpl implements ClientVersioningManager, Client,
 		}
 	}
 
-	@Override
-	public int getClientMinorVersion(Transaction txn, ContactId contactId,
-			ClientId clientId, int majorVersion) throws DbException {
-		try {
-			LatestUpdates latest = findLatestUpdates(txn, contactId);
-			if (latest == null || latest.remote == null) return -1;
-			Update remoteUpdate = loadUpdate(txn, latest.remote.messageId);
-			ClientMajorVersion cv =
-					new ClientMajorVersion(clientId, majorVersion);
-			for (ClientState remote : remoteUpdate.states) {
-				if (remote.majorVersion.equals(cv)) return remote.minorVersion;
-			}
-			return -1;
-		} catch (FormatException e) {
-			throw new DbException(e);
-		}
-	}
-
 	@Override
 	public void createLocalState(Transaction txn) throws DbException {
 		if (db.containsGroup(txn, localGroup.getId())) return;
@@ -349,17 +336,6 @@ class ClientVersioningManagerImpl implements ClientVersioningManager, Client,
 				MAJOR_VERSION, c);
 	}
 
-	@Nullable
-	private LatestUpdates findLatestUpdates(Transaction txn, ContactId c)
-			throws DbException, FormatException {
-		Contact contact = db.getContact(txn, c);
-		Group g = getContactGroup(contact);
-		// Contact may be in the process of being added or removed, so
-		// contact group may not exist
-		if (!db.containsGroup(txn, g.getId())) return null;
-		return findLatestUpdates(txn, g.getId());
-	}
-
 	private LatestUpdates findLatestUpdates(Transaction txn, GroupId g)
 			throws DbException, FormatException {
 		Map<MessageId, BdfDictionary> metadata =

bramble-core/src/test/java/org/briarproject/bramble/PriorityExecutorTest.java

@@ -1,86 +0,0 @@
-package org.briarproject.bramble;
-
-import org.briarproject.bramble.test.BrambleTestCase;
-import org.junit.Test;
-
-import java.util.List;
-import java.util.Vector;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Executor;
-
-import static java.util.Arrays.asList;
-import static java.util.concurrent.Executors.newSingleThreadExecutor;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-public class PriorityExecutorTest extends BrambleTestCase {
-
-	@Test
-	public void testHighPriorityTasksAreDelegatedInOrderOfSubmission()
-			throws Exception {
-		Executor delegate = newSingleThreadExecutor();
-		PriorityExecutor priority = new PriorityExecutor(delegate);
-		Executor high = priority.getHighPriorityExecutor();
-		testTasksAreDelegatedInOrderOfSubmission(high);
-	}
-
-	@Test
-	public void testLowPriorityTasksAreDelegatedInOrderOfSubmission()
-			throws Exception {
-		Executor delegate = newSingleThreadExecutor();
-		PriorityExecutor priority = new PriorityExecutor(delegate);
-		Executor low = priority.getLowPriorityExecutor();
-		testTasksAreDelegatedInOrderOfSubmission(low);
-	}
-
-	@Test
-	public void testHighPriorityTasksAreRunFirst() throws Exception {
-		Executor delegate = newSingleThreadExecutor();
-		PriorityExecutor priority = new PriorityExecutor(delegate);
-		Executor high = priority.getHighPriorityExecutor();
-		Executor low = priority.getLowPriorityExecutor();
-		// Submit a task that will block, causing other tasks to be queued
-		CountDownLatch cork = new CountDownLatch(1);
-		low.execute(() -> {
-			try {
-				cork.await();
-			} catch (InterruptedException e) {
-				fail();
-			}
-		});
-		// Submit alternating tasks to the high and low priority executors
-		List<Integer> results = new Vector<>();
-		CountDownLatch tasksFinished = new CountDownLatch(10);
-		for (int i = 0; i < 10; i++) {
-			int result = i;
-			Runnable task = () -> {
-				results.add(result);
-				tasksFinished.countDown();
-			};
-			if (i % 2 == 0) high.execute(task);
-			else low.execute(task);
-		}
-		// Release the cork and wait for all tasks to finish
-		cork.countDown();
-		tasksFinished.await();
-		// The high-priority tasks should have run before the low-priority tasks
-		assertEquals(asList(0, 2, 4, 6, 8, 1, 3, 5, 7, 9), results);
-	}
-
-	private void testTasksAreDelegatedInOrderOfSubmission(Executor e)
-			throws Exception {
-		List<Integer> results = new Vector<>();
-		CountDownLatch tasksFinished = new CountDownLatch(10);
-		for (int i = 0; i < 10; i++) {
-			int result = i;
-			e.execute(() -> {
-				results.add(result);
-				tasksFinished.countDown();
-			});
-		}
-		// Wait for all the tasks to finish
-		tasksFinished.await();
-		// The tasks should have run in the order they were submitted
-		assertEquals(asList(0, 1, 2, 3, 4, 5, 6, 7, 8, 9), results);
-	}
-}

bramble-core/src/test/java/org/briarproject/bramble/versioning/ClientVersioningManagerImplTest.java

@@ -8,7 +8,6 @@ import org.briarproject.bramble.api.data.BdfDictionary;
 import org.briarproject.bramble.api.data.BdfEntry;
 import org.briarproject.bramble.api.data.BdfList;
 import org.briarproject.bramble.api.db.DatabaseComponent;
-import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Metadata;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.sync.ClientId;
@@ -44,7 +43,6 @@ import static org.briarproject.bramble.util.StringUtils.getRandomString;
 import static org.briarproject.bramble.versioning.ClientVersioningConstants.GROUP_KEY_CONTACT_ID;
 import static org.briarproject.bramble.versioning.ClientVersioningConstants.MSG_KEY_LOCAL;
 import static org.briarproject.bramble.versioning.ClientVersioningConstants.MSG_KEY_UPDATE_VERSION;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
 public class ClientVersioningManagerImplTest extends BrambleMockTestCase {
@@ -659,327 +657,4 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase {
 		c.registerClient(clientId, 123, 234, hook);
 		assertFalse(c.incomingMessage(txn, newRemoteUpdate, new Metadata()));
 	}
-
-	@Test
-	public void testReturnsInvisibleIfContactGroupDoesNotExist()
-			throws Exception {
-		expectGetContactGroup(false);
-
-		ClientVersioningManagerImpl c = createInstance();
-		assertEquals(INVISIBLE, c.getClientVisibility(txn, contact.getId(),
-				clientId, 123));
-	}
-
-	@Test
-	public void testReturnsInvisibleIfNoRemoteUpdateExists() throws Exception {
-		MessageId localUpdateId = new MessageId(getRandomId());
-		BdfDictionary localUpdateMeta = BdfDictionary.of(
-				new BdfEntry(MSG_KEY_UPDATE_VERSION, 1L),
-				new BdfEntry(MSG_KEY_LOCAL, true));
-
-		expectGetContactGroup(true);
-		context.checking(new Expectations() {{
-			oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
-					contactGroup.getId());
-			will(returnValue(singletonMap(localUpdateId, localUpdateMeta)));
-		}});
-
-		ClientVersioningManagerImpl c = createInstance();
-		assertEquals(INVISIBLE, c.getClientVisibility(txn, contact.getId(),
-				clientId, 123));
-	}
-
-	@Test(expected = DbException.class)
-	public void testThrowsExceptionIfNoLocalUpdateExists() throws Exception {
-		MessageId remoteUpdateId = new MessageId(getRandomId());
-		BdfDictionary remoteUpdateMeta = BdfDictionary.of(
-				new BdfEntry(MSG_KEY_UPDATE_VERSION, 1L),
-				new BdfEntry(MSG_KEY_LOCAL, false));
-
-		expectGetContactGroup(true);
-		context.checking(new Expectations() {{
-			oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
-					contactGroup.getId());
-			will(returnValue(singletonMap(remoteUpdateId, remoteUpdateMeta)));
-		}});
-
-		ClientVersioningManagerImpl c = createInstance();
-		c.getClientVisibility(txn, contact.getId(), clientId, 123);
-	}
-
-	@Test
-	public void testReturnsInvisibleIfClientNotSupportedLocally()
-			throws Exception {
-		MessageId localUpdateId = new MessageId(getRandomId());
-		BdfDictionary localUpdateMeta = BdfDictionary.of(
-				new BdfEntry(MSG_KEY_UPDATE_VERSION, 1L),
-				new BdfEntry(MSG_KEY_LOCAL, true));
-		MessageId remoteUpdateId = new MessageId(getRandomId());
-		BdfDictionary remoteUpdateMeta = BdfDictionary.of(
-				new BdfEntry(MSG_KEY_UPDATE_VERSION, 1L),
-				new BdfEntry(MSG_KEY_LOCAL, false));
-		Map<MessageId, BdfDictionary> messageMetadata = new HashMap<>();
-		messageMetadata.put(localUpdateId, localUpdateMeta);
-		messageMetadata.put(remoteUpdateId, remoteUpdateMeta);
-		// The client is supported remotely but not locally
-		BdfList localUpdateBody = BdfList.of(new BdfList(), 1L);
-		BdfList remoteUpdateBody = BdfList.of(BdfList.of(
-				BdfList.of(clientId.getString(), 123, 234, false)), 1L);
-
-		expectGetContactGroup(true);
-		context.checking(new Expectations() {{
-			oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
-					contactGroup.getId());
-			will(returnValue(messageMetadata));
-			oneOf(clientHelper).getMessageAsList(txn, localUpdateId);
-			will(returnValue(localUpdateBody));
-			oneOf(clientHelper).getMessageAsList(txn, remoteUpdateId);
-			will(returnValue(remoteUpdateBody));
-		}});
-
-		ClientVersioningManagerImpl c = createInstance();
-		assertEquals(INVISIBLE, c.getClientVisibility(txn, contact.getId(),
-				clientId, 123));
-	}
-
-	@Test
-	public void testReturnsInvisibleIfClientNotSupportedRemotely()
-			throws Exception {
-		MessageId localUpdateId = new MessageId(getRandomId());
-		BdfDictionary localUpdateMeta = BdfDictionary.of(
-				new BdfEntry(MSG_KEY_UPDATE_VERSION, 1L),
-				new BdfEntry(MSG_KEY_LOCAL, true));
-		MessageId remoteUpdateId = new MessageId(getRandomId());
-		BdfDictionary remoteUpdateMeta = BdfDictionary.of(
-				new BdfEntry(MSG_KEY_UPDATE_VERSION, 1L),
-				new BdfEntry(MSG_KEY_LOCAL, false));
-		Map<MessageId, BdfDictionary> messageMetadata = new HashMap<>();
-		messageMetadata.put(localUpdateId, localUpdateMeta);
-		messageMetadata.put(remoteUpdateId, remoteUpdateMeta);
-		// The client is supported locally but not remotely
-		BdfList localUpdateBody = BdfList.of(BdfList.of(
-				BdfList.of(clientId.getString(), 123, 234, false)), 1L);
-		BdfList remoteUpdateBody = BdfList.of(new BdfList(), 1L);
-
-		expectGetContactGroup(true);
-		context.checking(new Expectations() {{
-			oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
-					contactGroup.getId());
-			will(returnValue(messageMetadata));
-			oneOf(clientHelper).getMessageAsList(txn, localUpdateId);
-			will(returnValue(localUpdateBody));
-			oneOf(clientHelper).getMessageAsList(txn, remoteUpdateId);
-			will(returnValue(remoteUpdateBody));
-		}});
-
-		ClientVersioningManagerImpl c = createInstance();
-		assertEquals(INVISIBLE, c.getClientVisibility(txn, contact.getId(),
-				clientId, 123));
-	}
-
-	@Test
-	public void testReturnsVisibleIfClientNotActiveRemotely() throws Exception {
-		MessageId localUpdateId = new MessageId(getRandomId());
-		BdfDictionary localUpdateMeta = BdfDictionary.of(
-				new BdfEntry(MSG_KEY_UPDATE_VERSION, 1L),
-				new BdfEntry(MSG_KEY_LOCAL, true));
-		MessageId remoteUpdateId = new MessageId(getRandomId());
-		BdfDictionary remoteUpdateMeta = BdfDictionary.of(
-				new BdfEntry(MSG_KEY_UPDATE_VERSION, 1L),
-				new BdfEntry(MSG_KEY_LOCAL, false));
-		Map<MessageId, BdfDictionary> messageMetadata = new HashMap<>();
-		messageMetadata.put(localUpdateId, localUpdateMeta);
-		messageMetadata.put(remoteUpdateId, remoteUpdateMeta);
-		// The client is supported locally and remotely but not active
-		BdfList localUpdateBody = BdfList.of(BdfList.of(
-				BdfList.of(clientId.getString(), 123, 234, false)), 1L);
-		BdfList remoteUpdateBody = BdfList.of(BdfList.of(
-				BdfList.of(clientId.getString(), 123, 234, false)), 1L);
-
-		expectGetContactGroup(true);
-		context.checking(new Expectations() {{
-			oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
-					contactGroup.getId());
-			will(returnValue(messageMetadata));
-			oneOf(clientHelper).getMessageAsList(txn, localUpdateId);
-			will(returnValue(localUpdateBody));
-			oneOf(clientHelper).getMessageAsList(txn, remoteUpdateId);
-			will(returnValue(remoteUpdateBody));
-		}});
-
-		ClientVersioningManagerImpl c = createInstance();
-		assertEquals(VISIBLE, c.getClientVisibility(txn, contact.getId(),
-				clientId, 123));
-	}
-
-	@Test
-	public void testReturnsSharedIfClientActiveRemotely() throws Exception {
-		MessageId localUpdateId = new MessageId(getRandomId());
-		BdfDictionary localUpdateMeta = BdfDictionary.of(
-				new BdfEntry(MSG_KEY_UPDATE_VERSION, 1L),
-				new BdfEntry(MSG_KEY_LOCAL, true));
-		MessageId remoteUpdateId = new MessageId(getRandomId());
-		BdfDictionary remoteUpdateMeta = BdfDictionary.of(
-				new BdfEntry(MSG_KEY_UPDATE_VERSION, 1L),
-				new BdfEntry(MSG_KEY_LOCAL, false));
-		Map<MessageId, BdfDictionary> messageMetadata = new HashMap<>();
-		messageMetadata.put(localUpdateId, localUpdateMeta);
-		messageMetadata.put(remoteUpdateId, remoteUpdateMeta);
-		// The client is supported locally and remotely and active
-		BdfList localUpdateBody = BdfList.of(BdfList.of(
-				BdfList.of(clientId.getString(), 123, 234, true)), 1L);
-		BdfList remoteUpdateBody = BdfList.of(BdfList.of(
-				BdfList.of(clientId.getString(), 123, 234, true)), 1L);
-
-		expectGetContactGroup(true);
-		context.checking(new Expectations() {{
-			oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
-					contactGroup.getId());
-			will(returnValue(messageMetadata));
-			oneOf(clientHelper).getMessageAsList(txn, localUpdateId);
-			will(returnValue(localUpdateBody));
-			oneOf(clientHelper).getMessageAsList(txn, remoteUpdateId);
-			will(returnValue(remoteUpdateBody));
-		}});
-
-		ClientVersioningManagerImpl c = createInstance();
-		assertEquals(SHARED, c.getClientVisibility(txn, contact.getId(),
-				clientId, 123));
-	}
-
-	@Test
-	public void testReturnsNegativeIfContactGroupDoesNotExist()
-			throws Exception {
-		expectGetContactGroup(false);
-
-		ClientVersioningManagerImpl c = createInstance();
-		assertEquals(-1, c.getClientMinorVersion(txn, contact.getId(),
-				clientId, 123));
-	}
-
-	@Test
-	public void testReturnsNegativeIfNoRemoteUpdateExists() throws Exception {
-		MessageId localUpdateId = new MessageId(getRandomId());
-		BdfDictionary localUpdateMeta = BdfDictionary.of(
-				new BdfEntry(MSG_KEY_UPDATE_VERSION, 1L),
-				new BdfEntry(MSG_KEY_LOCAL, true));
-
-		expectGetContactGroup(true);
-		context.checking(new Expectations() {{
-			oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
-					contactGroup.getId());
-			will(returnValue(singletonMap(localUpdateId, localUpdateMeta)));
-		}});
-
-		ClientVersioningManagerImpl c = createInstance();
-		assertEquals(-1, c.getClientMinorVersion(txn, contact.getId(),
-				clientId, 123));
-	}
-
-	@Test
-	public void testReturnsNegativeIfClientNotSupportedRemotely()
-			throws Exception {
-		MessageId localUpdateId = new MessageId(getRandomId());
-		BdfDictionary localUpdateMeta = BdfDictionary.of(
-				new BdfEntry(MSG_KEY_UPDATE_VERSION, 1L),
-				new BdfEntry(MSG_KEY_LOCAL, true));
-		MessageId remoteUpdateId = new MessageId(getRandomId());
-		BdfDictionary remoteUpdateMeta = BdfDictionary.of(
-				new BdfEntry(MSG_KEY_UPDATE_VERSION, 1L),
-				new BdfEntry(MSG_KEY_LOCAL, false));
-		Map<MessageId, BdfDictionary> messageMetadata = new HashMap<>();
-		messageMetadata.put(localUpdateId, localUpdateMeta);
-		messageMetadata.put(remoteUpdateId, remoteUpdateMeta);
-		// The client is not supported remotely
-		BdfList remoteUpdateBody = BdfList.of(new BdfList(), 1L);
-
-		expectGetContactGroup(true);
-		context.checking(new Expectations() {{
-			oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
-					contactGroup.getId());
-			will(returnValue(messageMetadata));
-			oneOf(clientHelper).getMessageAsList(txn, remoteUpdateId);
-			will(returnValue(remoteUpdateBody));
-		}});
-
-		ClientVersioningManagerImpl c = createInstance();
-		assertEquals(-1, c.getClientMinorVersion(txn, contact.getId(),
-				clientId, 123));
-	}
-
-	@Test
-	public void testReturnsMinorVersionIfClientNotActiveRemotely()
-			throws Exception {
-		MessageId localUpdateId = new MessageId(getRandomId());
-		BdfDictionary localUpdateMeta = BdfDictionary.of(
-				new BdfEntry(MSG_KEY_UPDATE_VERSION, 1L),
-				new BdfEntry(MSG_KEY_LOCAL, true));
-		MessageId remoteUpdateId = new MessageId(getRandomId());
-		BdfDictionary remoteUpdateMeta = BdfDictionary.of(
-				new BdfEntry(MSG_KEY_UPDATE_VERSION, 1L),
-				new BdfEntry(MSG_KEY_LOCAL, false));
-		Map<MessageId, BdfDictionary> messageMetadata = new HashMap<>();
-		messageMetadata.put(localUpdateId, localUpdateMeta);
-		messageMetadata.put(remoteUpdateId, remoteUpdateMeta);
-		// The client is supported remotely but not active
-		BdfList remoteUpdateBody = BdfList.of(BdfList.of(
-				BdfList.of(clientId.getString(), 123, 234, false)), 1L);
-
-		expectGetContactGroup(true);
-		context.checking(new Expectations() {{
-			oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
-					contactGroup.getId());
-			will(returnValue(messageMetadata));
-			oneOf(clientHelper).getMessageAsList(txn, remoteUpdateId);
-			will(returnValue(remoteUpdateBody));
-		}});
-
-		ClientVersioningManagerImpl c = createInstance();
-		assertEquals(234, c.getClientMinorVersion(txn, contact.getId(),
-				clientId, 123));
-	}
-
-	@Test
-	public void testReturnsMinorVersionIfClientActiveRemotely()
-			throws Exception {
-		MessageId localUpdateId = new MessageId(getRandomId());
-		BdfDictionary localUpdateMeta = BdfDictionary.of(
-				new BdfEntry(MSG_KEY_UPDATE_VERSION, 1L),
-				new BdfEntry(MSG_KEY_LOCAL, true));
-		MessageId remoteUpdateId = new MessageId(getRandomId());
-		BdfDictionary remoteUpdateMeta = BdfDictionary.of(
-				new BdfEntry(MSG_KEY_UPDATE_VERSION, 1L),
-				new BdfEntry(MSG_KEY_LOCAL, false));
-		Map<MessageId, BdfDictionary> messageMetadata = new HashMap<>();
-		messageMetadata.put(localUpdateId, localUpdateMeta);
-		messageMetadata.put(remoteUpdateId, remoteUpdateMeta);
-		// The client is supported remotely and active
-		BdfList remoteUpdateBody = BdfList.of(BdfList.of(
-				BdfList.of(clientId.getString(), 123, 234, true)), 1L);
-
-		expectGetContactGroup(true);
-		context.checking(new Expectations() {{
-			oneOf(clientHelper).getMessageMetadataAsDictionary(txn,
-					contactGroup.getId());
-			will(returnValue(messageMetadata));
-			oneOf(clientHelper).getMessageAsList(txn, remoteUpdateId);
-			will(returnValue(remoteUpdateBody));
-		}});
-
-		ClientVersioningManagerImpl c = createInstance();
-		assertEquals(234, c.getClientMinorVersion(txn, contact.getId(),
-				clientId, 123));
-	}
-
-	private void expectGetContactGroup(boolean exists) throws Exception {
-		context.checking(new Expectations() {{
-			oneOf(db).getContact(txn, contact.getId());
-			will(returnValue(contact));
-			oneOf(contactGroupFactory).createContactGroup(CLIENT_ID,
-					MAJOR_VERSION, contact);
-			will(returnValue(contactGroup));
-			oneOf(db).containsGroup(txn, contactGroup.getId());
-			will(returnValue(exists));
-		}});
-	}
 }

briar-android/artwork/ic_link_down.svg

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   style="width:24px;height:24px"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="ic_link_down.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1020"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="13.906433"
+     inkscape:cx="5.1490538"
+     inkscape:cy="22.945407"
+     inkscape:window-x="1440"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4" />
+  <path
+     fill="#000000"
+     d="M16,6H13V7.9H16C18.26,7.9 20.1,9.73 20.1,12A4.1,4.1 0 0,1 16,16.1H13V18H16A6,6 0 0,0 22,12C22,8.68 19.31,6 16,6M3.9,12C3.9,9.73 5.74,7.9 8,7.9H11V6H8A6,6 0 0,0 2,12A6,6 0 0,0 8,18H11V16.1H8C5.74,16.1 3.9,14.26 3.9,12M8,13H16V11H8V13Z"
+     id="path2" />
+  <path
+     id="path884"
+     d="m 21.659779,17.473157 h -2.295918 v 3.061224 H 17.51182 l 3.000001,3 2.999999,-3 h -1.852041 z"
+     inkscape:connector-curvature="0"
+     style="fill:#000000;stroke-width:0.38265303" />
+</svg>

briar-android/artwork/ic_link_up.svg

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   style="width:24px;height:24px"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="ic_link_up.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1020"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="13.906433"
+     inkscape:cx="5.1490538"
+     inkscape:cy="22.945407"
+     inkscape:window-x="1440"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4" />
+  <path
+     fill="#000000"
+     d="M16,6H13V7.9H16C18.26,7.9 20.1,9.73 20.1,12A4.1,4.1 0 0,1 16,16.1H13V18H16A6,6 0 0,0 22,12C22,8.68 19.31,6 16,6M3.9,12C3.9,9.73 5.74,7.9 8,7.9H11V6H8A6,6 0 0,0 2,12A6,6 0 0,0 8,18H11V16.1H8C5.74,16.1 3.9,14.26 3.9,12M8,13H16V11H8V13Z"
+     id="path2" />
+  <path
+     id="path884"
+     d="M 21.659779,23.534381 H 19.363861 V 20.473157 H 17.51182 l 3.000001,-3 2.999999,3 h -1.852041 z"
+     inkscape:connector-curvature="0"
+     style="fill:#000000;stroke-width:0.38265303" />
+</svg>

briar-android/artwork/ic_nearby.svg

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="svg12"
+   sodipodi:docname="nearby.svg"
+   style="fill:none"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata18">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs16" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1020"
+     id="namedview14"
+     showgrid="false"
+     inkscape:zoom="15.170655"
+     inkscape:cx="9.6488139"
+     inkscape:cy="11.430963"
+     inkscape:window-x="1440"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg12" />
+  <path
+     style="opacity:1;fill:#110000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.37658679px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 11.173062,2.4030645 C 9.9685672,2.4471125 8.7753453,2.7130268 7.6640583,3.2033016 8.187015,3.7262611 8.3967456,4.1446273 8.6059301,4.5629964 11.639055,3.412486 15.091396,4.0393524 17.497058,6.4449696 c 0.732151,0.7321412 1.359335,1.5691523 1.673062,2.5104781 0.418424,-0.2091845 0.941213,-0.3133673 1.464151,-0.3133672 h 0.104456 C 20.215788,7.3869735 19.482978,6.3401088 18.541616,5.2941863 16.528265,3.2807917 13.82295,2.3061587 11.173062,2.4030645 Z M 5.1695142,3.2316286 A 2.7193895,2.7193895 0 0 0 2.4501247,5.9510181 2.7193895,2.7193895 0 0 0 5.1695142,8.6704075 2.7193895,2.7193895 0 0 0 7.8889037,5.9510181 2.7193895,2.7193895 0 0 0 5.1695142,3.2316286 Z M 2.5404169,8.5358543 C 0.97153856,12.196552 1.7027262,16.484811 4.6313017,19.413413 c 1.8826514,1.987239 4.497171,2.930071 7.0073853,2.930071 2.510177,0 5.126431,-0.942832 7.009154,-2.930071 0.941272,-0.941362 1.672402,-2.091035 2.195341,-3.346124 h -0.104455 c -0.522939,0 -1.045818,-0.104155 -1.464151,-0.313367 -0.418423,0.941362 -0.940911,1.778328 -1.673062,2.510478 -3.242327,3.242419 -8.5770829,3.242419 -11.819429,0 C 3.27188,15.858828 2.6451458,12.406442 3.795656,9.3732707 3.377287,9.164086 2.9587814,8.9542233 2.5404169,8.5358543 Z m 9.0540081,0.8444984 a 2.9913288,2.9913284 0 0 0 -2.9902654,2.9902663 2.9913288,2.9913284 0 0 0 2.9902654,2.992036 2.9913288,2.9913284 0 0 0 2.992037,-2.992036 2.9913288,2.9913284 0 0 0 -2.992037,-2.9902663 z m 9.138991,0.423134 a 2.7193895,2.7193895 0 0 0 -2.71939,2.7193903 2.7193895,2.7193895 0 0 0 2.71939,2.719389 2.7193895,2.7193895 0 0 0 2.719389,-2.719389 2.7193895,2.7193895 0 0 0 -2.719389,-2.7193903 z"
+     id="path832-3-6"
+     inkscape:connector-curvature="0" />
+</svg>

briar-android/artwork/nickname.svg

@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="150"
+   height="178"
+   viewBox="0 0 150 178"
+   fill="none"
+   version="1.1"
+   id="svg129"
+   sodipodi:docname="nickname.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata133">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1020"
+     id="namedview131"
+     showgrid="false"
+     inkscape:zoom="3.7500494"
+     inkscape:cx="84.461975"
+     inkscape:cy="96.344913"
+     inkscape:window-x="1440"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg129" />
+  <path
+     d="M 85.1905,0.127869 3.35693,0.328805 C 2.46521,0.330621 1.6107,0.690255 0.981217,1.32866 0.351735,1.96706 -0.0011965,2.83198 3.04782e-6,3.73331 L 0.372743,156.201 c 0.001185,0.446 0.089367,0.888 0.259505,1.3 0.170138,0.412 0.418902,0.786 0.732092,1.101 0.31319,0.315 0.68466,0.564 1.09322,0.734 0.40856,0.17 0.84619,0.257 1.28792,0.256 l 81.83362,-0.201 c 0.8917,-0.003 1.746,-0.363 2.375,-1.002 0.6291,-0.639 0.9814,-1.504 0.9796,-2.405 L 88.5542,3.51639 C 88.5512,2.61665 88.1955,1.75479 87.565,1.11965 86.9345,0.484503 86.0807,0.127864 85.1905,0.127869 Z"
+     id="path2"
+     inkscape:connector-curvature="0"
+     style="display:inline;opacity:0.25;fill:url(#paint0_linear)" />
+  <path
+     d="M 84.2815,-0.0019907 4.27572,0.195606 C 2.57395,0.199809 1.19777,1.59763 1.20193,3.31772 L 1.56691,154.298 c 0.00416,1.72 1.38709,3.111 3.08885,3.107 l 80.00584,-0.198 c 1.7017,-0.004 3.0779,-1.402 3.0737,-3.122 L 87.3704,3.1049 C 87.3662,1.38481 85.9833,-0.0061937 84.2815,-0.0019907 Z"
+     id="path4"
+     inkscape:connector-curvature="0"
+     style="display:inline;opacity:0.25;fill:#6d6d6d;fill-opacity:0.7" />
+  <path
+     style="display:inline;opacity:0.25;fill:#646464"
+     d="M 81.939453 3.9570312 L 65.933594 3.9960938 C 65.688694 5.6638138 64.861562 7.1881588 63.601562 8.2929688 C 62.341563 9.3977688 60.732453 10.010031 59.064453 10.019531 L 29.302734 10.091797 C 27.634734 10.090597 26.021259 9.4871919 24.755859 8.3886719 C 23.490459 7.2901519 22.655444 5.7700256 22.402344 4.1035156 L 6.6367188 4.1425781 C 5.7689587 4.1449981 4.9382819 4.4954875 4.3261719 5.1171875 C 3.7140519 5.7388975 3.3712469 6.5799313 3.3730469 7.4570312 L 3.4609375 44.068359 L 3.7167969 150.16797 C 3.7209769 151.04497 4.0691969 151.88495 4.6855469 152.50195 C 5.3018969 153.11895 6.1361462 153.46394 7.0039062 153.46094 L 82.306641 153.27539 C 83.171641 153.27039 83.999475 152.92078 84.609375 152.30078 C 85.219375 151.68078 85.560547 150.8408 85.560547 149.9668 L 85.306641 43.5625 L 85.220703 7.2558594 C 85.218303 6.3787594 84.870959 5.5386319 84.255859 4.9199219 C 83.640859 4.3012219 82.807253 3.9552112 81.939453 3.9570312 z M 52.652344 5.7910156 L 34.357422 6.0683594 C 34.107922 6.0721494 33.908409 6.27906 33.912109 6.53125 L 33.916016 6.8300781 C 33.919716 7.0822681 34.1255 7.28504 34.375 7.28125 L 52.671875 7.0019531 C 52.921375 6.9981731 53.118934 6.7912525 53.115234 6.5390625 L 53.111328 6.2402344 C 53.107628 5.9880444 52.901844 5.7872256 52.652344 5.7910156 z "
+     id="path6" />
+  <path
+     d="M 57.2036,6.934 C 57.6016,6.92797 57.9193,6.59699 57.9133,6.19476 57.9074,5.79252 57.5799,5.47134 57.182,5.47738 c -0.398,0.00604 -0.7157,0.33701 -0.7098,0.73924 0.006,0.40224 0.3335,0.72342 0.7314,0.71738 z"
+     id="path10"
+     inkscape:connector-curvature="0"
+     style="opacity:0.25;fill:#dbdbdb" />
+  <path
+     style="display:inline;opacity:0.25;fill:#e0e0e0"
+     d="m 17.640625,19.458984 c -4.1846,0 -7.576172,3.445513 -7.576172,7.695313 0,4.2498 3.391572,7.695312 7.576172,7.695312 4.1845,0 7.576172,-3.445512 7.576172,-7.695312 0,-4.2498 -3.391672,-7.695313 -7.576172,-7.695313 z m 19.882813,4.177735 v 3.234375 h 40.117187 v -3.234375 z m 0,6.466797 v 3.234375 H 77.640625 V 30.103516 Z M 17.640625,44.087891 c -4.1846,0 -7.576172,3.443559 -7.576172,7.693359 0,4.2498 3.391572,7.695313 7.576172,7.695312 4.1845,0 7.576172,-3.445512 7.576172,-7.695312 0,-4.2498 -3.391672,-7.693359 -7.576172,-7.693359 z m 19.882813,4.177734 V 51.5 h 40.117187 v -3.234375 z m 0,6.466797 v 3.232422 H 77.640625 V 54.732422 Z M 17.640625,68.714844 c -4.1846,0 -7.576172,3.445512 -7.576172,7.695312 0,4.2498 3.391572,7.695313 7.576172,7.695313 4.1845,0 7.576172,-3.445513 7.576172,-7.695313 0,-4.2498 -3.391672,-7.695312 -7.576172,-7.695312 z m 19.882813,4.179687 v 3.232422 h 40.117187 v -3.232422 z m 0,6.466797 V 82.59375 H 77.640625 V 79.361328 Z M 17.640625,93.34375 c -4.1846,0 -7.576172,3.445613 -7.576172,7.69531 0,4.25 3.391572,7.69532 7.576172,7.69532 4.1845,0 7.576172,-3.44532 7.576172,-7.69532 0,-4.249698 -3.391672,-7.69531 -7.576172,-7.69531 z m 19.882813,4.179688 v 3.232422 h 40.117187 v -3.232422 z m 0,6.464842 v 3.23438 h 40.117187 v -3.23438 z m -19.882813,13.98438 c -4.1846,0 -7.576172,3.44631 -7.576172,7.69531 0,4.25 3.391572,7.69336 7.576172,7.69336 4.1845,0 7.576172,-3.44336 7.576172,-7.69336 0,-4.249 -3.391672,-7.69531 -7.576172,-7.69531 z m 19.882813,4.17773 v 3.23438 h 40.117187 v -3.23438 z m 0,6.4668 v 3.23437 h 40.117187 v -3.23437 z"
+     id="path12"
+     inkscape:connector-curvature="0" />
+  <path
+     style="display:inline;fill:#313131"
+     inkscape:connector-curvature="0"
+     id="path44"
+     d="m 136.95,18.4066 -80.0056,0.1976 c -1.7018,0.0042 -3.078,1.402 -3.0738,3.1221 l 0.365,150.9807 c 0.0041,1.72 1.3871,3.111 3.0888,3.107 l 80.0056,-0.198 c 1.702,-0.004 3.078,-1.402 3.074,-3.122 L 140.039,21.5135 c -0.004,-1.7201 -1.387,-3.1111 -3.089,-3.1069 z" />
+  <path
+     style="display:inline;fill:#3e3e3e"
+     d="M 134.60938 22.357422 L 118.59961 22.394531 C 118.35561 24.062231 117.52758 25.586606 116.26758 26.691406 C 115.00758 27.796206 113.39847 28.408469 111.73047 28.417969 L 81.96875 28.492188 C 80.30065 28.490987 78.689228 27.885609 77.423828 26.787109 C 76.158428 25.688609 75.323313 24.168453 75.070312 22.501953 L 59.304688 22.541016 C 58.436887 22.543416 57.604288 22.893925 56.992188 23.515625 C 56.380088 24.137325 56.037262 24.980322 56.039062 25.857422 L 56.128906 62.46875 L 56.748047 62.466797 L 56.128906 62.470703 L 56.382812 168.57031 C 56.385213 169.44731 56.732656 170.28725 57.347656 170.90625 C 57.962756 171.52425 58.796362 171.87114 59.664062 171.86914 L 134.9668 171.68359 C 135.8348 171.68159 136.66534 171.33098 137.27734 170.70898 C 137.88934 170.08798 138.23247 169.24614 138.23047 168.36914 L 137.97266 62.21875 L 137.97461 62.21875 L 137.88867 25.65625 C 137.88667 24.77915 137.54078 23.939012 136.92578 23.320312 C 136.31078 22.701612 135.47738 22.355522 134.60938 22.357422 z "
+     id="path46" />
+  <path
+     style="display:inline;fill:#e0e0e0"
+     d="M 109.84961 23.890625 C 109.45161 23.896725 109.13462 24.228559 109.14062 24.630859 C 109.14663 25.033059 109.47309 25.353756 109.87109 25.347656 C 110.26909 25.341656 110.58608 25.009622 110.58008 24.607422 C 110.57408 24.205222 110.24761 23.884625 109.84961 23.890625 z M 105.32031 24.201172 L 87.025391 24.478516 C 86.775891 24.482316 86.576378 24.691159 86.580078 24.943359 L 86.583984 25.242188 C 86.587684 25.494387 86.793469 25.695206 87.042969 25.691406 L 105.33984 25.414062 C 105.58884 25.410363 105.7872 25.203372 105.7832 24.951172 L 105.7793 24.650391 C 105.7753 24.398191 105.56931 24.197372 105.32031 24.201172 z M 63.365234 37.568359 L 63.365234 53.738281 L 79.365234 53.738281 L 79.365234 37.568359 L 63.365234 37.568359 z M 86.748047 37.568359 L 86.748047 40.800781 L 126.86523 40.800781 L 126.86523 37.568359 L 86.748047 37.568359 z M 86.748047 44.037109 L 86.748047 47.269531 L 126.86523 47.269531 L 126.86523 44.037109 L 86.748047 44.037109 z M 71.787109 112.99609 C 67.602609 112.99609 64.210937 116.44141 64.210938 120.69141 C 64.210938 124.94141 67.602609 128.38672 71.787109 128.38672 C 75.971709 128.38672 79.365234 124.94141 79.365234 120.69141 C 79.365234 116.44141 75.971709 112.99609 71.787109 112.99609 z M 86.748047 116.92773 L 86.748047 120.16016 L 126.86523 120.16016 L 126.86523 116.92773 L 86.748047 116.92773 z M 86.748047 123.39258 L 86.748047 126.62695 L 126.86523 126.62695 L 126.86523 123.39258 L 86.748047 123.39258 z M 71.787109 142.60156 C 67.602609 142.60156 64.210937 146.04687 64.210938 150.29688 C 64.210938 154.54688 67.602609 157.99023 71.787109 157.99023 C 75.971709 157.99023 79.365234 154.54688 79.365234 150.29688 C 79.365234 146.04688 75.971709 142.60156 71.787109 142.60156 z M 86.748047 145.53516 L 86.748047 148.76758 L 126.86523 148.76758 L 126.86523 145.53516 L 86.748047 145.53516 z M 86.748047 152.00195 L 86.748047 155.23438 L 126.86523 155.23438 L 126.86523 152.00195 L 86.748047 152.00195 z "
+     id="path50" />
+  <path
+     style="display:inline;fill:#d5d6d7"
+     inkscape:connector-curvature="0"
+     id="path56"
+     d="M 148.744,68.6655 H 45.619 v 33.5835 h 103.125 z" />
+  <path
+     style="display:inline;fill:#87c214"
+     d="m 97.822266,50.503906 v 5.722656 h 17.966794 v -5.722656 z m -11.074219,30.59961 v 3.232422 h 40.117183 v -3.232422 z m 0,6.46875 v 3.232422 h 40.117183 v -3.232422 z"
+     id="path58"
+     inkscape:connector-curvature="0" />
+  <path
+     style="display:inline;fill:#f5f5f5"
+     inkscape:connector-curvature="0"
+     id="path68"
+     d="m 66.8652,92.3143 c 4.1846,0 7.5768,-3.4451 7.5768,-7.695 0,-4.2498 -3.3922,-7.6949 -7.5768,-7.6949 -4.1846,0 -7.5768,3.4451 -7.5768,7.6949 0,4.2499 3.3922,7.695 7.5768,7.695 z" />
+  <path
+     style="display:inline;fill:#87c214"
+     inkscape:connector-curvature="0"
+     id="path70"
+     d="m 70.1296,90.0058 h -6.5738 c -0.3153,0.0024 -0.6253,0.0818 -0.9038,0.2312 -0.2784,0.1495 -0.5171,0.3647 -0.6956,0.6274 1.4766,0.8563 3.1474,1.3114 4.8498,1.321 1.7023,0.0096 3.3781,-0.4266 4.864,-1.2662 -0.1666,-0.265 -0.3932,-0.486 -0.6612,-0.6448 -0.2679,-0.1588 -0.5693,-0.2509 -0.8794,-0.2686 z" />
+  <path
+     style="display:inline;fill:#333333"
+     d="m 66.861328,80.746094 c -2.0798,0 -3.765625,1.70444 -3.765625,3.80664 0,0.393506 0.07586,0.766 0.185547,1.123047 -0.327549,0.812667 -0.821888,1.878261 -1.158203,1.708985 0,0 5.069822,4.4252 9.544922,0 -0.355198,-0.613452 -0.773279,-1.18389 -1.21875,-1.732422 0.10502,-0.350063 0.177734,-0.714879 0.177734,-1.09961 0,-2.1022 -1.685825,-3.80664 -3.765625,-3.80664 z"
+     id="path72"
+     inkscape:connector-curvature="0" />
+  <path
+     style="display:inline;fill:#fda57d"
+     d="m 66.861328,81.570312 c -1.800651,0 -3.302121,1.279176 -3.673828,2.986329 -0.0049,-3.79e-4 -0.0088,-0.0059 -0.01367,-0.0059 -0.1933,0 -0.349609,0.297063 -0.349609,0.664063 0,0.347156 0.141531,0.622551 0.320312,0.652344 0.180942,1.407599 1.108928,2.5691 2.38086,3.058593 v 0.732422 c 0,0.3234 0.127315,0.634681 0.353515,0.863281 0.2263,0.2287 0.533616,0.357422 0.853516,0.357422 h 0.224609 c 0.1588,3e-4 0.316091,-0.03245 0.462891,-0.09375 0.1467,-0.0613 0.280278,-0.150172 0.392578,-0.263672 0.1123,-0.1135 0.201119,-0.248084 0.261719,-0.396484 0.0606,-0.1483 0.0921,-0.30825 0.0918,-0.46875 v -0.720703 c 1.288752,-0.483775 2.232282,-1.654559 2.412109,-3.076172 0.168226,-0.0485 0.298828,-0.311757 0.298828,-0.644531 0,-0.363137 -0.153161,-0.655938 -0.34375,-0.66211 -0.373249,-1.705035 -1.87271,-2.982422 -3.671875,-2.982422 z"
+     id="path78"
+     inkscape:connector-curvature="0" />
+  <path
+     style="display:inline;fill:#333333"
+     inkscape:connector-curvature="0"
+     id="path84"
+     d="m 63.2529,83.9344 h 7.1792 c 0,0 -0.6122,-2.9296 -3.3275,-2.7401 -2.7154,0.1895 -3.8517,2.7401 -3.8517,2.7401 z" />
+  <defs
+     id="defs127">
+    <linearGradient
+       id="paint0_linear"
+       x1="10.0511"
+       y1="162.566"
+       x2="80.1467"
+       y2="-2.31086"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#808080"
+         stop-opacity="0.25"
+         id="stop110" />
+      <stop
+         offset="0.54"
+         stop-color="#808080"
+         stop-opacity="0.12"
+         id="stop112" />
+      <stop
+         offset="1"
+         stop-color="#808080"
+         stop-opacity="0.1"
+         id="stop114" />
+    </linearGradient>
+    <linearGradient
+       id="paint1_linear"
+       x1="45488.3"
+       y1="16529.6"
+       x2="45488.3"
+       y2="10752.2"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#808080"
+         stop-opacity="0.25"
+         id="stop117" />
+      <stop
+         offset="0.54"
+         stop-color="#808080"
+         stop-opacity="0.12"
+         id="stop119" />
+      <stop
+         offset="1"
+         stop-color="#808080"
+         stop-opacity="0.1"
+         id="stop121" />
+    </linearGradient>
+    <clipPath
+       id="clip0">
+      <rect
+         width="150"
+         height="178"
+         fill="white"
+         id="rect124" />
+    </clipPath>
+  </defs>
+</svg>

briar-android/build.gradle

@@ -2,6 +2,70 @@ apply plugin: 'com.android.application'
 apply plugin: 'witness'
 apply from: 'witness.gradle'
 
+// prototype
+repositories {
+	maven { url 'https://jitpack.io' }
+}
+
+dependencies {
+	implementation project(path: ':briar-core', configuration: 'default')
+	implementation project(path: ':bramble-core', configuration: 'default')
+	implementation project(':bramble-android')
+
+	def supportVersion = '28.0.0'
+	implementation "com.android.support:support-v4:$supportVersion"
+	implementation("com.android.support:appcompat-v7:$supportVersion") {
+		exclude module: 'support-v4'
+	}
+	implementation("com.android.support:preference-v14:$supportVersion") {
+		exclude module: 'support-v4'
+	}
+	implementation("com.android.support:design:$supportVersion") {
+		exclude module: 'support-v4'
+		exclude module: 'recyclerview-v7'
+	}
+	implementation "com.android.support:cardview-v7:$supportVersion"
+	implementation "com.android.support:support-annotations:$supportVersion"
+	implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+
+	implementation('ch.acra:acra:4.9.1') {
+		exclude module: 'support-v4'
+		exclude module: 'support-annotations'
+	}
+	implementation 'info.guardianproject.panic:panic:0.5'
+	implementation 'info.guardianproject.trustedintents:trustedintents:0.2'
+	implementation 'de.hdodenhof:circleimageview:2.2.0'
+	implementation 'com.google.zxing:core:3.3.0'
+	implementation 'uk.co.samuelwall:material-tap-target-prompt:2.8.0'
+	implementation 'com.vanniktech:emoji-google:0.5.1'
+
+	annotationProcessor 'com.google.dagger:dagger-compiler:2.0.2'
+
+	compileOnly 'javax.annotation:jsr250-api:1.0'
+
+	testImplementation project(path: ':bramble-api', configuration: 'testOutput')
+	testImplementation project(path: ':bramble-core', configuration: 'testOutput')
+	testImplementation 'org.robolectric:robolectric:3.8'
+	testImplementation 'org.robolectric:shadows-support-v4:3.3.2'
+	testImplementation 'org.mockito:mockito-core:2.13.0'
+	testImplementation 'junit:junit:4.12'
+	testImplementation "org.jmock:jmock:2.8.2"
+	testImplementation "org.jmock:jmock-junit4:2.8.2"
+	testImplementation "org.jmock:jmock-legacy:2.8.2"
+	testImplementation "org.hamcrest:hamcrest-library:1.3"
+	testImplementation "org.hamcrest:hamcrest-core:1.3"
+
+	def espressoVersion = '3.0.2'
+	androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoVersion"
+	androidTestImplementation "com.android.support.test.espresso:espresso-contrib:$espressoVersion"
+	androidTestImplementation "com.android.support.test.espresso:espresso-intents:$espressoVersion"
+	androidTestImplementation "tools.fastlane:screengrab:1.1.0"
+	androidTestImplementation "com.android.support.test.uiautomator:uiautomator-v18:2.1.3"
+	androidTestAnnotationProcessor "com.google.dagger:dagger-compiler:2.0.2"
+	androidTestCompileOnly 'javax.annotation:jsr250-api:1.0'
+	androidTestImplementation 'junit:junit:4.12'
+}
+
 def getStdout = { command, defaultValue ->
 	def stdout = new ByteArrayOutputStream()
 	try {
@@ -35,7 +99,7 @@ android {
 
 	buildTypes {
 		debug {
-			applicationIdSuffix ".debug"
+			applicationIdSuffix ".test"
 			shrinkResources false
 			minifyEnabled true
 			crunchPngs false
@@ -105,6 +169,7 @@ dependencies {
 	implementation "com.android.support:cardview-v7:$supportVersion"
 	implementation "com.android.support:support-annotations:$supportVersion"
 	implementation "com.android.support:exifinterface:$supportVersion"
+	implementation "com.android.support:palette-v7:$supportVersion"
 	implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 	implementation "android.arch.lifecycle:extensions:1.1.1"
 
@@ -116,7 +181,7 @@ dependencies {
 	implementation 'info.guardianproject.trustedintents:trustedintents:0.2'
 	implementation 'de.hdodenhof:circleimageview:2.2.0'
 	implementation 'com.google.zxing:core:3.3.3'
-	implementation 'uk.co.samuelwall:material-tap-target-prompt:2.14.0'
+	implementation 'uk.co.samuelwall:material-tap-target-prompt:2.12.4'
 	implementation 'com.vanniktech:emoji-google:0.5.1'
 	def glideVersion = '4.8.0'
 	implementation("com.github.bumptech.glide:glide:$glideVersion") {
@@ -125,6 +190,9 @@ dependencies {
 	}
 	implementation 'com.github.chrisbanes:PhotoView:2.1.4' // later versions already use androidx
 
+	// prototype
+	implementation "com.github.kobakei:MaterialFabSpeedDial:1.2.0"
+
 	annotationProcessor 'com.google.dagger:dagger-compiler:2.19'
 	annotationProcessor "com.github.bumptech.glide:compiler:$glideVersion"
 
@@ -134,7 +202,7 @@ dependencies {
 	testImplementation project(path: ':bramble-core', configuration: 'testOutput')
 	testImplementation 'org.robolectric:robolectric:4.0.1'
 	testImplementation 'org.robolectric:shadows-support-v4:3.3.2'
-	testImplementation 'org.mockito:mockito-core:2.19.0'
+	testImplementation 'org.mockito:mockito-core:2.13.0'
 	testImplementation 'junit:junit:4.12'
 	testImplementation "org.jmock:jmock:2.8.2"
 	testImplementation "org.jmock:jmock-junit4:2.8.2"

briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/conversation/AttachmentControllerIntegrationTest.java

@@ -1,279 +0,0 @@
-package org.briarproject.briar.android.conversation;
-
-import android.content.res.AssetManager;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.briarproject.bramble.api.UniqueId;
-import org.briarproject.bramble.api.sync.MessageId;
-import org.briarproject.briar.api.messaging.Attachment;
-import org.briarproject.briar.api.messaging.AttachmentHeader;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Random;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-@RunWith(AndroidJUnit4.class)
-public class AttachmentControllerIntegrationTest {
-
-	private static final String smallKitten =
-			"https://upload.wikimedia.org/wikipedia/commons/thumb/0/06/Kitten_in_Rizal_Park%2C_Manila.jpg/160px-Kitten_in_Rizal_Park%2C_Manila.jpg";
-	private static final String originalKitten =
-			"https://upload.wikimedia.org/wikipedia/commons/0/06/Kitten_in_Rizal_Park%2C_Manila.jpg";
-	private static final String pngKitten =
-			"https://upload.wikimedia.org/wikipedia/commons/c/c8/Young_cat.png";
-	private static final String uberGif =
-			"https://raw.githubusercontent.com/fuzzdb-project/fuzzdb/master/attack/file-upload/malicious-images/uber.gif";
-	private static final String lottaPixel =
-			"https://raw.githubusercontent.com/fuzzdb-project/fuzzdb/master/attack/file-upload/malicious-images/lottapixel.jpg";
-	private static final String imageIoCrash =
-			"https://www.landaire.net/img/crasher.png";
-	private static final String gimpCrash =
-			"https://gitlab.gnome.org/GNOME/gimp/uploads/75f5b7ed3b09b3f1c13f1f65bffe784f/31153c919d3aa634e8e6cff82219fe7352dd8a37.png";
-	private static final String optiPngAfl =
-			"https://sourceforge.net/p/optipng/bugs/64/attachment/test.gif";
-	private static final String librawError =
-			"https://www.libraw.org/sites/libraw.org/files/P1010671.JPG";
-
-	private final AttachmentDimensions dimensions = new AttachmentDimensions(
-			100, 50, 200, 75, 300
-	);
-	private final MessageId msgId = new MessageId(getRandomId());
-
-	private final AttachmentController controller =
-			new AttachmentController(null, dimensions);
-
-	@Test
-	public void testSmallJpegImage() throws Exception {
-		AttachmentHeader h = new AttachmentHeader(msgId, "image/jpeg");
-		InputStream is = getUrlInputStream(smallKitten);
-		Attachment a = new Attachment(is);
-		AttachmentItem item = controller.getAttachmentItem(h, a, true);
-		assertEquals(msgId, item.getMessageId());
-		assertEquals(160, item.getWidth());
-		assertEquals(240, item.getHeight());
-		assertEquals(160, item.getThumbnailWidth());
-		assertEquals(240, item.getThumbnailHeight());
-		assertEquals("image/jpeg", item.getMimeType());
-		assertEquals("jpg", item.getExtension());
-		assertFalse(item.hasError());
-	}
-
-	@Test
-	public void testBigJpegImage() throws Exception {
-		AttachmentHeader h = new AttachmentHeader(msgId, "image/jpeg");
-		InputStream is = getUrlInputStream(originalKitten);
-		Attachment a = new Attachment(is);
-		AttachmentItem item = controller.getAttachmentItem(h, a, true);
-		assertEquals(msgId, item.getMessageId());
-		assertEquals(1728, item.getWidth());
-		assertEquals(2592, item.getHeight());
-		assertEquals(dimensions.maxWidth, item.getThumbnailWidth());
-		assertEquals(dimensions.maxHeight, item.getThumbnailHeight());
-		assertEquals("image/jpeg", item.getMimeType());
-		assertEquals("jpg", item.getExtension());
-		assertFalse(item.hasError());
-	}
-
-	@Test
-	public void testSmallPngImage() throws Exception {
-		AttachmentHeader h = new AttachmentHeader(msgId, "image/png");
-		InputStream is = getUrlInputStream(pngKitten);
-		Attachment a = new Attachment(is);
-		AttachmentItem item = controller.getAttachmentItem(h, a, true);
-		assertEquals(msgId, item.getMessageId());
-		assertEquals(737, item.getWidth());
-		assertEquals(510, item.getHeight());
-		assertEquals(dimensions.maxWidth, item.getThumbnailWidth());
-		assertEquals(138, item.getThumbnailHeight());
-		assertEquals("image/png", item.getMimeType());
-		assertEquals("png", item.getExtension());
-		assertFalse(item.hasError());
-	}
-
-	@Test
-	public void testUberGif() throws Exception {
-		AttachmentHeader h = new AttachmentHeader(msgId, "image/jpeg");
-		InputStream is = getUrlInputStream(uberGif);
-		Attachment a = new Attachment(is);
-		AttachmentItem item = controller.getAttachmentItem(h, a, true);
-		assertEquals(1, item.getWidth());
-		assertEquals(1, item.getHeight());
-		assertEquals(dimensions.minHeight, item.getThumbnailWidth());
-		assertEquals(dimensions.minHeight, item.getThumbnailHeight());
-		assertEquals("image/gif", item.getMimeType());
-		assertEquals("gif", item.getExtension());
-		assertFalse(item.hasError());
-	}
-
-	@Test
-	public void testLottaPixels() throws Exception {
-		AttachmentHeader h = new AttachmentHeader(msgId, "image/jpeg");
-		InputStream is = getUrlInputStream(lottaPixel);
-		Attachment a = new Attachment(is);
-		AttachmentItem item = controller.getAttachmentItem(h, a, true);
-		assertEquals(64250, item.getWidth());
-		assertEquals(64250, item.getHeight());
-		assertEquals(dimensions.maxWidth, item.getThumbnailWidth());
-		assertEquals(dimensions.maxWidth, item.getThumbnailHeight());
-		assertEquals("image/jpeg", item.getMimeType());
-		assertEquals("jpg", item.getExtension());
-		assertFalse(item.hasError());
-	}
-
-	@Test
-	public void testImageIoCrash() throws Exception {
-		AttachmentHeader h = new AttachmentHeader(msgId, "image/jpeg");
-		InputStream is = getUrlInputStream(imageIoCrash);
-		Attachment a = new Attachment(is);
-		AttachmentItem item = controller.getAttachmentItem(h, a, true);
-		assertEquals(1184, item.getWidth());
-		assertEquals(448, item.getHeight());
-		assertEquals(dimensions.maxWidth, item.getThumbnailWidth());
-		assertEquals(dimensions.minHeight, item.getThumbnailHeight());
-		assertEquals("image/png", item.getMimeType());
-		assertEquals("png", item.getExtension());
-		assertFalse(item.hasError());
-	}
-
-	@Test
-	public void testGimpCrash() throws Exception {
-		AttachmentHeader h = new AttachmentHeader(msgId, "image/jpeg");
-		InputStream is = getUrlInputStream(gimpCrash);
-		Attachment a = new Attachment(is);
-		AttachmentItem item = controller.getAttachmentItem(h, a, true);
-		assertEquals(1, item.getWidth());
-		assertEquals(1, item.getHeight());
-		assertEquals(dimensions.minHeight, item.getThumbnailWidth());
-		assertEquals(dimensions.minHeight, item.getThumbnailHeight());
-		assertEquals("image/gif", item.getMimeType());
-		assertEquals("gif", item.getExtension());
-		assertFalse(item.hasError());
-	}
-
-	@Test
-	public void testOptiPngAfl() throws Exception {
-		AttachmentHeader h = new AttachmentHeader(msgId, "image/jpeg");
-		InputStream is = getUrlInputStream(optiPngAfl);
-		Attachment a = new Attachment(is);
-		AttachmentItem item = controller.getAttachmentItem(h, a, true);
-		assertEquals(32, item.getWidth());
-		assertEquals(32, item.getHeight());
-		assertEquals(dimensions.minHeight, item.getThumbnailWidth());
-		assertEquals(dimensions.minHeight, item.getThumbnailHeight());
-		assertEquals("image/gif", item.getMimeType());
-		assertEquals("gif", item.getExtension());
-		assertFalse(item.hasError());
-	}
-
-	@Test
-	public void testLibrawError() throws Exception {
-		AttachmentHeader h = new AttachmentHeader(msgId, "image/jpeg");
-		InputStream is = getUrlInputStream(librawError);
-		Attachment a = new Attachment(is);
-		AttachmentItem item = controller.getAttachmentItem(h, a, true);
-		assertTrue(item.hasError());
-	}
-
-	@Test
-	public void testSmallAnimatedGifMaxDimensions() throws Exception {
-		AttachmentHeader h = new AttachmentHeader(msgId, "image/gif");
-		InputStream is = getAssetInputStream("animated.gif");
-		Attachment a = new Attachment(is);
-		AttachmentItem item = controller.getAttachmentItem(h, a, true);
-		assertEquals(65535, item.getWidth());
-		assertEquals(65535, item.getHeight());
-		assertEquals(dimensions.maxWidth, item.getThumbnailWidth());
-		assertEquals(dimensions.maxWidth, item.getThumbnailHeight());
-		assertEquals("image/gif", item.getMimeType());
-		assertEquals("gif", item.getExtension());
-		assertFalse(item.hasError());
-	}
-
-	@Test
-	public void testSmallAnimatedGifHugeDimensions() throws Exception {
-		AttachmentHeader h = new AttachmentHeader(msgId, "image/gif");
-		InputStream is = getAssetInputStream("animated2.gif");
-		Attachment a = new Attachment(is);
-		AttachmentItem item = controller.getAttachmentItem(h, a, true);
-		assertEquals(10000, item.getWidth());
-		assertEquals(10000, item.getHeight());
-		assertEquals(dimensions.maxWidth, item.getThumbnailWidth());
-		assertEquals(dimensions.maxWidth, item.getThumbnailHeight());
-		assertEquals("image/gif", item.getMimeType());
-		assertEquals("gif", item.getExtension());
-		assertFalse(item.hasError());
-	}
-
-	@Test
-	public void testSmallGifLargeDimensions() throws Exception {
-		AttachmentHeader h = new AttachmentHeader(msgId, "image/gif");
-		InputStream is = getAssetInputStream("error_large.gif");
-		Attachment a = new Attachment(is);
-		AttachmentItem item = controller.getAttachmentItem(h, a, true);
-		assertEquals(16384, item.getWidth());
-		assertEquals(16384, item.getHeight());
-		assertEquals(dimensions.maxWidth, item.getThumbnailWidth());
-		assertEquals(dimensions.maxWidth, item.getThumbnailHeight());
-		assertEquals("image/gif", item.getMimeType());
-		assertEquals("gif", item.getExtension());
-		assertFalse(item.hasError());
-	}
-
-	@Test
-	public void testHighError() throws Exception {
-		AttachmentHeader h = new AttachmentHeader(msgId, "image/jpeg");
-		InputStream is = getAssetInputStream("error_high.jpg");
-		Attachment a = new Attachment(is);
-		AttachmentItem item = controller.getAttachmentItem(h, a, true);
-		assertEquals(1, item.getWidth());
-		assertEquals(10000, item.getHeight());
-		assertEquals(dimensions.minWidth, item.getThumbnailWidth());
-		assertEquals(dimensions.maxHeight, item.getThumbnailHeight());
-		assertEquals("image/jpeg", item.getMimeType());
-		assertEquals("jpg", item.getExtension());
-		assertFalse(item.hasError());
-	}
-
-	@Test
-	public void testWideError() throws Exception {
-		AttachmentHeader h = new AttachmentHeader(msgId, "image/jpeg");
-		InputStream is = getAssetInputStream("error_wide.jpg");
-		Attachment a = new Attachment(is);
-		AttachmentItem item = controller.getAttachmentItem(h, a, true);
-		assertEquals(1920, item.getWidth());
-		assertEquals(1, item.getHeight());
-		assertEquals(dimensions.maxWidth, item.getThumbnailWidth());
-		assertEquals(dimensions.minHeight, item.getThumbnailHeight());
-		assertEquals("image/jpeg", item.getMimeType());
-		assertEquals("jpg", item.getExtension());
-		assertFalse(item.hasError());
-	}
-
-	private InputStream getUrlInputStream(String url) throws IOException {
-		return new URL(url).openStream();
-	}
-
-	private InputStream getAssetInputStream(String name) throws IOException {
-		AssetManager assets = InstrumentationRegistry.getContext().getAssets();
-		return assets.open(name);
-	}
-
-	public static byte[] getRandomBytes(int length) {
-		byte[] b = new byte[length];
-		new Random().nextBytes(b);
-		return b;
-	}
-
-	public static byte[] getRandomId() {
-		return getRandomBytes(UniqueId.LENGTH);
-	}
-
-}

briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/conversation/ConversationActivityNotSignedInTest.java

@@ -1,38 +0,0 @@
-package org.briarproject.briar.android.conversation;
-
-import android.content.Context;
-import android.content.Intent;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.briarproject.briar.R;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static android.support.test.InstrumentationRegistry.getInstrumentation;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-import static org.briarproject.briar.android.ViewActions.waitUntilMatches;
-import static org.briarproject.briar.android.conversation.ConversationActivity.CONTACT_ID;
-
-@RunWith(AndroidJUnit4.class)
-public class ConversationActivityNotSignedInTest {
-
-	@Rule
-	public ActivityTestRule<ConversationActivity> testRule =
-			new ActivityTestRule<>(ConversationActivity.class, false, false);
-
-	@Test
-	public void openWithoutSignedIn() {
-		Context targetContext = getInstrumentation().getTargetContext();
-		Intent intent = new Intent(targetContext, ConversationActivity.class);
-		intent.putExtra(CONTACT_ID, 1);
-		testRule.launchActivity(intent);
-
-		onView(withText(R.string.sign_in_button))
-				.perform(waitUntilMatches(isDisplayed()));
-	}
-
-}

briar-android/src/debug/res/values/strings.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name" translatable="false">Briar Debug</string>
-	<string name="app_package" translatable="false">org.briarproject.briar.android.debug</string>
+	<string name="app_name" translatable="false">Briar Test</string>
+	<string name="app_package" translatable="false">org.briarproject.briar.android.test</string>
 </resources>

briar-android/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
 	package="org.briarproject.briar"
-	xmlns:tools="http://schemas.android.com/tools"
-	xmlns:android="http://schemas.android.com/apk/res/android">
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools">
 
 	<uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
 	<uses-feature android:name="android.hardware.camera" android:required="false"/>
@@ -119,7 +119,7 @@
 		<activity
 			android:name=".android.conversation.ImageActivity"
 			android:parentActivityName="org.briarproject.briar.android.conversation.ConversationActivity"
-			android:theme="@style/BriarTheme.ActionBarOverlay">
+			android:theme="@style/BriarTheme.Transparent.NoActionBar">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
 				android:value="org.briarproject.briar.android.conversation.ConversationActivity"/>
@@ -157,7 +157,7 @@
 				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity"/>
 		</activity>
 
-		<activity
+			<activity
 			android:name="org.briarproject.briar.android.privategroup.memberlist.GroupMemberListActivity"
 			android:label="@string/groups_member_list"
 			android:parentActivityName="org.briarproject.briar.android.privategroup.conversation.GroupActivity"
@@ -400,7 +400,7 @@
 		<activity
 			android:name="org.briarproject.briar.android.panic.PanicResponderActivity"
 			android:noHistory="true"
-			android:theme="@style/TranslucentTheme">
+			android:theme="@style/Theme.AppCompat.NoActionBar">
 			<!-- this can never have launchMode singleTask or singleInstance! -->
 			<intent-filter>
 				<action android:name="info.guardianproject.panic.action.TRIGGER"/>
@@ -410,12 +410,12 @@
 
 		<activity
 			android:name="org.briarproject.briar.android.logout.ExitActivity"
-			android:theme="@android:style/Theme.NoDisplay">
+			android:theme="@style/Theme.AppCompat.NoActionBar">
 		</activity>
 
 		<activity
 			android:name=".android.logout.HideUiActivity"
-			android:theme="@android:style/Theme.NoDisplay">
+			android:theme="@style/Theme.AppCompat.NoActionBar">
 		</activity>
 
 		<activity
@@ -424,5 +424,29 @@
 			android:launchMode="singleTask"
 			android:theme="@style/BriarTheme.NoActionBar"/>
 
+		<!-- Prototype -->
+		<activity
+			android:name=".android.contact.ContactLinkExchangeActivity"
+			android:theme="@style/BriarTheme"
+			android:label="@string/add_contact_title"
+			android:windowSoftInputMode="stateHidden|adjustResize">
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:scheme="briar"/>
+			</intent-filter>
+			<intent-filter>
+				<action android:name="android.intent.action.SEND"/>
+				<category android:name="android.intent.category.DEFAULT"/>
+				<data android:mimeType="text/plain"/>
+			</intent-filter>
+		</activity>
+
+		<activity
+			android:name=".android.contact.PendingRequestsActivity"
+			android:label="@string/pending_contact_requests"
+			android:theme="@style/BriarTheme"/>
+
 	</application>
 </manifest>

briar-android/src/main/java/org/briarproject/briar/android/BackgroundMonitor.java

@@ -1,54 +0,0 @@
-package org.briarproject.briar.android;
-
-import android.app.Activity;
-import android.app.Application.ActivityLifecycleCallbacks;
-import android.os.Bundle;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.ThreadSafe;
-
-@ThreadSafe
-@NotNullByDefault
-class BackgroundMonitor implements ActivityLifecycleCallbacks {
-
-	private final AtomicInteger foregroundActivities = new AtomicInteger(0);
-
-	boolean isRunningInBackground() {
-		return foregroundActivities.get() == 0;
-	}
-
-	@Override
-	public void onActivityCreated(Activity a, @Nullable Bundle state) {
-	}
-
-	@Override
-	public void onActivityStarted(Activity a) {
-		foregroundActivities.incrementAndGet();
-	}
-
-	@Override
-	public void onActivityResumed(Activity a) {
-	}
-
-	@Override
-	public void onActivityPaused(Activity a) {
-	}
-
-	@Override
-	public void onActivityStopped(Activity a) {
-		foregroundActivities.decrementAndGet();
-	}
-
-	@Override
-	public void onActivitySaveInstanceState(Activity a,
-			@Nullable Bundle outState) {
-	}
-
-	@Override
-	public void onActivityDestroyed(Activity a) {
-	}
-}

briar-android/src/main/java/org/briarproject/briar/android/BriarApplication.java

@@ -16,6 +16,4 @@ public interface BriarApplication {
 	AndroidComponent getApplicationComponent();
 
 	SharedPreferences getDefaultSharedPreferences();
-
-	boolean isRunningInBackground();
 }

briar-android/src/main/java/org/briarproject/briar/android/BriarApplicationImpl.java

@@ -1,7 +1,5 @@
 package org.briarproject.briar.android;
 
-import android.app.ActivityManager;
-import android.app.ActivityManager.RunningAppProcessInfo;
 import android.app.Application;
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -32,8 +30,6 @@ import java.util.logging.Handler;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 
-import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND;
-import static android.os.Build.VERSION.SDK_INT;
 import static java.util.logging.Level.FINE;
 import static java.util.logging.Level.INFO;
 import static org.acra.ReportField.ANDROID_VERSION;
@@ -83,7 +79,6 @@ public class BriarApplicationImpl extends Application
 			Logger.getLogger(BriarApplicationImpl.class.getName());
 
 	private final CachingLogHandler logHandler = new CachingLogHandler();
-	private final BackgroundMonitor backgroundMonitor = new BackgroundMonitor();
 
 	private AndroidComponent applicationComponent;
 	private volatile SharedPreferences prefs;
@@ -120,9 +115,6 @@ public class BriarApplicationImpl extends Application
 
 		applicationComponent = createApplicationComponent();
 		EmojiManager.install(new GoogleEmojiProvider());
-
-		if (SDK_INT < 16)
-			registerActivityLifecycleCallbacks(backgroundMonitor);
 	}
 
 	protected AndroidComponent createApplicationComponent() {
@@ -181,15 +173,4 @@ public class BriarApplicationImpl extends Application
 	public SharedPreferences getDefaultSharedPreferences() {
 		return prefs;
 	}
-
-	@Override
-	public boolean isRunningInBackground() {
-		if (SDK_INT >= 16) {
-			RunningAppProcessInfo info = new RunningAppProcessInfo();
-			ActivityManager.getMyMemoryState(info);
-			return (info.importance != IMPORTANCE_FOREGROUND);
-		} else {
-			return backgroundMonitor.isRunningInBackground();
-		}
-	}
 }

briar-android/src/main/java/org/briarproject/briar/android/BriarService.java

@@ -1,5 +1,7 @@
 package org.briarproject.briar.android;
 
+import android.app.ActivityManager;
+import android.app.ActivityManager.RunningAppProcessInfo;
 import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
@@ -33,6 +35,7 @@ import java.util.logging.Logger;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
+import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND;
 import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
 import static android.app.NotificationManager.IMPORTANCE_NONE;
 import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
@@ -71,7 +74,6 @@ public class BriarService extends Service {
 
 	@Nullable
 	private BroadcastReceiver receiver = null;
-	private BriarApplication app;
 
 	@Inject
 	AndroidNotificationManager notificationManager;
@@ -91,8 +93,8 @@ public class BriarService extends Service {
 	public void onCreate() {
 		super.onCreate();
 
-		app = (BriarApplication) getApplication();
-		app.getApplicationComponent().inject(this);
+		BriarApplication application = (BriarApplication) getApplication();
+		application.getApplicationComponent().inject(this);
 
 		LOG.info("Created");
 		if (created.getAndSet(true)) {
@@ -218,8 +220,8 @@ public class BriarService extends Service {
 	public void onLowMemory() {
 		super.onLowMemory();
 		LOG.warning("Memory is low");
-		// If we're not in the foreground, clear the UI to save memory
-		if (app.isRunningInBackground()) hideUi();
+		// Clear the UI - this is done in onTrimMemory() if SDK_INT >= 16
+		if (SDK_INT < 16) hideUi();
 	}
 
 	@Override
@@ -233,16 +235,20 @@ public class BriarService extends Service {
 			LOG.info("Trim memory: near middle of LRU list");
 		} else if (level == TRIM_MEMORY_COMPLETE) {
 			LOG.info("Trim memory: near end of LRU list");
-		} else if (level == TRIM_MEMORY_RUNNING_MODERATE) {
-			LOG.info("Trim memory: running moderately low");
-		} else if (level == TRIM_MEMORY_RUNNING_LOW) {
-			LOG.info("Trim memory: running low");
-		} else if (level == TRIM_MEMORY_RUNNING_CRITICAL) {
-			// This level may be received if SDK_INT < 16, although the
-			// constant isn't declared until API level 16
-			LOG.warning("Trim memory: running critically low");
-			// If we're not in the foreground, clear the UI to save memory
-			if (app.isRunningInBackground()) hideUi();
+		} else if (SDK_INT >= 16) {
+			if (level == TRIM_MEMORY_RUNNING_MODERATE) {
+				LOG.info("Trim memory: running moderately low");
+			} else if (level == TRIM_MEMORY_RUNNING_LOW) {
+				LOG.info("Trim memory: running low");
+			} else if (level == TRIM_MEMORY_RUNNING_CRITICAL) {
+				LOG.info("Trim memory: running critically low");
+				// If we're not in the foreground, clear the UI to save memory
+				RunningAppProcessInfo info = new RunningAppProcessInfo();
+				ActivityManager.getMyMemoryState(info);
+				if (info.importance != IMPORTANCE_FOREGROUND) hideUi();
+			} else if (LOG.isLoggable(INFO)) {
+				LOG.info("Trim memory: unknown level " + level);
+			}
 		} else if (LOG.isLoggable(INFO)) {
 			LOG.info("Trim memory: unknown level " + level);
 		}

briar-android/src/main/java/org/briarproject/briar/android/StartupFailureActivity.java

@@ -3,29 +3,22 @@ package org.briarproject.briar.android;
 import android.app.NotificationManager;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.activity.BaseActivity;
 import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener;
 import org.briarproject.briar.android.fragment.ErrorFragment;
 
-import static java.util.Objects.requireNonNull;
 import static org.briarproject.bramble.api.lifecycle.LifecycleManager.StartResult;
 import static org.briarproject.briar.android.BriarService.EXTRA_NOTIFICATION_ID;
 import static org.briarproject.briar.android.BriarService.EXTRA_START_RESULT;
 
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
 public class StartupFailureActivity extends BaseActivity implements
 		BaseFragmentListener {
 
 	@Override
-	public void onCreate(@Nullable Bundle state) {
+	public void onCreate(Bundle state) {
 		super.onCreate(state);
 
 		setContentView(R.layout.activity_fragment_container);
@@ -45,7 +38,7 @@ public class StartupFailureActivity extends BaseActivity implements
 		// cancel notification
 		if (notificationId > -1) {
 			Object o = getSystemService(NOTIFICATION_SERVICE);
-			NotificationManager nm = (NotificationManager) requireNonNull(o);
+			NotificationManager nm = (NotificationManager) o;
 			nm.cancel(notificationId);
 		}
 
@@ -73,7 +66,7 @@ public class StartupFailureActivity extends BaseActivity implements
 	}
 
 	@Override
-	public void runOnDbThread(@NonNull Runnable runnable) {
+	public void runOnDbThread(Runnable runnable) {
 		throw new AssertionError("Deprecated and should not be used");
 	}
 

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

@@ -15,12 +15,17 @@ import org.briarproject.briar.android.blog.ReblogFragment;
 import org.briarproject.briar.android.blog.RssFeedImportActivity;
 import org.briarproject.briar.android.blog.RssFeedManageActivity;
 import org.briarproject.briar.android.blog.WriteBlogPostActivity;
+import org.briarproject.briar.android.contact.ContactLinkExchangeActivity;
+import org.briarproject.briar.android.contact.ContactLinkExchangeFragment;
 import org.briarproject.briar.android.contact.ContactListFragment;
 import org.briarproject.briar.android.contact.ContactModule;
+import org.briarproject.briar.android.contact.ContactNicknameFragment;
+import org.briarproject.briar.android.contact.ContactQrCodeInputFragment;
+import org.briarproject.briar.android.contact.ContactQrCodeOutputFragment;
+import org.briarproject.briar.android.contact.PendingRequestsActivity;
 import org.briarproject.briar.android.conversation.AliasDialogFragment;
 import org.briarproject.briar.android.conversation.ConversationActivity;
 import org.briarproject.briar.android.conversation.ImageActivity;
-import org.briarproject.briar.android.conversation.ImageFragment;
 import org.briarproject.briar.android.forum.CreateForumActivity;
 import org.briarproject.briar.android.forum.ForumActivity;
 import org.briarproject.briar.android.forum.ForumListFragment;
@@ -31,6 +36,7 @@ import org.briarproject.briar.android.introduction.IntroductionActivity;
 import org.briarproject.briar.android.introduction.IntroductionMessageFragment;
 import org.briarproject.briar.android.keyagreement.ContactExchangeActivity;
 import org.briarproject.briar.android.keyagreement.ContactExchangeErrorFragment;
+import org.briarproject.briar.android.keyagreement.IntroFragment;
 import org.briarproject.briar.android.keyagreement.KeyAgreementActivity;
 import org.briarproject.briar.android.keyagreement.KeyAgreementFragment;
 import org.briarproject.briar.android.login.AuthorNameFragment;
@@ -48,6 +54,7 @@ import org.briarproject.briar.android.privategroup.conversation.GroupActivity;
 import org.briarproject.briar.android.privategroup.conversation.GroupConversationModule;
 import org.briarproject.briar.android.privategroup.creation.CreateGroupActivity;
 import org.briarproject.briar.android.privategroup.creation.CreateGroupFragment;
+import org.briarproject.briar.android.privategroup.creation.CreateGroupMessageFragment;
 import org.briarproject.briar.android.privategroup.creation.CreateGroupModule;
 import org.briarproject.briar.android.privategroup.creation.GroupInviteActivity;
 import org.briarproject.briar.android.privategroup.creation.GroupInviteFragment;
@@ -68,8 +75,10 @@ import org.briarproject.briar.android.sharing.ForumInvitationActivity;
 import org.briarproject.briar.android.sharing.ForumSharingStatusActivity;
 import org.briarproject.briar.android.sharing.ShareBlogActivity;
 import org.briarproject.briar.android.sharing.ShareBlogFragment;
+import org.briarproject.briar.android.sharing.ShareBlogMessageFragment;
 import org.briarproject.briar.android.sharing.ShareForumActivity;
 import org.briarproject.briar.android.sharing.ShareForumFragment;
+import org.briarproject.briar.android.sharing.ShareForumMessageFragment;
 import org.briarproject.briar.android.sharing.SharingModule;
 import org.briarproject.briar.android.splash.SplashScreenActivity;
 import org.briarproject.briar.android.test.TestDataActivity;
@@ -168,6 +177,10 @@ public interface ActivityComponent {
 
 	void inject(UnlockActivity activity);
 
+	void inject(ContactLinkExchangeActivity activity);
+
+	void inject(PendingRequestsActivity activity);
+
 	// Fragments
 	void inject(AuthorNameFragment fragment);
 
@@ -179,6 +192,8 @@ public interface ActivityComponent {
 
 	void inject(CreateGroupFragment fragment);
 
+	void inject(CreateGroupMessageFragment fragment);
+
 	void inject(GroupListFragment fragment);
 
 	void inject(GroupInviteFragment fragment);
@@ -189,14 +204,20 @@ public interface ActivityComponent {
 
 	void inject(FeedFragment fragment);
 
+	void inject(IntroFragment fragment);
+
 	void inject(KeyAgreementFragment fragment);
 
 	void inject(ContactChooserFragment fragment);
 
 	void inject(ShareForumFragment fragment);
 
+	void inject(ShareForumMessageFragment fragment);
+
 	void inject(ShareBlogFragment fragment);
 
+	void inject(ShareBlogMessageFragment fragment);
+
 	void inject(IntroductionMessageFragment fragment);
 
 	void inject(SettingsFragment fragment);
@@ -207,6 +228,12 @@ public interface ActivityComponent {
 
 	void inject(AliasDialogFragment aliasDialogFragment);
 
-	void inject(ImageFragment imageFragment);
+	void inject(ContactLinkExchangeFragment fragment);
+
+	void inject(ContactNicknameFragment fragment);
+
+	void inject(ContactQrCodeOutputFragment fragment);
+
+	void inject(ContactQrCodeInputFragment fragment);
 
 }

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

@@ -15,8 +15,6 @@ import android.view.ViewGroup.LayoutParams;
 import android.view.inputmethod.InputMethodManager;
 
 import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.AndroidComponent;
 import org.briarproject.briar.android.BriarApplication;
@@ -53,8 +51,6 @@ import static org.briarproject.briar.android.TestingConstants.PREVENT_SCREENSHOT
  * Warning: Some activities don't extend {@link BaseActivity}.
  *          E.g. {@link DevReportActivity}
  */
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
 public abstract class BaseActivity extends AppCompatActivity
 		implements DestroyableContext, OnTapFilteredListener {
 
@@ -81,17 +77,6 @@ public abstract class BaseActivity extends AppCompatActivity
 
 	@Override
 	public void onCreate(@Nullable Bundle state) {
-		// create the ActivityComponent *before* calling super.onCreate()
-		// because it already attaches fragments which need access
-		// to the component for their own injection
-		AndroidComponent applicationComponent =
-				((BriarApplication) getApplication()).getApplicationComponent();
-		activityComponent = DaggerActivityComponent.builder()
-				.androidComponent(applicationComponent)
-				.activityModule(getActivityModule())
-				.forumModule(getForumModule())
-				.build();
-		injectActivity(activityComponent);
 		super.onCreate(state);
 
 		// WARNING: When removing this or making it possible to turn it off,
@@ -101,6 +86,17 @@ public abstract class BaseActivity extends AppCompatActivity
 		//          unlock screen is shown.
 		if (PREVENT_SCREENSHOTS) getWindow().addFlags(FLAG_SECURE);
 
+		AndroidComponent applicationComponent =
+				((BriarApplication) getApplication()).getApplicationComponent();
+
+		activityComponent = DaggerActivityComponent.builder()
+				.androidComponent(applicationComponent)
+				.activityModule(getActivityModule())
+				.forumModule(getForumModule())
+				.build();
+
+		injectActivity(activityComponent);
+
 		for (ActivityLifecycleController alc : lifecycleControllers) {
 			alc.onActivityCreate(this);
 		}

briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java

@@ -1,5 +1,6 @@
 package org.briarproject.briar.android.activity;
 
+import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.support.annotation.RequiresApi;
 import android.support.v7.app.ActionBar;
@@ -9,8 +10,6 @@ import android.transition.Transition;
 import android.view.Window;
 import android.widget.CheckBox;
 
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.controller.BriarController;
 import org.briarproject.briar.android.controller.DbController;
@@ -37,8 +36,7 @@ import static org.briarproject.briar.android.util.UiUtils.excludeSystemUi;
 import static org.briarproject.briar.android.util.UiUtils.getDozeWhitelistingIntent;
 import static org.briarproject.briar.android.util.UiUtils.isSamsung7;
 
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
+@SuppressLint("Registered")
 public abstract class BriarActivity extends BaseActivity {
 
 	public static final String GROUP_ID = "briar.GROUP_ID";
@@ -62,8 +60,7 @@ public abstract class BriarActivity extends BaseActivity {
 	}
 
 	@Override
-	protected void onActivityResult(int request, int result,
-			@Nullable Intent data) {
+	protected void onActivityResult(int request, int result, Intent data) {
 		super.onActivityResult(request, result, data);
 		if (request == REQUEST_PASSWORD) {
 			// The result can be RESULT_CANCELED if there's no account
@@ -92,7 +89,7 @@ public abstract class BriarActivity extends BaseActivity {
 		} else if (lockManager.isLocked() && !isFinishing()) {
 			// Also check that the activity isn't finishing already.
 			// This is possible if we finished in onActivityResult().
-			// Launching another UnlockActivity would cause a loop.
+			// Lauching another UnlockActivity would cause a loop.
 			Intent i = new Intent(this, UnlockActivity.class);
 			startActivityForResult(i, REQUEST_UNLOCK);
 		} else if (SDK_INT >= 23) {
@@ -114,10 +111,6 @@ public abstract class BriarActivity extends BaseActivity {
 		lockManager.onActivityStop();
 	}
 
-	protected boolean signedIn() {
-		return briarController.accountSignedIn();
-	}
-
 	/**
 	 * Sets the transition animations.
 	 * @param enterTransition used to move views into initial positions

briar-android/src/main/java/org/briarproject/briar/android/blog/BasePostFragment.java

@@ -24,8 +24,6 @@ import javax.annotation.Nullable;
 import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
 import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
-import static java.util.Objects.requireNonNull;
-import static java.util.logging.Logger.getLogger;
 import static org.briarproject.briar.android.activity.BriarActivity.GROUP_ID;
 import static org.briarproject.briar.android.util.UiUtils.MIN_DATE_RESOLUTION;
 
@@ -37,7 +35,7 @@ abstract class BasePostFragment extends BaseFragment {
 	static final String POST_ID = "briar.POST_ID";
 
 	private static final Logger LOG =
-			getLogger(BasePostFragment.class.getName());
+			Logger.getLogger(BasePostFragment.class.getName());
 
 	private final Handler handler = new Handler(Looper.getMainLooper());
 
@@ -54,7 +52,7 @@ abstract class BasePostFragment extends BaseFragment {
 			@Nullable ViewGroup container,
 			@Nullable Bundle savedInstanceState) {
 		// retrieve MessageId of blog post from arguments
-		byte[] p = requireNonNull(getArguments()).getByteArray(POST_ID);
+		byte[] p = getArguments().getByteArray(POST_ID);
 		if (p == null) throw new IllegalStateException("No post ID in args");
 		postId = new MessageId(p);
 
@@ -70,7 +68,6 @@ abstract class BasePostFragment extends BaseFragment {
 
 			@Override
 			public void onAuthorClick(BlogPostItem post) {
-				if (getContext() == null) return;
 				Intent i = new Intent(getContext(), BlogActivity.class);
 				i.putExtra(GROUP_ID, post.getGroupId().getBytes());
 				i.setFlags(FLAG_ACTIVITY_CLEAR_TOP);

briar-android/src/main/java/org/briarproject/briar/android/blog/BlogFragment.java

@@ -43,7 +43,6 @@ import javax.inject.Inject;
 import static android.app.Activity.RESULT_OK;
 import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
 import static android.widget.Toast.LENGTH_SHORT;
-import static java.util.Objects.requireNonNull;
 import static org.briarproject.briar.android.activity.BriarActivity.GROUP_ID;
 import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_SHARE_BLOG;
 import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_WRITE_BLOG_POST;
@@ -70,6 +69,7 @@ public class BlogFragment extends BaseFragment
 	private boolean isMyBlog = false, canDeleteBlog = false;
 
 	static BlogFragment newInstance(GroupId groupId) {
+
 		BlogFragment f = new BlogFragment();
 
 		Bundle bundle = new Bundle();
@@ -79,27 +79,20 @@ public class BlogFragment extends BaseFragment
 		return f;
 	}
 
-	@Override
-	public void injectFragment(ActivityComponent component) {
-		component.inject(this);
-		blogController.setBlogSharingListener(this);
-		sharingController.setSharingListener(this);
-	}
-
 	@Nullable
 	@Override
 	public View onCreateView(LayoutInflater inflater,
 			@Nullable ViewGroup container,
 			@Nullable Bundle savedInstanceState) {
-		Bundle args = requireNonNull(getArguments());
+		Bundle args = getArguments();
 		byte[] b = args.getByteArray(GROUP_ID);
 		if (b == null) throw new IllegalStateException("No group ID in args");
 		groupId = new GroupId(b);
 
 		View v = inflater.inflate(R.layout.fragment_blog, container, false);
 
-		adapter = new BlogPostAdapter(requireNonNull(getActivity()), this,
-				getFragmentManager());
+		adapter =
+				new BlogPostAdapter(getActivity(), this, getFragmentManager());
 		list = v.findViewById(R.id.postList);
 		list.setLayoutManager(new LinearLayoutManager(getActivity()));
 		list.setAdapter(adapter);
@@ -109,6 +102,13 @@ public class BlogFragment extends BaseFragment
 		return v;
 	}
 
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+		blogController.setBlogSharingListener(this);
+		sharingController.setSharingListener(this);
+	}
+
 	@Override
 	public void onStart() {
 		super.onStart();
@@ -218,10 +218,7 @@ public class BlogFragment extends BaseFragment
 
 	@Override
 	public void onAuthorClick(BlogPostItem post) {
-		if (post.getGroupId().equals(groupId) || getContext() == null) {
-			// We're already there
-			return;
-		}
+		if (post.getGroupId().equals(groupId)) return; // We're already there
 		Intent i = new Intent(getContext(), BlogActivity.class);
 		i.putExtra(GROUP_ID, post.getGroupId().getBytes());
 		i.setFlags(FLAG_ACTIVITY_CLEAR_TOP);

briar-android/src/main/java/org/briarproject/briar/android/blog/FeedFragment.java

@@ -35,7 +35,6 @@ import javax.inject.Inject;
 import static android.app.Activity.RESULT_OK;
 import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
 import static android.support.design.widget.Snackbar.LENGTH_LONG;
-import static java.util.Objects.requireNonNull;
 import static org.briarproject.briar.android.activity.BriarActivity.GROUP_ID;
 import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_WRITE_BLOG_POST;
 
@@ -65,18 +64,13 @@ public class FeedFragment extends BaseFragment implements
 		return f;
 	}
 
-	@Override
-	public void injectFragment(ActivityComponent component) {
-		component.inject(this);
-		feedController.setFeedListener(this);
-	}
-
 	@Nullable
 	@Override
 	public View onCreateView(LayoutInflater inflater,
 			@Nullable ViewGroup container,
 			@Nullable Bundle savedInstanceState) {
-		requireNonNull(getActivity()).setTitle(R.string.blogs_button);
+
+		getActivity().setTitle(R.string.blogs_button);
 
 		View v = inflater.inflate(R.layout.fragment_blog, container, false);
 
@@ -94,6 +88,12 @@ public class FeedFragment extends BaseFragment implements
 		return v;
 	}
 
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+		feedController.setFeedListener(this);
+	}
+
 	@Override
 	public void onActivityResult(int requestCode, int resultCode, Intent data) {
 		super.onActivityResult(requestCode, resultCode, data);

briar-android/src/main/java/org/briarproject/briar/android/blog/FeedPostFragment.java

@@ -17,7 +17,6 @@ import org.briarproject.briar.android.controller.handler.UiResultExceptionHandle
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
-import static java.util.Objects.requireNonNull;
 import static org.briarproject.briar.android.activity.BriarActivity.GROUP_ID;
 
 @UiThread
@@ -43,17 +42,13 @@ public class FeedPostFragment extends BasePostFragment {
 		return f;
 	}
 
-	@Override
-	public void injectFragment(ActivityComponent component) {
-		component.inject(this);
-	}
-
 	@Nullable
 	@Override
 	public View onCreateView(LayoutInflater inflater,
 			@Nullable ViewGroup container,
 			@Nullable Bundle savedInstanceState) {
-		Bundle args = requireNonNull(getArguments());
+
+		Bundle args = getArguments();
 		byte[] b = args.getByteArray(GROUP_ID);
 		if (b == null) throw new IllegalStateException("No group ID in args");
 		blogId = new GroupId(b);
@@ -66,6 +61,11 @@ public class FeedPostFragment extends BasePostFragment {
 		return TAG;
 	}
 
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+	}
+
 	@Override
 	public void onStart() {
 		super.onStart();

briar-android/src/main/java/org/briarproject/briar/android/blog/ReblogFragment.java

@@ -31,7 +31,6 @@ import static android.view.View.FOCUS_DOWN;
 import static android.view.View.GONE;
 import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
-import static java.util.Objects.requireNonNull;
 import static org.briarproject.briar.android.activity.BriarActivity.GROUP_ID;
 import static org.briarproject.briar.android.blog.BasePostFragment.POST_ID;
 import static org.briarproject.briar.api.blog.BlogConstants.MAX_BLOG_POST_TEXT_LENGTH;
@@ -43,6 +42,8 @@ public class ReblogFragment extends BaseFragment implements SendListener {
 	public static final String TAG = ReblogFragment.class.getName();
 
 	private ViewHolder ui;
+	private GroupId blogId;
+	private MessageId postId;
 	private BlogPostItem item;
 
 	@Inject
@@ -74,11 +75,9 @@ public class ReblogFragment extends BaseFragment implements SendListener {
 			@Nullable ViewGroup container,
 			@Nullable Bundle savedInstanceState) {
 
-		Bundle args = requireNonNull(getArguments());
-		GroupId blogId =
-				new GroupId(requireNonNull(args.getByteArray(GROUP_ID)));
-		MessageId postId =
-				new MessageId(requireNonNull(args.getByteArray(POST_ID)));
+		Bundle args = getArguments();
+		blogId = new GroupId(args.getByteArray(GROUP_ID));
+		postId = new MessageId(args.getByteArray(POST_ID));
 
 		View v = inflater.inflate(R.layout.fragment_reblog, container, false);
 		ui = new ViewHolder(v);
@@ -90,6 +89,14 @@ public class ReblogFragment extends BaseFragment implements SendListener {
 		ui.input.setMaxTextLength(MAX_BLOG_POST_TEXT_LENGTH);
 		showProgressBar();
 
+		return v;
+	}
+
+	@Override
+	public void onStart() {
+		super.onStart();
+
+		// TODO: Load blog post when fragment is created. #631
 		feedController.loadBlogPost(blogId, postId,
 				new UiResultExceptionHandler<BlogPostItem, DbException>(
 						this) {
@@ -104,8 +111,6 @@ public class ReblogFragment extends BaseFragment implements SendListener {
 						handleDbException(exception);
 					}
 				});
-
-		return v;
 	}
 
 	private void bindViewHolder() {

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactLinkExchangeActivity.java

@@ -0,0 +1,196 @@
+package org.briarproject.briar.android.contact;
+
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.view.MenuItem;
+
+import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.lifecycle.LifecycleManager;
+import org.briarproject.bramble.api.plugin.ConnectionRegistry;
+import org.briarproject.bramble.api.plugin.TorConstants;
+import org.briarproject.bramble.api.system.Clock;
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.activity.BriarActivity;
+import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener;
+import org.briarproject.briar.api.messaging.MessagingManager;
+
+import java.util.logging.Logger;
+import java.util.regex.Pattern;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+
+import static android.app.AlarmManager.ELAPSED_REALTIME;
+import static android.content.Intent.ACTION_SEND;
+import static android.content.Intent.ACTION_VIEW;
+import static android.content.Intent.EXTRA_TEXT;
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+import static android.os.SystemClock.elapsedRealtime;
+import static java.lang.String.CASE_INSENSITIVE_ORDER;
+import static java.util.Objects.requireNonNull;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static java.util.logging.Level.WARNING;
+import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState.RUNNING;
+import static org.briarproject.bramble.util.LogUtils.logException;
+import static org.briarproject.bramble.util.StringUtils.getRandomBase32String;
+
+public class ContactLinkExchangeActivity extends BriarActivity implements
+		BaseFragmentListener {
+
+	private static final Logger LOG =
+			Logger.getLogger(ContactLinkExchangeActivity.class.getName());
+
+	static final int LINK_LENGTH = 128;
+	static final Pattern LINK_REGEX =
+			Pattern.compile("(briar://)?([a-z2-7]{" + LINK_LENGTH + "})");
+	static final String OUR_LINK = "briar://" + getRandomBase32String(LINK_LENGTH);;
+
+	@Inject
+	LifecycleManager lifecycleManager;
+	@Inject
+	MessagingManager messagingManager;
+	@Inject
+	ConnectionRegistry connectionRegistry;
+	@Inject
+	Clock clock;
+
+	@Override
+	public void injectActivity(ActivityComponent component) {
+		component.inject(this);
+	}
+
+	@Override
+	public void onCreate(@Nullable Bundle state) {
+		super.onCreate(state);
+		setContentView(R.layout.activity_fragment_container);
+
+		ActionBar ab = getSupportActionBar();
+		if (ab != null) {
+			ab.setDisplayHomeAsUpEnabled(true);
+		}
+
+		Intent i = getIntent();
+		if (i != null) {
+			String action = i.getAction();
+			if (ACTION_SEND.equals(action) || ACTION_VIEW.equals(action)) {
+				String text = i.getStringExtra(EXTRA_TEXT);
+				if (text != null) {
+					showInitialFragment(
+							ContactLinkExchangeFragment.newInstance(text));
+					return;
+				}
+				String uri = i.getDataString();
+				if (uri != null) {
+					showInitialFragment(
+							ContactLinkExchangeFragment.newInstance(uri));
+					return;
+				}
+			} else if ("addContact".equals(action)) {
+				removeFakeRequest(i.getStringExtra("name"),
+						i.getLongExtra("timestamp", 0), i.getLongExtra("addAt", 0));
+				setIntent(null);
+				finish();
+			}
+		}
+		if (state == null) {
+			showInitialFragment(new ContactLinkExchangeFragment());
+		}
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch (item.getItemId()) {
+			case android.R.id.home:
+				onBackPressed();
+				return true;
+			default:
+				return super.onOptionsItemSelected(item);
+		}
+	}
+
+	boolean isBriarLink(@Nullable CharSequence s) {
+		return s != null && LINK_REGEX.matcher(s).matches();
+	}
+
+	void scanCode() {
+		showNextFragment(new ContactQrCodeInputFragment());
+	}
+
+	void linkScanned(@Nullable String link) {
+		// FIXME: Contact name is lost
+		showNextFragment(ContactLinkExchangeFragment.newInstance(link));
+	}
+
+	void showCode() {
+		showNextFragment(new ContactQrCodeOutputFragment());
+	}
+
+	void addFakeRequest(String name, String link) {
+
+		AlarmManager alarmManager =
+				(AlarmManager) requireNonNull(getSystemService(ALARM_SERVICE));
+		double random = getPseudoRandom(link, OUR_LINK.replace("briar://", ""));
+		long m = SECONDS.toMillis(50);
+		long fromNow = (long) (-m * Math.log(random));
+		// it should take at least 30 seconds
+		if (fromNow < SECONDS.toMillis(30)) fromNow = SECONDS.toMillis(30);
+		LOG.info("Delay " + fromNow + " ms based on seed " + random);
+		long triggerAt = elapsedRealtime() + fromNow;
+
+		long timestamp = clock.currentTimeMillis();
+		try {
+			messagingManager.addNewPendingContact(name, timestamp, timestamp + fromNow);
+		} catch (DbException e) {
+			logException(LOG, WARNING, e);
+		}
+
+		Intent i = new Intent(this, ContactLinkExchangeActivity.class);
+		i.setAction("addContact");
+		i.setFlags(FLAG_ACTIVITY_NEW_TASK);
+		i.putExtra("name", name);
+		i.putExtra("timestamp", timestamp);
+		i.putExtra("addAt", timestamp + fromNow);
+		PendingIntent pendingIntent =
+				PendingIntent.getActivity(this, (int) timestamp / 1000, i, 0);
+		alarmManager.set(ELAPSED_REALTIME, triggerAt, pendingIntent);
+	}
+
+	/**
+	 * Returns a pseudo-random value greater than or equal to 0 and less than 1,
+	 * approximately uniformly distributed, based on the given strings. The
+	 * same value is returned if the strings are swapped.
+	 */
+	private double getPseudoRandom(String a, String b) {
+		String first, second;
+		if (CASE_INSENSITIVE_ORDER.compare(a, b) < 0) {
+			first = a;
+			second = b;
+		} else {
+			first = b;
+			second = a;
+		}
+		int hash = (first + second).hashCode() & Integer.MAX_VALUE;
+		return hash / (1.0 + Integer.MAX_VALUE);
+	}
+
+	private void removeFakeRequest(String name, long timestamp, long addAt) {
+		if (lifecycleManager.getLifecycleState() != RUNNING) {
+			LOG.info("Lifecycle not started, not adding contact " + name);
+			return;
+		}
+		LOG.info("Adding Contact " + name);
+		try {
+			ContactId c = messagingManager
+					.removePendingContact(name, timestamp, addAt);
+			// fake contact online status
+			connectionRegistry.registerConnection(c, TorConstants.ID, true);
+		} catch (DbException e) {
+			logException(LOG, WARNING, e);
+		}
+	}
+}

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactLinkExchangeFragment.java

@@ -0,0 +1,184 @@
+package org.briarproject.briar.android.contact;
+
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.design.widget.TextInputEditText;
+import android.support.design.widget.TextInputLayout;
+import android.support.v4.app.ShareCompat.IntentBuilder;
+import android.support.v7.widget.AppCompatImageButton;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.fragment.BaseFragment;
+
+import java.util.regex.Matcher;
+
+import javax.annotation.Nullable;
+
+import static android.content.Context.CLIPBOARD_SERVICE;
+import static android.os.Build.VERSION.SDK_INT;
+import static android.support.v4.graphics.drawable.DrawableCompat.setTint;
+import static android.support.v4.graphics.drawable.DrawableCompat.wrap;
+import static android.widget.Toast.LENGTH_SHORT;
+import static java.util.Objects.requireNonNull;
+import static org.briarproject.briar.android.contact.ContactLinkExchangeActivity.LINK_REGEX;
+import static org.briarproject.briar.android.contact.ContactLinkExchangeActivity.OUR_LINK;
+import static org.briarproject.briar.android.util.UiUtils.resolveColorAttribute;
+
+public class ContactLinkExchangeFragment extends BaseFragment {
+
+	static final String TAG = ContactLinkExchangeFragment.class.getName();
+
+	static BaseFragment newInstance(@Nullable String link) {
+		BaseFragment f = new ContactLinkExchangeFragment();
+		Bundle bundle = new Bundle();
+		bundle.putString("link", link);
+		f.setArguments(bundle);
+		return f;
+	}
+
+	private ClipboardManager clipboard;
+	private TextInputLayout linkInputLayout;
+	private TextInputEditText linkInput;
+
+	@Override
+	public String getUniqueTag() {
+		return TAG;
+	}
+
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+		if (getActivity() == null || getContext() == null) return null;
+
+		getActivity().setTitle(R.string.add_contact_remotely_title_case);
+
+		View v = inflater.inflate(R.layout.fragment_contact_link_exchange,
+				container, false);
+
+		clipboard = (ClipboardManager) requireNonNull(
+				getContext().getSystemService(CLIPBOARD_SERVICE));
+
+		int color =
+				resolveColorAttribute(getContext(), R.attr.colorControlNormal);
+
+		Button continueButton = v.findViewById(R.id.addButton);
+		continueButton.setOnClickListener(view -> onContinueButtonClicked());
+
+		linkInputLayout = v.findViewById(R.id.linkInputLayout);
+		linkInput = v.findViewById(R.id.linkInput);
+		if (SDK_INT < 23) {
+			Drawable drawable = wrap(linkInput.getCompoundDrawables()[0]);
+			setTint(drawable, color);
+			linkInput.setCompoundDrawables(drawable, null, null, null);
+		}
+		if (getArguments() != null)
+			linkInput.setText(getArguments().getString("link"));
+
+		AppCompatImageButton pasteButton = v.findViewById(R.id.pasteButton);
+		pasteButton.setOnClickListener(view -> {
+			ClipData clip = clipboard.getPrimaryClip();
+			if (clip != null)
+				linkInput.setText(clip.getItemAt(0).getText());
+		});
+
+		Button scanCodeButton = v.findViewById(R.id.scanCodeButton);
+		scanCodeButton.setOnClickListener(view -> {
+			ContactLinkExchangeActivity activity = getCastActivity();
+			if (activity != null) activity.scanCode();
+		});
+
+		TextView linkView = v.findViewById(R.id.linkView);
+		linkView.setText(OUR_LINK);
+
+		ClipData clip = ClipData.newPlainText(
+				getString(R.string.link_clip_label), OUR_LINK);
+
+		Button copyButton = v.findViewById(R.id.copyButton);
+		copyButton.setOnClickListener(view -> {
+			clipboard.setPrimaryClip(clip);
+			Toast.makeText(getContext(), R.string.link_copied_toast,
+					LENGTH_SHORT).show();
+		});
+
+		Button shareButton = v.findViewById(R.id.shareButton);
+		shareButton.setOnClickListener(view -> {
+			IntentBuilder.from(getActivity())
+					.setText(OUR_LINK)
+					.setType("text/plain")
+					.startChooser();
+		});
+
+		Button showCodeButton = v.findViewById(R.id.showCodeButton);
+		showCodeButton.setOnClickListener(
+				view -> {
+					ContactLinkExchangeActivity activity = getCastActivity();
+					if (activity != null) activity.showCode();
+				});
+
+		return v;
+	}
+
+	private ContactLinkExchangeActivity getCastActivity() {
+		return (ContactLinkExchangeActivity) getActivity();
+	}
+
+	private boolean isInputError() {
+		boolean briarLink = isBriarLink(linkInput.getText());
+		if (!briarLink) {
+			linkInputLayout.setError(getString(R.string.invalid_link));
+			linkInput.requestFocus();
+			return true;
+		} else linkInputLayout.setError(null);
+		String link = getLink();
+		boolean isOurLink = link != null && OUR_LINK.equals("briar://" + link);
+		if (isOurLink) {
+			linkInputLayout.setError(getString(R.string.own_link_error));
+			linkInput.requestFocus();
+			return true;
+		} else linkInputLayout.setError(null);
+		return false;
+	}
+
+	private boolean isBriarLink(@Nullable CharSequence s) {
+		ContactLinkExchangeActivity activity = getCastActivity();
+		return activity != null && activity.isBriarLink(s);
+	}
+
+	@Nullable
+	private String getLink() {
+		Matcher matcher = LINK_REGEX.matcher(linkInput.getText());
+		if (matcher.matches()) // needs to be called before groups become available
+			return matcher.group(2);
+		else
+			return null;
+	}
+
+	private void onContinueButtonClicked() {
+		ContactLinkExchangeActivity activity = getCastActivity();
+		if (activity == null || isInputError()) return;
+
+		String linkText = getLink();
+		if (linkText == null) throw new AssertionError();
+
+		BaseFragment f = ContactNicknameFragment.newInstance(linkText);
+		activity.showNextFragment(f);
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java

@@ -2,20 +2,22 @@ package org.briarproject.briar.android.contact;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.design.widget.FloatingActionButton;
+import android.support.design.widget.Snackbar;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.ActivityOptionsCompat;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.util.Pair;
 import android.support.v7.widget.LinearLayoutManager;
 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 android.widget.TextView;
 
 import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.contact.ContactManager;
+import org.briarproject.bramble.api.contact.event.ContactAddedEvent;
 import org.briarproject.bramble.api.contact.event.ContactRemovedEvent;
 import org.briarproject.bramble.api.contact.event.ContactStatusChangedEvent;
 import org.briarproject.bramble.api.db.DbException;
@@ -40,28 +42,34 @@ import org.briarproject.briar.api.client.MessageTracker.GroupCount;
 import org.briarproject.briar.api.conversation.ConversationManager;
 import org.briarproject.briar.api.conversation.ConversationMessageHeader;
 import org.briarproject.briar.api.conversation.event.ConversationMessageReceivedEvent;
+import org.briarproject.briar.api.messaging.MessagingManager;
+import org.briarproject.briar.api.messaging.MessagingManager.PendingContact;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.logging.Logger;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
+import io.github.kobakei.materialfabspeeddial.FabSpeedDial;
+import io.github.kobakei.materialfabspeeddial.FabSpeedDial.OnMenuItemClickListener;
+
 import static android.os.Build.VERSION.SDK_INT;
+import static android.support.design.widget.Snackbar.LENGTH_INDEFINITE;
 import static android.support.v4.app.ActivityOptionsCompat.makeSceneTransitionAnimation;
 import static android.support.v4.view.ViewCompat.getTransitionName;
-import static java.util.Objects.requireNonNull;
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.util.LogUtils.logDuration;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.bramble.util.LogUtils.now;
 import static org.briarproject.briar.android.conversation.ConversationActivity.CONTACT_ID;
-import static org.briarproject.briar.android.util.UiUtils.isSamsung7;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
-public class ContactListFragment extends BaseFragment implements EventListener {
+public class ContactListFragment extends BaseFragment implements EventListener,
+		OnMenuItemClickListener {
 
 	public static final String TAG = ContactListFragment.class.getName();
 	private static final Logger LOG = Logger.getLogger(TAG);
@@ -73,8 +81,13 @@ public class ContactListFragment extends BaseFragment implements EventListener {
 	@Inject
 	AndroidNotificationManager notificationManager;
 
+	// TODO remove
+	@Inject
+	MessagingManager messagingManager;
+
 	private ContactListAdapter adapter;
 	private BriarRecyclerView list;
+	private Snackbar snackbar;
 
 	// Fields that are accessed from background threads must be volatile
 	@Inject
@@ -104,9 +117,15 @@ public class ContactListFragment extends BaseFragment implements EventListener {
 	public View onCreateView(LayoutInflater inflater,
 			@Nullable ViewGroup container,
 			@Nullable Bundle savedInstanceState) {
-		requireNonNull(getActivity()).setTitle(R.string.contact_list_button);
 
-		View contentView = inflater.inflate(R.layout.list, container, false);
+		getActivity().setTitle(R.string.contact_list_button);
+
+		View contentView =
+				inflater.inflate(R.layout.fragment_contact_list, container,
+						false);
+
+		FabSpeedDial speedDialView = contentView.findViewById(R.id.speedDial);
+		speedDialView.addOnMenuItemClickListener(this);
 
 		OnContactClickListener<ContactListItem> onContactClickListener =
 				(view, item) -> {
@@ -115,7 +134,7 @@ public class ContactListFragment extends BaseFragment implements EventListener {
 					ContactId contactId = item.getContact().getId();
 					i.putExtra(CONTACT_ID, contactId.getInt());
 
-					if (SDK_INT >= 23 && !isSamsung7()) {
+					if (SDK_INT >= 23) {
 						ContactListItemViewHolder holder =
 								(ContactListItemViewHolder) list
 										.getRecyclerView()
@@ -145,26 +164,32 @@ public class ContactListFragment extends BaseFragment implements EventListener {
 		list.setEmptyText(getString(R.string.no_contacts));
 		list.setEmptyAction(getString(R.string.no_contacts_action));
 
+		snackbar = Snackbar.make(contentView,
+				R.string.pending_contact_requests_snackbar, LENGTH_INDEFINITE);
+		snackbar.getView().setBackgroundResource(R.color.briar_primary);
+		snackbar.setAction(R.string.show, v -> startActivity(
+				new Intent(getContext(), PendingRequestsActivity.class)));
+		snackbar.setActionTextColor(ContextCompat
+				.getColor(getContext(), R.color.briar_button_text_positive));
+
 		return contentView;
 	}
 
 	@Override
-	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-		inflater.inflate(R.menu.contact_list_actions, menu);
-		super.onCreateOptionsMenu(menu, inflater);
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		// Handle presses on the action bar items
-		switch (item.getItemId()) {
-			case R.id.action_add_contact:
+	public void onMenuItemClick(FloatingActionButton fab, @Nullable TextView v,
+			int itemId) {
+		switch (itemId) {
+			case R.id.action_add_contact_nearby:
 				Intent intent =
 						new Intent(getContext(), ContactExchangeActivity.class);
 				startActivity(intent);
-				return true;
+				return;
+			case R.id.action_add_contact_remotely:
+				startActivity(new Intent(getContext(),
+						ContactLinkExchangeActivity.class));
+				return;
 			default:
-				return super.onOptionsItemSelected(item);
+				return;
 		}
 	}
 
@@ -176,6 +201,26 @@ public class ContactListFragment extends BaseFragment implements EventListener {
 		notificationManager.clearAllIntroductionNotifications();
 		loadContacts();
 		list.startPeriodicUpdate();
+
+		// TODO remove
+		checkForPendingContacts();
+	}
+
+	// TODO remove
+	private void checkForPendingContacts() {
+		listener.runOnDbThread(() -> {
+			try {
+				Collection<PendingContact> contacts =
+						messagingManager.getPendingContacts();
+				if (contacts.isEmpty()) {
+					runOnUiThreadUnlessDestroyed(() -> snackbar.dismiss());
+				} else {
+					runOnUiThreadUnlessDestroyed(() -> snackbar.show());
+				}
+			} catch (DbException e) {
+				e.printStackTrace();
+			}
+		});
 	}
 
 	@Override
@@ -251,6 +296,11 @@ public class ContactListFragment extends BaseFragment implements EventListener {
 			ConversationMessageHeader h = p.getMessageHeader();
 			updateItem(p.getContactId(), h);
 		}
+
+		// TODO remove
+		else if (e instanceof ContactAddedEvent) {
+			checkForPendingContacts();
+		}
 	}
 
 	private void updateItem(ContactId c, ConversationMessageHeader h) {

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactNicknameFragment.java

@@ -0,0 +1,120 @@
+package org.briarproject.briar.android.contact;
+
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.support.annotation.MainThread;
+import android.support.annotation.NonNull;
+import android.support.annotation.UiThread;
+import android.support.design.widget.TextInputEditText;
+import android.support.design.widget.TextInputLayout;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.fragment.BaseFragment;
+
+import javax.annotation.Nullable;
+
+import static android.os.Build.VERSION.SDK_INT;
+import static android.support.v4.graphics.drawable.DrawableCompat.setTint;
+import static android.support.v4.graphics.drawable.DrawableCompat.wrap;
+import static java.util.Objects.requireNonNull;
+import static org.briarproject.briar.android.util.UiUtils.resolveColorAttribute;
+
+public class ContactNicknameFragment extends BaseFragment {
+
+	static final String TAG = ContactNicknameFragment.class.getName();
+
+	static BaseFragment newInstance(@Nullable String link) {
+		BaseFragment f = new ContactNicknameFragment();
+		Bundle bundle = new Bundle();
+		bundle.putString("link", link);
+		f.setArguments(bundle);
+		return f;
+	}
+
+	private TextInputLayout contactNameLayout;
+	private TextInputEditText contactNameInput;
+
+	@Nullable
+	private String link;
+
+	@Override
+	public String getUniqueTag() {
+		return TAG;
+	}
+
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+		if (getActivity() == null || getContext() == null) return null;
+
+		getActivity().setTitle(R.string.add_contact_remotely_title_case);
+
+		link = requireNonNull(getArguments()).getString("link");
+		Log.e(TAG, link);
+
+		View v = inflater.inflate(R.layout.fragment_contact_choose_nickname,
+				container, false);
+
+		int color =
+				resolveColorAttribute(getContext(), R.attr.colorControlNormal);
+
+		Button addButton = v.findViewById(R.id.addButton);
+		addButton.setOnClickListener(view -> onAddButtonClicked());
+
+		contactNameLayout = v.findViewById(R.id.contactNameLayout);
+		contactNameInput = v.findViewById(R.id.contactNameInput);
+		if (SDK_INT < 23) {
+			Drawable drawable = wrap(contactNameInput.getCompoundDrawables()[0]);
+			setTint(drawable, color);
+			contactNameInput.setCompoundDrawables(drawable, null, null, null);
+		}
+
+		return v;
+	}
+
+	private ContactLinkExchangeActivity getCastActivity() {
+		return (ContactLinkExchangeActivity) getActivity();
+	}
+
+	@MainThread
+	@UiThread
+	private boolean isInputError() {
+		boolean validContactName = contactNameInput.getText() != null &&
+				contactNameInput.getText().toString().trim().length() > 0;
+		if (!validContactName) {
+			contactNameLayout.setError(getString(R.string.nickname_missing));
+			contactNameInput.requestFocus();
+			return true;
+		} else contactNameLayout.setError(null);
+		return false;
+	}
+
+	private void onAddButtonClicked() {
+		ContactLinkExchangeActivity activity = getCastActivity();
+		if (activity == null || isInputError()) return;
+
+		String name = requireNonNull(contactNameInput.getText()).toString();
+		if (link == null) throw new AssertionError();
+
+		activity.addFakeRequest(name, link);
+
+		Intent intent = new Intent(activity, PendingRequestsActivity.class);
+		startActivity(intent);
+		finish();
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactQrCodeInputFragment.java

@@ -0,0 +1,185 @@
+package org.briarproject.briar.android.contact;
+
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.ActivityCompat;
+import android.support.v7.app.AlertDialog;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import com.google.zxing.Result;
+
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.fragment.BaseFragment;
+import org.briarproject.briar.android.keyagreement.CameraException;
+import org.briarproject.briar.android.keyagreement.CameraView;
+import org.briarproject.briar.android.keyagreement.QrCodeDecoder;
+import org.briarproject.briar.android.util.UiUtils;
+
+import java.util.logging.Logger;
+
+import javax.annotation.Nullable;
+
+import static android.Manifest.permission.CAMERA;
+import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_NOSENSOR;
+import static android.content.pm.PackageManager.PERMISSION_GRANTED;
+import static android.widget.Toast.LENGTH_LONG;
+import static android.widget.Toast.LENGTH_SHORT;
+import static java.util.logging.Level.WARNING;
+import static org.briarproject.bramble.util.LogUtils.logException;
+import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_PERMISSION_CAMERA_LOCATION;
+
+public class ContactQrCodeInputFragment extends BaseFragment
+		implements QrCodeDecoder.ResultCallback {
+
+	static final String TAG = ContactQrCodeInputFragment.class.getName();
+
+	private static final Logger LOG = Logger.getLogger(TAG);
+
+	private CameraView cameraView;
+
+	@Override
+	public String getUniqueTag() {
+		return TAG;
+	}
+
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+	}
+
+	@Override
+	public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+		if (getActivity() == null) throw new AssertionError();
+		super.onActivityCreated(savedInstanceState);
+		getActivity().setRequestedOrientation(SCREEN_ORIENTATION_NOSENSOR);
+		cameraView.setPreviewConsumer(new QrCodeDecoder(this));
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+		if (getActivity() == null) return null;
+
+		getActivity().setTitle(R.string.scan_qr_code_title);
+
+		View v = inflater.inflate(R.layout.fragment_contact_qr_code_input,
+				container, false);
+
+		cameraView = v.findViewById(R.id.camera_view);
+
+		return v;
+	}
+
+	@Override
+	public void onStart() {
+		super.onStart();
+		if (checkPermissions()) {
+			startCamera();
+		}
+	}
+
+	@Override
+	public void onStop() {
+		super.onStop();
+		try {
+			cameraView.stop();
+		} catch (CameraException e) {
+			logException(LOG, WARNING, e);
+		}
+	}
+
+	private void startCamera() {
+		try {
+			cameraView.start();
+		} catch (CameraException e) {
+			logException(LOG, WARNING, e);
+			Toast.makeText(getContext(), R.string.camera_error_toast,
+					LENGTH_SHORT).show();
+		}
+	}
+
+	private boolean checkPermissions() {
+		if (getContext() == null) return false;
+		if (ActivityCompat.checkSelfPermission(getContext(), CAMERA) !=
+				PERMISSION_GRANTED) {
+			// Should we show an explanation?
+			if (shouldShowRequestPermissionRationale(CAMERA)) {
+				DialogInterface.OnClickListener continueListener =
+						(dialog, which) -> requestPermission();
+				AlertDialog.Builder
+						builder = new AlertDialog.Builder(getContext(),
+						R.style.BriarDialogTheme);
+				builder.setTitle(R.string.permission_camera_title);
+				builder.setMessage(R.string.permission_camera_request_body);
+				builder.setNeutralButton(R.string.continue_button,
+						continueListener);
+				builder.show();
+			} else {
+				requestPermission();
+			}
+			return false;
+		} else {
+			return true;
+		}
+	}
+
+	@Override
+	public void onRequestPermissionsResult(int requestCode,
+			@NonNull String[] permissions, @NonNull int[] grantResults) {
+		if (getContext() == null) return;
+		if (requestCode == REQUEST_PERMISSION_CAMERA_LOCATION) {
+			// If request is cancelled, the result arrays are empty.
+			if (grantResults.length > 0 &&
+					grantResults[0] == PERMISSION_GRANTED) {
+				startCamera();
+			} else {
+				if (!shouldShowRequestPermissionRationale(CAMERA)) {
+					// The user has permanently denied the request
+					AlertDialog.Builder
+							builder = new AlertDialog.Builder(getContext(),
+							R.style.BriarDialogTheme);
+					builder.setTitle(R.string.permission_camera_title);
+					builder.setMessage(R.string.permission_camera_denied_body);
+					builder.setPositiveButton(R.string.ok,
+							UiUtils.getGoToSettingsListener(getContext()));
+					builder.setNegativeButton(R.string.cancel,
+							(dialog, which) -> cancel());
+					builder.show();
+				} else {
+					Toast.makeText(getContext(),
+							R.string.permission_camera_denied_body,
+							LENGTH_LONG).show();
+					cancel();
+				}
+			}
+		}
+	}
+
+	private void requestPermission() {
+		requestPermissions(new String[] {CAMERA}, REQUEST_PERMISSION_CAMERA_LOCATION);
+	}
+
+	@Nullable
+	private ContactLinkExchangeActivity getCastActivity() {
+		return (ContactLinkExchangeActivity) getActivity();
+	}
+
+	private void cancel() {
+		ContactLinkExchangeActivity activity = getCastActivity();
+		if (activity != null) activity.linkScanned(null);
+	}
+
+	@Override
+	public void handleResult(@NonNull Result result) {
+		LOG.info("Scanned link: " + result.getText());
+		ContactLinkExchangeActivity activity = getCastActivity();
+		if (activity != null) activity.linkScanned(result.getText());
+	}
+}

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactQrCodeOutputFragment.java

@@ -0,0 +1,54 @@
+package org.briarproject.briar.android.contact;
+
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.util.DisplayMetrics;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.fragment.BaseFragment;
+import org.briarproject.briar.android.view.QrCodeView;
+
+import javax.annotation.Nullable;
+
+import static org.briarproject.briar.android.contact.ContactLinkExchangeActivity.OUR_LINK;
+import static org.briarproject.briar.android.keyagreement.QrCodeUtils.createQrCode;
+
+public class ContactQrCodeOutputFragment extends BaseFragment {
+
+	static final String TAG = ContactQrCodeOutputFragment.class.getName();
+
+	@Override
+	public String getUniqueTag() {
+		return TAG;
+	}
+
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(@NonNull LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+		if (getActivity() == null) return null;
+
+		getActivity().setTitle(R.string.show_qr_code_title);
+
+		View v = inflater.inflate(R.layout.fragment_contact_qr_code_output,
+				container, false);
+
+		DisplayMetrics dm = getResources().getDisplayMetrics();
+		Bitmap qrCode = createQrCode(dm, OUR_LINK);
+		QrCodeView qrCodeView = v.findViewById(R.id.qrCodeView);
+		qrCodeView.setQrCode(qrCode);
+
+		return v;
+	}
+}

briar-android/src/main/java/org/briarproject/briar/android/contact/PendingRequestsActivity.java

@@ -0,0 +1,127 @@
+package org.briarproject.briar.android.contact;
+
+import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.support.v7.widget.LinearLayoutManager;
+import android.view.MenuItem;
+
+import org.briarproject.bramble.api.contact.Contact;
+import org.briarproject.bramble.api.contact.ContactManager;
+import org.briarproject.bramble.api.contact.event.ContactAddedEvent;
+import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.event.Event;
+import org.briarproject.bramble.api.event.EventBus;
+import org.briarproject.bramble.api.event.EventListener;
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.activity.BriarActivity;
+import org.briarproject.briar.android.view.BriarRecyclerView;
+import org.briarproject.briar.api.messaging.MessagingManager;
+import org.briarproject.briar.api.messaging.MessagingManager.PendingContact;
+
+import java.util.Collection;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+public class PendingRequestsActivity extends BriarActivity
+		implements EventListener {
+
+	@Inject
+	MessagingManager messagingManager;
+	@Inject
+	ContactManager contactManager;
+	@Inject
+	EventBus eventBus;
+
+	private PendingRequestsAdapter adapter;
+	private BriarRecyclerView list;
+
+	@Override
+	public void injectActivity(ActivityComponent component) {
+		component.inject(this);
+	}
+
+	@Override
+	public void onCreate(@Nullable Bundle state) {
+		super.onCreate(state);
+
+		setContentView(R.layout.list);
+
+		ActionBar ab = getSupportActionBar();
+		if (ab != null) {
+			ab.setDisplayHomeAsUpEnabled(true);
+		}
+
+		adapter = new PendingRequestsAdapter(this, PendingContact.class);
+		list = findViewById(R.id.list);
+		list.setLayoutManager(new LinearLayoutManager(this));
+		list.setAdapter(adapter);
+		list.setPERIODIC_UPDATE_MILLIS(SECONDS.toMillis(9));
+	}
+
+	@Override
+	public void onStart() {
+		super.onStart();
+		eventBus.addListener(this);
+		list.startPeriodicUpdate();
+		runOnDbThread(() -> {
+			try {
+				Collection<PendingContact> contacts =
+						messagingManager.getPendingContacts();
+				addPendingContacts(contacts);
+			} catch (DbException e) {
+				e.printStackTrace();
+			}
+		});
+	}
+
+	@Override
+	protected void onStop() {
+		super.onStop();
+		list.stopPeriodicUpdate();
+		adapter.clear();
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch (item.getItemId()) {
+			case android.R.id.home:
+				onBackPressed();
+				return true;
+			default:
+				return super.onOptionsItemSelected(item);
+		}
+	}
+
+	@Override
+	public void eventOccurred(Event e) {
+		if (e instanceof ContactAddedEvent) {
+			runOnDbThread(() -> {
+				try {
+					Contact contact = contactManager
+							.getContact(((ContactAddedEvent) e).getContactId());
+					runOnUiThreadUnlessDestroyed(() -> {
+						adapter.remove(contact);
+						if (adapter.isEmpty()) finish();
+					});
+				} catch (DbException e1) {
+					e1.printStackTrace();
+				}
+			});
+		}
+	}
+
+	private void addPendingContacts(Collection<PendingContact> contacts) {
+		runOnUiThreadUnlessDestroyed(() -> {
+			if (contacts.isEmpty()) {
+				list.showData();
+			} else {
+				adapter.addAll(contacts);
+			}
+		});
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/contact/PendingRequestsAdapter.java

@@ -0,0 +1,67 @@
+package org.briarproject.briar.android.contact;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.briarproject.bramble.api.contact.Contact;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.util.BriarAdapter;
+import org.briarproject.briar.api.messaging.MessagingManager.PendingContact;
+
+@NotNullByDefault
+public class PendingRequestsAdapter extends
+		BriarAdapter<PendingContact, PendingRequestsViewHolder> {
+
+	public PendingRequestsAdapter(Context ctx, Class<PendingContact> c) {
+		super(ctx, c);
+	}
+
+	@NonNull
+	@Override
+	public PendingRequestsViewHolder onCreateViewHolder(
+			ViewGroup viewGroup, int i) {
+		View v = LayoutInflater.from(viewGroup.getContext()).inflate(
+				R.layout.list_item_pending_contact, viewGroup, false);
+		return new PendingRequestsViewHolder(v);
+	}
+
+	@Override
+	public void onBindViewHolder(
+			PendingRequestsViewHolder pendingRequestsViewHolder, int i) {
+		pendingRequestsViewHolder.bind(items.get(i));
+	}
+
+	@Override
+	public int compare(PendingContact item1, PendingContact item2) {
+		return (int) (item1.getTimestamp() - item2.getTimestamp());
+	}
+
+	@Override
+	public boolean areContentsTheSame(PendingContact item1,
+			PendingContact item2) {
+		return item1.getName().equals(item2.getName()) &&
+				item1.getTimestamp() == item2.getTimestamp();
+	}
+
+	@Override
+	public boolean areItemsTheSame(PendingContact item1,
+			PendingContact item2) {
+		return item1.getName().equals(item2.getName()) &&
+				item1.getTimestamp() == item2.getTimestamp();
+	}
+
+	// TODO remove
+	public void remove(Contact contact) {
+		for (int i = 0; i < items.size(); i++) {
+			if (items.get(i).getName().equals(contact.getAuthor().getName())) {
+				items.removeItemAt(i);
+				return;
+			}
+		}
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/contact/PendingRequestsViewHolder.java

@@ -0,0 +1,55 @@
+package org.briarproject.briar.android.contact;
+
+import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.RecyclerView.ViewHolder;
+import android.util.Log;
+import android.view.View;
+import android.widget.TextView;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.view.TextAvatarView;
+import org.briarproject.briar.api.messaging.MessagingManager.PendingContact;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.briarproject.bramble.util.StringUtils.toUtf8;
+import static org.briarproject.briar.android.util.UiUtils.formatDate;
+
+@NotNullByDefault
+public class PendingRequestsViewHolder extends ViewHolder {
+
+	private final TextAvatarView avatar;
+	private final TextView name;
+	private final TextView time;
+	private final TextView status;
+
+	public PendingRequestsViewHolder(View v) {
+		super(v);
+		avatar = v.findViewById(R.id.avatar);
+		name = v.findViewById(R.id.name);
+		time = v.findViewById(R.id.time);
+		status = v.findViewById(R.id.status);
+	}
+
+	public void bind(PendingContact item) {
+		avatar.setText(item.getName());
+		avatar.setBackgroundBytes(toUtf8(item.getName() + item.getTimestamp()));
+		name.setText(item.getName());
+		time.setText(formatDate(time.getContext(), item.getTimestamp()));
+		long diff = item.getAddAt() - System.currentTimeMillis();
+		Log.e("TEST", "diff: " + diff);
+		int color = ContextCompat
+				.getColor(status.getContext(), R.color.briar_green);
+		if (diff < SECONDS.toMillis(10)) {
+			status.setText(R.string.adding_contact);
+		} else if (diff < SECONDS.toMillis(20)) {
+			status.setText(R.string.connecting);
+		} else if (diff < SECONDS.toMillis(30)) {
+			status.setText(R.string.waiting_for_contact_to_come_online);
+			color = ContextCompat
+					.getColor(status.getContext(), R.color.briar_yellow);
+		}
+		status.setTextColor(color);
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseContactSelectorFragment.java

@@ -25,7 +25,6 @@ import java.util.Collection;
 
 import javax.annotation.Nullable;
 
-import static java.util.Objects.requireNonNull;
 import static org.briarproject.briar.android.activity.BriarActivity.GROUP_ID;
 import static org.briarproject.briar.android.contactselection.ContactSelectorActivity.CONTACTS;
 import static org.briarproject.briar.android.contactselection.ContactSelectorActivity.getContactsFromIds;
@@ -51,10 +50,10 @@ public abstract class BaseContactSelectorFragment<I extends SelectableContactIte
 	}
 
 	@Override
-	public void onCreate(@Nullable Bundle savedInstanceState) {
+	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
-		Bundle args = requireNonNull(getArguments());
+		Bundle args = getArguments();
 		byte[] b = args.getByteArray(GROUP_ID);
 		if (b == null) throw new IllegalStateException("No GroupId");
 		groupId = new GroupId(b);
@@ -73,7 +72,7 @@ public abstract class BaseContactSelectorFragment<I extends SelectableContactIte
 		list.setEmptyImage(R.drawable.ic_empty_state_contact_list);
 		list.setEmptyText(getString(R.string.no_contacts_selector));
 		list.setEmptyAction(getString(R.string.no_contacts_selector_action));
-		adapter = getAdapter(requireNonNull(getContext()), this);
+		adapter = getAdapter(getContext(), this);
 		list.setAdapter(adapter);
 
 		// restore selected contacts if available

briar-android/src/main/java/org/briarproject/briar/android/conversation/AliasDialogFragment.java

@@ -39,8 +39,8 @@ public class AliasDialogFragment extends AppCompatDialogFragment {
 
 		setStyle(STYLE_NO_TITLE, R.style.BriarDialogTheme);
 
-		BriarActivity a = (BriarActivity) requireNonNull(getActivity());
-		a.getActivityComponent().inject(this);
+		if (getActivity() == null) return;
+		((BriarActivity) getActivity()).getActivityComponent().inject(this);
 		viewModel = ViewModelProviders.of(getActivity(), viewModelFactory)
 				.get(ConversationViewModel.class);
 	}
@@ -48,6 +48,7 @@ public class AliasDialogFragment extends AppCompatDialogFragment {
 	@Override
 	public View onCreateView(@NonNull LayoutInflater inflater,
 			ViewGroup container, Bundle savedInstanceState) {
+
 		View v = inflater.inflate(R.layout.fragment_alias_dialog, container,
 				false);
 
@@ -68,5 +69,4 @@ public class AliasDialogFragment extends AppCompatDialogFragment {
 
 		return v;
 	}
-
 }

briar-android/src/main/java/org/briarproject/briar/android/conversation/AttachmentController.java

@@ -1,24 +1,21 @@
 package org.briarproject.briar.android.conversation;
 
+import android.content.res.Resources;
 import android.graphics.BitmapFactory;
-import android.graphics.BitmapFactory.Options;
 import android.support.annotation.Nullable;
 import android.support.media.ExifInterface;
 import android.webkit.MimeTypeMap;
 
-import com.bumptech.glide.util.MarkEnforcingInputStream;
-
 import org.briarproject.bramble.api.Pair;
 import org.briarproject.bramble.api.db.DatabaseExecutor;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.MessageId;
-import org.briarproject.briar.android.conversation.ImageHelper.DecodeResult;
+import org.briarproject.briar.R;
 import org.briarproject.briar.api.messaging.Attachment;
 import org.briarproject.briar.api.messaging.AttachmentHeader;
 import org.briarproject.briar.api.messaging.MessagingManager;
 
-import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -46,10 +43,8 @@ class AttachmentController {
 
 	private static final Logger LOG =
 			getLogger(AttachmentController.class.getName());
-	private static final int READ_LIMIT = 1024 * 8192;
 
 	private final MessagingManager messagingManager;
-	private final ImageHelper imageHelper;
 	private final int defaultSize;
 	private final int minWidth, maxWidth;
 	private final int minHeight, maxHeight;
@@ -57,38 +52,18 @@ class AttachmentController {
 	private final Map<MessageId, List<AttachmentItem>> attachmentCache =
 			new ConcurrentHashMap<>();
 
-	AttachmentController(MessagingManager messagingManager,
-			AttachmentDimensions dimensions, ImageHelper imageHelper) {
+	AttachmentController(MessagingManager messagingManager, Resources res) {
 		this.messagingManager = messagingManager;
-		this.imageHelper = imageHelper;
-		defaultSize = dimensions.defaultSize;
-		minWidth = dimensions.minWidth;
-		maxWidth = dimensions.maxWidth;
-		minHeight = dimensions.minHeight;
-		maxHeight = dimensions.maxHeight;
-	}
-
-	AttachmentController(MessagingManager messagingManager,
-			AttachmentDimensions dimensions) {
-		this(messagingManager, dimensions, new ImageHelper() {
-			@Override
-			public DecodeResult decodeStream(InputStream is) {
-				Options options = new Options();
-				options.inJustDecodeBounds = true;
-				BitmapFactory.decodeStream(is, null, options);
-				String mimeType = options.outMimeType;
-				if (mimeType == null) mimeType = "";
-				return new DecodeResult(options.outWidth, options.outHeight,
-						mimeType);
-			}
-
-			@Nullable
-			@Override
-			public String getExtensionFromMimeType(String mimeType) {
-				MimeTypeMap mimeTypeMap = MimeTypeMap.getSingleton();
-				return mimeTypeMap.getExtensionFromMimeType(mimeType);
-			}
-		});
+		defaultSize =
+				res.getDimensionPixelSize(R.dimen.message_bubble_image_default);
+		minWidth = res.getDimensionPixelSize(
+				R.dimen.message_bubble_image_min_width);
+		maxWidth = res.getDimensionPixelSize(
+				R.dimen.message_bubble_image_max_width);
+		minHeight = res.getDimensionPixelSize(
+				R.dimen.message_bubble_image_min_height);
+		maxHeight = res.getDimensionPixelSize(
+				R.dimen.message_bubble_image_max_height);
 	}
 
 	void put(MessageId messageId, List<AttachmentItem> attachments) {
@@ -107,53 +82,31 @@ class AttachmentController {
 		List<Pair<AttachmentHeader, Attachment>> attachments =
 				new ArrayList<>(headers.size());
 		for (AttachmentHeader h : headers) {
-			Attachment a = messagingManager.getAttachment(h.getMessageId());
+			Attachment a =
+					messagingManager.getAttachment(h.getMessageId());
 			attachments.add(new Pair<>(h, a));
 		}
 		logDuration(LOG, "Loading attachment", start);
 		return attachments;
 	}
 
-	/**
-	 * Creates {@link AttachmentItem}s from the passed headers and Attachments.
-	 * <p>
-	 * Note: This closes the {@link Attachment}'s {@link InputStream}.
-	 */
 	List<AttachmentItem> getAttachmentItems(
 			List<Pair<AttachmentHeader, Attachment>> attachments) {
-		boolean needsSize = attachments.size() == 1;
 		List<AttachmentItem> items = new ArrayList<>(attachments.size());
 		for (Pair<AttachmentHeader, Attachment> a : attachments) {
 			AttachmentItem item =
-					getAttachmentItem(a.getFirst(), a.getSecond(), needsSize);
+					getAttachmentItem(a.getFirst(), a.getSecond());
 			items.add(item);
 		}
 		return items;
 	}
 
-	/**
-	 * Creates an {@link AttachmentItem} from the {@link Attachment}'s
-	 * {@link InputStream} which will be closed when this method returns.
-	 */
-	AttachmentItem getAttachmentItem(AttachmentHeader h, Attachment a,
-			boolean needsSize) {
+	private AttachmentItem getAttachmentItem(AttachmentHeader h, Attachment a) {
 		MessageId messageId = h.getMessageId();
-		if (!needsSize) {
-			String mimeType = h.getContentType();
-			String extension = imageHelper.getExtensionFromMimeType(mimeType);
-			boolean hasError = false;
-			if (extension == null) {
-				extension = "";
-				hasError = true;
-			}
-			return new AttachmentItem(messageId, 0, 0, mimeType, extension, 0,
-					0, hasError);
-		}
-
 		Size size = new Size();
-		InputStream is = new MarkEnforcingInputStream(
-				new BufferedInputStream(a.getStream()));
-		is.mark(READ_LIMIT);
+
+		InputStream is = a.getStream();
+		is.mark(Integer.MAX_VALUE);
 		try {
 			// use exif to get size
 			if (h.getContentType().equals("image/jpeg")) {
@@ -166,8 +119,6 @@ class AttachmentController {
 			// use BitmapFactory to get size
 			if (size.error) {
 				is.reset();
-				// need to mark again to re-add read limit
-				is.mark(READ_LIMIT);
 				size = getSizeFromBitmap(is);
 			}
 		} catch (IOException e) {
@@ -183,18 +134,21 @@ class AttachmentController {
 					getThumbnailSize(size.width, size.height, size.mimeType);
 		}
 		// get file extension
-		String extension = imageHelper.getExtensionFromMimeType(size.mimeType);
-		boolean hasError = extension == null || size.error;
-		if (extension == null) extension = "";
+		MimeTypeMap mimeTypeMap = MimeTypeMap.getSingleton();
+		String extension = mimeTypeMap.getExtensionFromMimeType(size.mimeType);
+		if (extension == null) {
+			return new AttachmentItem(messageId, 0, 0, "", "", 0, 0, true);
+		}
 		return new AttachmentItem(messageId, size.width, size.height,
-				size.mimeType, extension, thumbnailSize.width,
-				thumbnailSize.height, hasError);
+				size.mimeType, extension, thumbnailSize.width, thumbnailSize.height,
+				size.error);
 	}
 
 	/**
 	 * Gets the size of a JPEG {@link InputStream} if EXIF info is available.
 	 */
-	private Size getSizeFromExif(InputStream is) throws IOException {
+	private static Size getSizeFromExif(InputStream is)
+			throws IOException {
 		ExifInterface exif = new ExifInterface(is);
 		// these can return 0 independent of default value
 		int width = exif.getAttributeInt(TAG_IMAGE_WIDTH, 0);
@@ -214,10 +168,14 @@ class AttachmentController {
 	/**
 	 * Gets the size of any image {@link InputStream}.
 	 */
-	private Size getSizeFromBitmap(InputStream is) {
-		DecodeResult result = imageHelper.decodeStream(is);
-		if (result.width < 1 || result.height < 1) return new Size();
-		return new Size(result.width, result.height, result.mimeType);
+	private static Size getSizeFromBitmap(InputStream is) {
+		BitmapFactory.Options options = new BitmapFactory.Options();
+		options.inJustDecodeBounds = true;
+		BitmapFactory.decodeStream(is, null, options);
+		if (options.outWidth < 1 || options.outHeight < 1)
+			return new Size();
+		return new Size(options.outWidth, options.outHeight,
+				options.outMimeType);
 	}
 
 	private Size getThumbnailSize(int width, int height, String mimeType) {

briar-android/src/main/java/org/briarproject/briar/android/conversation/AttachmentDimensions.java

@@ -1,39 +0,0 @@
-package org.briarproject.briar.android.conversation;
-
-import android.content.res.Resources;
-import android.support.annotation.VisibleForTesting;
-
-import org.briarproject.briar.R;
-
-class AttachmentDimensions {
-
-	final int defaultSize;
-	final int minWidth, maxWidth;
-	final int minHeight, maxHeight;
-
-	@VisibleForTesting
-	AttachmentDimensions(int defaultSize, int minWidth, int maxWidth,
-			int minHeight, int maxHeight) {
-		this.defaultSize = defaultSize;
-		this.minWidth = minWidth;
-		this.maxWidth = maxWidth;
-		this.minHeight = minHeight;
-		this.maxHeight = maxHeight;
-	}
-
-	static AttachmentDimensions getAttachmentDimensions(Resources res) {
-		int defaultSize =
-				res.getDimensionPixelSize(R.dimen.message_bubble_image_default);
-		int minWidth = res.getDimensionPixelSize(
-				R.dimen.message_bubble_image_min_width);
-		int maxWidth = res.getDimensionPixelSize(
-				R.dimen.message_bubble_image_max_width);
-		int minHeight = res.getDimensionPixelSize(
-				R.dimen.message_bubble_image_min_height);
-		int maxHeight = res.getDimensionPixelSize(
-				R.dimen.message_bubble_image_max_height);
-		return new AttachmentDimensions(defaultSize, minWidth, maxWidth,
-				minHeight, minHeight);
-	}
-
-}

briar-android/src/main/java/org/briarproject/briar/android/conversation/AttachmentItem.java

@@ -2,13 +2,10 @@ package org.briarproject.briar.android.conversation;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.MessageId;
 
-import java.util.concurrent.atomic.AtomicLong;
-
 import javax.annotation.concurrent.Immutable;
 
 @Immutable
@@ -20,7 +17,6 @@ public class AttachmentItem implements Parcelable {
 	private final String mimeType, extension;
 	private final int thumbnailWidth, thumbnailHeight;
 	private final boolean hasError;
-	private final long instanceId;
 
 	public static final Creator<AttachmentItem> CREATOR =
 			new Creator<AttachmentItem>() {
@@ -35,8 +31,6 @@ public class AttachmentItem implements Parcelable {
 				}
 			};
 
-	private static final AtomicLong NEXT_INSTANCE_ID = new AtomicLong(0);
-
 	AttachmentItem(MessageId messageId, int width, int height, String mimeType,
 			String extension, int thumbnailWidth, int thumbnailHeight,
 			boolean hasError) {
@@ -48,7 +42,6 @@ public class AttachmentItem implements Parcelable {
 		this.thumbnailWidth = thumbnailWidth;
 		this.thumbnailHeight = thumbnailHeight;
 		this.hasError = hasError;
-		instanceId = NEXT_INSTANCE_ID.getAndIncrement();
 	}
 
 	protected AttachmentItem(Parcel in) {
@@ -62,7 +55,6 @@ public class AttachmentItem implements Parcelable {
 		thumbnailWidth = in.readInt();
 		thumbnailHeight = in.readInt();
 		hasError = in.readByte() != 0;
-		instanceId = in.readLong();
 	}
 
 	public MessageId getMessageId() {
@@ -97,8 +89,9 @@ public class AttachmentItem implements Parcelable {
 		return hasError;
 	}
 
+	// TODO use counter instead, because in theory one attachment can appear in more than one messages
 	String getTransitionName() {
-		return String.valueOf(instanceId);
+		return String.valueOf(messageId.hashCode());
 	}
 
 	@Override
@@ -116,13 +109,6 @@ public class AttachmentItem implements Parcelable {
 		dest.writeInt(thumbnailWidth);
 		dest.writeInt(thumbnailHeight);
 		dest.writeByte((byte) (hasError ? 1 : 0));
-		dest.writeLong(instanceId);
-	}
-
-	@Override
-	public boolean equals(@Nullable Object o) {
-		return o instanceof AttachmentItem &&
-				instanceId == ((AttachmentItem) o).instanceId;
 	}
 
 }

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java

@@ -8,7 +8,6 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Parcelable;
 import android.support.annotation.Nullable;
 import android.support.annotation.UiThread;
 import android.support.design.widget.Snackbar;
@@ -30,6 +29,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.Pair;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.contact.ContactManager;
@@ -46,8 +46,10 @@ import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.api.plugin.ConnectionRegistry;
 import org.briarproject.bramble.api.plugin.event.ContactConnectedEvent;
 import org.briarproject.bramble.api.plugin.event.ContactDisconnectedEvent;
+import org.briarproject.bramble.api.settings.Settings;
 import org.briarproject.bramble.api.settings.SettingsManager;
 import org.briarproject.bramble.api.sync.GroupId;
+import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.bramble.api.sync.event.MessagesAckedEvent;
 import org.briarproject.bramble.api.sync.event.MessagesSentEvent;
@@ -81,6 +83,7 @@ import org.briarproject.briar.api.introduction.IntroductionManager;
 import org.briarproject.briar.api.messaging.Attachment;
 import org.briarproject.briar.api.messaging.AttachmentHeader;
 import org.briarproject.briar.api.messaging.MessagingManager;
+import org.briarproject.briar.api.messaging.PrivateMessage;
 import org.briarproject.briar.api.messaging.PrivateMessageFactory;
 import org.briarproject.briar.api.messaging.PrivateMessageHeader;
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager;
@@ -102,12 +105,12 @@ import im.delight.android.identicons.IdenticonDrawable;
 import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt;
 import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt.PromptStateChangeListener;
 
-import static android.arch.lifecycle.Lifecycle.State.STARTED;
 import static android.os.Build.VERSION.SDK_INT;
 import static android.support.v4.app.ActivityOptionsCompat.makeSceneTransitionAnimation;
 import static android.support.v4.view.ViewCompat.setTransitionName;
 import static android.support.v7.util.SortedList.INVALID_POSITION;
 import static android.view.Gravity.RIGHT;
+import static android.widget.Toast.LENGTH_LONG;
 import static android.widget.Toast.LENGTH_SHORT;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.sort;
@@ -121,10 +124,10 @@ import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
 import static org.briarproject.briar.android.TestingConstants.FEATURE_FLAG_IMAGE_ATTACHMENTS;
 import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_ATTACH_IMAGE;
 import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_INTRODUCTION;
-import static org.briarproject.briar.android.conversation.ImageActivity.ATTACHMENTS;
-import static org.briarproject.briar.android.conversation.ImageActivity.ATTACHMENT_POSITION;
+import static org.briarproject.briar.android.conversation.ImageActivity.ATTACHMENT;
 import static org.briarproject.briar.android.conversation.ImageActivity.DATE;
 import static org.briarproject.briar.android.conversation.ImageActivity.NAME;
+import static org.briarproject.briar.android.settings.SettingsFragment.SETTINGS_NAMESPACE;
 import static org.briarproject.briar.android.util.UiUtils.getAvatarTransitionName;
 import static org.briarproject.briar.android.util.UiUtils.getBulbTransitionName;
 import static org.briarproject.briar.android.util.UiUtils.observeOnce;
@@ -142,9 +145,8 @@ public class ConversationActivity extends BriarActivity
 
 	private static final Logger LOG =
 			Logger.getLogger(ConversationActivity.class.getName());
-
-	private static final int TRANSITION_DURATION_MS = 500;
-	private static final int ONBOARDING_DELAY_MS = 250;
+	private static final String SHOW_ONBOARDING_INTRODUCTION =
+			"showOnboardingIntroduction";
 
 	@Inject
 	AndroidNotificationManager notificationManager;
@@ -153,8 +155,21 @@ public class ConversationActivity extends BriarActivity
 	@Inject
 	@CryptoExecutor
 	Executor cryptoExecutor;
-	@Inject
-	ViewModelProvider.Factory viewModelFactory;
+
+	private final Map<MessageId, String> textCache = new ConcurrentHashMap<>();
+	private AttachmentController attachmentController;
+
+	private ConversationViewModel viewModel;
+	private ConversationVisitor visitor;
+	private ConversationAdapter adapter;
+	private Toolbar toolbar;
+	private CircleImageView toolbarAvatar;
+	private ImageView toolbarStatus;
+	private TextView toolbarTitle;
+	private BriarRecyclerView list;
+	private LinearLayoutManager layoutManager;
+	private TextInputView textInputView;
+	private TextSendController sendController;
 
 	// Fields that are accessed from background threads must be volatile
 	@Inject
@@ -177,37 +192,24 @@ public class ConversationActivity extends BriarActivity
 	volatile BlogSharingManager blogSharingManager;
 	@Inject
 	volatile GroupInvitationManager groupInvitationManager;
+	@Inject
+	ViewModelProvider.Factory viewModelFactory;
+
+	private volatile ContactId contactId;
+	@Nullable
+	private volatile GroupId messagingGroupId;
 
-	private final Map<MessageId, String> textCache = new ConcurrentHashMap<>();
 	private final Observer<String> contactNameObserver = name -> {
 		requireNonNull(name);
 		loadMessages();
 	};
 
-	private AttachmentController attachmentController;
-	private ConversationViewModel viewModel;
-	private ConversationVisitor visitor;
-	private ConversationAdapter adapter;
-	private Toolbar toolbar;
-	private CircleImageView toolbarAvatar;
-	private ImageView toolbarStatus;
-	private TextView toolbarTitle;
-	private BriarRecyclerView list;
-	private LinearLayoutManager layoutManager;
-	private TextInputView textInputView;
-	private TextSendController sendController;
-	@Nullable
-	private Parcelable layoutManagerState;
-
-	private volatile ContactId contactId;
-
 	@Override
 	public void onCreate(@Nullable Bundle state) {
 		if (SDK_INT >= 21) {
 			// Spurious lint warning - using END causes a crash
 			@SuppressLint("RtlHardcoded")
 			Transition slide = new Slide(RIGHT);
-			slide.setDuration(TRANSITION_DURATION_MS);
 			setSceneTransitionAnimation(slide, null, slide);
 		}
 		super.onCreate(state);
@@ -219,6 +221,7 @@ public class ConversationActivity extends BriarActivity
 
 		viewModel = ViewModelProviders.of(this, viewModelFactory)
 				.get(ConversationViewModel.class);
+		viewModel.setContactId(contactId);
 		attachmentController = viewModel.getAttachmentController();
 
 		setContentView(R.layout.activity_conversation);
@@ -242,8 +245,6 @@ public class ConversationActivity extends BriarActivity
 			requireNonNull(deleted);
 			if (deleted) finish();
 		});
-		viewModel.getAddedPrivateMessage().observe(this,
-				this::onAddedPrivateMessage);
 
 		setTransitionName(toolbarAvatar, getAvatarTransitionName(contactId));
 		setTransitionName(toolbarStatus, getBulbTransitionName(contactId));
@@ -262,25 +263,12 @@ public class ConversationActivity extends BriarActivity
 			ImagePreview imagePreview = findViewById(R.id.imagePreview);
 			sendController = new TextAttachmentController(textInputView,
 					imagePreview, this, this);
-			observeOnce(viewModel.hasImageSupport(), this, hasSupport -> {
-				if (hasSupport != null && hasSupport) {
-					// remove cast when removing FEATURE_FLAG_IMAGE_ATTACHMENTS
-					((TextAttachmentController) sendController)
-							.setImagesSupported();
-				}
-			});
 		} else {
 			sendController = new TextSendController(textInputView, this, false);
 		}
 		textInputView.setSendController(sendController);
 		textInputView.setMaxTextLength(MAX_PRIVATE_MESSAGE_TEXT_LENGTH);
 		textInputView.setEnabled(false);
-		textInputView.addOnKeyboardShownListener(this::scrollToBottom);
-	}
-
-	private void scrollToBottom() {
-		int items = adapter.getItemCount();
-		if (items > 0) list.scrollToPosition(items - 1);
 	}
 
 	@Override
@@ -289,8 +277,7 @@ public class ConversationActivity extends BriarActivity
 	}
 
 	@Override
-	protected void onActivityResult(int request, int result,
-			@Nullable Intent data) {
+	protected void onActivityResult(int request, int result, Intent data) {
 		super.onActivityResult(request, result, data);
 
 		if (request == REQUEST_INTRODUCTION && result == RESULT_OK) {
@@ -315,16 +302,6 @@ public class ConversationActivity extends BriarActivity
 		list.startPeriodicUpdate();
 	}
 
-	@Override
-	public void onResume() {
-		super.onResume();
-		// Trigger loading of contact data, noop if data was loaded already.
-		//
-		// We can only start loading data *after* we are sure
-		// the user has signed in. After sign-in, onCreate() isn't run again.
-		if (signedIn()) viewModel.setContactId(contactId);
-	}
-
 	@Override
 	public void onStop() {
 		super.onStop();
@@ -334,39 +311,16 @@ public class ConversationActivity extends BriarActivity
 		list.stopPeriodicUpdate();
 	}
 
-	@Override
-	protected void onSaveInstanceState(Bundle outState) {
-		super.onSaveInstanceState(outState);
-		if (layoutManager != null) {
-			layoutManagerState = layoutManager.onSaveInstanceState();
-			outState.putParcelable("layoutManager", layoutManagerState);
-		}
-	}
-
-	@Override
-	protected void onRestoreInstanceState(Bundle savedInstanceState) {
-		super.onRestoreInstanceState(savedInstanceState);
-		layoutManagerState = savedInstanceState.getParcelable("layoutManager");
-	}
-
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		// Inflate the menu items for use in the action bar
 		MenuInflater inflater = getMenuInflater();
 		inflater.inflate(R.menu.conversation_actions, menu);
 
-		// enable introduction action if available
-		observeOnce(viewModel.showIntroductionAction(), this, enable -> {
-			if (enable != null && enable) {
-				menu.findItem(R.id.action_introduction).setEnabled(true);
-				// show introduction onboarding, if needed
-				observeOnce(viewModel.showIntroductionOnboarding(), this,
-						this::showIntroductionOnboarding);
-			}
-		});
-		// enable alias action if available
-		observeOnce(viewModel.getContact(), this, contact ->
-				menu.findItem(R.id.action_set_alias).setEnabled(true));
+		enableIntroductionActionIfAvailable(
+				menu.findItem(R.id.action_introduction));
+		enableAliasActionIfAvailable(
+				menu.findItem(R.id.action_set_alias));
 
 		return super.onCreateOptionsMenu(menu);
 	}
@@ -429,10 +383,33 @@ public class ConversationActivity extends BriarActivity
 						Long.compare(b.getTimestamp(), a.getTimestamp()));
 				if (!sorted.isEmpty()) {
 					// If the latest header is a private message, eagerly load
-					// its size so we can set the scroll position correctly
+					// its text so we can set the scroll position correctly
 					ConversationMessageHeader latest = sorted.get(0);
 					if (latest instanceof PrivateMessageHeader) {
-						eagerlyLoadMessageSize((PrivateMessageHeader) latest);
+						MessageId id = latest.getId();
+						PrivateMessageHeader h = (PrivateMessageHeader) latest;
+						if (h.hasText()) {
+							String text = textCache.get(id);
+							if (text == null) {
+								LOG.info(
+										"Eagerly loading text of latest message");
+								text = messagingManager.getMessageText(id);
+								textCache.put(id, text);
+							}
+						}
+						if (!h.getAttachmentHeaders().isEmpty()) {
+							List<AttachmentItem> items =
+									attachmentController.get(id);
+							if (items == null) {
+								LOG.info(
+										"Eagerly loading image size for latest message");
+								items = attachmentController.getAttachmentItems(
+										attachmentController
+												.getMessageAttachments(
+														h.getAttachmentHeaders()));
+								attachmentController.put(id, items);
+							}
+						}
 					}
 				}
 				displayMessages(revision, sorted);
@@ -444,51 +421,17 @@ public class ConversationActivity extends BriarActivity
 		});
 	}
 
-	private void eagerlyLoadMessageSize(PrivateMessageHeader h)
-			throws DbException {
-		MessageId id = h.getId();
-		// If the message has text, load it
-		if (h.hasText()) {
-			String text = textCache.get(id);
-			if (text == null) {
-				LOG.info("Eagerly loading text for latest message");
-				text = messagingManager.getMessageText(id);
-				textCache.put(id, text);
-			}
-		}
-		// If the message has a single image, load its size - for multiple
-		// images we use a grid so the size is fixed
-		if (h.getAttachmentHeaders().size() == 1) {
-			List<AttachmentItem> items = attachmentController.get(id);
-			if (items == null) {
-				LOG.info("Eagerly loading image size for latest message");
-				items = attachmentController.getAttachmentItems(
-						attachmentController.getMessageAttachments(
-								h.getAttachmentHeaders()));
-				attachmentController.put(id, items);
-			}
-		}
-	}
-
 	private void displayMessages(int revision,
 			Collection<ConversationMessageHeader> headers) {
 		runOnUiThreadUnlessDestroyed(() -> {
 			if (revision == adapter.getRevision()) {
 				adapter.incrementRevision();
 				textInputView.setEnabled(true);
-				// start observing onboarding after enabling (only once, because
-				// we only update this when an onboarding should be shown)
-				observeOnce(viewModel.showImageOnboarding(), this,
-						this::showImageOnboarding);
 				List<ConversationItem> items = createItems(headers);
 				adapter.addAll(items);
 				list.showData();
-				if (layoutManagerState == null) {
-					scrollToBottom();
-				} else {
-					// Restore the previous scroll position
-					layoutManager.onRestoreInstanceState(layoutManagerState);
-				}
+				// Scroll to the bottom
+				list.scrollToPosition(adapter.getItemCount() - 1);
 			} else {
 				LOG.info("Concurrent update, reloading");
 				loadMessages();
@@ -529,28 +472,21 @@ public class ConversationActivity extends BriarActivity
 			Pair<Integer, ConversationMessageItem> pair =
 					adapter.getMessageItem(m);
 			if (pair != null) {
-				boolean scroll = shouldScrollWhenUpdatingMessage();
 				pair.getSecond().setText(text);
+				boolean bottom = adapter.isScrolledToBottom(layoutManager);
 				adapter.notifyItemChanged(pair.getFirst());
-				if (scroll) scrollToBottom();
+				if (bottom) list.scrollToPosition(adapter.getItemCount() - 1);
 			}
 		});
 	}
 
-	// When a message's text or attachments are loaded, scroll to the bottom
-	// if the conversation is visible and we were previously at the bottom
-	private boolean shouldScrollWhenUpdatingMessage() {
-		return getLifecycle().getCurrentState().isAtLeast(STARTED)
-				&& adapter.isScrolledToBottom(layoutManager);
-	}
-
 	private void loadMessageAttachments(MessageId messageId,
 			List<AttachmentHeader> headers) {
 		runOnDbThread(() -> {
 			try {
 				List<Pair<AttachmentHeader, Attachment>> attachments =
 						attachmentController.getMessageAttachments(headers);
-				// TODO move getting the items off to IoExecutor, if size == 1
+				// TODO move getting the items off to the IoExecutor
 				List<AttachmentItem> items =
 						attachmentController.getAttachmentItems(attachments);
 				displayMessageAttachments(messageId, items);
@@ -567,10 +503,10 @@ public class ConversationActivity extends BriarActivity
 			Pair<Integer, ConversationMessageItem> pair =
 					adapter.getMessageItem(m);
 			if (pair != null) {
-				boolean scroll = shouldScrollWhenUpdatingMessage();
 				pair.getSecond().setAttachments(items);
+				boolean bottom = adapter.isScrolledToBottom(layoutManager);
 				adapter.notifyItemChanged(pair.getFirst());
-				if (scroll) scrollToBottom();
+				if (bottom) list.scrollToPosition(adapter.getItemCount() - 1);
 			}
 		});
 	}
@@ -619,13 +555,10 @@ public class ConversationActivity extends BriarActivity
 
 	private void addConversationItem(ConversationItem item) {
 		runOnUiThreadUnlessDestroyed(() -> {
+			boolean bottom = adapter.isScrolledToBottom(layoutManager);
 			adapter.incrementRevision();
 			adapter.add(item);
-			// When adding a new message, scroll to the bottom if the
-			// conversation is visible, even if we're not currently at
-			// the bottom
-			if (getLifecycle().getCurrentState().isAtLeast(STARTED))
-				scrollToBottom();
+			if (bottom) list.scrollToPosition(adapter.getItemCount() - 1);
 		});
 	}
 
@@ -667,11 +600,16 @@ public class ConversationActivity extends BriarActivity
 
 	@Override
 	public void onSendClick(@Nullable String text, List<Uri> imageUris) {
-		if (isNullOrEmpty(text) && imageUris.isEmpty())
-			throw new AssertionError();
+		if (!imageUris.isEmpty()) {
+			Toast.makeText(this, "Not yet implemented.", LENGTH_LONG).show();
+			textInputView.clearText();
+			return;
+		}
+		if (isNullOrEmpty(text)) throw new AssertionError();
 		long timestamp = System.currentTimeMillis();
 		timestamp = Math.max(timestamp, getMinTimestampForNewMessage());
-		viewModel.sendMessage(text, imageUris, timestamp);
+		if (messagingGroupId == null) loadGroupId(text, timestamp);
+		else createMessage(text, timestamp);
 		textInputView.clearText();
 	}
 
@@ -681,10 +619,48 @@ public class ConversationActivity extends BriarActivity
 		return item == null ? 0 : item.getTime() + 1;
 	}
 
-	private void onAddedPrivateMessage(@Nullable PrivateMessageHeader h) {
-		if (h == null) return;
-		addConversationItem(h.accept(visitor));
-		viewModel.onAddedPrivateMessageSeen();
+	private void loadGroupId(String text, long timestamp) {
+		runOnDbThread(() -> {
+			try {
+				messagingGroupId =
+						messagingManager.getConversationId(contactId);
+				createMessage(text, timestamp);
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+			}
+
+		});
+	}
+
+	private void createMessage(String text, long timestamp) {
+		cryptoExecutor.execute(() -> {
+			try {
+				//noinspection ConstantConditions init in loadGroupId()
+				storeMessage(privateMessageFactory.createPrivateMessage(
+						messagingGroupId, timestamp, text, emptyList()), text);
+			} catch (FormatException e) {
+				throw new RuntimeException(e);
+			}
+		});
+	}
+
+	private void storeMessage(PrivateMessage m, String text) {
+		runOnDbThread(() -> {
+			try {
+				long start = now();
+				messagingManager.addLocalMessage(m);
+				logDuration(LOG, "Storing message", start);
+				Message message = m.getMessage();
+				PrivateMessageHeader h = new PrivateMessageHeader(
+						message.getId(), message.getGroupId(),
+						message.getTimestamp(), true, false, false, false,
+						true, emptyList());
+				textCache.put(message.getId(), text);
+				addConversationItem(h.accept(visitor));
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+			}
+		});
 	}
 
 	private void askToRemoveContact() {
@@ -721,70 +697,74 @@ public class ConversationActivity extends BriarActivity
 		});
 	}
 
-	private void showImageOnboarding(@Nullable Boolean show) {
-		if (show == null || !show) return;
-		if (SDK_INT >= 21) {
-			// show onboarding only after the enter transition has ended
-			// otherwise the tap target animation won't play
-			textInputView.postDelayed(this::showImageOnboarding,
-					TRANSITION_DURATION_MS + ONBOARDING_DELAY_MS);
-		} else {
-			showImageOnboarding();
-		}
+	private void enableIntroductionActionIfAvailable(MenuItem item) {
+		runOnDbThread(() -> {
+			try {
+				if (contactManager.getActiveContacts().size() > 1) {
+					enableIntroductionAction(item);
+					Settings settings =
+							settingsManager.getSettings(SETTINGS_NAMESPACE);
+					if (settings.getBoolean(SHOW_ONBOARDING_INTRODUCTION,
+							true)) {
+						showIntroductionOnboarding();
+					}
+				}
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+			}
+		});
 	}
 
-	private void showImageOnboarding() {
-		// remove cast when removing FEATURE_FLAG_IMAGE_ATTACHMENTS
-		((TextAttachmentController) sendController)
-				.showImageOnboarding(this, () ->
-						viewModel.onImageOnboardingSeen());
+	private void enableAliasActionIfAvailable(MenuItem item) {
+		observeOnce(viewModel.getContact(), this, c -> item.setEnabled(true));
 	}
 
-	private void showIntroductionOnboarding(@Nullable Boolean show) {
-		if (show == null || !show) return;
-		if (SDK_INT >= 21) {
-			// show onboarding only after the enter transition has ended
-			// otherwise the tap target animation won't play
-			textInputView.postDelayed(this::showIntroductionOnboarding,
-					TRANSITION_DURATION_MS + ONBOARDING_DELAY_MS);
-		} else {
-			showIntroductionOnboarding();
-		}
+	private void enableIntroductionAction(MenuItem item) {
+		runOnUiThreadUnlessDestroyed(() -> item.setEnabled(true));
 	}
 
 	private void showIntroductionOnboarding() {
-		// find view of overflow icon
-		View target = null;
-		for (int i = 0; i < toolbar.getChildCount(); i++) {
-			if (toolbar.getChildAt(i) instanceof ActionMenuView) {
-				ActionMenuView menu = (ActionMenuView) toolbar.getChildAt(i);
-				// The overflow icon should be the last child of the menu
-				target = menu.getChildAt(menu.getChildCount() - 1);
-				// If the menu hasn't been populated yet, use the menu itself
-				// as the target
-				if (target == null) target = menu;
-				break;
+		runOnUiThreadUnlessDestroyed(() -> {
+			// find view of overflow icon
+			View target = null;
+			for (int i = 0; i < toolbar.getChildCount(); i++) {
+				if (toolbar.getChildAt(i) instanceof ActionMenuView) {
+					ActionMenuView menu =
+							(ActionMenuView) toolbar.getChildAt(i);
+					target = menu.getChildAt(menu.getChildCount() - 1);
+					break;
+				}
+			}
+			if (target == null) {
+				LOG.warning("No Overflow Icon found!");
+				return;
 			}
-		}
-		if (target == null) {
-			LOG.warning("No Overflow Icon found!");
-			return;
-		}
 
-		PromptStateChangeListener listener = (prompt, state) -> {
-			if (state == STATE_DISMISSED || state == STATE_FINISHED) {
-				viewModel.onIntroductionOnboardingSeen();
+			PromptStateChangeListener listener = (prompt, state) -> {
+				if (state == STATE_DISMISSED || state == STATE_FINISHED) {
+					introductionOnboardingSeen();
+				}
+			};
+			new MaterialTapTargetPrompt.Builder(ConversationActivity.this,
+					R.style.OnboardingDialogTheme).setTarget(target)
+					.setPrimaryText(R.string.introduction_onboarding_title)
+					.setSecondaryText(R.string.introduction_onboarding_text)
+					.setIcon(R.drawable.ic_more_vert_accent)
+					.setPromptStateChangeListener(listener)
+					.show();
+		});
+	}
+
+	private void introductionOnboardingSeen() {
+		runOnDbThread(() -> {
+			try {
+				Settings settings = new Settings();
+				settings.putBoolean(SHOW_ONBOARDING_INTRODUCTION, false);
+				settingsManager.mergeSettings(settings, SETTINGS_NAMESPACE);
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
 			}
-		};
-		new MaterialTapTargetPrompt.Builder(ConversationActivity.this,
-				R.style.OnboardingDialogTheme).setTarget(target)
-				.setPrimaryText(R.string.introduction_onboarding_title)
-				.setSecondaryText(R.string.introduction_onboarding_text)
-				.setIcon(R.drawable.ic_more_vert_accent)
-				.setBackgroundColour(
-						ContextCompat.getColor(this, R.color.briar_primary))
-				.setPromptStateChangeListener(listener)
-				.show();
+		});
 	}
 
 	@Override
@@ -878,18 +858,19 @@ public class ConversationActivity extends BriarActivity
 		} else {
 			name = getString(R.string.you);
 		}
-		ArrayList<AttachmentItem> attachments =
-				new ArrayList<>(messageItem.getAttachments());
 		Intent i = new Intent(this, ImageActivity.class);
-		i.putParcelableArrayListExtra(ATTACHMENTS, attachments);
-		i.putExtra(ATTACHMENT_POSITION, attachments.indexOf(item));
+		i.putExtra(ATTACHMENT, item);
 		i.putExtra(NAME, name);
 		i.putExtra(DATE, messageItem.getTime());
-		// restoring list position should not trigger android bug #224270
-		String transitionName = item.getTransitionName();
-		ActivityOptionsCompat options =
-				makeSceneTransitionAnimation(this, view, transitionName);
-		ActivityCompat.startActivity(this, i, options.toBundle());
+		if (SDK_INT >= 23) {
+			String transitionName = item.getTransitionName();
+			ActivityOptionsCompat options =
+					makeSceneTransitionAnimation(this, view, transitionName);
+			ActivityCompat.startActivity(this, i, options.toBundle());
+		} else {
+			// work-around for android bug #224270
+			startActivity(i);
+		}
 	}
 
 	@DatabaseExecutor

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationAdapter.java

@@ -3,7 +3,6 @@ package org.briarproject.briar.android.conversation;
 import android.content.Context;
 import android.support.annotation.LayoutRes;
 import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView.RecycledViewPool;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -22,17 +21,11 @@ class ConversationAdapter
 		extends BriarAdapter<ConversationItem, ConversationItemViewHolder> {
 
 	private ConversationListener listener;
-	private final RecycledViewPool imageViewPool;
-	private final ImageItemDecoration imageItemDecoration;
 
 	ConversationAdapter(Context ctx,
 			ConversationListener conversationListener) {
 		super(ctx, ConversationItem.class);
 		listener = conversationListener;
-		// This shares the same pool for view recycling between all image lists
-		imageViewPool = new RecycledViewPool();
-		// Share the item decoration as well
-		imageItemDecoration = new ImageItemDecoration(ctx);
 	}
 
 	@LayoutRes
@@ -49,17 +42,15 @@ class ConversationAdapter
 				type, viewGroup, false);
 		switch (type) {
 			case R.layout.list_item_conversation_msg_in:
-				return new ConversationMessageViewHolder(v, listener, true,
-						imageViewPool, imageItemDecoration);
+				return new ConversationMessageViewHolder(v, true);
 			case R.layout.list_item_conversation_msg_out:
-				return new ConversationMessageViewHolder(v, listener, false,
-						imageViewPool, imageItemDecoration);
+				return new ConversationMessageViewHolder(v, false);
 			case R.layout.list_item_conversation_notice_in:
-				return new ConversationNoticeViewHolder(v, listener, true);
+				return new ConversationNoticeViewHolder(v, true);
 			case R.layout.list_item_conversation_notice_out:
-				return new ConversationNoticeViewHolder(v, listener, false);
+				return new ConversationNoticeViewHolder(v, false);
 			case R.layout.list_item_conversation_request:
-				return new ConversationRequestViewHolder(v, listener, true);
+				return new ConversationRequestViewHolder(v, true);
 			default:
 				throw new IllegalArgumentException("Unknown ConversationItem");
 		}
@@ -68,7 +59,7 @@ class ConversationAdapter
 	@Override
 	public void onBindViewHolder(ConversationItemViewHolder ui, int position) {
 		ConversationItem item = items.get(position);
-		ui.bind(item);
+		ui.bind(item, listener);
 		listener.onItemVisible(item);
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemViewHolder.java

@@ -18,17 +18,14 @@ import static org.briarproject.briar.android.util.UiUtils.formatDate;
 @NotNullByDefault
 abstract class ConversationItemViewHolder extends ViewHolder {
 
-	protected final ConversationListener listener;
 	protected final ConstraintLayout layout;
 	@Nullable
 	private final OutItemViewHolder outViewHolder;
 	private final TextView text;
 	protected final TextView time;
 
-	ConversationItemViewHolder(View v, ConversationListener listener,
-			boolean isIncoming) {
+	ConversationItemViewHolder(View v, boolean isIncoming) {
 		super(v);
-		this.listener = listener;
 		this.outViewHolder = isIncoming ? null : new OutItemViewHolder(v);
 		layout = v.findViewById(R.id.layout);
 		text = v.findViewById(R.id.text);
@@ -36,7 +33,7 @@ abstract class ConversationItemViewHolder extends ViewHolder {
 	}
 
 	@CallSuper
-	void bind(ConversationItem item) {
+	void bind(ConversationItem item, ConversationListener listener) {
 		if (item.getText() != null) {
 			text.setText(trim(item.getText()));
 		}

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageViewHolder.java

@@ -1,45 +1,63 @@
 package org.briarproject.briar.android.conversation;
 
+import android.content.res.Configuration;
+import android.graphics.Bitmap;
+import android.support.annotation.DrawableRes;
 import android.support.annotation.UiThread;
 import android.support.constraint.ConstraintSet;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.RecycledViewPool;
+import android.support.v4.content.ContextCompat;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import com.bumptech.glide.load.Transformation;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.R;
+import org.briarproject.briar.android.conversation.glide.BriarImageTransformation;
+import org.briarproject.briar.android.conversation.glide.GlideApp;
 
-import static android.support.constraint.ConstraintSet.WRAP_CONTENT;
-import static android.support.v4.content.ContextCompat.getColor;
+import static android.os.Build.VERSION.SDK_INT;
+import static android.support.v4.view.ViewCompat.LAYOUT_DIRECTION_RTL;
+import static com.bumptech.glide.load.engine.DiskCacheStrategy.NONE;
+import static com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade;
 
 @UiThread
 @NotNullByDefault
 class ConversationMessageViewHolder extends ConversationItemViewHolder {
 
-	private final ImageAdapter adapter;
+	@DrawableRes
+	private static final int ERROR_RES = R.drawable.ic_image_broken;
+
+	private final ImageView imageView;
 	private final ViewGroup statusLayout;
 	private final int timeColor, timeColorBubble;
+	private final int radiusBig, radiusSmall;
+	private final boolean isRtl;
 	private final ConstraintSet textConstraints = new ConstraintSet();
 	private final ConstraintSet imageConstraints = new ConstraintSet();
 	private final ConstraintSet imageTextConstraints = new ConstraintSet();
 
-	ConversationMessageViewHolder(View v, ConversationListener listener,
-			boolean isIncoming, RecycledViewPool imageViewPool,
-			ImageItemDecoration imageItemDecoration) {
-		super(v, listener, isIncoming);
+	ConversationMessageViewHolder(View v, boolean isIncoming) {
+		super(v, isIncoming);
+		imageView = v.findViewById(R.id.imageView);
 		statusLayout = v.findViewById(R.id.statusLayout);
-
-		// image list
-		RecyclerView list = v.findViewById(R.id.imageList);
-		list.setRecycledViewPool(imageViewPool);
-		adapter = new ImageAdapter(v.getContext(), listener);
-		list.setAdapter(adapter);
-		list.addItemDecoration(imageItemDecoration);
+		radiusBig = v.getContext().getResources()
+				.getDimensionPixelSize(R.dimen.message_bubble_radius_big);
+		radiusSmall = v.getContext().getResources()
+				.getDimensionPixelSize(R.dimen.message_bubble_radius_small);
 
 		// remember original status text color
 		timeColor = time.getCurrentTextColor();
-		timeColorBubble = getColor(v.getContext(), R.color.briar_white);
+		timeColorBubble =
+				ContextCompat.getColor(v.getContext(), R.color.briar_white);
+
+		// find out if we are showing a RTL language, Use the configuration,
+		// because getting the layout direction of views is not reliable
+		Configuration config =
+				imageView.getContext().getResources().getConfiguration();
+		isRtl = SDK_INT >= 17 &&
+				config.getLayoutDirection() == LAYOUT_DIRECTION_RTL;
 
 		// clone constraint sets from layout files
 		textConstraints
@@ -59,55 +77,85 @@ class ConversationMessageViewHolder extends ConversationItemViewHolder {
 	}
 
 	@Override
-	void bind(ConversationItem conversationItem) {
-		super.bind(conversationItem);
+	void bind(ConversationItem conversationItem,
+			ConversationListener listener) {
+		super.bind(conversationItem, listener);
 		ConversationMessageItem item =
 				(ConversationMessageItem) conversationItem;
 		if (item.getAttachments().isEmpty()) {
 			bindTextItem();
 		} else {
-			bindImageItem(item);
+			bindImageItem(item, listener);
 		}
 	}
 
 	private void bindTextItem() {
-		resetStatusLayoutForText();
-		textConstraints.applyTo(layout);
-		adapter.clear();
-	}
-
-	private void bindImageItem(ConversationMessageItem item) {
-		ConstraintSet constraintSet;
-		if (item.getText() == null) {
-			statusLayout.setBackgroundResource(R.drawable.msg_status_bubble);
-			time.setTextColor(timeColorBubble);
-			constraintSet = imageConstraints;
-		} else {
-			resetStatusLayoutForText();
-			constraintSet = imageTextConstraints;
-		}
-
-		if (item.getAttachments().size() == 1) {
-			// apply image size constraints for a single image
-			AttachmentItem attachment = item.getAttachments().get(0);
-			int width = attachment.getThumbnailWidth();
-			int height = attachment.getThumbnailHeight();
-			constraintSet.constrainWidth(R.id.imageList, width);
-			constraintSet.constrainHeight(R.id.imageList, height);
-		} else {
-			// bubble adapts to size of image list
-			constraintSet.constrainWidth(R.id.imageList, WRAP_CONTENT);
-			constraintSet.constrainHeight(R.id.imageList, WRAP_CONTENT);
-		}
-		constraintSet.applyTo(layout);
-		adapter.setConversationItem(item);
-	}
-
-	private void resetStatusLayoutForText() {
+		clearImage();
 		statusLayout.setBackgroundResource(0);
 		// also reset padding (the background drawable defines some)
 		statusLayout.setPadding(0, 0, 0, 0);
 		time.setTextColor(timeColor);
+		textConstraints.applyTo(layout);
+	}
+
+	private void bindImageItem(ConversationMessageItem item,
+			ConversationListener listener) {
+		// TODO show more than just the first image
+		AttachmentItem attachment = item.getAttachments().get(0);
+
+		ConstraintSet constraintSet;
+		if (item.getText() == null) {
+			statusLayout
+					.setBackgroundResource(R.drawable.msg_status_bubble);
+			time.setTextColor(timeColorBubble);
+			constraintSet = imageConstraints;
+		} else {
+			statusLayout.setBackgroundResource(0);
+			// also reset padding (the background drawable defines some)
+			statusLayout.setPadding(0, 0, 0, 0);
+			time.setTextColor(timeColor);
+			constraintSet = imageTextConstraints;
+		}
+
+		// apply image size constraints, so glides picks them up for scaling
+		int width = attachment.getThumbnailWidth();
+		int height = attachment.getThumbnailHeight();
+		constraintSet.constrainWidth(R.id.imageView, width);
+		constraintSet.constrainHeight(R.id.imageView, height);
+		constraintSet.applyTo(layout);
+
+		if (attachment.hasError()) {
+			clearImage();
+			imageView.setImageResource(ERROR_RES);
+		} else {
+			loadImage(item, attachment, listener);
+		}
+	}
+
+	private void clearImage() {
+		GlideApp.with(imageView)
+				.clear(imageView);
+		imageView.setOnClickListener(null);
+	}
+
+	private void loadImage(ConversationMessageItem item,
+			AttachmentItem attachment, ConversationListener listener) {
+		boolean leftCornerSmall =
+				(isIncoming() && !isRtl) || (!isIncoming() && isRtl);
+		boolean bottomRound = item.getText() == null;
+		Transformation<Bitmap> transformation = new BriarImageTransformation(
+				radiusSmall, radiusBig, leftCornerSmall, bottomRound);
+
+		GlideApp.with(imageView)
+				.load(attachment)
+				.diskCacheStrategy(NONE)
+				.error(ERROR_RES)
+				.transform(transformation)
+				.transition(withCrossFade())
+				.into(imageView)
+				.waitForLayout();
+		imageView.setOnClickListener(
+				view -> listener.onAttachmentClicked(view, item, attachment));
 	}
 
 }

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeViewHolder.java

@@ -19,17 +19,16 @@ class ConversationNoticeViewHolder extends ConversationItemViewHolder {
 
 	private final TextView msgText;
 
-	ConversationNoticeViewHolder(View v, ConversationListener listener,
-			boolean isIncoming) {
-		super(v, listener, isIncoming);
+	ConversationNoticeViewHolder(View v, boolean isIncoming) {
+		super(v, isIncoming);
 		msgText = v.findViewById(R.id.msgText);
 	}
 
 	@Override
 	@CallSuper
-	void bind(ConversationItem item) {
+	void bind(ConversationItem item, ConversationListener listener) {
 		ConversationNoticeItem notice = (ConversationNoticeItem) item;
-		super.bind(notice);
+		super.bind(notice, listener);
 
 		String text = notice.getMsgText();
 		if (isNullOrEmpty(text)) {

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationRequestViewHolder.java

@@ -17,17 +17,16 @@ class ConversationRequestViewHolder extends ConversationNoticeViewHolder {
 	private final Button acceptButton;
 	private final Button declineButton;
 
-	ConversationRequestViewHolder(View v, ConversationListener listener,
-			boolean isIncoming) {
-		super(v, listener, isIncoming);
+	ConversationRequestViewHolder(View v, boolean isIncoming) {
+		super(v, isIncoming);
 		acceptButton = v.findViewById(R.id.acceptButton);
 		declineButton = v.findViewById(R.id.declineButton);
 	}
 
 	@Override
-	void bind(ConversationItem item) {
+	void bind(ConversationItem item, ConversationListener listener) {
 		ConversationRequestItem request = (ConversationRequestItem) item;
-		super.bind(request);
+		super.bind(request, listener);
 
 		if (request.wasAnswered() && request.canBeOpened()) {
 			acceptButton.setVisibility(VISIBLE);

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java

@@ -5,40 +5,19 @@ import android.arch.lifecycle.AndroidViewModel;
 import android.arch.lifecycle.LiveData;
 import android.arch.lifecycle.MutableLiveData;
 import android.arch.lifecycle.Transformations;
-import android.content.ContentResolver;
-import android.net.Uri;
 import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
 
-import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.Pair;
 import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.contact.ContactManager;
-import org.briarproject.bramble.api.crypto.CryptoExecutor;
-import org.briarproject.bramble.api.db.DatabaseComponent;
 import org.briarproject.bramble.api.db.DatabaseExecutor;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.NoSuchContactException;
 import org.briarproject.bramble.api.identity.AuthorId;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.settings.Settings;
-import org.briarproject.bramble.api.settings.SettingsManager;
-import org.briarproject.bramble.api.sync.GroupId;
-import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.briar.android.util.UiUtils;
-import org.briarproject.briar.api.messaging.Attachment;
-import org.briarproject.briar.api.messaging.AttachmentHeader;
 import org.briarproject.briar.api.messaging.MessagingManager;
-import org.briarproject.briar.api.messaging.PrivateMessage;
-import org.briarproject.briar.api.messaging.PrivateMessageFactory;
-import org.briarproject.briar.api.messaging.PrivateMessageHeader;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
@@ -47,34 +26,19 @@ import javax.inject.Inject;
 import static java.util.Objects.requireNonNull;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
-import static org.briarproject.bramble.util.IoUtils.tryToClose;
 import static org.briarproject.bramble.util.LogUtils.logDuration;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.bramble.util.LogUtils.now;
-import static org.briarproject.briar.android.conversation.AttachmentDimensions.getAttachmentDimensions;
-import static org.briarproject.briar.android.settings.SettingsFragment.SETTINGS_NAMESPACE;
-import static org.briarproject.briar.android.util.UiUtils.observeForeverOnce;
 
 @NotNullByDefault
 public class ConversationViewModel extends AndroidViewModel {
 
 	private static Logger LOG =
 			getLogger(ConversationViewModel.class.getName());
-	private static final String SHOW_ONBOARDING_IMAGE =
-			"showOnboardingImage";
-	private static final String SHOW_ONBOARDING_INTRODUCTION =
-			"showOnboardingIntroduction";
 
 	@DatabaseExecutor
 	private final Executor dbExecutor;
-	@CryptoExecutor
-	private final Executor cryptoExecutor;
-	// TODO replace with TransactionManager once it exists
-	private final DatabaseComponent db;
-	private final MessagingManager messagingManager;
 	private final ContactManager contactManager;
-	private final SettingsManager settingsManager;
-	private final PrivateMessageFactory privateMessageFactory;
 	private final AttachmentController attachmentController;
 
 	@Nullable
@@ -84,64 +48,38 @@ public class ConversationViewModel extends AndroidViewModel {
 			Transformations.map(contact, c -> c.getAuthor().getId());
 	private final LiveData<String> contactName =
 			Transformations.map(contact, UiUtils::getContactDisplayName);
-	private final MutableLiveData<Boolean> imageSupport =
-			new MutableLiveData<>();
-	private final MutableLiveData<Boolean> showImageOnboarding =
-			new MutableLiveData<>();
-	private final MutableLiveData<Boolean> showIntroductionOnboarding =
-			new MutableLiveData<>();
-	private final MutableLiveData<Boolean> showIntroductionAction =
-			new MutableLiveData<>();
 	private final MutableLiveData<Boolean> contactDeleted =
 			new MutableLiveData<>();
-	private final MutableLiveData<GroupId> messagingGroupId =
-			new MutableLiveData<>();
-	private final MutableLiveData<PrivateMessageHeader> addedHeader =
-			new MutableLiveData<>();
 
 	@Inject
 	ConversationViewModel(Application application,
 			@DatabaseExecutor Executor dbExecutor,
-			@CryptoExecutor Executor cryptoExecutor, DatabaseComponent db,
-			MessagingManager messagingManager, ContactManager contactManager,
-			SettingsManager settingsManager,
-			PrivateMessageFactory privateMessageFactory) {
+			ContactManager contactManager, MessagingManager messagingManager) {
 		super(application);
 		this.dbExecutor = dbExecutor;
-		this.cryptoExecutor = cryptoExecutor;
-		this.db = db;
-		this.messagingManager = messagingManager;
 		this.contactManager = contactManager;
-		this.settingsManager = settingsManager;
-		this.privateMessageFactory = privateMessageFactory;
 		this.attachmentController = new AttachmentController(messagingManager,
-				getAttachmentDimensions(application.getResources()));
+				application.getResources());
 		contactDeleted.setValue(false);
 	}
 
-	/**
-	 * Setting the {@link ContactId} automatically triggers loading of other
-	 * data.
-	 */
 	void setContactId(ContactId contactId) {
 		if (this.contactId == null) {
 			this.contactId = contactId;
-			loadContact(contactId);
+			loadContact();
 		} else if (!contactId.equals(this.contactId)) {
 			throw new IllegalStateException();
 		}
 	}
 
-	private void loadContact(ContactId contactId) {
+	private void loadContact() {
 		dbExecutor.execute(() -> {
 			try {
 				long start = now();
-				Contact c = contactManager.getContact(contactId);
+				Contact c =
+						contactManager.getContact(requireNonNull(contactId));
 				contact.postValue(c);
 				logDuration(LOG, "Loading contact", start);
-				start = now();
-				checkFeaturesAndOnboarding(contactId);
-				logDuration(LOG, "Checking for image support", start);
 			} catch (NoSuchContactException e) {
 				contactDeleted.postValue(true);
 			} catch (DbException e) {
@@ -155,179 +93,13 @@ public class ConversationViewModel extends AndroidViewModel {
 			try {
 				contactManager.setContactAlias(requireNonNull(contactId),
 						alias.isEmpty() ? null : alias);
-				loadContact(contactId);
+				loadContact();
 			} catch (DbException e) {
 				logException(LOG, WARNING, e);
 			}
 		});
 	}
 
-	void sendMessage(@Nullable String text, List<Uri> uris, long timestamp) {
-		if (messagingGroupId.getValue() == null) loadGroupId();
-		observeForeverOnce(messagingGroupId, groupId -> {
-			if (groupId == null) return;
-			// calls through to creating and storing the message
-			storeAttachments(groupId, text, uris, timestamp);
-		});
-	}
-
-	private void loadGroupId() {
-		if (contactId == null) throw new IllegalStateException();
-		dbExecutor.execute(() -> {
-			try {
-				messagingGroupId.postValue(
-						messagingManager.getConversationId(contactId));
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
-	}
-
-	@DatabaseExecutor
-	private void checkFeaturesAndOnboarding(ContactId c) throws DbException {
-		// check if images are supported
-		boolean imagesSupported = db.transactionWithResult(true, txn ->
-				messagingManager.contactSupportsImages(txn, c));
-		imageSupport.postValue(imagesSupported);
-
-		// check if introductions are supported
-		Collection<Contact> contacts = contactManager.getActiveContacts();
-		boolean introductionSupported = contacts.size() > 1;
-		showIntroductionAction.postValue(introductionSupported);
-
-		Settings settings = settingsManager.getSettings(SETTINGS_NAMESPACE);
-		if (imagesSupported &&
-				settings.getBoolean(SHOW_ONBOARDING_IMAGE, true)) {
-			// check if we should show onboarding, only if images are supported
-			showImageOnboarding.postValue(true);
-			// allow observer to stop listening for changes
-			showIntroductionOnboarding.postValue(false);
-		} else {
-			// allow observer to stop listening for changes
-			showImageOnboarding.postValue(false);
-			// we only show one onboarding dialog at a time
-			if (introductionSupported &&
-					settings.getBoolean(SHOW_ONBOARDING_INTRODUCTION, true)) {
-				showIntroductionOnboarding.postValue(true);
-			} else {
-				// allow observer to stop listening for changes
-				showIntroductionOnboarding.postValue(false);
-			}
-		}
-	}
-
-	void onImageOnboardingSeen() {
-		onOnboardingSeen(SHOW_ONBOARDING_IMAGE);
-	}
-
-	void onIntroductionOnboardingSeen() {
-		onOnboardingSeen(SHOW_ONBOARDING_INTRODUCTION);
-	}
-
-	private void onOnboardingSeen(String key) {
-		dbExecutor.execute(() -> {
-			try {
-				Settings settings = new Settings();
-				settings.putBoolean(key, false);
-				settingsManager.mergeSettings(settings, SETTINGS_NAMESPACE);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
-	}
-
-	private void storeAttachments(GroupId groupId, @Nullable String text,
-			List<Uri> uris, long timestamp) {
-		dbExecutor.execute(() -> {
-			long start = now();
-			List<AttachmentHeader> attachments = new ArrayList<>();
-			List<AttachmentItem> items = new ArrayList<>();
-			boolean needsSize = uris.size() == 1;
-			for (Uri uri : uris) {
-				Pair<AttachmentHeader, AttachmentItem> pair =
-						createAttachmentHeader(groupId, uri, timestamp,
-								needsSize);
-				if (pair == null) continue;
-				attachments.add(pair.getFirst());
-				items.add(pair.getSecond());
-			}
-			logDuration(LOG, "Storing attachments", start);
-			createMessage(groupId, text, attachments, items, timestamp);
-		});
-	}
-
-	@Nullable
-	@DatabaseExecutor
-	private Pair<AttachmentHeader, AttachmentItem> createAttachmentHeader(
-			GroupId groupId, Uri uri, long timestamp, boolean needsSize) {
-		InputStream is = null;
-		try {
-			ContentResolver contentResolver =
-					getApplication().getContentResolver();
-			is = contentResolver.openInputStream(uri);
-			if (is == null) throw new IOException();
-			String contentType = contentResolver.getType(uri);
-			if (contentType == null) throw new IOException("null content type");
-			AttachmentHeader h = messagingManager
-					.addLocalAttachment(groupId, timestamp, contentType, is);
-			is.close();
-			// re-open stream to get AttachmentItem
-			is = contentResolver.openInputStream(uri);
-			if (is == null) throw new IOException();
-			AttachmentItem item = attachmentController
-					.getAttachmentItem(h, new Attachment(is), needsSize);
-			return new Pair<>(h, item);
-		} catch (DbException | IOException e) {
-			logException(LOG, WARNING, e);
-			return null;
-		} finally {
-			if (is != null) tryToClose(is, LOG, WARNING);
-		}
-	}
-
-	private void createMessage(GroupId groupId, @Nullable String text,
-			List<AttachmentHeader> attachments, List<AttachmentItem> aItems,
-			long timestamp) {
-		cryptoExecutor.execute(() -> {
-			try {
-				// TODO remove when text can be null in the backend
-				String msgText = text == null ? "null" : text;
-				PrivateMessage pm = privateMessageFactory
-						.createPrivateMessage(groupId, timestamp, msgText,
-								attachments);
-				attachmentController.put(pm.getMessage().getId(), aItems);
-				storeMessage(pm, msgText, attachments);
-			} catch (FormatException e) {
-				throw new RuntimeException(e);
-			}
-		});
-	}
-
-	private void storeMessage(PrivateMessage m, @Nullable String text,
-			List<AttachmentHeader> attachments) {
-		dbExecutor.execute(() -> {
-			try {
-				long start = now();
-				messagingManager.addLocalMessage(m);
-				logDuration(LOG, "Storing message", start);
-				Message message = m.getMessage();
-				PrivateMessageHeader h = new PrivateMessageHeader(
-						message.getId(), message.getGroupId(),
-						message.getTimestamp(), true, true, false, false,
-						text != null, attachments);
-				// TODO add text to cache when available here
-				addedHeader.postValue(h);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
-	}
-
-	@UiThread
-	void onAddedPrivateMessageSeen() {
-		addedHeader.setValue(null);
-	}
-
 	AttachmentController getAttachmentController() {
 		return attachmentController;
 	}
@@ -344,28 +116,8 @@ public class ConversationViewModel extends AndroidViewModel {
 		return contactName;
 	}
 
-	LiveData<Boolean> hasImageSupport() {
-		return imageSupport;
-	}
-
-	LiveData<Boolean> showImageOnboarding() {
-		return showImageOnboarding;
-	}
-
-	LiveData<Boolean> showIntroductionOnboarding() {
-		return showIntroductionOnboarding;
-	}
-
-	LiveData<Boolean> showIntroductionAction() {
-		return showIntroductionAction;
-	}
-
 	LiveData<Boolean> isContactDeleted() {
 		return contactDeleted;
 	}
 
-	LiveData<PrivateMessageHeader> getAddedPrivateMessage() {
-		return addedHeader;
-	}
-
 }

briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java

@@ -4,18 +4,15 @@ import android.arch.lifecycle.ViewModelProvider;
 import android.arch.lifecycle.ViewModelProviders;
 import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
+import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
 import android.support.design.widget.AppBarLayout;
 import android.support.design.widget.Snackbar;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v4.view.ViewPager;
 import android.support.v7.app.AlertDialog.Builder;
 import android.support.v7.widget.Toolbar;
 import android.transition.Fade;
@@ -23,20 +20,23 @@ import android.transition.Transition;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewTreeObserver.OnGlobalLayoutListener;
 import android.view.Window;
 import android.widget.TextView;
 
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import com.bumptech.glide.load.DataSource;
+import com.bumptech.glide.load.engine.GlideException;
+import com.bumptech.glide.request.RequestListener;
+import com.bumptech.glide.request.target.Target;
+import com.github.chrisbanes.photoview.PhotoView;
+
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.activity.BriarActivity;
+import org.briarproject.briar.android.conversation.glide.GlideApp;
 import org.briarproject.briar.android.view.PullDownLayout;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.List;
 import java.util.Locale;
 
 import javax.inject.Inject;
@@ -53,17 +53,16 @@ import static android.view.View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN;
 import static android.view.View.SYSTEM_UI_FLAG_LAYOUT_STABLE;
 import static android.view.View.VISIBLE;
 import static android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS;
+import static android.widget.ImageView.ScaleType.FIT_START;
+import static com.bumptech.glide.load.engine.DiskCacheStrategy.NONE;
 import static java.util.Objects.requireNonNull;
 import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_SAVE_ATTACHMENT;
 import static org.briarproject.briar.android.util.UiUtils.formatDateAbsolute;
 
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
 public class ImageActivity extends BriarActivity
-		implements PullDownLayout.Callback, OnGlobalLayoutListener {
+		implements PullDownLayout.Callback {
 
-	final static String ATTACHMENTS = "attachments";
-	final static String ATTACHMENT_POSITION = "position";
+	final static String ATTACHMENT = "attachment";
 	final static String NAME = "name";
 	final static String DATE = "date";
 
@@ -73,8 +72,8 @@ public class ImageActivity extends BriarActivity
 	private ImageViewModel viewModel;
 	private PullDownLayout layout;
 	private AppBarLayout appBarLayout;
-	private ViewPager viewPager;
-	private List<AttachmentItem> attachments;
+	private PhotoView photoView;
+	private AttachmentItem attachment;
 
 	@Override
 	public void injectActivity(ActivityComponent component) {
@@ -86,7 +85,7 @@ public class ImageActivity extends BriarActivity
 		super.onCreate(state);
 
 		// Transitions
-		if (state == null) supportPostponeEnterTransition();
+		supportPostponeEnterTransition();
 		Window window = getWindow();
 		if (SDK_INT >= 21) {
 			Transition transition = new Fade();
@@ -101,8 +100,8 @@ public class ImageActivity extends BriarActivity
 		// inflate layout
 		setContentView(R.layout.activity_image);
 		layout = findViewById(R.id.layout);
+		layout.getBackground().setAlpha(255);
 		layout.setCallback(this);
-		layout.getViewTreeObserver().addOnGlobalLayoutListener(this);
 
 		// Status Bar
 		if (SDK_INT >= 21) {
@@ -119,29 +118,59 @@ public class ImageActivity extends BriarActivity
 		TextView dateView = toolbar.findViewById(R.id.dateView);
 
 		// Intent Extras
-		Intent i = getIntent();
-		attachments = i.getParcelableArrayListExtra(ATTACHMENTS);
-		int position = i.getIntExtra(ATTACHMENT_POSITION, -1);
-		if (position == -1) throw new IllegalStateException();
-		String name = i.getStringExtra(NAME);
-		long time = i.getLongExtra(DATE, 0);
+		attachment = getIntent().getParcelableExtra(ATTACHMENT);
+		String name = getIntent().getStringExtra(NAME);
+		long time = getIntent().getLongExtra(DATE, 0);
 		String date = formatDateAbsolute(this, time);
 		contactName.setText(name);
 		dateView.setText(date);
 
-		// Set up image ViewPager
-		viewPager = findViewById(R.id.viewPager);
-		ImagePagerAdapter pagerAdapter =
-				new ImagePagerAdapter(getSupportFragmentManager());
-		viewPager.setAdapter(pagerAdapter);
-		viewPager.setCurrentItem(position);
-
+		// Image View
+		photoView = findViewById(R.id.photoView);
 		if (SDK_INT >= 16) {
-			viewModel.getOnImageClicked().observe(this, this::onImageClicked);
+			photoView.setOnClickListener(view -> toggleSystemUi());
 			window.getDecorView().setSystemUiVisibility(
 					SYSTEM_UI_FLAG_LAYOUT_STABLE |
 							SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
 		}
+
+		// Request Listener
+		RequestListener<Drawable> listener = new RequestListener<Drawable>() {
+			@Override
+			public boolean onLoadFailed(@Nullable GlideException e,
+					Object model, Target<Drawable> target,
+					boolean isFirstResource) {
+				supportStartPostponedEnterTransition();
+				return false;
+			}
+
+			@Override
+			public boolean onResourceReady(Drawable resource, Object model,
+					Target<Drawable> target, DataSource dataSource,
+					boolean isFirstResource) {
+				if (SDK_INT >= 21 && !(resource instanceof Animatable)) {
+					// set transition name only when not animatable,
+					// because the animation won't start otherwise
+					photoView.setTransitionName(
+							attachment.getTransitionName());
+				}
+				// Move image to the top if overlapping toolbar
+				if (isOverlappingToolbar(resource)) {
+					photoView.setScaleType(FIT_START);
+				}
+				supportStartPostponedEnterTransition();
+				return false;
+			}
+		};
+
+		// Load Image
+		GlideApp.with(this)
+				.load(attachment)
+				.diskCacheStrategy(NONE)
+				.error(R.drawable.ic_image_broken)
+				.dontTransform()
+				.addListener(listener)
+				.into(photoView);
 	}
 
 	@Override
@@ -165,24 +194,10 @@ public class ImageActivity extends BriarActivity
 	}
 
 	@Override
-	public void onGlobalLayout() {
-		viewModel.setToolbarPosition(
-				appBarLayout.getTop(), appBarLayout.getBottom()
-		);
-		if (SDK_INT >= 16) {
-			layout.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-		} else {
-			layout.getViewTreeObserver().removeGlobalOnLayoutListener(this);
-		}
-	}
-
-	@Override
-	protected void onActivityResult(int request, int result,
-			@Nullable Intent data) {
+	protected void onActivityResult(int request, int result, Intent data) {
 		super.onActivityResult(request, result, data);
-		if (request == REQUEST_SAVE_ATTACHMENT && result == RESULT_OK &&
-				data != null) {
-			viewModel.saveImage(getVisibleAttachment(), data.getData());
+		if (request == REQUEST_SAVE_ATTACHMENT && result == RESULT_OK) {
+			viewModel.saveImage(attachment, data.getData());
 		}
 	}
 
@@ -195,6 +210,7 @@ public class ImageActivity extends BriarActivity
 
 	@Override
 	public void onPull(float progress) {
+		layout.getBackground().setAlpha(Math.round((1 - progress) * 255));
 	}
 
 	@Override
@@ -209,14 +225,6 @@ public class ImageActivity extends BriarActivity
 		supportFinishAfterTransition();
 	}
 
-	@RequiresApi(api = 16)
-	private void onImageClicked(@Nullable Boolean clicked) {
-		if (clicked != null && clicked) {
-			toggleSystemUi();
-			viewModel.onOnImageClickSeen();
-		}
-	}
-
 	@RequiresApi(api = 16)
 	private void toggleSystemUi() {
 		View decorView = getWindow().getDecorView();
@@ -251,13 +259,29 @@ public class ImageActivity extends BriarActivity
 				.start();
 	}
 
+	private boolean isOverlappingToolbar(Drawable drawable) {
+		int width = drawable.getIntrinsicWidth();
+		int height = drawable.getIntrinsicHeight();
+		float widthPercentage = photoView.getWidth() / (float) width;
+		float heightPercentage = photoView.getHeight() / (float) height;
+		float scaleFactor = Math.min(widthPercentage, heightPercentage);
+		int realWidth = (int) (width * scaleFactor);
+		int realHeight = (int) (height * scaleFactor);
+		// return if photo doesn't use the full width,
+		// because it will be moved to the right otherwise
+		if (realWidth < photoView.getWidth()) return false;
+		int drawableTop = (photoView.getHeight() - realHeight) / 2;
+		return drawableTop < appBarLayout.getBottom() &&
+				drawableTop != appBarLayout.getTop();
+	}
+
 	private void showSaveImageDialog() {
 		OnClickListener okListener = (dialog, which) -> {
 			if (SDK_INT >= 19) {
 				Intent intent = getCreationIntent();
 				startActivityForResult(intent, REQUEST_SAVE_ATTACHMENT);
 			} else {
-				viewModel.saveImage(getVisibleAttachment());
+				viewModel.saveImage(attachment);
 			}
 		};
 		Builder builder = new Builder(this, R.style.BriarDialogTheme);
@@ -279,7 +303,7 @@ public class ImageActivity extends BriarActivity
 		String fileName = sdf.format(new Date());
 		Intent intent = new Intent(ACTION_CREATE_DOCUMENT);
 		intent.addCategory(CATEGORY_OPENABLE);
-		intent.setType(getVisibleAttachment().getMimeType());
+		intent.setType(attachment.getMimeType());
 		intent.putExtra(EXTRA_TITLE, fileName);
 		return intent;
 	}
@@ -296,31 +320,4 @@ public class ImageActivity extends BriarActivity
 		viewModel.onSaveStateSeen();
 	}
 
-	AttachmentItem getVisibleAttachment() {
-		return attachments.get(viewPager.getCurrentItem());
-	}
-
-	private class ImagePagerAdapter extends FragmentStatePagerAdapter {
-
-		private boolean isFirst = true;
-
-		private ImagePagerAdapter(FragmentManager fm) {
-			super(fm);
-		}
-
-		@Override
-		public Fragment getItem(int position) {
-			Fragment f = ImageFragment
-					.newInstance(attachments.get(position), isFirst);
-			isFirst = false;
-			return f;
-		}
-
-		@Override
-		public int getCount() {
-			return attachments.size();
-		}
-
-	}
-
 }

briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageAdapter.java

@@ -1,155 +0,0 @@
-package org.briarproject.briar.android.conversation;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView.Adapter;
-import android.util.DisplayMetrics;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.briar.R;
-import org.briarproject.briar.android.conversation.glide.Radii;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static android.content.Context.WINDOW_SERVICE;
-import static java.util.Objects.requireNonNull;
-import static org.briarproject.briar.android.util.UiUtils.isRtl;
-
-@NotNullByDefault
-class ImageAdapter extends Adapter<ImageViewHolder> {
-
-	private final List<AttachmentItem> items = new ArrayList<>();
-	private final ConversationListener listener;
-	private final int imageSize;
-	private final int radiusBig, radiusSmall;
-	private final boolean isRtl;
-	@Nullable
-	private ConversationMessageItem conversationItem;
-
-	ImageAdapter(Context ctx, ConversationListener listener) {
-		this.listener = listener;
-		imageSize = getImageSize(ctx);
-		Resources res = ctx.getResources();
-		radiusBig =
-				res.getDimensionPixelSize(R.dimen.message_bubble_radius_big);
-		radiusSmall =
-				res.getDimensionPixelSize(R.dimen.message_bubble_radius_small);
-		isRtl = isRtl(ctx);
-	}
-
-	@Override
-	public ImageViewHolder onCreateViewHolder(ViewGroup viewGroup, int type) {
-		View v = LayoutInflater.from(viewGroup.getContext()).inflate(
-				R.layout.list_item_image, viewGroup, false);
-		return new ImageViewHolder(v, imageSize);
-	}
-
-	@Override
-	public void onBindViewHolder(ImageViewHolder imageViewHolder,
-			int position) {
-		// get item
-		requireNonNull(conversationItem);
-		AttachmentItem item = items.get(position);
-		// set onClick listener
-		imageViewHolder.itemView.setOnClickListener(v ->
-				listener.onAttachmentClicked(v, conversationItem, item)
-		);
-		// bind view holder
-		int size = items.size();
-		boolean isIncoming = conversationItem.isIncoming();
-		boolean hasText = conversationItem.getText() != null;
-		Radii r = getRadii(position, size, isIncoming, hasText);
-		imageViewHolder.bind(item, r, size == 1, singleInRow(position, size));
-	}
-
-	@Override
-	public int getItemCount() {
-		return items.size();
-	}
-
-	void setConversationItem(ConversationMessageItem item) {
-		this.conversationItem = item;
-		this.items.clear();
-		this.items.addAll(item.getAttachments());
-		notifyDataSetChanged();
-	}
-
-	private int getImageSize(Context ctx) {
-		Resources res = ctx.getResources();
-		WindowManager windowManager =
-				(WindowManager) ctx.getSystemService(WINDOW_SERVICE);
-		DisplayMetrics displayMetrics = new DisplayMetrics();
-		if (windowManager == null) {
-			return res.getDimensionPixelSize(
-					R.dimen.message_bubble_image_default);
-		}
-		windowManager.getDefaultDisplay().getMetrics(displayMetrics);
-		int imageSize = displayMetrics.widthPixels / 3;
-		int maxSize = res.getDimensionPixelSize(
-				R.dimen.message_bubble_image_max_width);
-		return Math.min(imageSize, maxSize);
-	}
-
-	private Radii getRadii(int pos, int num, boolean isIncoming,
-			boolean hasText) {
-		boolean left = isLeft(pos);
-		boolean single = num == 1;
-		// Top Row
-		int topLeft;
-		int topRight;
-		if (single) {
-			topLeft = isIncoming ? radiusSmall : radiusBig;
-			topRight = !isIncoming ? radiusSmall : radiusBig;
-		} else if (isTopRow(pos)) {
-			topLeft = left ? (isIncoming ? radiusSmall : radiusBig) : 0;
-			topRight = !left ? (!isIncoming ? radiusSmall : radiusBig) : 0;
-		} else {
-			topLeft = 0;
-			topRight = 0;
-		}
-		// Bottom Row
-		boolean singleInRow = singleInRow(pos, num);
-		int bottomLeft;
-		int bottomRight;
-		if (!hasText && isBottomRow(pos, num)) {
-			bottomLeft = singleInRow || left ? radiusBig : 0;
-			bottomRight = singleInRow || !left ? radiusBig : 0;
-		} else {
-			bottomLeft = 0;
-			bottomRight = 0;
-		}
-		if (isRtl) return new Radii(topRight, topLeft, bottomRight, bottomLeft);
-		return new Radii(topLeft, topRight, bottomLeft, bottomRight);
-	}
-
-	void clear() {
-		items.clear();
-		notifyDataSetChanged();
-	}
-
-	static boolean isTopRow(int pos) {
-		return pos < 2;
-	}
-
-	static boolean isLeft(int pos) {
-		return pos % 2 == 0;
-	}
-
-	static boolean isBottomRow(int pos, int num) {
-		return num % 2 == 0 ?
-				pos >= num - 2 : // last two, if even
-				pos > num - 2;   // last one, if odd
-	}
-
-	static boolean singleInRow(int pos, int num) {
-		// last item of an odd number
-		return num % 2 != 0 && pos == num -1;
-	}
-
-}

briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageFragment.java

@@ -1,133 +0,0 @@
-package org.briarproject.briar.android.conversation;
-
-import android.arch.lifecycle.ViewModelProvider;
-import android.arch.lifecycle.ViewModelProviders;
-import android.graphics.drawable.Animatable;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.bumptech.glide.load.DataSource;
-import com.bumptech.glide.load.engine.GlideException;
-import com.bumptech.glide.request.RequestListener;
-import com.bumptech.glide.request.target.Target;
-import com.github.chrisbanes.photoview.PhotoView;
-
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.briar.R;
-import org.briarproject.briar.android.activity.BaseActivity;
-import org.briarproject.briar.android.conversation.glide.GlideApp;
-
-import javax.annotation.ParametersAreNonnullByDefault;
-import javax.inject.Inject;
-
-import static android.os.Build.VERSION.SDK_INT;
-import static android.widget.ImageView.ScaleType.FIT_START;
-import static com.bumptech.glide.load.engine.DiskCacheStrategy.NONE;
-import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
-import static org.briarproject.briar.android.conversation.ImageActivity.ATTACHMENT_POSITION;
-
-@MethodsNotNullByDefault
-@ParametersAreNonnullByDefault
-public class ImageFragment extends Fragment {
-
-	private final static String IS_FIRST = "isFirst";
-
-	@Inject
-	ViewModelProvider.Factory viewModelFactory;
-
-	private AttachmentItem attachment;
-	private boolean isFirst;
-	private ImageViewModel viewModel;
-	private PhotoView photoView;
-
-	static ImageFragment newInstance(AttachmentItem a, boolean isFirst) {
-		ImageFragment f = new ImageFragment();
-		Bundle args = new Bundle();
-		args.putParcelable(ATTACHMENT_POSITION, a);
-		args.putBoolean(IS_FIRST, isFirst);
-		f.setArguments(args);
-		return f;
-	}
-
-	@Override
-	public void onActivityCreated(@Nullable Bundle savedInstanceState) {
-		super.onActivityCreated(savedInstanceState);
-		BaseActivity a = (BaseActivity) requireNonNull(getActivity());
-		a.getActivityComponent().inject(this);
-	}
-
-	@Override
-	public void onCreate(@Nullable Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-
-		Bundle args = requireNonNull(getArguments());
-		attachment = requireNonNull(args.getParcelable(ATTACHMENT_POSITION));
-		isFirst = args.getBoolean(IS_FIRST);
-	}
-
-	@Nullable
-	@Override
-	public View onCreateView(LayoutInflater inflater,
-			@Nullable ViewGroup container,
-			@Nullable Bundle savedInstanceState) {
-		View v = inflater.inflate(R.layout.fragment_image, container,
-				false);
-
-		viewModel = ViewModelProviders.of(requireNonNull(getActivity()),
-				viewModelFactory).get(ImageViewModel.class);
-
-		photoView = v.findViewById(R.id.photoView);
-		photoView.setScaleLevels(1, 2, 4);
-		photoView.setOnClickListener(view -> viewModel.clickImage());
-
-		// Request Listener
-		RequestListener<Drawable> listener = new RequestListener<Drawable>() {
-			@Override
-			public boolean onLoadFailed(@Nullable GlideException e,
-					Object model, Target<Drawable> target,
-					boolean isFirstResource) {
-				if (getActivity() != null && isFirst)
-					getActivity().supportStartPostponedEnterTransition();
-				return false;
-			}
-
-			@Override
-			public boolean onResourceReady(Drawable resource, Object model,
-					Target<Drawable> target, DataSource dataSource,
-					boolean isFirstResource) {
-				if (SDK_INT >= 21 && !(resource instanceof Animatable)) {
-					// set transition name only when not animatable,
-					// because the animation won't start otherwise
-					photoView.setTransitionName(
-							attachment.getTransitionName());
-				}
-				// Move image to the top if overlapping toolbar
-				if (viewModel.isOverlappingToolbar(photoView, resource)) {
-					photoView.setScaleType(FIT_START);
-				}
-				if (getActivity() != null && isFirst) {
-					getActivity().supportStartPostponedEnterTransition();
-				}
-				return false;
-			}
-		};
-
-		// Load Image
-		GlideApp.with(this)
-				.load(attachment)
-				// TODO allow if size < maxTextureSize ?
-//				.override(SIZE_ORIGINAL)
-				.diskCacheStrategy(NONE)
-				.error(R.drawable.ic_image_broken)
-				.addListener(listener)
-				.into(photoView);
-
-		return v;
-	}
-
-}

briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageHelper.java

@@ -1,29 +0,0 @@
-package org.briarproject.briar.android.conversation;
-
-import android.support.annotation.Nullable;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.io.InputStream;
-
-@NotNullByDefault
-interface ImageHelper {
-
-	DecodeResult decodeStream(InputStream is);
-
-	@Nullable
-	String getExtensionFromMimeType(String mimeType);
-
-	class DecodeResult {
-
-		final int width;
-		final int height;
-		final String mimeType;
-
-		DecodeResult(int width, int height, String mimeType) {
-			this.width = width;
-			this.height = height;
-			this.mimeType = mimeType;
-		}
-	}
-}

briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageItemDecoration.java

@@ -1,54 +0,0 @@
-package org.briarproject.briar.android.conversation;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Rect;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.ItemDecoration;
-import android.support.v7.widget.RecyclerView.State;
-import android.view.View;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.briar.R;
-
-import static org.briarproject.briar.android.conversation.ImageAdapter.isBottomRow;
-import static org.briarproject.briar.android.conversation.ImageAdapter.isLeft;
-import static org.briarproject.briar.android.conversation.ImageAdapter.isTopRow;
-import static org.briarproject.briar.android.conversation.ImageAdapter.singleInRow;
-import static org.briarproject.briar.android.util.UiUtils.isRtl;
-
-@NotNullByDefault
-class ImageItemDecoration extends ItemDecoration {
-
-	private final int border;
-	private final boolean isRtl;
-
-	ImageItemDecoration(Context ctx) {
-		Resources res = ctx.getResources();
-
-		// for pixel perfection, add a pixel to the border if it has an odd size
-		int b = res.getDimensionPixelSize(R.dimen.message_bubble_border);
-		int realBorderSize = b % 2 == 0 ? b : b + 1;
-
-		// we are applying half the border around the insides of each image
-		// to prevent differently sized images looking slightly broken
-		border = realBorderSize / 2;
-
-		// find out if we are showing a RTL language
-		isRtl = isRtl(ctx);
-	}
-
-	@Override
-	public void getItemOffsets(Rect outRect, View view, RecyclerView parent,
-			State state) {
-		if (state.getItemCount() == 1) return;
-		int pos = parent.getChildAdapterPosition(view);
-		int num = state.getItemCount();
-		boolean start = isLeft(pos) ^ isRtl;
-		outRect.top = isTopRow(pos) ? 0 : border;
-		outRect.left = start ? 0 : border;
-		outRect.right = start && !singleInRow(pos, num) ? border : 0;
-		outRect.bottom = isBottomRow(pos, num) ? 0 : border;
-	}
-
-}

briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewHolder.java

@@ -1,74 +0,0 @@
-package org.briarproject.briar.android.conversation;
-
-import android.graphics.Bitmap;
-import android.support.annotation.DrawableRes;
-import android.support.v7.widget.RecyclerView.ViewHolder;
-import android.support.v7.widget.StaggeredGridLayoutManager.LayoutParams;
-import android.view.View;
-import android.widget.ImageView;
-
-import com.bumptech.glide.load.Transformation;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.briar.R;
-import org.briarproject.briar.android.conversation.glide.BriarImageTransformation;
-import org.briarproject.briar.android.conversation.glide.GlideApp;
-import org.briarproject.briar.android.conversation.glide.Radii;
-
-import static android.os.Build.VERSION.SDK_INT;
-import static com.bumptech.glide.load.engine.DiskCacheStrategy.NONE;
-import static com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade;
-
-@NotNullByDefault
-class ImageViewHolder extends ViewHolder {
-
-	@DrawableRes
-	private static final int ERROR_RES = R.drawable.ic_image_broken;
-
-	protected final ImageView imageView;
-	private final int imageSize;
-
-	ImageViewHolder(View v, int imageSize) {
-		super(v);
-		imageView = v.findViewById(R.id.imageView);
-		this.imageSize = imageSize;
-	}
-
-	void bind(AttachmentItem attachment, Radii r, boolean single,
-			boolean needsStretch) {
-		if (attachment.hasError()) {
-			GlideApp.with(imageView)
-					.clear(imageView);
-			imageView.setImageResource(ERROR_RES);
-		} else {
-			setImageViewDimensions(attachment, single, needsStretch);
-			loadImage(attachment, r);
-			if (SDK_INT >= 21) {
-				imageView.setTransitionName(attachment.getTransitionName());
-			}
-		}
-	}
-
-	private void setImageViewDimensions(AttachmentItem a, boolean single,
-			boolean needsStretch) {
-		LayoutParams params = (LayoutParams) imageView.getLayoutParams();
-		int width = needsStretch ? imageSize * 2 : imageSize;
-		params.width = single ? a.getThumbnailWidth() : width;
-		params.height = single ? a.getThumbnailHeight() : imageSize;
-		params.setFullSpan(!single && needsStretch);
-		imageView.setLayoutParams(params);
-	}
-
-	private void loadImage(AttachmentItem a, Radii r) {
-		Transformation<Bitmap> transformation = new BriarImageTransformation(r);
-		GlideApp.with(imageView)
-				.load(a)
-				.diskCacheStrategy(NONE)
-				.error(ERROR_RES)
-				.transform(transformation)
-				.transition(withCrossFade())
-				.into(imageView)
-				.waitForLayout();
-	}
-
-}

briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewModel.java

@@ -4,11 +4,9 @@ import android.app.Application;
 import android.arch.lifecycle.AndroidViewModel;
 import android.arch.lifecycle.LiveData;
 import android.arch.lifecycle.MutableLiveData;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.support.annotation.Nullable;
 import android.support.annotation.UiThread;
-import android.view.View;
 
 import org.briarproject.bramble.api.db.DatabaseExecutor;
 import org.briarproject.bramble.api.db.DbException;
@@ -50,16 +48,10 @@ public class ImageViewModel extends AndroidViewModel {
 	@IoExecutor
 	private final Executor ioExecutor;
 
-	/**
-	 * true means there was an error saving the image, false if image was saved.
-	 */
-	private final MutableLiveData<Boolean> saveState = new MutableLiveData<>();
-	private final MutableLiveData<Boolean> imageClicked =
-			new MutableLiveData<>();
-	private int toolbarTop, toolbarBottom;
+	private MutableLiveData<Boolean> saveState = new MutableLiveData<>();
 
 	@Inject
-	ImageViewModel(Application application,
+	public ImageViewModel(Application application,
 			MessagingManager messagingManager,
 			@DatabaseExecutor Executor dbExecutor,
 			@IoExecutor Executor ioExecutor) {
@@ -69,49 +61,9 @@ public class ImageViewModel extends AndroidViewModel {
 		this.ioExecutor = ioExecutor;
 	}
 
-	void clickImage() {
-		imageClicked.setValue(true);
-	}
-
 	/**
-	 * A LiveData that is true if the image was clicked,
-	 * false if it wasn't.
-	 *
-	 * Call {@link #onOnImageClickSeen()} after consuming an update.
-	 */
-	LiveData<Boolean> getOnImageClicked() {
-		return imageClicked;
-	}
-
-	@UiThread
-	void onOnImageClickSeen() {
-		imageClicked.setValue(false);
-	}
-
-	void setToolbarPosition(int top, int bottom) {
-		toolbarTop = top;
-		toolbarBottom = bottom;
-	}
-
-	boolean isOverlappingToolbar(View screenView, Drawable drawable) {
-		int width = drawable.getIntrinsicWidth();
-		int height = drawable.getIntrinsicHeight();
-		float widthPercentage = screenView.getWidth() / (float) width;
-		float heightPercentage = screenView.getHeight() / (float) height;
-		float scaleFactor = Math.min(widthPercentage, heightPercentage);
-		int realWidth = (int) (width * scaleFactor);
-		int realHeight = (int) (height * scaleFactor);
-		// return if image doesn't use the full width,
-		// because it will be moved to the right otherwise
-		if (realWidth < screenView.getWidth()) return false;
-		int drawableTop = (screenView.getHeight() - realHeight) / 2;
-		return drawableTop < toolbarBottom && drawableTop != toolbarTop;
-	}
-
-	/**
-	 * A LiveData that is true if there was an error
-	 * and false if the image was saved.
-	 * It can be null otherwise, if no image was saved recently.
+	 * A LiveData that is true if the image was saved,
+	 * false if there was an error and null otherwise.
 	 *
 	 * Call {@link #onSaveStateSeen()} after consuming an update.
 	 */
@@ -130,7 +82,7 @@ public class ImageViewModel extends AndroidViewModel {
 	@UiThread
 	void saveImage(AttachmentItem attachment, @Nullable Uri uri) {
 		if (uri == null) {
-			saveState.setValue(true);
+			saveState.setValue(false);
 		} else {
 			saveImage(attachment, () -> getOutputStream(uri), null);
 		}

briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarDataFetcher.java

@@ -40,7 +40,7 @@ class BriarDataFetcher implements DataFetcher<InputStream> {
 	private volatile boolean cancel = false;
 
 	@Inject
-	BriarDataFetcher(MessagingManager messagingManager,
+	public BriarDataFetcher(MessagingManager messagingManager,
 			@DatabaseExecutor Executor dbExecutor, AttachmentItem attachment) {
 		this.messagingManager = messagingManager;
 		this.dbExecutor = dbExecutor;

briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarImageTransformation.java

@@ -7,8 +7,10 @@ import com.bumptech.glide.load.resource.bitmap.CenterCrop;
 
 public class BriarImageTransformation extends MultiTransformation<Bitmap> {
 
-	public BriarImageTransformation(Radii r) {
-		super(new CenterCrop(), new CustomCornersTransformation(r));
+	public BriarImageTransformation(int smallRadius, int radius,
+			boolean leftCornerSmall, boolean bottomRound) {
+		super(new CenterCrop(), new ImageCornerTransformation(
+				smallRadius, radius, leftCornerSmall, bottomRound));
 	}
 
 }

briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarModelLoader.java

@@ -22,7 +22,7 @@ public final class BriarModelLoader
 	@Inject
 	BriarDataFetcherFactory dataFetcherFactory;
 
-	BriarModelLoader(BriarApplication app) {
+	public BriarModelLoader(BriarApplication app) {
 		app.getApplicationComponent().inject(this);
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarModelLoaderFactory.java

@@ -16,7 +16,7 @@ class BriarModelLoaderFactory
 
 	private final BriarApplication app;
 
-	BriarModelLoaderFactory(BriarApplication app) {
+	public BriarModelLoaderFactory(BriarApplication app) {
 		this.app = app;
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/CustomCornersTransformation.java

@@ -1,129 +0,0 @@
-package org.briarproject.briar.android.conversation.glide;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapShader;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.RectF;
-import android.support.annotation.NonNull;
-
-import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
-import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.security.MessageDigest;
-
-import javax.annotation.concurrent.Immutable;
-
-import static android.graphics.Bitmap.Config.ARGB_8888;
-import static android.graphics.Shader.TileMode.CLAMP;
-
-@Immutable
-@NotNullByDefault
-class CustomCornersTransformation extends BitmapTransformation {
-
-	private static final String ID =
-			CustomCornersTransformation.class.getName();
-
-	private final Radii radii;
-
-	CustomCornersTransformation(Radii radii) {
-		this.radii = radii;
-	}
-
-	@Override
-	protected Bitmap transform(BitmapPool pool, Bitmap toTransform,
-			int outWidth, int outHeight) {
-		int width = toTransform.getWidth();
-		int height = toTransform.getHeight();
-
-		Bitmap bitmap = pool.get(width, height, ARGB_8888);
-		bitmap.setHasAlpha(true);
-
-		Canvas canvas = new Canvas(bitmap);
-		Paint paint = new Paint();
-		paint.setAntiAlias(true);
-		paint.setShader(new BitmapShader(toTransform, CLAMP, CLAMP));
-		drawRect(canvas, paint, width, height);
-		return bitmap;
-	}
-
-	private void drawRect(Canvas canvas, Paint paint, float width,
-			float height) {
-		drawTopLeft(canvas, paint, radii.topLeft, width, height);
-		drawTopRight(canvas, paint, radii.topRight, width, height);
-		drawBottomLeft(canvas, paint, radii.bottomLeft, width, height);
-		drawBottomRight(canvas, paint, radii.bottomRight, width, height);
-	}
-
-	private void drawTopLeft(Canvas canvas, Paint paint, int radius,
-			float width, float height) {
-		RectF rect = new RectF(
-				0,
-				0,
-				width / 2 + radius + 1,
-				height / 2 + radius + 1
-		);
-		if (radius == 0) canvas.drawRect(rect, paint);
-		else canvas.drawRoundRect(rect, radius, radius, paint);
-	}
-
-	private void drawTopRight(Canvas canvas, Paint paint, int radius,
-			float width, float height) {
-		RectF rect = new RectF(
-				width / 2 - radius,
-				0,
-				width,
-				height / 2 + radius + 1
-		);
-		if (radius == 0) canvas.drawRect(rect, paint);
-		else canvas.drawRoundRect(rect, radius, radius, paint);
-	}
-
-	private void drawBottomLeft(Canvas canvas, Paint paint, int radius,
-			float width, float height) {
-		RectF rect = new RectF(
-				0,
-				height / 2 - radius,
-				width / 2 + radius + 1,
-				height
-		);
-		if (radius == 0) canvas.drawRect(rect, paint);
-		else canvas.drawRoundRect(rect, radius, radius, paint);
-	}
-
-	private void drawBottomRight(Canvas canvas, Paint paint, int radius,
-			float width, float height) {
-		RectF rect = new RectF(
-				width / 2 - radius,
-				height / 2 - radius,
-				width,
-				height
-		);
-		if (radius == 0) canvas.drawRect(rect, paint);
-		else canvas.drawRoundRect(rect, radius, radius, paint);
-	}
-
-	@Override
-	public String toString() {
-		return "ImageCornerTransformation(" + radii + ")";
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		return o instanceof CustomCornersTransformation &&
-				radii.equals(((CustomCornersTransformation) o).radii);
-	}
-
-	@Override
-	public int hashCode() {
-		return ID.hashCode() + radii.hashCode();
-	}
-
-	@Override
-	public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
-		messageDigest.update((ID + radii).getBytes(CHARSET));
-	}
-
-}

briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/ImageCornerTransformation.java

@@ -0,0 +1,111 @@
+package org.briarproject.briar.android.conversation.glide;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapShader;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.support.annotation.NonNull;
+
+import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
+import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+import java.security.MessageDigest;
+
+import javax.annotation.concurrent.Immutable;
+
+import static android.graphics.Bitmap.Config.ARGB_8888;
+import static android.graphics.Shader.TileMode.CLAMP;
+
+@Immutable
+@NotNullByDefault
+class ImageCornerTransformation extends BitmapTransformation {
+
+	private static final String ID = ImageCornerTransformation.class.getName();
+
+	private final int smallRadius, radius;
+	private final boolean leftCornerSmall, bottomRound;
+
+	ImageCornerTransformation(int smallRadius, int radius,
+			boolean leftCornerSmall, boolean bottomRound) {
+		this.smallRadius = smallRadius;
+		this.radius = radius;
+		this.leftCornerSmall = leftCornerSmall;
+		this.bottomRound = bottomRound;
+	}
+
+	@Override
+	protected Bitmap transform(BitmapPool pool, Bitmap toTransform,
+			int outWidth, int outHeight) {
+		int width = toTransform.getWidth();
+		int height = toTransform.getHeight();
+
+		Bitmap bitmap = pool.get(width, height, ARGB_8888);
+		bitmap.setHasAlpha(true);
+
+		Canvas canvas = new Canvas(bitmap);
+		Paint paint = new Paint();
+		paint.setAntiAlias(true);
+		paint.setShader(new BitmapShader(toTransform, CLAMP, CLAMP));
+		drawRect(canvas, paint, width, height);
+		return bitmap;
+	}
+
+	private void drawRect(Canvas canvas, Paint paint, float width,
+			float height) {
+		drawSmallCorner(canvas, paint, width);
+		drawBigCorners(canvas, paint, width, height);
+	}
+
+	private void drawSmallCorner(Canvas canvas, Paint paint, float width) {
+		float left = leftCornerSmall ? 0 : width - radius;
+		float right = leftCornerSmall ? radius : width;
+		canvas.drawRoundRect(new RectF(left, 0, right, radius),
+				smallRadius, smallRadius, paint);
+	}
+
+	private void drawBigCorners(Canvas canvas, Paint paint, float width,
+			float height) {
+		float top = bottomRound ? 0 : radius;
+		RectF rect = new RectF(0, top, width, height);
+		if (bottomRound) {
+			canvas.drawRoundRect(rect, radius, radius, paint);
+		} else {
+			canvas.drawRect(rect, paint);
+			canvas.drawRoundRect(new RectF(0, 0, width, radius * 2),
+					radius, radius, paint);
+		}
+	}
+
+	@Override
+	public String toString() {
+		return "ImageCornerTransformation(smallRadius=" + smallRadius +
+				", radius=" + radius + ", leftCornerSmall=" + leftCornerSmall +
+				", bottomRound=" + bottomRound + ")";
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		return o instanceof ImageCornerTransformation &&
+				((ImageCornerTransformation) o).smallRadius == smallRadius &&
+				((ImageCornerTransformation) o).radius == radius &&
+				((ImageCornerTransformation) o).leftCornerSmall ==
+						leftCornerSmall &&
+				((ImageCornerTransformation) o).bottomRound == bottomRound;
+	}
+
+	@Override
+	public int hashCode() {
+		return ID.hashCode() + (smallRadius << 16) ^ (radius << 2) ^
+				(leftCornerSmall ? 2 : 0) ^ (bottomRound ? 1 : 0);
+	}
+
+	@Override
+	public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
+		messageDigest.update((ID + '|' + smallRadius + '|' + radius + '|' +
+				leftCornerSmall + '|' + bottomRound).getBytes(CHARSET));
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/Radii.java

@@ -1,41 +0,0 @@
-package org.briarproject.briar.android.conversation.glide;
-
-import android.support.annotation.Nullable;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public class Radii {
-
-	public final int topLeft, topRight, bottomLeft, bottomRight;
-
-	public Radii(int topLeft, int topRight, int bottomLeft, int bottomRight) {
-		this.topLeft = topLeft;
-		this.topRight = topRight;
-		this.bottomLeft = bottomLeft;
-		this.bottomRight = bottomRight;
-	}
-
-	@Override
-	public boolean equals(@Nullable Object o) {
-		return o instanceof Radii &&
-				topLeft == ((Radii) o).topLeft &&
-				topRight == ((Radii) o).topRight &&
-				bottomLeft == ((Radii) o).bottomLeft &&
-				bottomRight == ((Radii) o).bottomRight;
-	}
-
-	@Override
-	public int hashCode() {
-		return topLeft << 24 ^ topRight << 16 ^ bottomLeft << 8 ^ bottomRight;
-	}
-
-	@Override
-	public String toString() {
-		return "Radii(topLeft=" + topLeft +
-				",topRight=" + topRight +
-				",bottomLeft=" + bottomLeft +
-				",bottomRight=" + bottomRight;
-	}
-
-}

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

@@ -44,7 +44,6 @@ import javax.annotation.Nullable;
 import javax.inject.Inject;
 
 import static android.support.design.widget.Snackbar.LENGTH_INDEFINITE;
-import static java.util.Objects.requireNonNull;
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.util.LogUtils.logDuration;
 import static org.briarproject.bramble.util.LogUtils.logException;
@@ -81,18 +80,13 @@ public class ForumListFragment extends BaseEventFragment implements
 		return fragment;
 	}
 
-	@Override
-	public void injectFragment(ActivityComponent component) {
-		component.inject(this);
-	}
-
 	@Nullable
 	@Override
 	public View onCreateView(LayoutInflater inflater,
 			@Nullable ViewGroup container,
 			@Nullable Bundle savedInstanceState) {
 
-		requireNonNull(getActivity()).setTitle(R.string.forums_button);
+		getActivity().setTitle(R.string.forums_button);
 
 		View contentView =
 				inflater.inflate(R.layout.fragment_forum_list, container,
@@ -108,7 +102,7 @@ public class ForumListFragment extends BaseEventFragment implements
 		snackbar.getView().setBackgroundResource(R.color.briar_primary);
 		snackbar.setAction(R.string.show, this);
 		snackbar.setActionTextColor(ContextCompat
-				.getColor(getActivity(), R.color.briar_button_text_positive));
+				.getColor(getContext(), R.color.briar_button_text_positive));
 
 		return contentView;
 	}
@@ -118,6 +112,11 @@ public class ForumListFragment extends BaseEventFragment implements
 		return TAG;
 	}
 
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+	}
+
 	@Override
 	public void onStart() {
 		super.onStart();

briar-android/src/main/java/org/briarproject/briar/android/fragment/BaseFragment.java

@@ -10,15 +10,11 @@ import android.support.v4.app.FragmentActivity;
 import android.view.MenuItem;
 
 import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.android.DestroyableContext;
 import org.briarproject.briar.android.activity.ActivityComponent;
 
 import javax.annotation.Nullable;
 
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
 public abstract class BaseFragment extends Fragment
 		implements DestroyableContext {
 
@@ -26,15 +22,12 @@ public abstract class BaseFragment extends Fragment
 
 	public abstract String getUniqueTag();
 
+	public abstract void injectFragment(ActivityComponent component);
+
 	@Override
 	public void onAttach(Context context) {
 		super.onAttach(context);
 		listener = (BaseFragmentListener) context;
-		injectFragment(listener.getActivityComponent());
-	}
-
-	public void injectFragment(ActivityComponent component) {
-		// fragments that need to inject, can override this method
 	}
 
 	@Override
@@ -45,6 +38,12 @@ public abstract class BaseFragment extends Fragment
 		setHasOptionsMenu(true);
 	}
 
+	@Override
+	public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+		super.onActivityCreated(savedInstanceState);
+		injectFragment(listener.getActivityComponent());
+	}
+
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {

briar-android/src/main/java/org/briarproject/briar/android/fragment/ErrorFragment.java

@@ -10,6 +10,7 @@ import android.widget.TextView;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
 
 
 @MethodsNotNullByDefault
@@ -56,4 +57,9 @@ public class ErrorFragment extends BaseFragment {
 		return v;
 	}
 
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		// not necessary
+	}
+
 }

briar-android/src/main/java/org/briarproject/briar/android/introduction/ContactChooserFragment.java

@@ -1,8 +1,7 @@
 package org.briarproject.briar.android.introduction;
 
+import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
 import android.support.v7.widget.LinearLayoutManager;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -12,8 +11,6 @@ import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.contact.ContactManager;
 import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.api.plugin.ConnectionRegistry;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
@@ -31,14 +28,10 @@ import java.util.logging.Logger;
 
 import javax.inject.Inject;
 
-import static java.util.Objects.requireNonNull;
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.briar.android.conversation.ConversationActivity.CONTACT_ID;
 
-@UiThread
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
 public class ContactChooserFragment extends BaseFragment {
 
 	public static final String TAG = ContactChooserFragment.class.getName();
@@ -58,6 +51,7 @@ public class ContactChooserFragment extends BaseFragment {
 	volatile ConnectionRegistry connectionRegistry;
 
 	public static ContactChooserFragment newInstance(ContactId id) {
+
 		Bundle args = new Bundle();
 
 		ContactChooserFragment fragment = new ContactChooserFragment();
@@ -67,13 +61,13 @@ public class ContactChooserFragment extends BaseFragment {
 	}
 
 	@Override
-	public void injectFragment(ActivityComponent component) {
-		component.inject(this);
+	public void onAttach(Context context) {
+		super.onAttach(context);
 	}
 
 	@Override
-	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
-			@Nullable Bundle savedInstanceState) {
+	public View onCreateView(LayoutInflater inflater, ViewGroup container,
+			Bundle savedInstanceState) {
 
 		View contentView = inflater.inflate(R.layout.list, container, false);
 
@@ -83,16 +77,14 @@ public class ContactChooserFragment extends BaseFragment {
 					Contact c2 = item.getContact();
 					showMessageScreen(c1, c2);
 				};
-		adapter = new ContactListAdapter(requireNonNull(getActivity()),
-				onContactClickListener);
+		adapter = new ContactListAdapter(getActivity(), onContactClickListener);
 
 		list = contentView.findViewById(R.id.list);
 		list.setLayoutManager(new LinearLayoutManager(getActivity()));
 		list.setAdapter(adapter);
 		list.setEmptyText(R.string.no_contacts);
 
-		contactId = new ContactId(
-				requireNonNull(getArguments()).getInt(CONTACT_ID));
+		contactId = new ContactId(getArguments().getInt(CONTACT_ID));
 
 		return contentView;
 	}
@@ -115,6 +107,11 @@ public class ContactChooserFragment extends BaseFragment {
 		return TAG;
 	}
 
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+	}
+
 	private void loadContacts() {
 		listener.runOnDbThread(() -> {
 			try {

briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java

@@ -39,7 +39,6 @@ import static android.app.Activity.RESULT_OK;
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 import static android.widget.Toast.LENGTH_SHORT;
-import static java.util.Objects.requireNonNull;
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName;
@@ -79,14 +78,14 @@ public class IntroductionMessageFragment extends BaseFragment
 	}
 
 	@Override
-	public void onAttach(Context context) {
-		super.onAttach(context);
-		introductionActivity = (IntroductionActivity) context;
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
 	}
 
 	@Override
-	public void injectFragment(ActivityComponent component) {
-		component.inject(this);
+	public void onAttach(Context context) {
+		super.onAttach(context);
+		introductionActivity = (IntroductionActivity) context;
 	}
 
 	@Override
@@ -100,14 +99,6 @@ public class IntroductionMessageFragment extends BaseFragment
 			actionBar.setTitle(R.string.introduction_message_title);
 		}
 
-		// get contact IDs from fragment arguments
-		Bundle args = requireNonNull(getArguments());
-		int contactId1 = args.getInt(CONTACT_ID_1, -1);
-		int contactId2 = args.getInt(CONTACT_ID_2, -1);
-		if (contactId1 == -1 || contactId2 == -1) {
-			throw new AssertionError("Use newInstance() to instantiate");
-		}
-
 		// inflate view
 		View v = inflater.inflate(R.layout.introduction_message, container,
 				false);
@@ -118,15 +109,22 @@ public class IntroductionMessageFragment extends BaseFragment
 		ui.message.setMaxTextLength(MAX_INTRODUCTION_TEXT_LENGTH);
 		ui.message.setEnabled(false);
 
-		// get contacts and then show view
-		prepareToSetUpViews(contactId1, contactId2);
-
 		return v;
 	}
 
 	@Override
 	public void onStart() {
 		super.onStart();
+
+		// get contact IDs from fragment arguments
+		int contactId1 = getArguments().getInt(CONTACT_ID_1, -1);
+		int contactId2 = getArguments().getInt(CONTACT_ID_2, -1);
+		if (contactId1 == -1 || contactId2 == -1) {
+			throw new java.lang.InstantiationError(
+					"You need to use newInstance() to instantiate");
+		}
+		// get contacts and then show view
+		prepareToSetUpViews(contactId1, contactId2);
 	}
 
 	@Override

briar-android/src/main/java/org/briarproject/briar/android/keyagreement/CameraException.java

@@ -2,7 +2,7 @@ package org.briarproject.briar.android.keyagreement;
 
 import java.io.IOException;
 
-class CameraException extends IOException {
+public class CameraException extends IOException {
 
 	CameraException(String message) {
 		super(message);

briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeErrorFragment.java

@@ -44,11 +44,6 @@ public class ContactExchangeErrorFragment extends BaseFragment {
 		return TAG;
 	}
 
-	@Override
-	public void injectFragment(ActivityComponent component) {
-		component.inject(this);
-	}
-
 	@Nullable
 	@Override
 	public View onCreateView(LayoutInflater inflater,
@@ -79,6 +74,11 @@ public class ContactExchangeErrorFragment extends BaseFragment {
 		return v;
 	}
 
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+	}
+
 	private void triggerFeedback() {
 		finish();
 		UiUtils.triggerFeedback(androidExecutor);

briar-android/src/main/java/org/briarproject/briar/android/keyagreement/IntroFragment.java

@@ -10,6 +10,7 @@ import android.widget.ScrollView;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.fragment.BaseFragment;
 
 import javax.annotation.Nullable;
@@ -38,6 +39,11 @@ public class IntroFragment extends BaseFragment {
 		return fragment;
 	}
 
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+	}
+
 	@Override
 	public void onAttach(Context context) {
 		super.onAttach(context);

briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementFragment.java

@@ -53,7 +53,6 @@ import static android.view.View.VISIBLE;
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.widget.LinearLayout.HORIZONTAL;
 import static android.widget.Toast.LENGTH_LONG;
-import static java.util.Objects.requireNonNull;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.util.LogUtils.logException;
@@ -137,8 +136,7 @@ public class KeyAgreementFragment extends BaseEventFragment
 	@Override
 	public void onActivityCreated(@Nullable Bundle savedInstanceState) {
 		super.onActivityCreated(savedInstanceState);
-		requireNonNull(getActivity())
-				.setRequestedOrientation(SCREEN_ORIENTATION_NOSENSOR);
+		getActivity().setRequestedOrientation(SCREEN_ORIENTATION_NOSENSOR);
 		cameraView.setPreviewConsumer(new QrCodeDecoder(this));
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/keyagreement/PreviewConsumer.java

@@ -7,7 +7,7 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 @SuppressWarnings("deprecation")
 @NotNullByDefault
-interface PreviewConsumer {
+public interface PreviewConsumer {
 
 	@UiThread
 	void start(Camera camera, int cameraIndex);

briar-android/src/main/java/org/briarproject/briar/android/keyagreement/QrCodeDecoder.java

@@ -29,7 +29,7 @@ import static java.util.logging.Level.WARNING;
 @SuppressWarnings("deprecation")
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
-class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
+public class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
 
 	private static final Logger LOG =
 			Logger.getLogger(QrCodeDecoder.class.getName());
@@ -40,7 +40,7 @@ class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
 	private Camera camera = null;
 	private int cameraIndex = 0;
 
-	QrCodeDecoder(ResultCallback callback) {
+	public QrCodeDecoder(ResultCallback callback) {
 		this.callback = callback;
 	}
 
@@ -141,7 +141,7 @@ class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
 	}
 
 	@NotNullByDefault
-	interface ResultCallback {
+	public interface ResultCallback {
 
 		void handleResult(Result result);
 	}

briar-android/src/main/java/org/briarproject/briar/android/keyagreement/QrCodeUtils.java

@@ -21,13 +21,13 @@ import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.util.LogUtils.logException;
 
 @NotNullByDefault
-class QrCodeUtils {
+public class QrCodeUtils {
 
 	private static final Logger LOG =
 			Logger.getLogger(QrCodeUtils.class.getName());
 
 	@Nullable
-	static Bitmap createQrCode(DisplayMetrics dm, String input) {
+	public static Bitmap createQrCode(DisplayMetrics dm, String input) {
 		int smallestDimen = Math.min(dm.widthPixels, dm.heightPixels);
 		try {
 			// Generate QR code

briar-android/src/main/java/org/briarproject/briar/android/login/AuthorNameFragment.java

@@ -18,7 +18,6 @@ import javax.annotation.Nullable;
 
 import static android.view.inputmethod.EditorInfo.IME_ACTION_NEXT;
 import static android.view.inputmethod.EditorInfo.IME_ACTION_NONE;
-import static java.util.Objects.requireNonNull;
 import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
 import static org.briarproject.briar.android.util.UiUtils.setError;
 
@@ -36,16 +35,11 @@ public class AuthorNameFragment extends SetupFragment {
 		return new AuthorNameFragment();
 	}
 
-	@Override
-	public void injectFragment(ActivityComponent component) {
-		component.inject(this);
-	}
-
 	@Override
 	public View onCreateView(LayoutInflater inflater,
 			@Nullable ViewGroup container,
 			@Nullable Bundle savedInstanceState) {
-		requireNonNull(getActivity()).setTitle(getString(R.string.setup_title));
+		getActivity().setTitle(getString(R.string.setup_title));
 		View v = inflater.inflate(R.layout.fragment_setup_author_name,
 				container, false);
 		authorNameWrapper = v.findViewById(R.id.nickname_entry_wrapper);
@@ -63,6 +57,11 @@ public class AuthorNameFragment extends SetupFragment {
 		return TAG;
 	}
 
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+	}
+
 	@Override
 	protected String getHelpText() {
 		return getString(R.string.setup_name_explanation);

briar-android/src/main/java/org/briarproject/briar/android/login/DozeFragment.java

@@ -19,7 +19,6 @@ import org.briarproject.briar.android.util.UiUtils;
 
 import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
-import static java.util.Objects.requireNonNull;
 import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_DOZE_WHITELISTING;
 import static org.briarproject.briar.android.util.UiUtils.showOnboardingDialog;
 
@@ -40,16 +39,11 @@ public class DozeFragment extends SetupFragment
 		return new DozeFragment();
 	}
 
-	@Override
-	public void injectFragment(ActivityComponent component) {
-		component.inject(this);
-	}
-
 	@Override
 	public View onCreateView(LayoutInflater inflater,
 			@Nullable ViewGroup container,
 			@Nullable Bundle savedInstanceState) {
-		requireNonNull(getActivity()).setTitle(getString(R.string.setup_doze_title));
+		getActivity().setTitle(getString(R.string.setup_doze_title));
 		setHasOptionsMenu(false);
 		View v = inflater.inflate(R.layout.fragment_setup_doze, container,
 						false);
@@ -71,6 +65,11 @@ public class DozeFragment extends SetupFragment
 		return TAG;
 	}
 
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+	}
+
 	@Override
 	protected String getHelpText() {
 		return getString(R.string.setup_doze_explanation);

briar-android/src/main/java/org/briarproject/briar/android/login/PasswordFragment.java

@@ -23,7 +23,6 @@ import static android.content.Context.INPUT_METHOD_SERVICE;
 import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
 import static android.view.inputmethod.EditorInfo.IME_ACTION_DONE;
-import static java.util.Objects.requireNonNull;
 import static org.briarproject.bramble.api.crypto.PasswordStrengthEstimator.QUITE_WEAK;
 
 @MethodsNotNullByDefault
@@ -44,16 +43,11 @@ public class PasswordFragment extends SetupFragment {
 		return new PasswordFragment();
 	}
 
-	@Override
-	public void injectFragment(ActivityComponent component) {
-		component.inject(this);
-	}
-
 	@Override
 	public View onCreateView(LayoutInflater inflater,
 			@Nullable ViewGroup container,
 			@Nullable Bundle savedInstanceState) {
-		requireNonNull(getActivity()).setTitle(getString(R.string.setup_password_intro));
+		getActivity().setTitle(getString(R.string.setup_password_intro));
 		View v = inflater.inflate(R.layout.fragment_setup_password, container,
 						false);
 
@@ -70,11 +64,6 @@ public class PasswordFragment extends SetupFragment {
 		passwordConfirmation.addTextChangedListener(this);
 		nextButton.setOnClickListener(this);
 
-		if (!setupController.needToShowDozeFragment()) {
-			nextButton.setText(R.string.create_account_button);
-			passwordConfirmation.setImeOptions(IME_ACTION_DONE);
-		}
-
 		return v;
 	}
 
@@ -83,6 +72,17 @@ public class PasswordFragment extends SetupFragment {
 		return TAG;
 	}
 
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+
+		// the controller is not yet available in onCreateView()
+		if (!setupController.needToShowDozeFragment()) {
+			nextButton.setText(R.string.create_account_button);
+			passwordConfirmation.setImeOptions(IME_ACTION_DONE);
+		}
+	}
+
 	@Override
 	protected String getHelpText() {
 		return getString(R.string.setup_password_explanation);

briar-android/src/main/java/org/briarproject/briar/android/login/SetupFragment.java

@@ -11,8 +11,7 @@ import android.view.View.OnClickListener;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.fragment.BaseFragment;
 
@@ -23,8 +22,7 @@ import static android.view.inputmethod.EditorInfo.IME_ACTION_NEXT;
 import static org.briarproject.briar.android.util.UiUtils.enterPressed;
 import static org.briarproject.briar.android.util.UiUtils.showOnboardingDialog;
 
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
+@NotNullByDefault
 abstract class SetupFragment extends BaseFragment implements TextWatcher,
 		OnEditorActionListener, OnClickListener {
 

briar-android/src/main/java/org/briarproject/briar/android/logout/ExitActivity.java

@@ -1,13 +1,14 @@
 package org.briarproject.briar.android.logout;
 
-import android.app.Activity;
+import android.os.Build;
 import android.os.Bundle;
 
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.activity.BaseActivity;
+
 import java.util.logging.Logger;
 
-import static android.os.Build.VERSION.SDK_INT;
-
-public class ExitActivity extends Activity {
+public class ExitActivity extends BaseActivity {
 
 	private static final Logger LOG =
 			Logger.getLogger(ExitActivity.class.getName());
@@ -15,9 +16,14 @@ public class ExitActivity extends Activity {
 	@Override
 	public void onCreate(Bundle state) {
 		super.onCreate(state);
-		if (SDK_INT >= 21) finishAndRemoveTask();
+		if (Build.VERSION.SDK_INT >= 21) finishAndRemoveTask();
 		else finish();
 		LOG.info("Exiting");
 		System.exit(0);
 	}
+
+	@Override
+	public void injectActivity(ActivityComponent component) {
+
+	}
 }

briar-android/src/main/java/org/briarproject/briar/android/logout/HideUiActivity.java

@@ -1,13 +1,20 @@
 package org.briarproject.briar.android.logout;
 
-import android.app.Activity;
 import android.os.Bundle;
 
-public class HideUiActivity extends Activity {
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.activity.BaseActivity;
+
+public class HideUiActivity extends BaseActivity {
 
 	@Override
 	public void onCreate(Bundle state) {
 		super.onCreate(state);
 		finish();
 	}
+
+	@Override
+	public void injectActivity(ActivityComponent component) {
+
+	}
 }

briar-android/src/main/java/org/briarproject/briar/android/logout/SignOutFragment.java

@@ -5,21 +5,19 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.fragment.BaseFragment;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
 public class SignOutFragment extends BaseFragment {
 
 	public static final String TAG = SignOutFragment.class.getName();
 
 	@Override
-	public View onCreateView(LayoutInflater inflater,
+	public View onCreateView(@Nonnull LayoutInflater inflater,
 			@Nullable ViewGroup container,
 			@Nullable Bundle savedInstanceState) {
 		return inflater.inflate(R.layout.fragment_sign_out, container, false);
@@ -29,4 +27,9 @@ public class SignOutFragment extends BaseFragment {
 	public String getUniqueTag() {
 		return TAG;
 	}
+
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		// no need to inject
+	}
 }

briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java

@@ -5,7 +5,6 @@ import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.support.design.widget.NavigationView;
 import android.support.design.widget.NavigationView.OnNavigationItemSelectedListener;
 import android.support.v4.app.ActivityCompat;
@@ -13,7 +12,6 @@ import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
@@ -27,8 +25,6 @@ import android.widget.TextView;
 
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.api.plugin.BluetoothConstants;
 import org.briarproject.bramble.api.plugin.LanTcpConstants;
 import org.briarproject.bramble.api.plugin.TorConstants;
@@ -58,16 +54,12 @@ import static android.support.v4.view.GravityCompat.START;
 import static android.support.v4.widget.DrawerLayout.LOCK_MODE_LOCKED_CLOSED;
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
-import static java.util.Objects.requireNonNull;
 import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState.RUNNING;
 import static org.briarproject.briar.android.BriarService.EXTRA_STARTUP_FAILED;
 import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_PASSWORD;
-import static org.briarproject.briar.android.navdrawer.NavDrawerController.ExpiryWarning.NO;
 import static org.briarproject.briar.android.navdrawer.NavDrawerController.ExpiryWarning.UPDATE;
 import static org.briarproject.briar.android.util.UiUtils.getDaysUntilExpiry;
 
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
 public class NavDrawerActivity extends BriarActivity implements
 		BaseFragmentListener, TransportStateListener,
 		OnNavigationItemSelectedListener {
@@ -119,8 +111,9 @@ public class NavDrawerActivity extends BriarActivity implements
 		component.inject(this);
 	}
 
+	@SuppressWarnings("ConstantConditions")
 	@Override
-	public void onCreate(@Nullable Bundle state) {
+	public void onCreate(Bundle state) {
 		super.onCreate(state);
 		exitIfStartupFailed(getIntent());
 		setContentView(R.layout.activity_nav_drawer);
@@ -131,9 +124,8 @@ public class NavDrawerActivity extends BriarActivity implements
 		GridView transportsView = findViewById(R.id.transportsView);
 
 		setSupportActionBar(toolbar);
-		ActionBar actionBar = requireNonNull(getSupportActionBar());
-		actionBar.setDisplayHomeAsUpEnabled(true);
-		actionBar.setHomeButtonEnabled(true);
+		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+		getSupportActionBar().setHomeButtonEnabled(true);
 
 		drawerToggle = new ActionBarDrawerToggle(this, drawerLayout, toolbar,
 				R.string.nav_drawer_open_description,
@@ -163,17 +155,16 @@ public class NavDrawerActivity extends BriarActivity implements
 		super.onStart();
 		updateTransports();
 		lockManager.checkIfLockable();
-		controller.showExpiryWarning(new UiResultHandler<ExpiryWarning>(this) {
-			@Override
-			public void onResultUi(ExpiryWarning expiry) {
-				if (expiry != NO) showExpiryWarning(expiry);
-			}
-		});
+//		controller.showExpiryWarning(new UiResultHandler<ExpiryWarning>(this) {
+//			@Override
+//			public void onResultUi(ExpiryWarning expiry) {
+//				if (expiry != NO) showExpiryWarning(expiry);
+//			}
+//		});
 	}
 
 	@Override
-	protected void onActivityResult(int request, int result,
-			@Nullable Intent data) {
+	protected void onActivityResult(int request, int result, Intent data) {
 		super.onActivityResult(request, result, data);
 		if (request == REQUEST_PASSWORD && result == RESULT_OK) {
 			controller.shouldAskForDozeWhitelisting(this,
@@ -261,7 +252,7 @@ public class NavDrawerActivity extends BriarActivity implements
 	}
 
 	@Override
-	public void onPostCreate(@Nullable Bundle savedInstanceState) {
+	public void onPostCreate(Bundle savedInstanceState) {
 		super.onPostCreate(savedInstanceState);
 		drawerToggle.syncState();
 	}

briar-android/src/main/java/org/briarproject/briar/android/panic/PanicResponderActivity.java

@@ -2,6 +2,7 @@ package org.briarproject.briar.android.panic;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.v7.preference.PreferenceManager;
 
@@ -19,7 +20,6 @@ import info.guardianproject.panic.Panic;
 import info.guardianproject.panic.PanicResponder;
 import info.guardianproject.trustedintents.TrustedIntents;
 
-import static android.os.Build.VERSION.SDK_INT;
 import static org.briarproject.briar.android.panic.PanicPreferencesFragment.KEY_LOCK;
 import static org.briarproject.briar.android.panic.PanicPreferencesFragment.KEY_PURGE;
 
@@ -69,7 +69,7 @@ public class PanicResponderActivity extends BriarActivity {
 			}
 		}
 
-		if (SDK_INT >= 21) {
+		if (Build.VERSION.SDK_INT >= 21) {
 			finishAndRemoveTask();
 		} else {
 			finish();

briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupFragment.java

@@ -2,7 +2,6 @@ package org.briarproject.briar.android.privategroup.creation;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.support.design.widget.TextInputLayout;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -13,8 +12,6 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ProgressBar;
 
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.util.StringUtils;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
@@ -26,8 +23,6 @@ import static android.view.inputmethod.EditorInfo.IME_ACTION_DONE;
 import static org.briarproject.briar.android.util.UiUtils.enterPressed;
 import static org.briarproject.briar.api.privategroup.PrivateGroupConstants.MAX_GROUP_NAME_LENGTH;
 
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
 public class CreateGroupFragment extends BaseFragment {
 
 	public final static String TAG = CreateGroupFragment.class.getName();
@@ -45,13 +40,8 @@ public class CreateGroupFragment extends BaseFragment {
 	}
 
 	@Override
-	public void injectFragment(ActivityComponent component) {
-		component.inject(this);
-	}
-
-	@Override
-	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
-			@Nullable Bundle savedInstanceState) {
+	public View onCreateView(LayoutInflater inflater, ViewGroup container,
+			Bundle savedInstanceState) {
 
 		View v = inflater.inflate(R.layout.fragment_create_group, container,
 				false);
@@ -97,6 +87,11 @@ public class CreateGroupFragment extends BaseFragment {
 		listener.showSoftKeyboard(nameEntry);
 	}
 
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+	}
+
 	@Override
 	public String getUniqueTag() {
 		return TAG;

briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupMessageFragment.java

@@ -2,13 +2,10 @@ package org.briarproject.briar.android.privategroup.creation;
 
 import android.support.annotation.StringRes;
 
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.sharing.BaseMessageFragment;
 
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
 public class CreateGroupMessageFragment extends BaseMessageFragment {
 
 	private final static String TAG =
@@ -31,4 +28,9 @@ public class CreateGroupMessageFragment extends BaseMessageFragment {
 		return TAG;
 	}
 
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+	}
+
 }

briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/GroupInviteFragment.java

@@ -1,7 +1,6 @@
 package org.briarproject.briar.android.privategroup.creation;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
@@ -14,7 +13,6 @@ import org.briarproject.briar.android.contactselection.SelectableContactItem;
 
 import javax.inject.Inject;
 
-import static java.util.Objects.requireNonNull;
 import static org.briarproject.briar.android.activity.BriarActivity.GROUP_ID;
 
 @MethodsNotNullByDefault
@@ -35,14 +33,14 @@ public class GroupInviteFragment extends ContactSelectorFragment {
 	}
 
 	@Override
-	public void injectFragment(ActivityComponent component) {
-		component.inject(this);
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		getActivity().setTitle(R.string.groups_invite_members);
 	}
 
 	@Override
-	public void onCreate(@Nullable Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		requireNonNull(getActivity()).setTitle(R.string.groups_invite_members);
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
 	}
 
 	@Override

briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListFragment.java

@@ -37,7 +37,6 @@ import javax.annotation.Nullable;
 import javax.inject.Inject;
 
 import static android.support.design.widget.Snackbar.LENGTH_INDEFINITE;
-import static java.util.Objects.requireNonNull;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
@@ -58,23 +57,17 @@ public class GroupListFragment extends BaseFragment implements
 	private GroupListAdapter adapter;
 	private Snackbar snackbar;
 
-	@Override
-	public void injectFragment(ActivityComponent component) {
-		component.inject(this);
-		controller.setGroupListListener(this);
-	}
-
 	@Nullable
 	@Override
 	public View onCreateView(LayoutInflater inflater,
 			@Nullable ViewGroup container,
 			@Nullable Bundle savedInstanceState) {
 
-		requireNonNull(getActivity()).setTitle(R.string.groups_button);
+		getActivity().setTitle(R.string.groups_button);
 
 		View v = inflater.inflate(R.layout.list, container, false);
 
-		adapter = new GroupListAdapter(getActivity(), this);
+		adapter = new GroupListAdapter(getContext(), this);
 		list = v.findViewById(R.id.list);
 		list.setEmptyImage(R.drawable.ic_empty_state_group_list);
 		list.setEmptyText(R.string.groups_list_empty);
@@ -86,11 +79,17 @@ public class GroupListFragment extends BaseFragment implements
 		snackbar.getView().setBackgroundResource(R.color.briar_primary);
 		snackbar.setAction(R.string.show, this);
 		snackbar.setActionTextColor(ContextCompat
-				.getColor(getActivity(), R.color.briar_button_text_positive));
+				.getColor(getContext(), R.color.briar_button_text_positive));
 
 		return v;
 	}
 
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+		controller.setGroupListListener(this);
+	}
+
 	@Override
 	public void onStart() {
 		super.onStart();

briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java

@@ -75,7 +75,6 @@ import static org.briarproject.bramble.api.plugin.BluetoothConstants.PREF_BT_ENA
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_MOBILE;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_AUTOMATIC;
-import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_ONLY_WHEN_CHARGING;
 import static org.briarproject.bramble.util.LogUtils.logDuration;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.bramble.util.LogUtils.now;
@@ -112,8 +111,6 @@ public class SettingsFragment extends PreferenceFragmentCompat
 	public static final String NOTIFY_SIGN_IN = "pref_key_notify_sign_in";
 	public static final String TOR_NETWORK = "pref_key_tor_network";
 	public static final String TOR_MOBILE = "pref_key_tor_mobile_data";
-	public static final String TOR_ONLY_WHEN_CHARGING =
-			"pref_key_tor_only_when_charging";
 
 	private static final Logger LOG =
 			Logger.getLogger(SettingsFragment.class.getName());
@@ -123,7 +120,6 @@ public class SettingsFragment extends PreferenceFragmentCompat
 	private ListPreference enableBluetooth;
 	private ListPreference torNetwork;
 	private SwitchPreference torMobile;
-	private SwitchPreference torOnlyWhenCharging;
 	private SwitchPreference screenLock;
 	private ListPreference screenLockTimeout;
 	private SwitchPreference notifyPrivateMessages;
@@ -169,8 +165,6 @@ public class SettingsFragment extends PreferenceFragmentCompat
 		enableBluetooth = (ListPreference) findPreference("pref_key_bluetooth");
 		torNetwork = (ListPreference) findPreference(TOR_NETWORK);
 		torMobile = (SwitchPreference) findPreference(TOR_MOBILE);
-		torOnlyWhenCharging =
-				(SwitchPreference) findPreference(TOR_ONLY_WHEN_CHARGING);
 		screenLock = (SwitchPreference) findPreference(PREF_SCREEN_LOCK);
 		screenLockTimeout =
 				(ListPreference) findPreference(PREF_SCREEN_LOCK_TIMEOUT);
@@ -208,7 +202,6 @@ public class SettingsFragment extends PreferenceFragmentCompat
 		enableBluetooth.setOnPreferenceChangeListener(this);
 		torNetwork.setOnPreferenceChangeListener(this);
 		torMobile.setOnPreferenceChangeListener(this);
-		torOnlyWhenCharging.setOnPreferenceChangeListener(this);
 		screenLock.setOnPreferenceChangeListener(this);
 		screenLockTimeout.setOnPreferenceChangeListener(this);
 
@@ -369,10 +362,6 @@ public class SettingsFragment extends PreferenceFragmentCompat
 					torSettings.getBoolean(PREF_TOR_MOBILE, true);
 			torMobile.setChecked(torMobileSetting);
 
-			boolean torChargingSetting =
-					torSettings.getBoolean(PREF_TOR_ONLY_WHEN_CHARGING, false);
-			torOnlyWhenCharging.setChecked(torChargingSetting);
-
 			displayScreenLockSetting();
 
 			if (SDK_INT < 26) {
@@ -434,7 +423,6 @@ public class SettingsFragment extends PreferenceFragmentCompat
 		enableBluetooth.setEnabled(enabled);
 		torNetwork.setEnabled(enabled);
 		torMobile.setEnabled(enabled);
-		torOnlyWhenCharging.setEnabled(enabled);
 		if (!enabled) screenLock.setEnabled(false);
 		notifyPrivateMessages.setEnabled(enabled);
 		notifyGroupMessages.setEnabled(enabled);
@@ -531,9 +519,6 @@ public class SettingsFragment extends PreferenceFragmentCompat
 		} else if (preference == torMobile) {
 			boolean torMobileSetting = (Boolean) newValue;
 			storeTorMobileSetting(torMobileSetting);
-		} else if (preference == torOnlyWhenCharging) {
-			boolean torChargingSetting = (Boolean) newValue;
-			storeTorChargingSetting(torChargingSetting);
 		} else if (preference == screenLock) {
 			Settings s = new Settings();
 			s.putBoolean(PREF_SCREEN_LOCK, (Boolean) newValue);
@@ -600,12 +585,6 @@ public class SettingsFragment extends PreferenceFragmentCompat
 		mergeSettings(s, TOR_NAMESPACE);
 	}
 
-	private void storeTorChargingSetting(boolean torChargingSetting) {
-		Settings s = new Settings();
-		s.putBoolean(PREF_TOR_ONLY_WHEN_CHARGING, torChargingSetting);
-		mergeSettings(s, TOR_NAMESPACE);
-	}
-
 	private void storeBluetoothSettings(boolean btSetting) {
 		Settings s = new Settings();
 		s.putBoolean(PREF_BT_ENABLE, btSetting);

briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java

@@ -37,7 +37,7 @@ public abstract class BaseMessageFragment extends BaseFragment
 	}
 
 	@Override
-	public View onCreateView(LayoutInflater inflater,
+	public View onCreateView(@Nullable LayoutInflater inflater,
 			@Nullable ViewGroup container,
 			@Nullable Bundle savedInstanceState) {
 

briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogMessageFragment.java

@@ -1,18 +1,14 @@
 package org.briarproject.briar.android.sharing;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
 
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
 public class ShareBlogMessageFragment extends BaseMessageFragment {
 
 	public final static String TAG = ShareBlogMessageFragment.class.getName();
@@ -22,9 +18,9 @@ public class ShareBlogMessageFragment extends BaseMessageFragment {
 	}
 
 	@Override
-	public View onCreateView(LayoutInflater inflater,
-			@Nullable ViewGroup container,
-			@Nullable Bundle savedInstanceState) {
+	public View onCreateView(LayoutInflater inflater, ViewGroup container,
+			Bundle savedInstanceState) {
+
 		setTitle(R.string.blogs_sharing_share);
 		return super.onCreateView(inflater, container, savedInstanceState);
 	}
@@ -41,6 +37,11 @@ public class ShareBlogMessageFragment extends BaseMessageFragment {
 		return R.string.forum_share_message;
 	}
 
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+	}
+
 	@Override
 	public String getUniqueTag() {
 		return TAG;