Refactor layouts for alias and link dialogs.

This commit also uses LiveData Transformations to expose contact related information

bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java

@@ -16,18 +16,27 @@ import org.briarproject.bramble.api.plugin.PluginException;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
 import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
 import org.briarproject.bramble.api.system.AndroidExecutor;
+import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.util.AndroidUtils;
 
 import java.io.Closeable;
 import java.io.IOException;
 import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
+import java.util.concurrent.LinkedBlockingQueue;
 import java.util.logging.Logger;
 
 import javax.annotation.Nullable;
 
+import static android.bluetooth.BluetoothAdapter.ACTION_DISCOVERY_FINISHED;
+import static android.bluetooth.BluetoothAdapter.ACTION_DISCOVERY_STARTED;
 import static android.bluetooth.BluetoothAdapter.ACTION_SCAN_MODE_CHANGED;
 import static android.bluetooth.BluetoothAdapter.ACTION_STATE_CHANGED;
 import static android.bluetooth.BluetoothAdapter.EXTRA_SCAN_MODE;
@@ -37,8 +46,13 @@ import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERA
 import static android.bluetooth.BluetoothAdapter.SCAN_MODE_NONE;
 import static android.bluetooth.BluetoothAdapter.STATE_OFF;
 import static android.bluetooth.BluetoothAdapter.STATE_ON;
+import static android.bluetooth.BluetoothDevice.ACTION_FOUND;
+import static android.bluetooth.BluetoothDevice.EXTRA_DEVICE;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.util.LogUtils.logException;
+import static org.briarproject.bramble.util.PrivacyUtils.scrubMacAddress;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
@@ -47,8 +61,11 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
 	private static final Logger LOG =
 			Logger.getLogger(AndroidBluetoothPlugin.class.getName());
 
+	private static final int MAX_DISCOVERY_MS = 10_000;
+
 	private final AndroidExecutor androidExecutor;
 	private final Context appContext;
+	private final Clock clock;
 
 	private volatile boolean wasEnabledByUs = false;
 	private volatile BluetoothStateReceiver receiver = null;
@@ -58,12 +75,13 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
 
 	AndroidBluetoothPlugin(BluetoothConnectionLimiter connectionLimiter,
 			Executor ioExecutor, AndroidExecutor androidExecutor,
-			Context appContext, SecureRandom secureRandom, Backoff backoff,
-			DuplexPluginCallback callback, int maxLatency) {
+			Context appContext, SecureRandom secureRandom, Clock clock,
+			Backoff backoff, DuplexPluginCallback callback, int maxLatency) {
 		super(connectionLimiter, ioExecutor, secureRandom, backoff, callback,
 				maxLatency);
 		this.androidExecutor = androidExecutor;
 		this.appContext = appContext;
+		this.clock = clock;
 	}
 
 	@Override
@@ -182,6 +200,74 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
 		}
 	}
 
+	@Override
+	@Nullable
+	DuplexTransportConnection discoverAndConnect(String uuid) {
+		if (adapter == null) return null;
+		for (String address : discoverDevices()) {
+			try {
+				if (LOG.isLoggable(INFO))
+					LOG.info("Connecting to " + scrubMacAddress(address));
+				return connectTo(address, uuid);
+			} catch (IOException e) {
+				if (LOG.isLoggable(INFO)) {
+					LOG.info("Could not connect to "
+							+ scrubMacAddress(address));
+				}
+			}
+		}
+		LOG.info("Could not connect to any devices");
+		return null;
+	}
+
+	private Collection<String> discoverDevices() {
+		List<String> addresses = new ArrayList<>();
+		BlockingQueue<Intent> intents = new LinkedBlockingQueue<>();
+		DiscoveryReceiver receiver = new DiscoveryReceiver(intents);
+		IntentFilter filter = new IntentFilter();
+		filter.addAction(ACTION_DISCOVERY_STARTED);
+		filter.addAction(ACTION_DISCOVERY_FINISHED);
+		filter.addAction(ACTION_FOUND);
+		appContext.registerReceiver(receiver, filter);
+		try {
+			if (adapter.startDiscovery()) {
+				long now = clock.currentTimeMillis();
+				long end = now + MAX_DISCOVERY_MS;
+				while (now < end) {
+					Intent i = intents.poll(end - now, MILLISECONDS);
+					if (i == null) break;
+					String action = i.getAction();
+					if (ACTION_DISCOVERY_STARTED.equals(action)) {
+						LOG.info("Discovery started");
+					} else if (ACTION_DISCOVERY_FINISHED.equals(action)) {
+						LOG.info("Discovery finished");
+						break;
+					} else if (ACTION_FOUND.equals(action)) {
+						BluetoothDevice d = i.getParcelableExtra(EXTRA_DEVICE);
+						String address = d.getAddress();
+						if (LOG.isLoggable(INFO))
+							LOG.info("Discovered " + scrubMacAddress(address));
+						if (!addresses.contains(address))
+							addresses.add(address);
+					}
+					now = clock.currentTimeMillis();
+				}
+			} else {
+				LOG.info("Could not start discovery");
+			}
+		} catch (InterruptedException e) {
+			LOG.info("Interrupted while discovering devices");
+			Thread.currentThread().interrupt();
+		} finally {
+			LOG.info("Cancelling discovery");
+			adapter.cancelDiscovery();
+			appContext.unregisterReceiver(receiver);
+		}
+		// Shuffle the addresses so we don't always try the same one first
+		Collections.shuffle(addresses);
+		return addresses;
+	}
+
 	private void tryToClose(@Nullable Closeable c) {
 		try {
 			if (c != null) c.close();
@@ -207,4 +293,18 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
 			}
 		}
 	}
+
+	private static class DiscoveryReceiver extends BroadcastReceiver {
+
+		private final BlockingQueue<Intent> intents;
+
+		private DiscoveryReceiver(BlockingQueue<Intent> intents) {
+			this.intents = intents;
+		}
+
+		@Override
+		public void onReceive(Context ctx, Intent intent) {
+			intents.add(intent);
+		}
+	}
 }

bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPluginFactory.java

@@ -11,6 +11,7 @@ import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
 import org.briarproject.bramble.api.system.AndroidExecutor;
+import org.briarproject.bramble.api.system.Clock;
 
 import java.security.SecureRandom;
 import java.util.concurrent.Executor;
@@ -33,17 +34,19 @@ public class AndroidBluetoothPluginFactory implements DuplexPluginFactory {
 	private final Context appContext;
 	private final SecureRandom secureRandom;
 	private final EventBus eventBus;
+	private final Clock clock;
 	private final BackoffFactory backoffFactory;
 
 	public AndroidBluetoothPluginFactory(Executor ioExecutor,
 			AndroidExecutor androidExecutor, Context appContext,
-			SecureRandom secureRandom, EventBus eventBus,
+			SecureRandom secureRandom, EventBus eventBus, Clock clock,
 			BackoffFactory backoffFactory) {
 		this.ioExecutor = ioExecutor;
 		this.androidExecutor = androidExecutor;
 		this.appContext = appContext;
 		this.secureRandom = secureRandom;
 		this.eventBus = eventBus;
+		this.clock = clock;
 		this.backoffFactory = backoffFactory;
 	}
 
@@ -65,7 +68,7 @@ public class AndroidBluetoothPluginFactory implements DuplexPluginFactory {
 				MAX_POLLING_INTERVAL, BACKOFF_BASE);
 		AndroidBluetoothPlugin plugin = new AndroidBluetoothPlugin(
 				connectionLimiter, ioExecutor, androidExecutor, appContext,
-				secureRandom, backoff, callback, MAX_LATENCY);
+				secureRandom, clock, backoff, callback, MAX_LATENCY);
 		eventBus.addListener(plugin);
 		return plugin;
 	}

bramble-api/src/main/java/org/briarproject/bramble/api/contact/Contact.java

@@ -4,8 +4,12 @@ import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorId;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
+import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
+import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
+import static org.briarproject.bramble.util.StringUtils.toUtf8;
+
 @Immutable
 @NotNullByDefault
 public class Contact {
@@ -13,13 +17,21 @@ public class Contact {
 	private final ContactId id;
 	private final Author author;
 	private final AuthorId localAuthorId;
+	@Nullable
+	private final String alias;
 	private final boolean verified, active;
 
 	public Contact(ContactId id, Author author, AuthorId localAuthorId,
-			boolean verified, boolean active) {
+			@Nullable String alias, boolean verified, boolean active) {
+		if (alias != null) {
+			int aliasLength = toUtf8(alias).length;
+			if (aliasLength == 0 || aliasLength > MAX_AUTHOR_NAME_LENGTH)
+				throw new IllegalArgumentException();
+		}
 		this.id = id;
 		this.author = author;
 		this.localAuthorId = localAuthorId;
+		this.alias = alias;
 		this.verified = verified;
 		this.active = active;
 	}
@@ -36,6 +48,11 @@ public class Contact {
 		return localAuthorId;
 	}
 
+	@Nullable
+	public String getAlias() {
+		return alias;
+	}
+
 	public boolean isVerified() {
 		return verified;
 	}

bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactManager.java

@@ -5,11 +5,14 @@ import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorId;
+import org.briarproject.bramble.api.identity.AuthorInfo;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import java.util.Collection;
 
+import javax.annotation.Nullable;
+
 @NotNullByDefault
 public interface ContactManager {
 
@@ -93,6 +96,12 @@ public interface ContactManager {
 	void setContactActive(Transaction txn, ContactId c, boolean active)
 			throws DbException;
 
+	/**
+	 * Sets an alias name for the contact or unsets it if alias is null.
+	 */
+	void setContactAlias(ContactId c, @Nullable String alias)
+			throws DbException;
+
 	/**
 	 * Return true if a contact with this name and public key already exists
 	 */
@@ -105,6 +114,16 @@ public interface ContactManager {
 	boolean contactExists(AuthorId remoteAuthorId, AuthorId localAuthorId)
 			throws DbException;
 
+	/**
+	 * Returns the {@link AuthorInfo} for the given author.
+	 */
+	AuthorInfo getAuthorInfo(AuthorId a) throws DbException;
+
+	/**
+	 * Returns the {@link AuthorInfo} for the given author.
+	 */
+	AuthorInfo getAuthorInfo(Transaction txn, AuthorId a) throws DbException;
+
 	interface ContactHook {
 
 		void addingContact(Transaction txn, Contact c) throws DbException;

bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseComponent.java

@@ -515,6 +515,12 @@ public interface DatabaseComponent {
 	void setContactActive(Transaction txn, ContactId c, boolean active)
 			throws DbException;
 
+	/**
+	 * Sets an alias name for the contact or unsets it if alias is null.
+	 */
+	void setContactAlias(Transaction txn, ContactId c, @Nullable String alias)
+			throws DbException;
+
 	/**
 	 * Sets the given group's visibility to the given contact.
 	 */

bramble-api/src/main/java/org/briarproject/bramble/api/identity/Author.java

@@ -16,10 +16,6 @@ import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_PUBLIC_K
 @NotNullByDefault
 public class Author implements Nameable {
 
-	public enum Status {
-		NONE, ANONYMOUS, UNKNOWN, UNVERIFIED, VERIFIED, OURSELVES
-	}
-
 	/**
 	 * The current version of the author structure.
 	 */

bramble-api/src/main/java/org/briarproject/bramble/api/identity/AuthorInfo.java

@@ -0,0 +1,42 @@
+package org.briarproject.bramble.api.identity;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
+
+@Immutable
+@NotNullByDefault
+public class AuthorInfo {
+
+	public enum Status {
+		NONE, ANONYMOUS, UNKNOWN, UNVERIFIED, VERIFIED, OURSELVES;
+
+		public boolean isContact() {
+			return this == UNVERIFIED || this == VERIFIED;
+		}
+	}
+
+	private final Status status;
+	@Nullable
+	private final String alias;
+
+	public AuthorInfo(Status status, @Nullable String alias) {
+		this.status = status;
+		this.alias = alias;
+	}
+
+	public AuthorInfo(Status status) {
+		this(status, null);
+	}
+
+	public Status getStatus() {
+		return status;
+	}
+
+	@Nullable
+	public String getAlias() {
+		return alias;
+	}
+
+}

bramble-api/src/main/java/org/briarproject/bramble/api/identity/IdentityManager.java

@@ -3,7 +3,6 @@ package org.briarproject.bramble.api.identity;
 import org.briarproject.bramble.api.crypto.CryptoExecutor;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.identity.Author.Status;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 @NotNullByDefault
@@ -37,14 +36,4 @@ public interface IdentityManager {
 	 */
 	LocalAuthor getLocalAuthor(Transaction txn) throws DbException;
 
-	/**
-	 * Returns the {@link Status} of the given author.
-	 */
-	Status getAuthorStatus(AuthorId a) throws DbException;
-
-	/**
-	 * Returns the {@link Status} of the given author.
-	 */
-	Status getAuthorStatus(Transaction txn, AuthorId a) throws DbException;
-
 }

bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementConstants.java

@@ -21,7 +21,7 @@ public interface KeyAgreementConstants {
 	/**
 	 * The connection timeout in milliseconds.
 	 */
-	long CONNECTION_TIMEOUT = 20 * 1000;
+	long CONNECTION_TIMEOUT = 60_000;
 
 	/**
 	 * The transport identifier for Bluetooth.

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

@@ -153,15 +153,4 @@ 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/contact/ContactManagerImpl.java

@@ -10,6 +10,9 @@ import org.briarproject.bramble.api.db.NoSuchContactException;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorId;
+import org.briarproject.bramble.api.identity.AuthorInfo;
+import org.briarproject.bramble.api.identity.IdentityManager;
+import org.briarproject.bramble.api.identity.LocalAuthor;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.transport.KeyManager;
 
@@ -18,21 +21,32 @@ import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 import javax.inject.Inject;
 
+import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
+import static org.briarproject.bramble.api.identity.AuthorInfo.Status.OURSELVES;
+import static org.briarproject.bramble.api.identity.AuthorInfo.Status.UNKNOWN;
+import static org.briarproject.bramble.api.identity.AuthorInfo.Status.UNVERIFIED;
+import static org.briarproject.bramble.api.identity.AuthorInfo.Status.VERIFIED;
+import static org.briarproject.bramble.util.StringUtils.toUtf8;
+
 @ThreadSafe
 @NotNullByDefault
 class ContactManagerImpl implements ContactManager {
 
 	private final DatabaseComponent db;
 	private final KeyManager keyManager;
+	private final IdentityManager identityManager;
 	private final List<ContactHook> hooks;
 
 	@Inject
-	ContactManagerImpl(DatabaseComponent db, KeyManager keyManager) {
+	ContactManagerImpl(DatabaseComponent db, KeyManager keyManager,
+			IdentityManager identityManager) {
 		this.db = db;
 		this.keyManager = keyManager;
+		this.identityManager = identityManager;
 		hooks = new CopyOnWriteArrayList<>();
 	}
 
@@ -148,6 +162,17 @@ class ContactManagerImpl implements ContactManager {
 		db.setContactActive(txn, c, active);
 	}
 
+	@Override
+	public void setContactAlias(ContactId c, @Nullable String alias)
+			throws DbException {
+		if (alias != null) {
+			int aliasLength = toUtf8(alias).length;
+			if (aliasLength == 0 || aliasLength > MAX_AUTHOR_NAME_LENGTH)
+				throw new IllegalArgumentException();
+		}
+		db.transaction(false, txn -> db.setContactAlias(txn, c, alias));
+	}
+
 	@Override
 	public boolean contactExists(Transaction txn, AuthorId remoteAuthorId,
 			AuthorId localAuthorId) throws DbException {
@@ -176,4 +201,23 @@ class ContactManagerImpl implements ContactManager {
 		db.removeContact(txn, c);
 	}
 
+	@Override
+	public AuthorInfo getAuthorInfo(AuthorId a) throws DbException {
+		return db.transactionWithResult(true, txn -> getAuthorInfo(txn, a));
+	}
+
+	@Override
+	public AuthorInfo getAuthorInfo(Transaction txn, AuthorId authorId)
+			throws DbException {
+		LocalAuthor localAuthor = identityManager.getLocalAuthor(txn);
+		if (localAuthor.getId().equals(authorId))
+			return new AuthorInfo(OURSELVES);
+		Collection<Contact> contacts = db.getContactsByAuthorId(txn, authorId);
+		if (contacts.isEmpty()) return new AuthorInfo(UNKNOWN);
+		if (contacts.size() > 1) throw new AssertionError();
+		Contact c = contacts.iterator().next();
+		if (c.isVerified()) return new AuthorInfo(VERIFIED, c.getAlias());
+		else return new AuthorInfo(UNVERIFIED, c.getAlias());
+	}
+
 }

bramble-core/src/main/java/org/briarproject/bramble/db/Database.java

@@ -616,6 +616,12 @@ interface Database<T> {
 	void setContactActive(T txn, ContactId c, boolean active)
 			throws DbException;
 
+	/**
+	 * Sets an alias name for a contact.
+	 */
+	void setContactAlias(T txn, ContactId c, @Nullable String alias)
+			throws DbException;
+
 	/**
 	 * Sets the given group's visibility to the given contact to either
 	 * {@link Visibility VISIBLE} or {@link Visibility SHARED}.

bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseComponentImpl.java

@@ -859,6 +859,16 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		transaction.attach(new ContactStatusChangedEvent(c, active));
 	}
 
+	@Override
+	public void setContactAlias(Transaction transaction, ContactId c,
+			String alias) throws DbException {
+		if (transaction.isReadOnly()) throw new IllegalArgumentException();
+		T txn = unbox(transaction);
+		if (!db.containsContact(txn, c))
+			throw new NoSuchContactException();
+		db.setContactAlias(txn, c, alias);
+	}
+
 	@Override
 	public void setGroupVisibility(Transaction transaction, ContactId c,
 			GroupId g, Visibility v) throws DbException {

bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseTypes.java

@@ -0,0 +1,34 @@
+package org.briarproject.bramble.db;
+
+class DatabaseTypes {
+
+	private final String hashType, secretType, binaryType;
+    private final String counterType, stringType;
+
+	public DatabaseTypes(String hashType, String secretType, String binaryType,
+			String counterType, String stringType) {
+		this.hashType = hashType;
+		this.secretType = secretType;
+		this.binaryType = binaryType;
+		this.counterType = counterType;
+		this.stringType = stringType;
+	}
+
+	/**
+	 * Replaces database type placeholders in a statement with the actual types.
+	 * These placeholders are currently supported:
+	 *	<li> _HASH
+	 *	<li> _SECRET
+	 *	<li> _BINARY
+	 *	<li> _COUNTER
+	 *	<li> _STRING
+	 */
+	String replaceTypes(String s) {
+		s = s.replaceAll("_HASH", hashType);
+		s = s.replaceAll("_SECRET", secretType);
+		s = s.replaceAll("_BINARY", binaryType);
+		s = s.replaceAll("_COUNTER", counterType);
+		s = s.replaceAll("_STRING", stringType);
+		return s;
+	}
+}

bramble-core/src/main/java/org/briarproject/bramble/db/H2Database.java

@@ -30,6 +30,8 @@ class H2Database extends JdbcDatabase {
 	private static final String BINARY_TYPE = "BINARY";
 	private static final String COUNTER_TYPE = "INT NOT NULL AUTO_INCREMENT";
 	private static final String STRING_TYPE = "VARCHAR";
+	private static final DatabaseTypes dbTypes = new DatabaseTypes(HASH_TYPE,
+			SECRET_TYPE, BINARY_TYPE, COUNTER_TYPE, STRING_TYPE);
 
 	private final DatabaseConfig config;
 	private final String url;
@@ -40,8 +42,7 @@ class H2Database extends JdbcDatabase {
 	@Inject
 	H2Database(DatabaseConfig config, MessageFactory messageFactory,
 			Clock clock) {
-		super(HASH_TYPE, SECRET_TYPE, BINARY_TYPE, COUNTER_TYPE, STRING_TYPE,
-				messageFactory, clock);
+		super(dbTypes, messageFactory, clock);
 		this.config = config;
 		File dir = config.getDatabaseDirectory();
 		String path = new File(dir, "db").getAbsolutePath();

bramble-core/src/main/java/org/briarproject/bramble/db/HyperSqlDatabase.java

@@ -30,6 +30,8 @@ class HyperSqlDatabase extends JdbcDatabase {
 	private static final String COUNTER_TYPE =
 			"INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY(START WITH 1)";
 	private static final String STRING_TYPE = "VARCHAR";
+	private static final DatabaseTypes dbTypes = new DatabaseTypes(HASH_TYPE,
+			SECRET_TYPE, BINARY_TYPE, COUNTER_TYPE, STRING_TYPE);
 
 	private final DatabaseConfig config;
 	private final String url;
@@ -40,8 +42,7 @@ class HyperSqlDatabase extends JdbcDatabase {
 	@Inject
 	HyperSqlDatabase(DatabaseConfig config, MessageFactory messageFactory,
 			Clock clock) {
-		super(HASH_TYPE, SECRET_TYPE, BINARY_TYPE, COUNTER_TYPE, STRING_TYPE,
-				messageFactory, clock);
+		super(dbTypes, messageFactory, clock);
 		this.config = config;
 		File dir = config.getDatabaseDirectory();
 		String path = new File(dir, "db").getAbsolutePath();
@@ -78,7 +79,7 @@ class HyperSqlDatabase extends JdbcDatabase {
 	}
 
 	@Override
-	public long getFreeSpace() throws DbException {
+	public long getFreeSpace() {
 		File dir = config.getDatabaseDirectory();
 		long maxSize = config.getMaxSize();
 		long free = dir.getFreeSpace();

bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java

@@ -56,6 +56,7 @@ import java.util.logging.Logger;
 import javax.annotation.Nullable;
 
 import static java.sql.Types.INTEGER;
+import static java.sql.Types.VARCHAR;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.api.db.Metadata.REMOVE;
@@ -83,7 +84,7 @@ import static org.briarproject.bramble.util.LogUtils.now;
 abstract class JdbcDatabase implements Database<Connection> {
 
 	// Package access for testing
-	static final int CODE_SCHEMA_VERSION = 40;
+	static final int CODE_SCHEMA_VERSION = 41;
 
 	// Rotation period offsets for incoming transport keys
 	private static final int OFFSET_PREV = -1;
@@ -113,6 +114,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 					+ " authorId _HASH NOT NULL,"
 					+ " formatVersion INT NOT NULL,"
 					+ " name _STRING NOT NULL,"
+					+ " alias _STRING," // Null if no alias exists
 					+ " publicKey _BINARY NOT NULL,"
 					+ " localAuthorId _HASH NOT NULL,"
 					+ " verified BOOLEAN NOT NULL,"
@@ -310,10 +312,9 @@ abstract class JdbcDatabase implements Database<Connection> {
 			Logger.getLogger(JdbcDatabase.class.getName());
 
 	// Different database libraries use different names for certain types
-	private final String hashType, secretType, binaryType;
-	private final String counterType, stringType;
 	private final MessageFactory messageFactory;
 	private final Clock clock;
+	private final DatabaseTypes dbTypes;
 
 	// Locking: connectionsLock
 	private final LinkedList<Connection> connections = new LinkedList<>();
@@ -328,14 +329,9 @@ abstract class JdbcDatabase implements Database<Connection> {
 	private final Lock connectionsLock = new ReentrantLock();
 	private final Condition connectionsChanged = connectionsLock.newCondition();
 
-	JdbcDatabase(String hashType, String secretType, String binaryType,
-			String counterType, String stringType,
-			MessageFactory messageFactory, Clock clock) {
-		this.hashType = hashType;
-		this.secretType = secretType;
-		this.binaryType = binaryType;
-		this.counterType = counterType;
-		this.stringType = stringType;
+	JdbcDatabase(DatabaseTypes databaseTypes, MessageFactory messageFactory,
+			Clock clock) {
+		this.dbTypes = databaseTypes;
 		this.messageFactory = messageFactory;
 		this.clock = clock;
 	}
@@ -427,7 +423,11 @@ abstract class JdbcDatabase implements Database<Connection> {
 
 	// Package access for testing
 	List<Migration<Connection>> getMigrations() {
-		return Arrays.asList(new Migration38_39(), new Migration39_40());
+		return Arrays.asList(
+				new Migration38_39(),
+				new Migration39_40(),
+				new Migration40_41(dbTypes)
+		);
 	}
 
 	private boolean isCompactionDue(Settings s) {
@@ -486,20 +486,20 @@ abstract class JdbcDatabase implements Database<Connection> {
 		Statement s = null;
 		try {
 			s = txn.createStatement();
-			s.executeUpdate(insertTypeNames(CREATE_SETTINGS));
-			s.executeUpdate(insertTypeNames(CREATE_LOCAL_AUTHORS));
-			s.executeUpdate(insertTypeNames(CREATE_CONTACTS));
-			s.executeUpdate(insertTypeNames(CREATE_GROUPS));
-			s.executeUpdate(insertTypeNames(CREATE_GROUP_METADATA));
-			s.executeUpdate(insertTypeNames(CREATE_GROUP_VISIBILITIES));
-			s.executeUpdate(insertTypeNames(CREATE_MESSAGES));
-			s.executeUpdate(insertTypeNames(CREATE_MESSAGE_METADATA));
-			s.executeUpdate(insertTypeNames(CREATE_MESSAGE_DEPENDENCIES));
-			s.executeUpdate(insertTypeNames(CREATE_OFFERS));
-			s.executeUpdate(insertTypeNames(CREATE_STATUSES));
-			s.executeUpdate(insertTypeNames(CREATE_TRANSPORTS));
-			s.executeUpdate(insertTypeNames(CREATE_OUTGOING_KEYS));
-			s.executeUpdate(insertTypeNames(CREATE_INCOMING_KEYS));
+			s.executeUpdate(dbTypes.replaceTypes(CREATE_SETTINGS));
+			s.executeUpdate(dbTypes.replaceTypes(CREATE_LOCAL_AUTHORS));
+			s.executeUpdate(dbTypes.replaceTypes(CREATE_CONTACTS));
+			s.executeUpdate(dbTypes.replaceTypes(CREATE_GROUPS));
+			s.executeUpdate(dbTypes.replaceTypes(CREATE_GROUP_METADATA));
+			s.executeUpdate(dbTypes.replaceTypes(CREATE_GROUP_VISIBILITIES));
+			s.executeUpdate(dbTypes.replaceTypes(CREATE_MESSAGES));
+			s.executeUpdate(dbTypes.replaceTypes(CREATE_MESSAGE_METADATA));
+			s.executeUpdate(dbTypes.replaceTypes(CREATE_MESSAGE_DEPENDENCIES));
+			s.executeUpdate(dbTypes.replaceTypes(CREATE_OFFERS));
+			s.executeUpdate(dbTypes.replaceTypes(CREATE_STATUSES));
+			s.executeUpdate(dbTypes.replaceTypes(CREATE_TRANSPORTS));
+			s.executeUpdate(dbTypes.replaceTypes(CREATE_OUTGOING_KEYS));
+			s.executeUpdate(dbTypes.replaceTypes(CREATE_INCOMING_KEYS));
 			s.close();
 		} catch (SQLException e) {
 			tryToClose(s);
@@ -524,15 +524,6 @@ abstract class JdbcDatabase implements Database<Connection> {
 		}
 	}
 
-	private String insertTypeNames(String s) {
-		s = s.replaceAll("_HASH", hashType);
-		s = s.replaceAll("_SECRET", secretType);
-		s = s.replaceAll("_BINARY", binaryType);
-		s = s.replaceAll("_COUNTER", counterType);
-		s = s.replaceAll("_STRING", stringType);
-		return s;
-	}
-
 	@Override
 	public Connection startTransaction() throws DbException {
 		Connection txn;
@@ -1258,8 +1249,8 @@ abstract class JdbcDatabase implements Database<Connection> {
 		PreparedStatement ps = null;
 		ResultSet rs = null;
 		try {
-			String sql = "SELECT authorId, formatVersion, name, publicKey,"
-					+ " localAuthorId, verified, active"
+			String sql = "SELECT authorId, formatVersion, name, alias,"
+					+ " publicKey, localAuthorId, verified, active"
 					+ " FROM contacts"
 					+ " WHERE contactId = ?";
 			ps = txn.prepareStatement(sql);
@@ -1269,15 +1260,17 @@ abstract class JdbcDatabase implements Database<Connection> {
 			AuthorId authorId = new AuthorId(rs.getBytes(1));
 			int formatVersion = rs.getInt(2);
 			String name = rs.getString(3);
-			byte[] publicKey = rs.getBytes(4);
-			AuthorId localAuthorId = new AuthorId(rs.getBytes(5));
-			boolean verified = rs.getBoolean(6);
-			boolean active = rs.getBoolean(7);
+			String alias = rs.getString(4);
+			byte[] publicKey = rs.getBytes(5);
+			AuthorId localAuthorId = new AuthorId(rs.getBytes(6));
+			boolean verified = rs.getBoolean(7);
+			boolean active = rs.getBoolean(8);
 			rs.close();
 			ps.close();
 			Author author =
 					new Author(authorId, formatVersion, name, publicKey);
-			return new Contact(c, author, localAuthorId, verified, active);
+			return new Contact(c, author, localAuthorId, alias, verified,
+					active);
 		} catch (SQLException e) {
 			tryToClose(rs);
 			tryToClose(ps);
@@ -1292,7 +1285,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 		ResultSet rs = null;
 		try {
 			String sql = "SELECT contactId, authorId, formatVersion, name,"
-					+ " publicKey, localAuthorId, verified, active"
+					+ " alias, publicKey, localAuthorId, verified, active"
 					+ " FROM contacts";
 			ps = txn.prepareStatement(sql);
 			rs = ps.executeQuery();
@@ -1302,14 +1295,15 @@ abstract class JdbcDatabase implements Database<Connection> {
 				AuthorId authorId = new AuthorId(rs.getBytes(2));
 				int formatVersion = rs.getInt(3);
 				String name = rs.getString(4);
-				byte[] publicKey = rs.getBytes(5);
+				String alias = rs.getString(5);
+				byte[] publicKey = rs.getBytes(6);
 				Author author =
 						new Author(authorId, formatVersion, name, publicKey);
-				AuthorId localAuthorId = new AuthorId(rs.getBytes(6));
-				boolean verified = rs.getBoolean(7);
-				boolean active = rs.getBoolean(8);
+				AuthorId localAuthorId = new AuthorId(rs.getBytes(7));
+				boolean verified = rs.getBoolean(8);
+				boolean active = rs.getBoolean(9);
 				contacts.add(new Contact(contactId, author, localAuthorId,
-						verified, active));
+						alias, verified, active));
 			}
 			rs.close();
 			ps.close();
@@ -1350,8 +1344,8 @@ abstract class JdbcDatabase implements Database<Connection> {
 		PreparedStatement ps = null;
 		ResultSet rs = null;
 		try {
-			String sql = "SELECT contactId, formatVersion, name, publicKey,"
-					+ " localAuthorId, verified, active"
+			String sql = "SELECT contactId, formatVersion, name, alias,"
+					+ " publicKey, localAuthorId, verified, active"
 					+ " FROM contacts"
 					+ " WHERE authorId = ?";
 			ps = txn.prepareStatement(sql);
@@ -1362,14 +1356,15 @@ abstract class JdbcDatabase implements Database<Connection> {
 				ContactId c = new ContactId(rs.getInt(1));
 				int formatVersion = rs.getInt(2);
 				String name = rs.getString(3);
-				byte[] publicKey = rs.getBytes(4);
-				AuthorId localAuthorId = new AuthorId(rs.getBytes(5));
-				boolean verified = rs.getBoolean(6);
-				boolean active = rs.getBoolean(7);
+				String alias = rs.getString(4);
+				byte[] publicKey = rs.getBytes(5);
+				AuthorId localAuthorId = new AuthorId(rs.getBytes(6));
+				boolean verified = rs.getBoolean(7);
+				boolean active = rs.getBoolean(8);
 				Author author =
 						new Author(remote, formatVersion, name, publicKey);
-				contacts.add(new Contact(c, author, localAuthorId, verified,
-						active));
+				contacts.add(new Contact(c, author, localAuthorId, alias,
+						verified, active));
 			}
 			rs.close();
 			ps.close();
@@ -2794,6 +2789,25 @@ abstract class JdbcDatabase implements Database<Connection> {
 		}
 	}
 
+	@Override
+	public void setContactAlias(Connection txn, ContactId c,
+			@Nullable String alias) throws DbException {
+		PreparedStatement ps = null;
+		try {
+			String sql = "UPDATE contacts SET alias = ? WHERE contactId = ?";
+			ps = txn.prepareStatement(sql);
+			if (alias == null) ps.setNull(1, VARCHAR);
+			else ps.setString(1, alias);
+			ps.setInt(2, c.getInt());
+			int affected = ps.executeUpdate();
+			if (affected < 0 || affected > 1) throw new DbStateException();
+			ps.close();
+		} catch (SQLException e) {
+			tryToClose(ps);
+			throw new DbException(e);
+		}
+	}
+
 	@Override
 	public void setGroupVisibility(Connection txn, ContactId c, GroupId g,
 			boolean shared) throws DbException {

bramble-core/src/main/java/org/briarproject/bramble/db/Migration40_41.java

@@ -0,0 +1,56 @@
+package org.briarproject.bramble.db;
+
+import org.briarproject.bramble.api.db.DbException;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.logging.Logger;
+
+import javax.annotation.Nullable;
+
+import static java.util.logging.Level.WARNING;
+import static java.util.logging.Logger.getLogger;
+import static org.briarproject.bramble.util.LogUtils.logException;
+
+class Migration40_41 implements Migration<Connection> {
+
+	private static final Logger LOG = getLogger(Migration40_41.class.getName());
+
+	private final DatabaseTypes dbTypes;
+
+	public Migration40_41(DatabaseTypes databaseTypes) {
+		this.dbTypes = databaseTypes;
+	}
+
+	@Override
+	public int getStartVersion() {
+		return 40;
+	}
+
+	@Override
+	public int getEndVersion() {
+		return 41;
+	}
+
+	@Override
+	public void migrate(Connection txn) throws DbException {
+		Statement s = null;
+		try {
+			s = txn.createStatement();
+			s.execute("ALTER TABLE contacts"
+					+ dbTypes.replaceTypes(" ADD alias VARCHAR"));
+		} catch (SQLException e) {
+			tryToClose(s);
+			throw new DbException(e);
+		}
+	}
+
+	private void tryToClose(@Nullable Statement s) {
+		try {
+			if (s != null) s.close();
+		} catch (SQLException e) {
+			logException(LOG, WARNING, e);
+		}
+	}
+}

bramble-core/src/main/java/org/briarproject/bramble/identity/IdentityManagerImpl.java

@@ -1,29 +1,21 @@
 package org.briarproject.bramble.identity;
 
-import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.crypto.KeyPair;
 import org.briarproject.bramble.api.db.DatabaseComponent;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.identity.Author.Status;
 import org.briarproject.bramble.api.identity.AuthorFactory;
-import org.briarproject.bramble.api.identity.AuthorId;
 import org.briarproject.bramble.api.identity.IdentityManager;
 import org.briarproject.bramble.api.identity.LocalAuthor;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
-import java.util.Collection;
 import java.util.logging.Logger;
 
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 import javax.inject.Inject;
 
-import static org.briarproject.bramble.api.identity.Author.Status.OURSELVES;
-import static org.briarproject.bramble.api.identity.Author.Status.UNKNOWN;
-import static org.briarproject.bramble.api.identity.Author.Status.UNVERIFIED;
-import static org.briarproject.bramble.api.identity.Author.Status.VERIFIED;
 import static org.briarproject.bramble.util.LogUtils.logDuration;
 import static org.briarproject.bramble.util.LogUtils.now;
 
@@ -118,26 +110,4 @@ class IdentityManagerImpl implements IdentityManager {
 		return db.getLocalAuthors(txn).iterator().next();
 	}
 
-	@Override
-	public Status getAuthorStatus(AuthorId authorId) throws DbException {
-		Transaction txn = db.startTransaction(true);
-		try {
-			return getAuthorStatus(txn, authorId);
-		} finally {
-			db.endTransaction(txn);
-		}
-	}
-
-	@Override
-	public Status getAuthorStatus(Transaction txn, AuthorId authorId)
-			throws DbException {
-		if (getLocalAuthor(txn).getId().equals(authorId)) return OURSELVES;
-		Collection<Contact> contacts = db.getContactsByAuthorId(txn, authorId);
-		if (contacts.isEmpty()) return UNKNOWN;
-		for (Contact c : contacts) {
-			if (c.isVerified()) return VERIFIED;
-		}
-		return UNVERIFIED;
-	}
-
 }

bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java

@@ -23,7 +23,6 @@ import org.briarproject.bramble.api.plugin.event.EnableBluetoothEvent;
 import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.api.settings.Settings;
 import org.briarproject.bramble.api.settings.event.SettingsUpdatedEvent;
-import org.briarproject.bramble.util.StringUtils;
 
 import java.io.IOException;
 import java.security.SecureRandom;
@@ -46,6 +45,9 @@ import static org.briarproject.bramble.api.plugin.BluetoothConstants.PROP_UUID;
 import static org.briarproject.bramble.api.plugin.BluetoothConstants.UUID_BYTES;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.bramble.util.PrivacyUtils.scrubMacAddress;
+import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
+import static org.briarproject.bramble.util.StringUtils.macToBytes;
+import static org.briarproject.bramble.util.StringUtils.macToString;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
@@ -96,6 +98,9 @@ abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
 	abstract DuplexTransportConnection connectTo(String address, String uuid)
 			throws IOException;
 
+	@Nullable
+	abstract DuplexTransportConnection discoverAndConnect(String uuid);
+
 	BluetoothPlugin(BluetoothConnectionLimiter connectionLimiter,
 			Executor ioExecutor, SecureRandom secureRandom,
 			Backoff backoff, DuplexPluginCallback callback, int maxLatency) {
@@ -193,7 +198,7 @@ abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
 			address = getBluetoothAddress();
 			if (LOG.isLoggable(INFO))
 				LOG.info("Local address " + scrubMacAddress(address));
-			if (!StringUtils.isNullOrEmpty(address)) {
+			if (!isNullOrEmpty(address)) {
 				p.put(PROP_ADDRESS, address);
 				changed = true;
 			}
@@ -256,9 +261,9 @@ abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
 		// Try to connect to known devices in parallel
 		for (Entry<ContactId, TransportProperties> e : contacts.entrySet()) {
 			String address = e.getValue().get(PROP_ADDRESS);
-			if (StringUtils.isNullOrEmpty(address)) continue;
+			if (isNullOrEmpty(address)) continue;
 			String uuid = e.getValue().get(PROP_UUID);
-			if (StringUtils.isNullOrEmpty(uuid)) continue;
+			if (isNullOrEmpty(uuid)) continue;
 			ContactId c = e.getKey();
 			ioExecutor.execute(() -> {
 				if (!isRunning() || !shouldAllowContactConnections()) return;
@@ -309,9 +314,9 @@ abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
 		if (!isRunning() || !shouldAllowContactConnections()) return null;
 		if (!connectionLimiter.canOpenContactConnection()) return null;
 		String address = p.get(PROP_ADDRESS);
-		if (StringUtils.isNullOrEmpty(address)) return null;
+		if (isNullOrEmpty(address)) return null;
 		String uuid = p.get(PROP_UUID);
-		if (StringUtils.isNullOrEmpty(uuid)) return null;
+		if (isNullOrEmpty(uuid)) return null;
 		DuplexTransportConnection conn = connect(address, uuid);
 		if (conn == null) return null;
 		// TODO: Why don't we reset the backoff here?
@@ -326,9 +331,6 @@ abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
 	@Override
 	public KeyAgreementListener createKeyAgreementListener(byte[] commitment) {
 		if (!isRunning()) return null;
-		// There's no point listening if we can't discover our own address
-		String address = getBluetoothAddress();
-		if (address == null) return null;
 		// No truncation necessary because COMMIT_LENGTH = 16
 		String uuid = UUID.nameUUIDFromBytes(commitment).toString();
 		if (LOG.isLoggable(INFO)) LOG.info("Key agreement UUID " + uuid);
@@ -346,7 +348,8 @@ abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
 		}
 		BdfList descriptor = new BdfList();
 		descriptor.add(TRANSPORT_ID_BLUETOOTH);
-		descriptor.add(StringUtils.macToBytes(address));
+		String address = getBluetoothAddress();
+		if (address != null) descriptor.add(macToBytes(address));
 		return new BluetoothKeyAgreementListener(descriptor, ss);
 	}
 
@@ -354,18 +357,25 @@ abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
 	public DuplexTransportConnection createKeyAgreementConnection(
 			byte[] commitment, BdfList descriptor) {
 		if (!isRunning()) return null;
-		String address;
-		try {
-			address = parseAddress(descriptor);
-		} catch (FormatException e) {
-			LOG.info("Invalid address in key agreement descriptor");
-			return null;
-		}
 		// No truncation necessary because COMMIT_LENGTH = 16
 		String uuid = UUID.nameUUIDFromBytes(commitment).toString();
-		if (LOG.isLoggable(INFO))
-			LOG.info("Connecting to key agreement UUID " + uuid);
-		DuplexTransportConnection conn = connect(address, uuid);
+		DuplexTransportConnection conn;
+		if (descriptor.size() == 1) {
+			if (LOG.isLoggable(INFO))
+				LOG.info("Discovering address for key agreement UUID " + uuid);
+			conn = discoverAndConnect(uuid);
+		} else {
+			String address;
+			try {
+				address = parseAddress(descriptor);
+			} catch (FormatException e) {
+				LOG.info("Invalid address in key agreement descriptor");
+				return null;
+			}
+			if (LOG.isLoggable(INFO))
+				LOG.info("Connecting to key agreement UUID " + uuid);
+			conn = connect(address, uuid);
+		}
 		if (conn != null) connectionLimiter.keyAgreementConnectionOpened(conn);
 		return conn;
 	}
@@ -373,7 +383,7 @@ abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
 	private String parseAddress(BdfList descriptor) throws FormatException {
 		byte[] mac = descriptor.getRaw(1);
 		if (mac.length != 6) throw new FormatException();
-		return StringUtils.macToString(mac);
+		return macToString(mac);
 	}
 
 	@Override

bramble-core/src/test/java/org/briarproject/bramble/contact/ContactManagerImplTest.java

@@ -5,12 +5,17 @@ import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.contact.ContactManager;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.db.DatabaseComponent;
+import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.NoSuchContactException;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorId;
+import org.briarproject.bramble.api.identity.AuthorInfo;
+import org.briarproject.bramble.api.identity.IdentityManager;
+import org.briarproject.bramble.api.identity.LocalAuthor;
 import org.briarproject.bramble.api.transport.KeyManager;
 import org.briarproject.bramble.test.BrambleMockTestCase;
+import org.briarproject.bramble.test.DbExpectations;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.junit.Test;
@@ -20,10 +25,20 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Random;
 
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
+import static org.briarproject.bramble.api.identity.AuthorInfo.Status.OURSELVES;
+import static org.briarproject.bramble.api.identity.AuthorInfo.Status.UNKNOWN;
+import static org.briarproject.bramble.api.identity.AuthorInfo.Status.UNVERIFIED;
+import static org.briarproject.bramble.api.identity.AuthorInfo.Status.VERIFIED;
 import static org.briarproject.bramble.test.TestUtils.getAuthor;
+import static org.briarproject.bramble.test.TestUtils.getLocalAuthor;
 import static org.briarproject.bramble.test.TestUtils.getRandomId;
 import static org.briarproject.bramble.test.TestUtils.getSecretKey;
+import static org.briarproject.bramble.util.StringUtils.getRandomString;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 public class ContactManagerImplTest extends BrambleMockTestCase {
@@ -31,16 +46,20 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 	private final Mockery context = new Mockery();
 	private final DatabaseComponent db = context.mock(DatabaseComponent.class);
 	private final KeyManager keyManager = context.mock(KeyManager.class);
+	private final IdentityManager identityManager =
+			context.mock(IdentityManager.class);
 	private final ContactManager contactManager;
 	private final ContactId contactId = new ContactId(42);
 	private final Author remote = getAuthor();
 	private final AuthorId local = new AuthorId(getRandomId());
+	private final LocalAuthor localAuthor = getLocalAuthor();
+	private final String alias = getRandomString(MAX_AUTHOR_NAME_LENGTH);
 	private final boolean verified = false, active = true;
 	private final Contact contact =
-			new Contact(contactId, remote, local, verified, active);
+			new Contact(contactId, remote, local, alias, verified, active);
 
 	public ContactManagerImplTest() {
-		contactManager = new ContactManagerImpl(db, keyManager);
+		contactManager = new ContactManagerImpl(db, keyManager, identityManager);
 	}
 
 	@Test
@@ -105,7 +124,7 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn));
 			oneOf(db).getContactsByAuthorId(txn, remote.getId());
-			will(returnValue(Collections.emptyList()));
+			will(returnValue(emptyList()));
 			oneOf(db).endTransaction(txn);
 		}});
 
@@ -131,7 +150,8 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 	public void testActiveContacts() throws Exception {
 		Collection<Contact> activeContacts = Collections.singletonList(contact);
 		Collection<Contact> contacts = new ArrayList<>(activeContacts);
-		contacts.add(new Contact(new ContactId(3), remote, local, true, false));
+		contacts.add(new Contact(new ContactId(3), remote, local, alias, true,
+				false));
 		Transaction txn = new Transaction(null, true);
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(true);
@@ -171,6 +191,23 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 		contactManager.setContactActive(txn, contactId, active);
 	}
 
+	@Test
+	public void testSetContactAlias() throws Exception {
+		Transaction txn = new Transaction(null, false);
+		context.checking(new DbExpectations() {{
+			oneOf(db).transaction(with(equal(false)), withDbRunnable(txn));
+			oneOf(db).setContactAlias(txn, contactId, alias);
+		}});
+
+		contactManager.setContactAlias(contactId, alias);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testSetContactAliasTooLong() throws Exception {
+		contactManager.setContactAlias(contactId,
+				getRandomString(MAX_AUTHOR_NAME_LENGTH + 1));
+	}
+
 	@Test
 	public void testContactExists() throws Exception {
 		Transaction txn = new Transaction(null, true);
@@ -186,4 +223,79 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 		assertTrue(contactManager.contactExists(remote.getId(), local));
 	}
 
+	@Test
+	public void testGetAuthorStatus() throws Exception {
+		Transaction txn = new Transaction(null, true);
+		Collection<Contact> contacts = singletonList(
+				new Contact(new ContactId(1), remote, localAuthor.getId(),
+						alias, false, true));
+
+		context.checking(new DbExpectations() {{
+			oneOf(db).transactionWithResult(with(equal(true)),
+					withDbCallable(txn));
+			oneOf(identityManager).getLocalAuthor(txn);
+			will(returnValue(localAuthor));
+			oneOf(db).getContactsByAuthorId(txn, remote.getId());
+			will(returnValue(contacts));
+		}});
+		AuthorInfo authorInfo =
+				contactManager.getAuthorInfo(txn, remote.getId());
+		assertEquals(UNVERIFIED, authorInfo.getStatus());
+		assertEquals(alias, contact.getAlias());
+	}
+
+	@Test
+	public void testGetAuthorStatusTransaction() throws DbException {
+		Transaction txn = new Transaction(null, true);
+
+		// check unknown author
+		context.checking(new Expectations() {{
+			oneOf(identityManager).getLocalAuthor(txn);
+			will(returnValue(localAuthor));
+			oneOf(db).getContactsByAuthorId(txn, remote.getId());
+			will(returnValue(emptyList()));
+		}});
+		AuthorInfo authorInfo =
+				contactManager.getAuthorInfo(txn, remote.getId());
+		assertEquals(UNKNOWN, authorInfo.getStatus());
+		assertNull(authorInfo.getAlias());
+
+		// check unverified contact
+		Collection<Contact> contacts = singletonList(
+				new Contact(new ContactId(1), remote, localAuthor.getId(),
+						alias, false, true));
+		checkAuthorStatusContext(txn, remote.getId(), contacts);
+		authorInfo = contactManager.getAuthorInfo(txn, remote.getId());
+		assertEquals(UNVERIFIED, authorInfo.getStatus());
+		assertEquals(alias, contact.getAlias());
+
+		// check verified contact
+		contacts = singletonList(new Contact(new ContactId(1), remote,
+				localAuthor.getId(), alias, true, true));
+		checkAuthorStatusContext(txn, remote.getId(), contacts);
+		authorInfo = contactManager.getAuthorInfo(txn, remote.getId());
+		assertEquals(VERIFIED, authorInfo.getStatus());
+		assertEquals(alias, contact.getAlias());
+
+		// check ourselves
+		context.checking(new Expectations() {{
+			oneOf(identityManager).getLocalAuthor(txn);
+			will(returnValue(localAuthor));
+			never(db).getContactsByAuthorId(txn, remote.getId());
+		}});
+		authorInfo = contactManager.getAuthorInfo(txn, localAuthor.getId());
+		assertEquals(OURSELVES, authorInfo.getStatus());
+		assertNull(authorInfo.getAlias());
+	}
+
+	private void checkAuthorStatusContext(Transaction txn, AuthorId authorId,
+			Collection<Contact> contacts) throws DbException {
+		context.checking(new Expectations() {{
+			oneOf(identityManager).getLocalAuthor(txn);
+			will(returnValue(localAuthor));
+			oneOf(db).getContactsByAuthorId(txn, authorId);
+			will(returnValue(contacts));
+		}});
+	}
+
 }

bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseComponentImplTest.java

@@ -77,6 +77,7 @@ import static org.briarproject.bramble.test.TestUtils.getMessage;
 import static org.briarproject.bramble.test.TestUtils.getRandomId;
 import static org.briarproject.bramble.test.TestUtils.getSecretKey;
 import static org.briarproject.bramble.test.TestUtils.getTransportId;
+import static org.briarproject.bramble.util.StringUtils.getRandomString;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -99,6 +100,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 	private final Group group;
 	private final Author author;
 	private final LocalAuthor localAuthor;
+	private final String alias;
 	private final Message message, message1;
 	private final MessageId messageId, messageId1;
 	private final Metadata metadata;
@@ -115,6 +117,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		groupId = group.getId();
 		author = getAuthor();
 		localAuthor = getLocalAuthor();
+		alias = getRandomString(5);
 		message = getMessage(groupId);
 		message1 = getMessage(groupId);
 		messageId = message.getId();
@@ -124,7 +127,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		transportId = getTransportId();
 		maxLatency = Integer.MAX_VALUE;
 		contactId = new ContactId(234);
-		contact = new Contact(contactId, author, localAuthor.getId(),
+		contact = new Contact(contactId, author, localAuthor.getId(), alias,
 				true, true);
 		keySetId = new KeySetId(345);
 	}
@@ -288,11 +291,11 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 			throws Exception {
 		context.checking(new Expectations() {{
 			// Check whether the contact is in the DB (which it's not)
-			exactly(16).of(database).startTransaction();
+			exactly(17).of(database).startTransaction();
 			will(returnValue(txn));
-			exactly(16).of(database).containsContact(txn, contactId);
+			exactly(17).of(database).containsContact(txn, contactId);
 			will(returnValue(false));
-			exactly(16).of(database).abortTransaction(txn);
+			exactly(17).of(database).abortTransaction(txn);
 		}});
 		DatabaseComponent db = createDatabaseComponent(database, eventBus,
 				shutdown);
@@ -450,6 +453,16 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 			db.endTransaction(transaction);
 		}
 
+		transaction = db.startTransaction(false);
+		try {
+			db.setContactAlias(transaction, contactId, alias);
+			fail();
+		} catch (NoSuchContactException expected) {
+			// Expected
+		} finally {
+			db.endTransaction(transaction);
+		}
+
 		transaction = db.startTransaction(false);
 		try {
 			db.setGroupVisibility(transaction, contactId, groupId, SHARED);

bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabaseTest.java

@@ -53,6 +53,7 @@ import static java.util.Collections.singletonList;
 import static java.util.Collections.singletonMap;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.briarproject.bramble.api.db.Metadata.REMOVE;
+import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
 import static org.briarproject.bramble.api.sync.Group.Visibility.INVISIBLE;
 import static org.briarproject.bramble.api.sync.Group.Visibility.SHARED;
 import static org.briarproject.bramble.api.sync.Group.Visibility.VISIBLE;
@@ -74,6 +75,7 @@ import static org.briarproject.bramble.test.TestUtils.getRandomId;
 import static org.briarproject.bramble.test.TestUtils.getSecretKey;
 import static org.briarproject.bramble.test.TestUtils.getTestDirectory;
 import static org.briarproject.bramble.test.TestUtils.getTransportId;
+import static org.briarproject.bramble.util.StringUtils.getRandomString;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -1713,6 +1715,39 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 		db.close();
 	}
 
+	@Test
+	public void testSetContactAlias() throws Exception {
+		Database<Connection> db = open(false);
+		Connection txn = db.startTransaction();
+
+		// Add a contact
+		db.addLocalAuthor(txn, localAuthor);
+		assertEquals(contactId, db.addContact(txn, author, localAuthor.getId(),
+				true, true));
+
+		// The contact should have no alias
+		Contact contact = db.getContact(txn, contactId);
+		assertNull(contact.getAlias());
+
+		// Set a contact alias
+		String alias = getRandomString(MAX_AUTHOR_NAME_LENGTH);
+		db.setContactAlias(txn, contactId, alias);
+
+		// The contact should have an alias
+		contact = db.getContact(txn, contactId);
+		assertEquals(alias, contact.getAlias());
+
+		// Set the contact alias null
+		db.setContactAlias(txn, contactId, null);
+
+		// The contact should have no alias
+		contact = db.getContact(txn, contactId);
+		assertNull(contact.getAlias());
+
+		db.commitTransaction(txn);
+		db.close();
+	}
+
 	@Test
 	public void testSetMessageState() throws Exception {
 		Database<Connection> db = open(false);

bramble-core/src/test/java/org/briarproject/bramble/identity/IdentityManagerImplTest.java

@@ -1,7 +1,5 @@
 package org.briarproject.bramble.identity;
 
-import org.briarproject.bramble.api.contact.Contact;
-import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.crypto.KeyPair;
 import org.briarproject.bramble.api.crypto.PrivateKey;
@@ -9,9 +7,7 @@ import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.db.DatabaseComponent;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorFactory;
-import org.briarproject.bramble.api.identity.AuthorId;
 import org.briarproject.bramble.api.identity.IdentityManager;
 import org.briarproject.bramble.api.identity.LocalAuthor;
 import org.briarproject.bramble.test.BrambleMockTestCase;
@@ -19,15 +15,9 @@ import org.jmock.Expectations;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 
-import static org.briarproject.bramble.api.identity.Author.Status.OURSELVES;
-import static org.briarproject.bramble.api.identity.Author.Status.UNKNOWN;
-import static org.briarproject.bramble.api.identity.Author.Status.UNVERIFIED;
-import static org.briarproject.bramble.api.identity.Author.Status.VERIFIED;
-import static org.briarproject.bramble.test.TestUtils.getAuthor;
 import static org.briarproject.bramble.test.TestUtils.getLocalAuthor;
 import static org.junit.Assert.assertEquals;
 
@@ -107,60 +97,4 @@ public class IdentityManagerImplTest extends BrambleMockTestCase {
 		assertEquals(localAuthor, identityManager.getLocalAuthor());
 	}
 
-	@Test
-	public void testGetAuthorStatus() throws DbException {
-		Author author = getAuthor();
-		AuthorId authorId = author.getId();
-		Collection<Contact> contacts = new ArrayList<>();
-
-		context.checking(new Expectations() {{
-			oneOf(db).startTransaction(true);
-			will(returnValue(txn));
-			oneOf(db).getLocalAuthors(txn);
-			will(returnValue(localAuthors));
-			oneOf(db).getContactsByAuthorId(txn, authorId);
-			will(returnValue(contacts));
-			oneOf(db).endTransaction(txn);
-		}});
-		assertEquals(UNKNOWN, identityManager.getAuthorStatus(authorId));
-
-		// add one unverified contact
-		Contact contact = new Contact(new ContactId(1), author,
-				localAuthor.getId(), false, true);
-		contacts.add(contact);
-
-		checkAuthorStatusContext(authorId, contacts);
-		assertEquals(UNVERIFIED, identityManager.getAuthorStatus(authorId));
-
-		// add one verified contact
-		Contact contact2 = new Contact(new ContactId(1), author,
-				localAuthor.getId(), true, true);
-		contacts.add(contact2);
-
-		checkAuthorStatusContext(authorId, contacts);
-		assertEquals(VERIFIED, identityManager.getAuthorStatus(authorId));
-
-		context.checking(new Expectations() {{
-			oneOf(db).startTransaction(true);
-			will(returnValue(txn));
-			never(db).getLocalAuthors(txn);
-			never(db).getContactsByAuthorId(txn, authorId);
-			oneOf(db).endTransaction(txn);
-		}});
-		assertEquals(OURSELVES,
-				identityManager.getAuthorStatus(localAuthor.getId()));
-	}
-
-	private void checkAuthorStatusContext(AuthorId authorId,
-			Collection<Contact> contacts) throws DbException {
-		context.checking(new Expectations() {{
-			oneOf(db).startTransaction(true);
-			will(returnValue(txn));
-			never(db).getLocalAuthors(txn);
-			oneOf(db).getContactsByAuthorId(txn, authorId);
-			will(returnValue(contacts));
-			oneOf(db).endTransaction(txn);
-		}});
-	}
-
 }

bramble-core/src/test/java/org/briarproject/bramble/properties/TransportPropertyManagerImplTest.java

@@ -39,6 +39,7 @@ import static org.briarproject.bramble.test.TestUtils.getGroup;
 import static org.briarproject.bramble.test.TestUtils.getLocalAuthor;
 import static org.briarproject.bramble.test.TestUtils.getMessage;
 import static org.briarproject.bramble.test.TestUtils.getRandomId;
+import static org.briarproject.bramble.util.StringUtils.getRandomString;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
@@ -612,7 +613,7 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 	private Contact getContact(boolean active) {
 		ContactId c = new ContactId(nextContactId++);
 		return new Contact(c, getAuthor(), localAuthor.getId(),
-				true, active);
+				getRandomString(5), true, active);
 	}
 
 	private void expectGetLocalProperties(Transaction txn) throws Exception {

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

@@ -0,0 +1,24 @@
+package org.briarproject.bramble.test;
+
+import org.briarproject.bramble.api.db.DbCallable;
+import org.briarproject.bramble.api.db.DbRunnable;
+import org.briarproject.bramble.api.db.Transaction;
+import org.jmock.Expectations;
+
+public class DbExpectations extends Expectations {
+
+	protected <E extends Exception> DbRunnable<E> withDbRunnable(
+			Transaction txn) {
+		addParameterMatcher(any(DbRunnable.class));
+		currentBuilder().setAction(new RunTransactionAction(txn));
+		return null;
+	}
+
+	protected <R, E extends Exception> DbCallable<R, E> withDbCallable(
+			Transaction txn) {
+		addParameterMatcher(any(DbCallable.class));
+		currentBuilder().setAction(new RunTransactionWithResultAction(txn));
+		return null;
+	}
+
+}

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

@@ -0,0 +1,30 @@
+package org.briarproject.bramble.test;
+
+import org.briarproject.bramble.api.db.DbRunnable;
+import org.briarproject.bramble.api.db.Transaction;
+import org.hamcrest.Description;
+import org.jmock.api.Action;
+import org.jmock.api.Invocation;
+
+public class RunTransactionAction implements Action {
+
+	private final Transaction txn;
+
+	@SuppressWarnings("WeakerAccess")
+	public RunTransactionAction(Transaction txn) {
+		this.txn = txn;
+	}
+
+	@Override
+	public Object invoke(Invocation invocation) throws Throwable {
+		DbRunnable task = (DbRunnable) invocation.getParameter(1);
+		task.run(txn);
+		return null;
+	}
+
+	@Override
+	public void describeTo(Description description) {
+		description.appendText("runs a task inside a database transaction");
+	}
+
+}

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

@@ -0,0 +1,27 @@
+package org.briarproject.bramble.test;
+
+import org.briarproject.bramble.api.db.DbCallable;
+import org.briarproject.bramble.api.db.Transaction;
+import org.hamcrest.Description;
+import org.jmock.api.Action;
+import org.jmock.api.Invocation;
+
+public class RunTransactionWithResultAction implements Action {
+
+	private final Transaction txn;
+
+	public RunTransactionWithResultAction(Transaction txn) {
+		this.txn = txn;
+	}
+
+	@Override
+	public Object invoke(Invocation invocation) throws Throwable {
+		DbCallable task = (DbCallable) invocation.getParameter(1);
+		return task.call(txn);
+	}
+
+	@Override
+	public void describeTo(Description description) {
+		description.appendText("runs a task inside a database transaction");
+	}
+}

bramble-core/src/test/java/org/briarproject/bramble/transport/KeyManagerImplTest.java

@@ -33,6 +33,7 @@ import static org.briarproject.bramble.test.TestUtils.getRandomBytes;
 import static org.briarproject.bramble.test.TestUtils.getRandomId;
 import static org.briarproject.bramble.test.TestUtils.getSecretKey;
 import static org.briarproject.bramble.test.TestUtils.getTransportId;
+import static org.briarproject.bramble.util.StringUtils.getRandomString;
 import static org.junit.Assert.assertEquals;
 
 public class KeyManagerImplTest extends BrambleMockTestCase {
@@ -66,10 +67,10 @@ public class KeyManagerImplTest extends BrambleMockTestCase {
 		Author remoteAuthor = getAuthor();
 		AuthorId localAuthorId = new AuthorId(getRandomId());
 		Collection<Contact> contacts = new ArrayList<>();
-		contacts.add(new Contact(contactId, remoteAuthor, localAuthorId, true,
-				true));
+		contacts.add(new Contact(contactId, remoteAuthor, localAuthorId,
+				getRandomString(5), true, true));
 		contacts.add(new Contact(inactiveContactId, remoteAuthor, localAuthorId,
-				true, false));
+				getRandomString(5), true, false));
 		SimplexPluginFactory pluginFactory =
 				context.mock(SimplexPluginFactory.class);
 		Collection<SimplexPluginFactory> factories =

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

@@ -38,6 +38,7 @@ import static org.briarproject.bramble.test.TestUtils.getGroup;
 import static org.briarproject.bramble.test.TestUtils.getLocalAuthor;
 import static org.briarproject.bramble.test.TestUtils.getMessage;
 import static org.briarproject.bramble.test.TestUtils.getRandomId;
+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;
@@ -56,7 +57,8 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase {
 	private final Group localGroup = getGroup(CLIENT_ID, MAJOR_VERSION);
 	private final Group contactGroup = getGroup(CLIENT_ID, MAJOR_VERSION);
 	private final Contact contact = new Contact(new ContactId(123),
-			getAuthor(), getLocalAuthor().getId(), true, true);
+			getAuthor(), getLocalAuthor().getId(), getRandomString(5), true,
+			true);
 	private final ClientId clientId = getClientId();
 	private final long now = System.currentTimeMillis();
 	private final Transaction txn = new Transaction(null, false);

bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothPlugin.java

@@ -108,6 +108,12 @@ class JavaBluetoothPlugin extends BluetoothPlugin<StreamConnectionNotifier> {
 		return wrapSocket((StreamConnection) Connector.open(url));
 	}
 
+	@Override
+	@Nullable
+	DuplexTransportConnection discoverAndConnect(String uuid) {
+		return null; // TODO
+	}
+
 	private String makeUrl(String address, String uuid) {
 		return "btspp://" + address + ":" + uuid + ";name=RFCOMM";
 	}

briar-android/artwork/ic_link_down.svg

@@ -1,59 +0,0 @@
-<?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

@@ -1,58 +0,0 @@
-<?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/build.gradle

@@ -2,70 +2,6 @@ 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 {
@@ -99,7 +35,7 @@ android {
 
 	buildTypes {
 		debug {
-			applicationIdSuffix ".debug.qr" // prototype
+			applicationIdSuffix ".debug"
 			shrinkResources false
 			minifyEnabled true
 			crunchPngs false
@@ -169,6 +105,7 @@ dependencies {
 	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 "android.arch.lifecycle:extensions:1.1.1"
 
 	implementation('ch.acra:acra:4.11') {
 		exclude module: 'support-v4'
@@ -181,9 +118,6 @@ dependencies {
 	implementation 'uk.co.samuelwall:material-tap-target-prompt:2.12.4'
 	implementation 'com.vanniktech:emoji-google:0.5.1'
 
-	// prototype
-	implementation "com.github.kobakei:MaterialFabSpeedDial:1.2.0"
-
 	annotationProcessor 'com.google.dagger:dagger-compiler:2.0.2'
 
 	compileOnly 'javax.annotation:jsr250-api:1.0'

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 (Full)</string>
-	<string name="app_package" translatable="false">org.briarproject.briar.android.debug.qr</string>
+	<string name="app_name" translatable="false">Briar Debug</string>
+	<string name="app_package" translatable="false">org.briarproject.briar.android.debug</string>
 </resources>

briar-android/src/main/AndroidManifest.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
 	package="org.briarproject.briar"
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools">
+	xmlns:android="http://schemas.android.com/apk/res/android">
 
 	<uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
 	<uses-feature android:name="android.hardware.camera" android:required="false"/>
 	<uses-feature android:name="android.hardware.touchscreen" android:required="false" />
 
+	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
 	<uses-permission android:name="android.permission.BLUETOOTH" />
@@ -28,8 +28,7 @@
 		android:label="@string/app_name"
 		android:logo="@mipmap/ic_launcher_round"
 		android:supportsRtl="true"
-		android:theme="@style/BriarTheme"
-		tools:ignore="GoogleAppIndexingWarning">
+		android:theme="@style/BriarTheme">
 
 		<receiver
 			android:name="org.briarproject.briar.android.login.SignInReminderReceiver"
@@ -413,29 +412,5 @@
 			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/AndroidComponent.java

@@ -26,6 +26,7 @@ import org.briarproject.bramble.api.system.LocationUtils;
 import org.briarproject.bramble.plugin.tor.CircumventionProvider;
 import org.briarproject.briar.BriarCoreEagerSingletons;
 import org.briarproject.briar.BriarCoreModule;
+import org.briarproject.briar.android.contact.ConversationViewModel;
 import org.briarproject.briar.android.login.SignInReminderReceiver;
 import org.briarproject.briar.android.reporting.BriarReportSender;
 import org.briarproject.briar.android.view.TextInputView;
@@ -164,6 +165,8 @@ public interface AndroidComponent
 
 	void inject(TextInputView textInputView);
 
+	void inject(ConversationViewModel conversationViewModel);
+
 	// Eager singleton load
 	void inject(AppModule.EagerSingletons init);
 }

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

@@ -107,7 +107,7 @@ public class AppModule {
 		Context appContext = app.getApplicationContext();
 		DuplexPluginFactory bluetooth =
 				new AndroidBluetoothPluginFactory(ioExecutor, androidExecutor,
-						appContext, random, eventBus, backoffFactory);
+						appContext, random, eventBus, clock, backoffFactory);
 		DuplexPluginFactory tor = new AndroidTorPluginFactory(ioExecutor,
 				scheduler, appContext, networkManager, locationUtils, eventBus,
 				torSocketFactory, backoffFactory, resourceProvider,

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

@@ -15,14 +15,9 @@ 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.ContactQrCodeInputFragment;
-import org.briarproject.briar.android.contact.ContactQrCodeOutputFragment;
 import org.briarproject.briar.android.contact.ConversationActivity;
-import org.briarproject.briar.android.contact.PendingRequestsActivity;
 import org.briarproject.briar.android.forum.CreateForumActivity;
 import org.briarproject.briar.android.forum.ForumActivity;
 import org.briarproject.briar.android.forum.ForumListFragment;
@@ -172,10 +167,6 @@ public interface ActivityComponent {
 
 	void inject(UnlockActivity activity);
 
-	void inject(ContactLinkExchangeActivity activity);
-
-	void inject(PendingRequestsActivity activity);
-
 	// Fragments
 	void inject(AuthorNameFragment fragment);
 
@@ -220,11 +211,4 @@ public interface ActivityComponent {
 	void inject(ScreenFilterDialogFragment fragment);
 
 	void inject(ContactExchangeErrorFragment fragment);
-
-	void inject(ContactLinkExchangeFragment fragment);
-
-	void inject(ContactQrCodeOutputFragment fragment);
-
-	void inject(ContactQrCodeInputFragment fragment);
-
 }

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

@@ -34,6 +34,7 @@ import org.briarproject.briar.api.android.ScreenFilterMonitor.AppDetails;
 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;
@@ -42,6 +43,8 @@ import static android.arch.lifecycle.Lifecycle.State.STARTED;
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
 import static android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT;
+import static java.util.logging.Level.INFO;
+import static java.util.logging.Logger.getLogger;
 import static org.briarproject.briar.android.TestingConstants.PREVENT_SCREENSHOTS;
 
 /**
@@ -51,6 +54,8 @@ import static org.briarproject.briar.android.TestingConstants.PREVENT_SCREENSHOT
 public abstract class BaseActivity extends AppCompatActivity
 		implements DestroyableContext, OnTapFilteredListener {
 
+	private final static Logger LOG = getLogger(BaseActivity.class.getName());
+
 	@Inject
 	protected ScreenFilterMonitor screenFilterMonitor;
 
@@ -119,6 +124,8 @@ public abstract class BaseActivity extends AppCompatActivity
 	@Override
 	protected void onStart() {
 		super.onStart();
+		if (LOG.isLoggable(INFO))
+			LOG.info("Starting " + this.getClass().getSimpleName());
 		for (ActivityLifecycleController alc : lifecycleControllers) {
 			alc.onActivityStart();
 		}
@@ -137,6 +144,8 @@ public abstract class BaseActivity extends AppCompatActivity
 	@Override
 	protected void onStop() {
 		super.onStop();
+		if (LOG.isLoggable(INFO))
+			LOG.info("Stopping " + this.getClass().getSimpleName());
 		for (ActivityLifecycleController alc : lifecycleControllers) {
 			alc.onActivityStop();
 		}

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

@@ -9,9 +9,9 @@ public interface RequestCodes {
 	int REQUEST_WRITE_BLOG_POST = 5;
 	int REQUEST_SHARE_BLOG = 6;
 	int REQUEST_RINGTONE = 7;
-	int REQUEST_PERMISSION_CAMERA = 8;
+	int REQUEST_PERMISSION_CAMERA_LOCATION = 8;
 	int REQUEST_DOZE_WHITELISTING = 9;
-	int REQUEST_ENABLE_BLUETOOTH = 10;
+	int REQUEST_BLUETOOTH_DISCOVERABLE = 10;
 	int REQUEST_UNLOCK = 11;
 	int REQUEST_KEYGUARD_UNLOCK = 12;
 

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

@@ -3,7 +3,7 @@ package org.briarproject.briar.android.blog;
 import android.support.annotation.NonNull;
 
 import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.bramble.api.identity.Author.Status;
+import org.briarproject.bramble.api.identity.AuthorInfo;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.briar.api.blog.BlogPostHeader;
@@ -15,6 +15,7 @@ import javax.annotation.concurrent.NotThreadSafe;
 public class BlogPostItem implements Comparable<BlogPostItem> {
 
 	private final BlogPostHeader header;
+	@Nullable
 	protected String text;
 	private boolean read;
 
@@ -40,10 +41,11 @@ public class BlogPostItem implements Comparable<BlogPostItem> {
 		return header.getAuthor();
 	}
 
-	Status getAuthorStatus() {
-		return header.getAuthorStatus();
+	AuthorInfo getAuthorInfo() {
+		return header.getAuthorInfo();
 	}
 
+	@Nullable
 	public String getText() {
 		return text;
 	}

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

@@ -14,7 +14,6 @@ import android.view.ViewGroup;
 import android.widget.ImageButton;
 import android.widget.TextView;
 
-import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.view.AuthorView;
@@ -98,9 +97,7 @@ class BlogPostViewHolder extends RecyclerView.ViewHolder {
 
 		// author and date
 		BlogPostHeader post = item.getPostHeader();
-		Author a = post.getAuthor();
-		author.setAuthor(a);
-		author.setAuthorStatus(post.getAuthorStatus());
+		author.setAuthor(post.getAuthor(), post.getAuthorInfo());
 		author.setDate(post.getTimestamp());
 		author.setPersona(
 				item.isRssFeed() ? AuthorView.RSS_FEED : AuthorView.NORMAL);
@@ -143,8 +140,7 @@ class BlogPostViewHolder extends RecyclerView.ViewHolder {
 
 	private void onBindComment(BlogCommentItem item) {
 		// reblogger
-		reblogger.setAuthor(item.getAuthor());
-		reblogger.setAuthorStatus(item.getAuthorStatus());
+		reblogger.setAuthor(item.getAuthor(), item.getAuthorInfo());
 		reblogger.setDate(item.getTimestamp());
 		if (!fullText) {
 			reblogger.setAuthorClickable(v -> listener.onAuthorClick(item));
@@ -165,8 +161,7 @@ class BlogPostViewHolder extends RecyclerView.ViewHolder {
 			AuthorView author = v.findViewById(R.id.authorView);
 			TextView text = v.findViewById(R.id.textView);
 
-			author.setAuthor(c.getAuthor());
-			author.setAuthorStatus(c.getAuthorStatus());
+			author.setAuthor(c.getAuthor(), c.getAuthorInfo());
 			author.setDate(c.getTimestamp());
 			// TODO make author clickable #624
 

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

@@ -0,0 +1,75 @@
+package org.briarproject.briar.android.contact;
+
+import android.arch.lifecycle.ViewModelProviders;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v7.app.AppCompatDialogFragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+
+import org.briarproject.bramble.api.contact.Contact;
+import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.briar.R;
+
+public class AliasDialogFragment extends AppCompatDialogFragment {
+
+	final static String TAG = AliasDialogFragment.class.getName();
+
+	private ConversationViewModel viewModel;
+	private ContactId contactId;
+	private EditText aliasEditText;
+
+	public static AliasDialogFragment newInstance(ContactId id) {
+		AliasDialogFragment f = new AliasDialogFragment();
+
+		Bundle args = new Bundle();
+		args.putInt("contactId", id.getInt());
+		f.setArguments(args);
+
+		return f;
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		if (getArguments() == null) throw new IllegalArgumentException();
+		int contactIdInt = getArguments().getInt("contactId", -1);
+		if (contactIdInt == -1) throw new IllegalArgumentException();
+		contactId = new ContactId(contactIdInt);
+
+		setStyle(STYLE_NO_TITLE, R.style.BriarDialogTheme);
+
+		viewModel =
+				ViewModelProviders.of(getActivity()).get(ConversationViewModel.class);
+	}
+
+	@Override
+	public View onCreateView(@NonNull LayoutInflater inflater,
+			ViewGroup container, Bundle savedInstanceState) {
+
+		View v = inflater.inflate(R.layout.fragment_alias_dialog, container,
+				false);
+
+		aliasEditText = v.findViewById(R.id.aliasEditText);
+		Contact contact = viewModel.getContact().getValue();
+		String alias = contact == null ? null : contact.getAlias();
+		aliasEditText.setText(alias);
+		if (alias != null) aliasEditText.setSelection(alias.length());
+
+		Button setButton = v.findViewById(R.id.setButton);
+		setButton.setOnClickListener(v1 -> {
+			viewModel.setContactAlias(contactId,
+					aliasEditText.getText().toString());
+			getDialog().dismiss();
+		});
+
+		Button cancelButton = v.findViewById(R.id.cancelButton);
+		cancelButton.setOnClickListener(v1 -> getDialog().cancel());
+
+		return v;
+	}
+}

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

@@ -1,6 +1,7 @@
 package org.briarproject.briar.android.contact;
 
 import android.content.Context;
+import android.support.annotation.NonNull;
 import android.view.View;
 
 import org.briarproject.bramble.api.contact.ContactId;
@@ -9,6 +10,7 @@ import org.briarproject.briar.android.util.BriarAdapter;
 import javax.annotation.Nullable;
 
 import static android.support.v7.util.SortedList.INVALID_POSITION;
+import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName;
 
 public abstract class BaseContactListAdapter<I extends ContactItem, VH extends ContactItemViewHolder<I>>
 		extends BriarAdapter<I, VH> {
@@ -23,15 +25,15 @@ public abstract class BaseContactListAdapter<I extends ContactItem, VH extends C
 	}
 
 	@Override
-	public void onBindViewHolder(VH ui, int position) {
+	public void onBindViewHolder(@NonNull VH ui, int position) {
 		I item = items.get(position);
 		ui.bind(item, listener);
 	}
 
 	@Override
 	public int compare(I c1, I c2) {
-		return c1.getContact().getAuthor().getName()
-				.compareTo(c2.getContact().getAuthor().getName());
+		return getContactDisplayName(c1.getContact())
+				.compareTo(getContactDisplayName(c2.getContact()));
 	}
 
 	@Override

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

@@ -16,6 +16,8 @@ import javax.annotation.Nullable;
 
 import im.delight.android.identicons.IdenticonDrawable;
 
+import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName;
+
 @UiThread
 @NotNullByDefault
 public class ContactItemViewHolder<I extends ContactItem>
@@ -41,8 +43,7 @@ public class ContactItemViewHolder<I extends ContactItem>
 		Author author = item.getContact().getAuthor();
 		avatar.setImageDrawable(
 				new IdenticonDrawable(author.getId().getBytes()));
-		String contactName = author.getName();
-		name.setText(contactName);
+		name.setText(getContactDisplayName(item.getContact()));
 
 		if (bulb != null) {
 			// online/offline

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

@@ -1,184 +0,0 @@
-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.db.DbException;
-import org.briarproject.bramble.api.lifecycle.LifecycleManager;
-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.MINUTES;
-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
-	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));
-				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) {
-		long timestamp = clock.currentTimeMillis();
-		try {
-			messagingManager.addNewPendingContact(name, timestamp);
-		} catch (DbException e) {
-			logException(LOG, WARNING, e);
-		}
-
-		AlarmManager alarmManager =
-				(AlarmManager) requireNonNull(getSystemService(ALARM_SERVICE));
-		double random = getPseudoRandom(link, OUR_LINK.replace("briar://", ""));
-		long m = MINUTES.toMillis(1);
-		long fromNow = (long) (-m * Math.log(random));
-		LOG.info("Delay " + fromNow + " ms based on seed " + random);
-		long triggerAt = elapsedRealtime() + fromNow;
-
-		Intent i = new Intent(this, ContactLinkExchangeActivity.class);
-		i.setAction("addContact");
-		i.setFlags(FLAG_ACTIVITY_NEW_TASK);
-		i.putExtra("name", name);
-		i.putExtra("timestamp", timestamp);
-		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) {
-		if (lifecycleManager.getLifecycleState() != RUNNING) {
-			LOG.info("Lifecycle not started, not adding contact " + name);
-			return;
-		}
-		LOG.info("Adding Contact " + name);
-		try {
-			messagingManager.removePendingContact(name, timestamp);
-		} catch (DbException e) {
-			logException(LOG, WARNING, e);
-		}
-	}
-}

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

@@ -1,225 +0,0 @@
-package org.briarproject.briar.android.contact;
-
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Intent;
-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.v7.app.AlertDialog;
-import android.text.Editable;
-import android.text.TextWatcher;
-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.content.Intent.ACTION_SEND;
-import static android.content.Intent.EXTRA_TEXT;
-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
-		implements TextWatcher {
-
-	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, contactNameInput;
-	private Button addButton;
-
-	@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_title);
-
-		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);
-
-		addButton = v.findViewById(R.id.addButton);
-		addButton.setOnClickListener(view -> onAddButtonClicked());
-
-		contactNameInput = v.findViewById(R.id.contactNameInput);
-		contactNameInput.addTextChangedListener(this);
-		if (SDK_INT < 23) {
-			Drawable drawable =
-					wrap(contactNameInput.getCompoundDrawables()[0]);
-			setTint(drawable, color);
-			contactNameInput.setCompoundDrawables(drawable, null, null, null);
-		}
-
-		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);
-		}
-		linkInput.addTextChangedListener(this);
-		if (getArguments() != null)
-			linkInput.setText(getArguments().getString("link"));
-
-		Button 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 -> {
-			Intent i = new Intent(ACTION_SEND);
-			i.putExtra(EXTRA_TEXT, OUR_LINK);
-			i.setType("text/plain");
-			startActivity(i);
-		});
-
-		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();
-	}
-
-	@Override
-	public void beforeTextChanged(CharSequence s, int start, int count,
-			int after) {
-	}
-
-	@Override
-	public void onTextChanged(CharSequence s, int start, int before,
-			int count) {
-		updateAddButtonState();
-	}
-
-	@Override
-	public void afterTextChanged(Editable s) {
-	}
-
-	private void updateAddButtonState() {
-		boolean validContactName = contactNameInput.getText() != null &&
-				contactNameInput.getText().length() > 0;
-		boolean briarLink = isBriarLink(linkInput.getText());
-		if (briarLink) {
-			linkInputLayout.setErrorEnabled(false);
-		} else {
-			linkInputLayout.setError("Invalid link");
-		}
-		addButton.setEnabled(validContactName && briarLink);
-	}
-
-	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 onAddButtonClicked() {
-		ContactLinkExchangeActivity activity = getCastActivity();
-		if (activity == null) return;
-
-		String linkText = getLink();
-		if (linkText == null) throw new AssertionError();
-		if (OUR_LINK.equals("briar://" + linkText)) {
-			new AlertDialog.Builder(activity, R.style.BriarDialogTheme_Neutral)
-					.setMessage(
-							"Add the link you get from your contact, not your own link.")
-					.setNeutralButton(R.string.ok,
-							(dialog, which) -> {
-								linkInput.setText(null);
-								dialog.cancel();
-							})
-					.show();
-			return;
-		}
-
-		activity.addFakeRequest(contactNameInput.getText().toString(),
-				linkText);
-
-		Intent intent = new Intent(activity, PendingRequestsActivity.class);
-		startActivity(intent);
-		finish();
-	}
-}

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

@@ -2,22 +2,20 @@ 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;
@@ -39,24 +37,17 @@ import org.briarproject.briar.android.view.BriarRecyclerView;
 import org.briarproject.briar.api.android.AndroidNotificationManager;
 import org.briarproject.briar.api.client.MessageTracker.GroupCount;
 import org.briarproject.briar.api.messaging.ConversationManager;
-import org.briarproject.briar.api.messaging.MessagingManager;
-import org.briarproject.briar.api.messaging.MessagingManager.PendingContact;
 import org.briarproject.briar.api.messaging.PrivateMessageHeader;
 import org.briarproject.briar.api.messaging.event.PrivateMessageReceivedEvent;
 
 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.logging.Level.WARNING;
@@ -67,8 +58,7 @@ import static org.briarproject.briar.android.contact.ConversationActivity.CONTAC
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
-public class ContactListFragment extends BaseFragment implements EventListener,
-		OnMenuItemClickListener {
+public class ContactListFragment extends BaseFragment implements EventListener {
 
 	public static final String TAG = ContactListFragment.class.getName();
 	private static final Logger LOG = Logger.getLogger(TAG);
@@ -80,13 +70,8 @@ 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
@@ -119,12 +104,7 @@ public class ContactListFragment extends BaseFragment implements EventListener,
 
 		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);
+		View contentView = inflater.inflate(R.layout.list, container, false);
 
 		OnContactClickListener<ContactListItem> onContactClickListener =
 				(view, item) -> {
@@ -163,32 +143,26 @@ 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 onMenuItemClick(FloatingActionButton fab, @Nullable TextView v,
-			int itemId) {
-		switch (itemId) {
-			case R.id.action_add_contact_nearby:
+	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:
 				Intent intent =
 						new Intent(getContext(), ContactExchangeActivity.class);
 				startActivity(intent);
-				return;
-			case R.id.action_add_contact_remotely:
-				startActivity(new Intent(getContext(),
-						ContactLinkExchangeActivity.class));
-				return;
+				return true;
 			default:
-				return;
+				return super.onOptionsItemSelected(item);
 		}
 	}
 
@@ -200,26 +174,6 @@ 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
@@ -294,11 +248,6 @@ public class ContactListFragment extends BaseFragment implements EventListener,
 			PrivateMessageHeader h = p.getMessageHeader();
 			updateItem(p.getContactId(), h);
 		}
-
-		// TODO remove
-		else if (e instanceof ContactAddedEvent) {
-			checkForPendingContacts();
-		}
 	}
 
 	private void updateItem(ContactId c, PrivateMessageHeader h) {

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

@@ -1,185 +0,0 @@
-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;
-
-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) {
-			// 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_toast,
-							LENGTH_LONG).show();
-					cancel();
-				}
-			}
-		}
-	}
-
-	private void requestPermission() {
-		requestPermissions(new String[] {CAMERA}, REQUEST_PERMISSION_CAMERA);
-	}
-
-	@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

@@ -1,54 +0,0 @@
-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/ConversationActivity.java

@@ -1,7 +1,8 @@
 package org.briarproject.briar.android.contact;
 
-import android.arch.lifecycle.MutableLiveData;
+import android.arch.lifecycle.LiveData;
 import android.arch.lifecycle.Observer;
+import android.arch.lifecycle.ViewModelProviders;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
@@ -23,7 +24,6 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import org.briarproject.bramble.api.FormatException;
-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.ContactRemovedEvent;
@@ -34,7 +34,6 @@ import org.briarproject.bramble.api.db.NoSuchContactException;
 import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.event.EventListener;
-import org.briarproject.bramble.api.identity.AuthorId;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.api.plugin.ConnectionRegistry;
@@ -131,8 +130,8 @@ public class ConversationActivity extends BriarActivity
 	Executor cryptoExecutor;
 
 	private final Map<MessageId, String> textCache = new ConcurrentHashMap<>();
-	private final MutableLiveData<String> contactName = new MutableLiveData<>();
 
+	private ConversationViewModel viewModel;
 	private ConversationVisitor visitor;
 	private ConversationAdapter adapter;
 	private Toolbar toolbar;
@@ -166,8 +165,6 @@ public class ConversationActivity extends BriarActivity
 
 	private volatile ContactId contactId;
 	@Nullable
-	private volatile AuthorId contactAuthorId;
-	@Nullable
 	private volatile GroupId messagingGroupId;
 
 	@SuppressWarnings("ConstantConditions")
@@ -176,6 +173,9 @@ public class ConversationActivity extends BriarActivity
 		setSceneTransitionAnimation();
 		super.onCreate(state);
 
+		viewModel =
+				ViewModelProviders.of(this).get(ConversationViewModel.class);
+
 		Intent i = getIntent();
 		int id = i.getIntExtra(CONTACT_ID, -1);
 		if (id == -1) throw new IllegalStateException();
@@ -185,16 +185,29 @@ public class ConversationActivity extends BriarActivity
 
 		// Custom Toolbar
 		toolbar = setUpCustomToolbar(true);
-		if (toolbar != null) {
-			toolbarAvatar = toolbar.findViewById(R.id.contactAvatar);
-			toolbarStatus = toolbar.findViewById(R.id.contactStatus);
-			toolbarTitle = toolbar.findViewById(R.id.contactName);
-		}
+		toolbarAvatar = toolbar.findViewById(R.id.contactAvatar);
+		toolbarStatus = toolbar.findViewById(R.id.contactStatus);
+		toolbarTitle = toolbar.findViewById(R.id.contactName);
+
+		viewModel.getContactAuthorId().observe(this, authorId -> {
+			toolbarAvatar.setImageDrawable(
+					new IdenticonDrawable(authorId.getBytes()));
+			// we only need this once
+			viewModel.getContactAuthorId().removeObservers(this);
+		});
+		viewModel.getContactDisplayName().observe(this, contactName -> {
+			toolbarTitle.setText(contactName);
+		});
+		viewModel.isContactDeleted().observe(this, deleted -> {
+			if (deleted != null && deleted) finish();
+		});
+		viewModel.loadContact(contactId);
 
 		setTransitionName(toolbarAvatar, getAvatarTransitionName(contactId));
 		setTransitionName(toolbarStatus, getBulbTransitionName(contactId));
 
-		visitor = new ConversationVisitor(this, this, contactName);
+		visitor = new ConversationVisitor(this, this,
+				viewModel.getContactDisplayName());
 		adapter = new ConversationAdapter(this, this);
 		list = findViewById(R.id.conversationView);
 		list.setLayoutManager(new LinearLayoutManager(this));
@@ -229,7 +242,19 @@ public class ConversationActivity extends BriarActivity
 		notificationManager.blockContactNotification(contactId);
 		notificationManager.clearContactNotification(contactId);
 		displayContactOnlineStatus();
-		loadContactDetailsAndMessages();
+		LiveData<String> contactName = viewModel.getContactDisplayName();
+		if (contactName.getValue() == null) {
+			// wait for contact name to be initialized
+			contactName.observe(this, new Observer<String>() {
+				@Override
+				public void onChanged(@Nullable String cName) {
+					if (cName != null) {
+						loadMessages();
+						contactName.removeObserver(this);
+					}
+				}
+			});
+		} else loadMessages();
 		list.startPeriodicUpdate();
 	}
 
@@ -266,6 +291,10 @@ public class ConversationActivity extends BriarActivity
 				intent.putExtra(CONTACT_ID, contactId.getInt());
 				startActivityForResult(intent, REQUEST_INTRODUCTION);
 				return true;
+			case R.id.action_set_alias:
+				AliasDialogFragment.newInstance(contactId).show(
+						getSupportFragmentManager(), AliasDialogFragment.TAG);
+				return true;
 			case R.id.action_social_remove_person:
 				askToRemoveContact();
 				return true;
@@ -274,36 +303,6 @@ public class ConversationActivity extends BriarActivity
 		}
 	}
 
-	private void loadContactDetailsAndMessages() {
-		runOnDbThread(() -> {
-			try {
-				long start = now();
-				if (contactAuthorId == null) {
-					Contact contact = contactManager.getContact(contactId);
-					contactName.postValue(contact.getAuthor().getName());
-					contactAuthorId = contact.getAuthor().getId();
-				}
-				logDuration(LOG, "Loading contact", start);
-				loadMessages();
-				displayContactDetails();
-			} catch (NoSuchContactException e) {
-				finishOnUiThread();
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
-	}
-
-	// contactAuthorId and contactName are expected to be set
-	private void displayContactDetails() {
-		runOnUiThreadUnlessDestroyed(() -> {
-			//noinspection ConstantConditions
-			toolbarAvatar.setImageDrawable(
-					new IdenticonDrawable(contactAuthorId.getBytes()));
-			toolbarTitle.setText(contactName.getValue());
-		});
-	}
-
 	private void displayContactOnlineStatus() {
 		runOnUiThreadUnlessDestroyed(() -> {
 			if (connectionRegistry.isConnected(contactId)) {
@@ -453,15 +452,17 @@ public class ConversationActivity extends BriarActivity
 	private void onNewPrivateMessage(PrivateMessageHeader h) {
 		runOnUiThreadUnlessDestroyed(() -> {
 			if (h instanceof PrivateRequest || h instanceof PrivateResponse) {
-				String cName = contactName.getValue();
+				String cName = viewModel.getContactDisplayName().getValue();
 				if (cName == null) {
 					// Wait for the contact name to be loaded
-					contactName.observe(this, new Observer<String>() {
+					viewModel.getContactDisplayName()
+							.observe(this, new Observer<String>() {
 						@Override
 						public void onChanged(@Nullable String cName) {
 							if (cName != null) {
 								addConversationItem(h.accept(visitor));
-								contactName.removeObserver(this);
+								viewModel.getContactDisplayName()
+										.removeObserver(this);
 							}
 						}
 					});

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

@@ -0,0 +1,100 @@
+package org.briarproject.briar.android.contact;
+
+import android.app.Application;
+import android.arch.lifecycle.AndroidViewModel;
+import android.arch.lifecycle.LiveData;
+import android.arch.lifecycle.MutableLiveData;
+import android.arch.lifecycle.Transformations;
+import android.support.annotation.NonNull;
+
+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.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.briar.android.AndroidComponent;
+import org.briarproject.briar.android.BriarApplication;
+import org.briarproject.briar.android.util.UiUtils;
+
+import java.util.concurrent.Executor;
+import java.util.logging.Logger;
+
+import javax.inject.Inject;
+
+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;
+
+public class ConversationViewModel extends AndroidViewModel {
+
+	private static Logger LOG =
+			Logger.getLogger(ConversationViewModel.class.getName());
+
+	@Inject
+	@DatabaseExecutor
+	Executor dbExecutor;
+	@Inject
+	ContactManager contactManager;
+
+	private final MutableLiveData<Contact> contact = new MutableLiveData<>();
+	private final LiveData<AuthorId> contactAuthorId =
+			Transformations.map(contact, c -> c.getAuthor().getId());
+	private final LiveData<String> contactName =
+			Transformations.map(contact, UiUtils::getContactDisplayName);
+	private final MutableLiveData<Boolean> contactDeleted =
+			new MutableLiveData<>();
+
+	public ConversationViewModel(@NonNull Application application) {
+		super(application);
+		AndroidComponent component =
+				((BriarApplication) application).getApplicationComponent();
+		component.inject(this);
+		contactDeleted.setValue(false);
+	}
+
+	void loadContact(ContactId contactId) {
+		dbExecutor.execute(() -> {
+			try {
+				long start = now();
+				contact.postValue(contactManager.getContact(contactId));
+				logDuration(LOG, "Loading contact", start);
+			} catch (NoSuchContactException e) {
+				contactDeleted.postValue(true);
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+			}
+		});
+	}
+
+	void setContactAlias(ContactId contactId, String alias) {
+		dbExecutor.execute(() -> {
+			try {
+				contactManager.setContactAlias(contactId,
+						alias.isEmpty() ? null : alias);
+				loadContact(contactId);
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+			}
+		});
+	}
+
+	LiveData<Contact> getContact() {
+		return contact;
+	}
+
+	LiveData<AuthorId> getContactAuthorId() {
+		return contactAuthorId;
+	}
+
+	LiveData<String> getContactDisplayName() {
+		return contactName;
+	}
+
+	LiveData<Boolean> isContactDeleted() {
+		return contactDeleted;
+	}
+
+}

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

@@ -24,6 +24,7 @@ import static org.briarproject.briar.android.contact.ConversationRequestItem.Req
 import static org.briarproject.briar.android.contact.ConversationRequestItem.RequestType.FORUM;
 import static org.briarproject.briar.android.contact.ConversationRequestItem.RequestType.GROUP;
 import static org.briarproject.briar.android.contact.ConversationRequestItem.RequestType.INTRODUCTION;
+import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName;
 
 @UiThread
 @NotNullByDefault
@@ -188,33 +189,36 @@ class ConversationVisitor implements PrivateMessageVisitor<ConversationItem> {
 
 	@Override
 	public ConversationItem visitIntroductionRequest(IntroductionRequest r) {
+		String name = getContactDisplayName(r.getNameable(), r.getAlias());
 		if (r.isLocal()) {
 			String text = ctx.getString(R.string.introduction_request_sent,
-					contactName.getValue(), r.getName());
+					contactName.getValue(), name);
 			return new ConversationNoticeOutItem(text, r);
 		} else {
 			String text = ctx.getString(R.string.introduction_request_received,
-					contactName.getValue(), r.getName());
+					contactName.getValue(), name);
 			return new ConversationRequestItem(text, INTRODUCTION, r);
 		}
 	}
 
 	@Override
 	public ConversationItem visitIntroductionResponse(IntroductionResponse r) {
+		String introducedAuthor =
+				getContactDisplayName(r.getIntroducedAuthor(),
+						r.getIntroducedAuthorInfo().getAlias());
 		if (r.isLocal()) {
 			String text;
 			if (r.wasAccepted()) {
-				String introducee = r.getIntroducedAuthor().getName();
 				text = ctx.getString(
 						R.string.introduction_response_accepted_sent,
-						introducee)
+						introducedAuthor)
 						+ "\n\n" + ctx.getString(
 						R.string.introduction_response_accepted_sent_info,
-						introducee);
+						introducedAuthor);
 			} else {
 				text = ctx.getString(
 						R.string.introduction_response_declined_sent,
-						r.getIntroducedAuthor().getName());
+						introducedAuthor);
 			}
 			return new ConversationNoticeOutItem(text, r);
 		} else {
@@ -223,17 +227,17 @@ class ConversationVisitor implements PrivateMessageVisitor<ConversationItem> {
 				text = ctx.getString(
 						R.string.introduction_response_accepted_received,
 						contactName.getValue(),
-						r.getIntroducedAuthor().getName());
+						introducedAuthor);
 			} else if (r.isIntroducer()) {
 				text = ctx.getString(
 						R.string.introduction_response_declined_received,
 						contactName.getValue(),
-						r.getIntroducedAuthor().getName());
+						introducedAuthor);
 			} else {
 				text = ctx.getString(
 						R.string.introduction_response_declined_received_by_introducee,
 						contactName.getValue(),
-						r.getIntroducedAuthor().getName());
+						introducedAuthor);
 			}
 			return new ConversationNoticeInItem(text, r);
 		}

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

@@ -1,122 +0,0 @@
-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;
-
-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);
-	}
-
-	@Override
-	public void onStart() {
-		super.onStart();
-		eventBus.addListener(this);
-		runOnDbThread(() -> {
-			try {
-				Collection<PendingContact> contacts =
-						messagingManager.getPendingContacts();
-				addPendingContacts(contacts);
-			} catch (DbException e) {
-				e.printStackTrace();
-			}
-		});
-	}
-
-	@Override
-	protected void onStop() {
-		super.onStop();
-		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

@@ -1,67 +0,0 @@
-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

@@ -1,36 +0,0 @@
-package org.briarproject.briar.android.contact;
-
-import android.support.v7.widget.RecyclerView.ViewHolder;
-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 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;
-
-	public PendingRequestsViewHolder(View v) {
-		super(v);
-		avatar = v.findViewById(R.id.avatar);
-		name = v.findViewById(R.id.name);
-		time = v.findViewById(R.id.time);
-	}
-
-	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()));
-	}
-
-}

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

@@ -1,7 +1,7 @@
 package org.briarproject.briar.android.forum;
 
 import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.bramble.api.identity.Author.Status;
+import org.briarproject.bramble.api.identity.AuthorInfo;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.briar.android.threaded.ThreadItem;
 import org.briarproject.briar.api.forum.ForumPostHeader;
@@ -14,11 +14,11 @@ class ForumItem extends ThreadItem {
 
 	ForumItem(ForumPostHeader h, String text) {
 		super(h.getId(), h.getParentId(), text, h.getTimestamp(), h.getAuthor(),
-				h.getAuthorStatus(), h.isRead());
+				h.getAuthorInfo(), h.isRead());
 	}
 
 	ForumItem(MessageId messageId, @Nullable MessageId parentId, String text,
-			long timestamp, Author author, Status status) {
+			long timestamp, Author author, AuthorInfo status) {
 		super(messageId, parentId, text, timestamp, author, status, true);
 	}
 

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

@@ -38,6 +38,7 @@ import static android.view.View.VISIBLE;
 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.util.UiUtils.getContactDisplayName;
 import static org.briarproject.briar.api.introduction.IntroductionConstants.MAX_INTRODUCTION_TEXT_LENGTH;
 
 public class IntroductionMessageFragment extends BaseFragment
@@ -148,8 +149,8 @@ public class IntroductionMessageFragment extends BaseFragment
 					c2.getAuthor().getId().getBytes()));
 
 			// set contact names
-			ui.contactName1.setText(c1.getAuthor().getName());
-			ui.contactName2.setText(c2.getAuthor().getName());
+			ui.contactName1.setText(getContactDisplayName(c1));
+			ui.contactName2.setText(getContactDisplayName(c2));
 
 			// hide progress bar
 			ui.progressBar.setVisibility(GONE);

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;
 
-public class CameraException extends IOException {
+class CameraException extends IOException {
 
 	CameraException(String message) {
 		super(message);

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

@@ -3,7 +3,6 @@ package org.briarproject.briar.android.keyagreement;
 import android.bluetooth.BluetoothAdapter;
 import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
@@ -11,19 +10,15 @@ import android.support.annotation.StringRes;
 import android.support.annotation.UiThread;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.FragmentManager;
-import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog.Builder;
 import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
-import android.widget.Toast;
 
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.api.plugin.event.BluetoothEnabledEvent;
 import org.briarproject.briar.R;
-import org.briarproject.briar.R.string;
-import org.briarproject.briar.R.style;
 import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.activity.BriarActivity;
 import org.briarproject.briar.android.fragment.BaseFragment;
@@ -37,16 +32,19 @@ import java.util.logging.Logger;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
+import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
 import static android.Manifest.permission.CAMERA;
-import static android.bluetooth.BluetoothAdapter.ACTION_REQUEST_ENABLE;
+import static android.bluetooth.BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE;
+import static android.bluetooth.BluetoothAdapter.ACTION_SCAN_MODE_CHANGED;
 import static android.bluetooth.BluetoothAdapter.ACTION_STATE_CHANGED;
+import static android.bluetooth.BluetoothAdapter.EXTRA_SCAN_MODE;
 import static android.bluetooth.BluetoothAdapter.EXTRA_STATE;
+import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE;
+import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE;
 import static android.bluetooth.BluetoothAdapter.STATE_ON;
 import static android.content.pm.PackageManager.PERMISSION_GRANTED;
-import static android.os.Build.VERSION.SDK_INT;
-import static android.widget.Toast.LENGTH_LONG;
-import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_ENABLE_BLUETOOTH;
-import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_PERMISSION_CAMERA;
+import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_BLUETOOTH_DISCOVERABLE;
+import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_PERMISSION_CAMERA_LOCATION;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
@@ -55,7 +53,11 @@ public abstract class KeyAgreementActivity extends BriarActivity implements
 		KeyAgreementEventListener {
 
 	private enum BluetoothState {
-		UNKNOWN, NO_ADAPTER, WAITING, REFUSED, ENABLED
+		UNKNOWN, NO_ADAPTER, WAITING, REFUSED, ENABLED, DISCOVERABLE
+	}
+
+	private enum Permission {
+		UNKNOWN, GRANTED, SHOW_RATIONALE, PERMANENTLY_DENIED
 	}
 
 	private static final Logger LOG =
@@ -64,8 +66,27 @@ public abstract class KeyAgreementActivity extends BriarActivity implements
 	@Inject
 	EventBus eventBus;
 
-	private boolean isResumed = false, enableWasRequested = false;
-	private boolean continueClicked, gotCameraPermission;
+	/**
+	 * Set to true in onPostResume() and false in onPause(). This prevents the
+	 * QR code fragment from being shown if onRequestPermissionsResult() is
+	 * called while the activity is paused, which could cause a crash due to
+	 * https://issuetracker.google.com/issues/37067655.
+	 */
+	private boolean isResumed = false;
+	/**
+	 * Set to true when the continue button is clicked, and false when the QR
+	 * code fragment is shown. This prevents the QR code fragment from being
+	 * shown automatically before the continue button has been clicked.
+	 */
+	private boolean continueClicked = false;
+	/**
+	 * Records whether the Bluetooth adapter was already enabled before we
+	 * asked for Bluetooth discoverability, so we know whether to broadcast a
+	 * {@link BluetoothEnabledEvent}.
+	 */
+	private boolean wasAdapterEnabled = false;
+	private Permission cameraPermission = Permission.UNKNOWN;
+	private Permission locationPermission = Permission.UNKNOWN;
 	private BluetoothState bluetoothState = BluetoothState.UNKNOWN;
 	private BroadcastReceiver bluetoothReceiver = null;
 
@@ -85,7 +106,9 @@ public abstract class KeyAgreementActivity extends BriarActivity implements
 		if (state == null) {
 			showInitialFragment(IntroFragment.newInstance());
 		}
-		IntentFilter filter = new IntentFilter(ACTION_STATE_CHANGED);
+		IntentFilter filter = new IntentFilter();
+		filter.addAction(ACTION_STATE_CHANGED);
+		filter.addAction(ACTION_SCAN_MODE_CHANGED);
 		bluetoothReceiver = new BluetoothStateReceiver();
 		registerReceiver(bluetoothReceiver, filter);
 	}
@@ -107,20 +130,40 @@ public abstract class KeyAgreementActivity extends BriarActivity implements
 		}
 	}
 
+	@Override
+	public void onStart() {
+		super.onStart();
+		// Permissions may have been granted manually while we were stopped
+		cameraPermission = Permission.UNKNOWN;
+		locationPermission = Permission.UNKNOWN;
+	}
+
 	@Override
 	protected void onPostResume() {
 		super.onPostResume();
 		isResumed = true;
 		// Workaround for
 		// https://code.google.com/p/android/issues/detail?id=190966
-		if (canShowQrCodeFragment()) showQrCodeFragment();
+		showQrCodeFragmentIfAllowed();
 	}
 
-	private boolean canShowQrCodeFragment() {
-		return isResumed && continueClicked
-				&& (SDK_INT < 23 || gotCameraPermission)
-				&& bluetoothState != BluetoothState.UNKNOWN
-				&& bluetoothState != BluetoothState.WAITING;
+	private void showQrCodeFragmentIfAllowed() {
+		if (isResumed && continueClicked && areEssentialPermissionsGranted()) {
+			if (bluetoothState == BluetoothState.UNKNOWN ||
+					bluetoothState == BluetoothState.ENABLED) {
+				requestBluetoothDiscoverable();
+			} else if (bluetoothState != BluetoothState.WAITING) {
+				showQrCodeFragment();
+			}
+		}
+	}
+
+	private boolean areEssentialPermissionsGranted() {
+		// If the camera permission has been granted, and the location
+		// permission has been granted or permanently denied, we can continue
+		return cameraPermission == Permission.GRANTED &&
+				(locationPermission == Permission.GRANTED ||
+						locationPermission == Permission.PERMANENTLY_DENIED);
 	}
 
 	@Override
@@ -132,50 +175,54 @@ public abstract class KeyAgreementActivity extends BriarActivity implements
 	@Override
 	public void showNextScreen() {
 		continueClicked = true;
-		if (checkPermissions()) {
-			if (shouldRequestEnableBluetooth()) requestEnableBluetooth();
-			else if (canShowQrCodeFragment()) showQrCodeFragment();
-		}
+		if (checkPermissions()) showQrCodeFragmentIfAllowed();
 	}
 
-	private boolean shouldRequestEnableBluetooth() {
-		return bluetoothState == BluetoothState.UNKNOWN
-				|| bluetoothState == BluetoothState.REFUSED;
-	}
-
-	private void requestEnableBluetooth() {
+	private void requestBluetoothDiscoverable() {
 		BluetoothAdapter bt = BluetoothAdapter.getDefaultAdapter();
 		if (bt == null) {
 			setBluetoothState(BluetoothState.NO_ADAPTER);
-		} else if (bt.isEnabled()) {
-			setBluetoothState(BluetoothState.ENABLED);
 		} else {
-			enableWasRequested = true;
 			setBluetoothState(BluetoothState.WAITING);
-			Intent i = new Intent(ACTION_REQUEST_ENABLE);
-			startActivityForResult(i, REQUEST_ENABLE_BLUETOOTH);
+			wasAdapterEnabled = bt.isEnabled();
+			Intent i = new Intent(ACTION_REQUEST_DISCOVERABLE);
+			startActivityForResult(i, REQUEST_BLUETOOTH_DISCOVERABLE);
 		}
 	}
 
 	private void setBluetoothState(BluetoothState bluetoothState) {
 		LOG.info("Setting Bluetooth state to " + bluetoothState);
 		this.bluetoothState = bluetoothState;
-		if (enableWasRequested && bluetoothState == BluetoothState.ENABLED) {
+		if (!wasAdapterEnabled && bluetoothState == BluetoothState.ENABLED) {
 			eventBus.broadcast(new BluetoothEnabledEvent());
-			enableWasRequested = false;
+			wasAdapterEnabled = true;
 		}
-		if (canShowQrCodeFragment()) showQrCodeFragment();
+		showQrCodeFragmentIfAllowed();
 	}
 
 	@Override
 	public void onActivityResult(int request, int result, Intent data) {
-		// If the request was granted we'll catch the state change event
-		if (request == REQUEST_ENABLE_BLUETOOTH && result == RESULT_CANCELED)
-			setBluetoothState(BluetoothState.REFUSED);
+		if (request == REQUEST_BLUETOOTH_DISCOVERABLE) {
+			if (result == RESULT_CANCELED) {
+				setBluetoothState(BluetoothState.REFUSED);
+			} else {
+				// If Bluetooth is already discoverable, show the QR code -
+				// otherwise wait for the state or scan mode to change
+				BluetoothAdapter bt = BluetoothAdapter.getDefaultAdapter();
+				if (bt == null) throw new AssertionError();
+				if (bt.getScanMode() == SCAN_MODE_CONNECTABLE_DISCOVERABLE)
+					setBluetoothState(BluetoothState.DISCOVERABLE);
+			}
+		}
 	}
 
 	private void showQrCodeFragment() {
+		// If we return to the intro fragment, the continue button needs to be
+		// clicked again before showing the QR code fragment
 		continueClicked = false;
+		// If we return to the intro fragment, ask for Bluetooth
+		// discoverability again before showing the QR code fragment
+		bluetoothState = BluetoothState.UNKNOWN;
 		// FIXME #824
 		FragmentManager fm = getSupportFragmentManager();
 		if (fm.findFragmentByTag(KeyAgreementFragment.TAG) == null) {
@@ -194,74 +241,113 @@ public abstract class KeyAgreementActivity extends BriarActivity implements
 	}
 
 	private boolean checkPermissions() {
-		if (ContextCompat.checkSelfPermission(this, CAMERA) !=
-				PERMISSION_GRANTED) {
-			// Should we show an explanation?
-			if (ActivityCompat.shouldShowRequestPermissionRationale(this,
-					CAMERA)) {
-				OnClickListener continueListener =
-						(dialog, which) -> requestPermission();
-				Builder builder = new Builder(this, style.BriarDialogTheme);
-				builder.setTitle(string.permission_camera_title);
-				builder.setMessage(string.permission_camera_request_body);
-				builder.setNeutralButton(string.continue_button,
-						continueListener);
-				builder.show();
-			} else {
-				requestPermission();
-			}
-			gotCameraPermission = false;
+		if (areEssentialPermissionsGranted()) return true;
+		// If the camera permission has been permanently denied, ask the
+		// user to change the setting
+		if (cameraPermission == Permission.PERMANENTLY_DENIED) {
+			Builder builder = new Builder(this, 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(this));
+			builder.setNegativeButton(R.string.cancel,
+					(dialog, which) -> supportFinishAfterTransition());
+			builder.show();
 			return false;
-		} else {
-			gotCameraPermission = true;
-			return true;
 		}
+		// Should we show the rationale for one or both permissions?
+		if (cameraPermission == Permission.SHOW_RATIONALE &&
+				locationPermission == Permission.SHOW_RATIONALE) {
+			showRationale(R.string.permission_camera_location_title,
+					R.string.permission_camera_location_request_body);
+		} else if (cameraPermission == Permission.SHOW_RATIONALE) {
+			showRationale(R.string.permission_camera_title,
+					R.string.permission_camera_request_body);
+		} else if (locationPermission == Permission.SHOW_RATIONALE) {
+			showRationale(R.string.permission_location_title,
+					R.string.permission_location_request_body);
+		} else {
+			requestPermissions();
+		}
+		return false;
 	}
 
-	private void requestPermission() {
-		ActivityCompat.requestPermissions(this, new String[] {CAMERA},
-				REQUEST_PERMISSION_CAMERA);
+	private void showRationale(@StringRes int title, @StringRes int body) {
+		Builder builder = new Builder(this, R.style.BriarDialogTheme);
+		builder.setTitle(title);
+		builder.setMessage(body);
+		builder.setNeutralButton(R.string.continue_button,
+				(dialog, which) -> requestPermissions());
+		builder.show();
+	}
+
+	private void requestPermissions() {
+		ActivityCompat.requestPermissions(this,
+				new String[] {CAMERA, ACCESS_COARSE_LOCATION},
+				REQUEST_PERMISSION_CAMERA_LOCATION);
 	}
 
 	@Override
 	@UiThread
 	public void onRequestPermissionsResult(int requestCode,
-			String permissions[], int[] grantResults) {
-		if (requestCode == REQUEST_PERMISSION_CAMERA) {
-			// If request is cancelled, the result arrays are empty.
-			if (grantResults.length > 0 &&
-					grantResults[0] == PERMISSION_GRANTED) {
-				gotCameraPermission = true;
-				showNextScreen();
-			} else {
-				if (!ActivityCompat.shouldShowRequestPermissionRationale(this,
-						CAMERA)) {
-					// The user has permanently denied the request
-					OnClickListener cancelListener =
-							(dialog, which) -> supportFinishAfterTransition();
-					Builder builder = new Builder(this, style.BriarDialogTheme);
-					builder.setTitle(string.permission_camera_title);
-					builder.setMessage(string.permission_camera_denied_body);
-					builder.setPositiveButton(string.ok,
-							UiUtils.getGoToSettingsListener(this));
-					builder.setNegativeButton(string.cancel, cancelListener);
-					builder.show();
-				} else {
-					Toast.makeText(this, string.permission_camera_denied_toast,
-							LENGTH_LONG).show();
-					supportFinishAfterTransition();
-				}
-			}
+			String[] permissions, int[] grantResults) {
+		if (requestCode != REQUEST_PERMISSION_CAMERA_LOCATION)
+			throw new AssertionError();
+		if (gotPermission(CAMERA, permissions, grantResults)) {
+			cameraPermission = Permission.GRANTED;
+		} else if (shouldShowRationale(CAMERA)) {
+			cameraPermission = Permission.SHOW_RATIONALE;
+		} else {
+			cameraPermission = Permission.PERMANENTLY_DENIED;
 		}
+		if (gotPermission(ACCESS_COARSE_LOCATION, permissions, grantResults)) {
+			locationPermission = Permission.GRANTED;
+		} else if (shouldShowRationale(ACCESS_COARSE_LOCATION)) {
+			locationPermission = Permission.SHOW_RATIONALE;
+		} else {
+			locationPermission = Permission.PERMANENTLY_DENIED;
+		}
+		// If a permission dialog has been shown, showing the QR code fragment
+		// on this call path would cause a crash due to
+		// https://code.google.com/p/android/issues/detail?id=190966.
+		// In that case the isResumed flag prevents the fragment from being
+		// shown here, and showQrCodeFragmentIfAllowed() will be called again
+		// from onPostResume().
+		if (checkPermissions()) showQrCodeFragmentIfAllowed();
+	}
+
+	private boolean gotPermission(String permission, String[] permissions,
+			int[] grantResults) {
+		for (int i = 0; i < permissions.length; i++) {
+			if (permission.equals(permissions[i]))
+				return grantResults[i] == PERMISSION_GRANTED;
+		}
+		return false;
+	}
+
+	private boolean shouldShowRationale(String permission) {
+		return ActivityCompat.shouldShowRequestPermissionRationale(this,
+				permission);
 	}
 
 	private class BluetoothStateReceiver extends BroadcastReceiver {
 
 		@Override
 		public void onReceive(Context context, Intent intent) {
-			int state = intent.getIntExtra(EXTRA_STATE, 0);
-			if (state == STATE_ON) setBluetoothState(BluetoothState.ENABLED);
-			else setBluetoothState(BluetoothState.UNKNOWN);
+			String action = intent.getAction();
+			if (ACTION_STATE_CHANGED.equals(action)) {
+				int state = intent.getIntExtra(EXTRA_STATE, 0);
+				if (state == STATE_ON)
+					setBluetoothState(BluetoothState.ENABLED);
+				else setBluetoothState(BluetoothState.UNKNOWN);
+			} else if (ACTION_SCAN_MODE_CHANGED.equals(action)) {
+				int scanMode = intent.getIntExtra(EXTRA_SCAN_MODE, 0);
+				if (scanMode == SCAN_MODE_CONNECTABLE_DISCOVERABLE)
+					setBluetoothState(BluetoothState.DISCOVERABLE);
+				else if (scanMode == SCAN_MODE_CONNECTABLE)
+					setBluetoothState(BluetoothState.ENABLED);
+				else setBluetoothState(BluetoothState.UNKNOWN);
+			}
 		}
 	}
 }

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
-public interface PreviewConsumer {
+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
-public class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
+class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
 
 	private static final Logger LOG =
 			Logger.getLogger(QrCodeDecoder.class.getName());
@@ -40,7 +40,7 @@ public class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
 	private Camera camera = null;
 	private int cameraIndex = 0;
 
-	public QrCodeDecoder(ResultCallback callback) {
+	QrCodeDecoder(ResultCallback callback) {
 		this.callback = callback;
 	}
 
@@ -73,7 +73,8 @@ public class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
 				if (data.length == size.width * size.height * 3 / 2) {
 					CameraInfo info = new CameraInfo();
 					Camera.getCameraInfo(cameraIndex, info);
-					new DecoderTask(data, size.width, size.height).execute();
+					new DecoderTask(data, size.width, size.height,
+							info.orientation).execute();
 				} else {
 					// Camera parameters have changed - ask for a new preview
 					LOG.info("Preview size does not match camera parameters");
@@ -90,18 +91,19 @@ public class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
 	private class DecoderTask extends AsyncTask<Void, Void, Void> {
 
 		private final byte[] data;
-		private final int width;
-		private final int height;
+		private final int width, height, orientation;
 
-		private DecoderTask(byte[] data, int width, int height) {
+		private DecoderTask(byte[] data, int width, int height,
+				int orientation) {
 			this.data = data;
 			this.width = width;
 			this.height = height;
+			this.orientation = orientation;
 		}
 
 		@Override
 		protected Void doInBackground(Void... params) {
-			BinaryBitmap bitmap = binarize(data, width, height);
+			BinaryBitmap bitmap = binarize(data, width, height, orientation);
 			Result result;
 			try {
 				result = reader.decode(bitmap,
@@ -125,14 +127,21 @@ public class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
 		}
 	}
 
-	private static BinaryBitmap binarize(byte[] data, int width, int height) {
+	private static BinaryBitmap binarize(byte[] data, int width, int height,
+			int orientation) {
+		// Crop to a square at the top (portrait) or left (landscape) of the
+		// screen - this will be faster to decode and should include
+		// everything visible in the viewfinder
+		int crop = Math.min(width, height);
+		int left = orientation >= 180 ? width - crop : 0;
+		int top = orientation >= 180 ? height - crop : 0;
 		LuminanceSource src = new PlanarYUVLuminanceSource(data, width,
-				height, 0, 0, width, height, false);
+				height, left, top, crop, crop, false);
 		return new BinaryBitmap(new HybridBinarizer(src));
 	}
 
 	@NotNullByDefault
-	public interface ResultCallback {
+	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
-public class QrCodeUtils {
+class QrCodeUtils {
 
 	private static final Logger LOG =
 			Logger.getLogger(QrCodeUtils.class.getName());
 
 	@Nullable
-	public static Bitmap createQrCode(DisplayMetrics dm, String input) {
+	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/privategroup/conversation/GroupMessageItem.java

@@ -4,7 +4,7 @@ import android.support.annotation.LayoutRes;
 import android.support.annotation.UiThread;
 
 import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.bramble.api.identity.Author.Status;
+import org.briarproject.bramble.api.identity.AuthorInfo;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.briar.R;
@@ -22,14 +22,14 @@ class GroupMessageItem extends ThreadItem {
 
 	private GroupMessageItem(MessageId messageId, GroupId groupId,
 			@Nullable MessageId parentId, String text, long timestamp,
-			Author author, Status status, boolean isRead) {
+			Author author, AuthorInfo status, boolean isRead) {
 		super(messageId, parentId, text, timestamp, author, status, isRead);
 		this.groupId = groupId;
 	}
 
 	GroupMessageItem(GroupMessageHeader h, String text) {
 		this(h.getId(), h.getGroupId(), h.getParentId(), text, h.getTimestamp(),
-				h.getAuthor(), h.getAuthorStatus(), h.isRead());
+				h.getAuthor(), h.getAuthorInfo(), h.isRead());
 	}
 
 	public GroupId getGroupId() {

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

@@ -9,7 +9,8 @@ import org.briarproject.briar.R;
 import org.briarproject.briar.android.threaded.BaseThreadItemViewHolder;
 import org.briarproject.briar.android.threaded.ThreadItemAdapter.ThreadItemListener;
 
-import static org.briarproject.bramble.api.identity.Author.Status.OURSELVES;
+import static org.briarproject.bramble.api.identity.AuthorInfo.Status.OURSELVES;
+import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName;
 
 @UiThread
 @NotNullByDefault
@@ -36,24 +37,27 @@ class JoinMessageItemViewHolder
 		if (item.isInitial()) {
 			textView.setText(R.string.groups_member_created_you);
 		} else {
-			textView.setText(
-					getContext().getString(R.string.groups_member_joined,
-							item.getAuthor().getName()));
+			String name = getContactDisplayName(item.getAuthor(),
+					item.getAuthorInfo().getAlias());
+			textView.setText(getContext()
+					.getString(R.string.groups_member_joined, name));
 		}
 	}
 
 	private void bind(JoinMessageItem item) {
 		Context ctx = getContext();
+		String name = getContactDisplayName(item.getAuthor(),
+				item.getAuthorInfo().getAlias());
 
 		if (item.isInitial()) {
-			textView.setText(ctx.getString(R.string.groups_member_created,
-					item.getAuthor().getName()));
+			textView.setText(
+					ctx.getString(R.string.groups_member_created, name));
 		} else {
-			if (item.getStatus() == OURSELVES) {
+			if (item.getAuthorInfo().getStatus() == OURSELVES) {
 				textView.setText(R.string.groups_member_joined_you);
 			} else {
-				textView.setText(ctx.getString(R.string.groups_member_joined,
-						item.getAuthor().getName()));
+				textView.setText(
+						ctx.getString(R.string.groups_member_joined, name));
 			}
 		}
 	}

briar-android/src/main/java/org/briarproject/briar/android/privategroup/invitation/GroupInvitationViewHolder.java

@@ -9,6 +9,8 @@ import org.briarproject.briar.api.privategroup.invitation.GroupInvitationItem;
 
 import javax.annotation.Nullable;
 
+import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName;
+
 class GroupInvitationViewHolder
 		extends InvitationViewHolder<GroupInvitationItem> {
 
@@ -24,7 +26,7 @@ class GroupInvitationViewHolder
 
 		sharedBy.setText(
 				sharedBy.getContext().getString(R.string.groups_created_by,
-						item.getCreator().getAuthor().getName()));
+						getContactDisplayName(item.getCreator())));
 	}
 
 }

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

@@ -1,6 +1,7 @@
 package org.briarproject.briar.android.privategroup.list;
 
 import org.briarproject.bramble.api.identity.Author;
+import org.briarproject.bramble.api.identity.AuthorInfo;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.briar.api.client.MessageTracker.GroupCount;
@@ -12,12 +13,15 @@ import org.briarproject.briar.api.privategroup.PrivateGroup;
 class GroupItem {
 
 	private final PrivateGroup privateGroup;
+	private final AuthorInfo authorInfo;
 	private int messageCount, unreadCount;
 	private long timestamp;
 	private boolean dissolved;
 
-	GroupItem(PrivateGroup privateGroup, GroupCount count, boolean dissolved) {
+	GroupItem(PrivateGroup privateGroup, AuthorInfo authorInfo,
+			GroupCount count, boolean dissolved) {
 		this.privateGroup = privateGroup;
+		this.authorInfo = authorInfo;
 		this.messageCount = count.getMsgCount();
 		this.unreadCount = count.getUnreadCount();
 		this.timestamp = count.getLatestMsgTime();
@@ -46,6 +50,10 @@ class GroupItem {
 		return privateGroup.getCreator();
 	}
 
+	AuthorInfo getCreatorInfo() {
+		return authorInfo;
+	}
+
 	String getName() {
 		return privateGroup.getName();
 	}

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

@@ -2,12 +2,15 @@ package org.briarproject.briar.android.privategroup.list;
 
 import android.support.annotation.CallSuper;
 
+import org.briarproject.bramble.api.contact.ContactManager;
 import org.briarproject.bramble.api.db.DatabaseExecutor;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.NoSuchGroupException;
 import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.event.EventListener;
+import org.briarproject.bramble.api.identity.AuthorId;
+import org.briarproject.bramble.api.identity.AuthorInfo;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
@@ -30,7 +33,9 @@ import org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
@@ -52,6 +57,7 @@ class GroupListControllerImpl extends DbControllerImpl
 
 	private final PrivateGroupManager groupManager;
 	private final GroupInvitationManager groupInvitationManager;
+	private final ContactManager contactManager;
 	private final AndroidNotificationManager notificationManager;
 	private final EventBus eventBus;
 
@@ -61,10 +67,12 @@ class GroupListControllerImpl extends DbControllerImpl
 	GroupListControllerImpl(@DatabaseExecutor Executor dbExecutor,
 			LifecycleManager lifecycleManager, PrivateGroupManager groupManager,
 			GroupInvitationManager groupInvitationManager,
+			ContactManager contactManager,
 			AndroidNotificationManager notificationManager, EventBus eventBus) {
 		super(dbExecutor, lifecycleManager);
 		this.groupManager = groupManager;
 		this.groupInvitationManager = groupInvitationManager;
+		this.contactManager = contactManager;
 		this.notificationManager = notificationManager;
 		this.eventBus = eventBus;
 	}
@@ -153,12 +161,22 @@ class GroupListControllerImpl extends DbControllerImpl
 				Collection<PrivateGroup> groups =
 						groupManager.getPrivateGroups();
 				List<GroupItem> items = new ArrayList<>(groups.size());
+				Map<AuthorId, AuthorInfo> authorInfos = new HashMap<>();
 				for (PrivateGroup g : groups) {
 					try {
 						GroupId id = g.getId();
+						AuthorId authorId = g.getCreator().getId();
+						AuthorInfo authorInfo;
+						if (authorInfos.containsKey(authorId)) {
+							authorInfo = authorInfos.get(authorId);
+						} else {
+							authorInfo = contactManager.getAuthorInfo(authorId);
+							authorInfos.put(authorId, authorInfo);
+						}
 						GroupCount count = groupManager.getGroupCount(id);
 						boolean dissolved = groupManager.isDissolved(id);
-						items.add(new GroupItem(g, count, dissolved));
+						items.add(
+								new GroupItem(g, authorInfo, count, dissolved));
 					} catch (NoSuchGroupException e) {
 						// Continue
 					}

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

@@ -20,6 +20,7 @@ import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 import static org.briarproject.briar.android.activity.BriarActivity.GROUP_ID;
 import static org.briarproject.briar.android.activity.BriarActivity.GROUP_NAME;
+import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
@@ -60,8 +61,9 @@ class GroupViewHolder extends RecyclerView.ViewHolder {
 		name.setText(group.getName());
 
 		// Creator
-		creator.setText(ctx.getString(R.string.groups_created_by,
-				group.getCreator().getName()));
+		String creatorName = getContactDisplayName(group.getCreator(),
+				group.getCreatorInfo().getAlias());
+		creator.setText(ctx.getString(R.string.groups_created_by, creatorName));
 
 		if (!group.isDissolved()) {
 			// full visibility

briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListAdapter.java

@@ -1,6 +1,7 @@
 package org.briarproject.briar.android.privategroup.memberlist;
 
 import android.content.Context;
+import android.support.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -8,6 +9,8 @@ import android.view.ViewGroup;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.util.BriarAdapter;
 
+import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName;
+
 class MemberListAdapter extends
 		BriarAdapter<MemberListItem, MemberListItemHolder> {
 
@@ -15,8 +18,9 @@ class MemberListAdapter extends
 		super(context, MemberListItem.class);
 	}
 
+	@NonNull
 	@Override
-	public MemberListItemHolder onCreateViewHolder(ViewGroup viewGroup,
+	public MemberListItemHolder onCreateViewHolder(@NonNull ViewGroup viewGroup,
 			int i) {
 		View v = LayoutInflater.from(ctx).inflate(
 				R.layout.list_item_group_member, viewGroup, false);
@@ -24,13 +28,18 @@ class MemberListAdapter extends
 	}
 
 	@Override
-	public void onBindViewHolder(MemberListItemHolder ui, int position) {
+	public void onBindViewHolder(@NonNull MemberListItemHolder ui,
+			int position) {
 		ui.bind(items.get(position));
 	}
 
 	@Override
 	public int compare(MemberListItem m1, MemberListItem m2) {
-		return m1.getMember().getName().compareTo(m2.getMember().getName());
+		String n1 = getContactDisplayName(m1.getMember(),
+				m1.getAuthorInfo().getAlias());
+		String n2 = getContactDisplayName(m2.getMember(),
+				m2.getAuthorInfo().getAlias());
+		return n1.compareTo(n2);
 	}
 
 	@Override

briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItem.java

@@ -2,7 +2,8 @@ package org.briarproject.briar.android.privategroup.memberlist;
 
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.bramble.api.identity.Author.Status;
+import org.briarproject.bramble.api.identity.AuthorInfo;
+import org.briarproject.bramble.api.identity.AuthorInfo.Status;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.api.privategroup.GroupMember;
 
@@ -25,8 +26,12 @@ class MemberListItem {
 		return groupMember.getAuthor();
 	}
 
+	AuthorInfo getAuthorInfo() {
+		return groupMember.getAuthorInfo();
+	}
+
 	Status getStatus() {
-		return groupMember.getStatus();
+		return groupMember.getAuthorInfo().getStatus();
 	}
 
 	boolean isCreator() {

briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItemHolder.java

@@ -10,7 +10,10 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.view.AuthorView;
 
-import static org.briarproject.bramble.api.identity.Author.Status.OURSELVES;
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
+import static org.briarproject.bramble.api.identity.AuthorInfo.Status.OURSELVES;
+import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName;
 
 @UiThread
 @NotNullByDefault
@@ -29,33 +32,33 @@ class MemberListItemHolder extends RecyclerView.ViewHolder {
 
 	protected void bind(MemberListItem item) {
 		// member name, avatar and status
-		author.setAuthor(item.getMember());
-		author.setAuthorStatus(item.getStatus());
+		author.setAuthor(item.getMember(), item.getAuthorInfo());
 
 		// online status of visible contacts
 		if (item.getContactId() != null) {
-			bulb.setVisibility(View.VISIBLE);
+			bulb.setVisibility(VISIBLE);
 			if (item.isOnline()) {
 				bulb.setImageResource(R.drawable.contact_connected);
 			} else {
 				bulb.setImageResource(R.drawable.contact_disconnected);
 			}
 		} else {
-			bulb.setVisibility(View.GONE);
+			bulb.setVisibility(GONE);
 		}
 
 		// text shown for creator
 		if (item.isCreator()) {
-			creator.setVisibility(View.VISIBLE);
+			creator.setVisibility(VISIBLE);
 			if (item.getStatus() == OURSELVES) {
 				creator.setText(R.string.groups_member_created_you);
 			} else {
+				String name = getContactDisplayName(item.getMember(),
+						item.getAuthorInfo().getAlias());
 				creator.setText(creator.getContext()
-						.getString(R.string.groups_member_created,
-								item.getMember().getName()));
+						.getString(R.string.groups_member_created, name));
 			}
 		} else {
-			creator.setVisibility(View.GONE);
+			creator.setVisibility(GONE);
 		}
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealableContactViewHolder.java

@@ -14,6 +14,7 @@ import javax.annotation.Nullable;
 import static org.briarproject.briar.android.privategroup.VisibilityHelper.getVisibilityIcon;
 import static org.briarproject.briar.android.privategroup.VisibilityHelper.getVisibilityString;
 import static org.briarproject.briar.android.util.UiUtils.GREY_OUT;
+import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName;
 
 @UiThread
 @NotNullByDefault
@@ -36,7 +37,7 @@ class RevealableContactViewHolder
 		icon.setImageResource(getVisibilityIcon(item.getVisibility()));
 		info.setText(
 				getVisibilityString(info.getContext(), item.getVisibility(),
-						item.getContact().getAuthor().getName()));
+						getContactDisplayName(item.getContact())));
 	}
 
 	@Override

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

@@ -44,6 +44,7 @@ import org.briarproject.briar.android.navdrawer.NavDrawerActivity;
 import org.briarproject.briar.android.util.UiUtils;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.logging.Logger;
@@ -210,6 +211,13 @@ public class SettingsFragment extends PreferenceFragmentCompat
 					return true;
 				});
 
+		if (SDK_INT < 27) {
+			// remove System Default Theme option
+			List<CharSequence> entries =
+					new ArrayList<>(Arrays.asList(theme.getEntries()));
+			entries.remove(getString(R.string.pref_theme_system));
+			theme.setEntries(entries.toArray(new CharSequence[0]));
+		}
 		if (IS_DEBUG_BUILD) {
 			findPreference("pref_key_explode").setOnPreferenceClickListener(
 					preference -> {

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

@@ -13,6 +13,8 @@ import java.util.Collection;
 
 import javax.annotation.Nullable;
 
+import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName;
+
 class SharingInvitationViewHolder
 		extends InvitationViewHolder<SharingInvitationItem> {
 
@@ -28,7 +30,7 @@ class SharingInvitationViewHolder
 
 		Collection<String> names = new ArrayList<>();
 		for (Contact c : item.getNewSharers())
-			names.add(c.getAuthor().getName());
+			names.add(getContactDisplayName(c));
 		sharedBy.setText(
 				sharedBy.getContext().getString(R.string.shared_by_format,
 						StringUtils.join(names, ", ")));

briar-android/src/main/java/org/briarproject/briar/android/threaded/BaseThreadItemViewHolder.java

@@ -43,9 +43,8 @@ public abstract class BaseThreadItemViewHolder<I extends ThreadItem>
 	public void bind(I item, ThreadItemListener<I> listener) {
 		textView.setText(StringUtils.trim(item.getText()));
 
-		author.setAuthor(item.getAuthor());
+		author.setAuthor(item.getAuthor(), item.getAuthorInfo());
 		author.setDate(item.getTimestamp());
-		author.setAuthorStatus(item.getStatus());
 
 		if (item.isHighlighted()) {
 			layout.setActivated(true);

briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItem.java

@@ -1,7 +1,7 @@
 package org.briarproject.briar.android.threaded;
 
 import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.bramble.api.identity.Author.Status;
+import org.briarproject.bramble.api.identity.AuthorInfo;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.briar.api.client.MessageTree.MessageNode;
@@ -21,19 +21,19 @@ public abstract class ThreadItem implements MessageNode {
 	private final String text;
 	private final long timestamp;
 	private final Author author;
-	private final Status status;
+	private final AuthorInfo authorInfo;
 	private int level = UNDEFINED;
 	private boolean isRead, highlighted;
 
 	public ThreadItem(MessageId messageId, @Nullable MessageId parentId,
-			String text, long timestamp, Author author, Status status,
+			String text, long timestamp, Author author, AuthorInfo authorInfo,
 			boolean isRead) {
 		this.messageId = messageId;
 		this.parentId = parentId;
 		this.text = text;
 		this.timestamp = timestamp;
 		this.author = author;
-		this.status = status;
+		this.authorInfo = authorInfo;
 		this.isRead = isRead;
 		this.highlighted = false;
 	}
@@ -66,8 +66,8 @@ public abstract class ThreadItem implements MessageNode {
 		return author;
 	}
 
-	public Status getStatus() {
-		return status;
+	public AuthorInfo getAuthorInfo() {
+		return authorInfo;
 	}
 
 	@Override

briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java

@@ -33,7 +33,9 @@ import android.view.View;
 import android.widget.TextView;
 
 import org.acra.ACRA;
+import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.api.system.AndroidExecutor;
@@ -74,6 +76,17 @@ public class UiUtils {
 	public static final int TEASER_LENGTH = 320;
 	public static final float GREY_OUT = 0.5f;
 
+	public static String getContactDisplayName(Author author,
+			@Nullable String alias) {
+		String name = author.getName();
+		if (alias == null) return name;
+		else return String.format("%s (%s)", alias, name);
+	}
+
+	public static String getContactDisplayName(Contact c) {
+		return getContactDisplayName(c.getAuthor(), c.getAlias());
+	}
+
 	public static void setError(TextInputLayout til, @Nullable String error,
 			boolean set) {
 		if (set) {
@@ -127,7 +140,9 @@ public class UiUtils {
 		return builder;
 	}
 
-	public static Spanned getSpanned(String s) {
+	public static Spanned getSpanned(@Nullable String s) {
+		// TODO move to HtmlCompat
+		// https://commonsware.com/blog/2018/05/29/at-last-htmlcompat.html
 		return Html.fromHtml(s);
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/view/AuthorView.java

@@ -12,7 +12,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.bramble.api.identity.Author.Status;
+import org.briarproject.bramble.api.identity.AuthorInfo;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.util.UiUtils;
 
@@ -24,8 +24,9 @@ import im.delight.android.identicons.IdenticonDrawable;
 import static android.content.Context.LAYOUT_INFLATER_SERVICE;
 import static android.graphics.Typeface.BOLD;
 import static android.util.TypedValue.COMPLEX_UNIT_PX;
-import static org.briarproject.bramble.api.identity.Author.Status.NONE;
-import static org.briarproject.bramble.api.identity.Author.Status.OURSELVES;
+import static org.briarproject.bramble.api.identity.AuthorInfo.Status.NONE;
+import static org.briarproject.bramble.api.identity.AuthorInfo.Status.OURSELVES;
+import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName;
 import static org.briarproject.briar.android.util.UiUtils.resolveAttribute;
 
 @UiThread
@@ -70,24 +71,20 @@ public class AuthorView extends ConstraintLayout {
 		this(context, null);
 	}
 
-	public void setAuthor(Author author) {
-		authorName.setText(author.getName());
+	public void setAuthor(Author author, AuthorInfo authorInfo) {
+		authorName
+				.setText(getContactDisplayName(author, authorInfo.getAlias()));
 		IdenticonDrawable d = new IdenticonDrawable(author.getId().getBytes());
 		avatar.setImageDrawable(d);
 
-		invalidate();
-		requestLayout();
-	}
-
-	public void setAuthorStatus(Status status) {
-		if (status != NONE) {
-			trustIndicator.setTrustLevel(status);
+		if (authorInfo.getStatus() != NONE) {
+			trustIndicator.setTrustLevel(authorInfo.getStatus());
 			trustIndicator.setVisibility(VISIBLE);
 		} else {
 			trustIndicator.setVisibility(GONE);
 		}
 
-		if (status == OURSELVES) {
+		if (authorInfo.getStatus() == OURSELVES) {
 			authorName.setTypeface(authorNameTypeface, BOLD);
 		} else {
 			authorName.setTypeface(authorNameTypeface, NORMAL);
@@ -123,7 +120,7 @@ public class AuthorView extends ConstraintLayout {
 	 *
 	 * Attention: RSS_FEED and RSS_FEED_REBLOGGED change the avatar
 	 *            and override the one set by
-	 *            {@link AuthorView#setAuthor(Author)}.
+	 *            {@link AuthorView#setAuthor(Author, AuthorInfo)}.
 	 */
 	public void setPersona(int persona) {
 		switch (persona) {

briar-android/src/main/java/org/briarproject/briar/android/view/BriarRecyclerView.java

@@ -20,17 +20,12 @@ import android.widget.TextView;
 
 import org.briarproject.briar.R;
 
-import java.util.logging.Logger;
-
 import javax.annotation.Nullable;
 
 import static org.briarproject.briar.android.util.UiUtils.MIN_DATE_RESOLUTION;
 
 public class BriarRecyclerView extends FrameLayout {
 
-	private static final Logger LOG =
-			Logger.getLogger(BriarRecyclerView.class.getName());
-
 	private final Handler handler = new Handler(Looper.getMainLooper());
 
 	private RecyclerView recyclerView;
@@ -39,6 +34,7 @@ public class BriarRecyclerView extends FrameLayout {
 	private TextView emptyText, emptyAction;
 	private ProgressBar progressBar;
 	private RecyclerView.AdapterDataObserver emptyObserver;
+	@Nullable
 	private Runnable refresher = null;
 	private boolean isScrollingToEnd = false;
 
@@ -217,18 +213,15 @@ public class BriarRecyclerView extends FrameLayout {
 			throw new IllegalStateException("Need to call setAdapter() first!");
 		}
 		refresher = () -> {
-			LOG.info("Updating Content...");
 			Adapter adapter = recyclerView.getAdapter();
 			adapter.notifyItemRangeChanged(0, adapter.getItemCount());
 			handler.postDelayed(refresher, MIN_DATE_RESOLUTION);
 		};
-		LOG.info("Adding Handler Callback");
 		handler.postDelayed(refresher, MIN_DATE_RESOLUTION);
 	}
 
 	public void stopPeriodicUpdate() {
 		if (refresher != null) {
-			LOG.info("Removing Handler Callback");
 			handler.removeCallbacks(refresher);
 			refresher = null;
 		}

briar-android/src/main/java/org/briarproject/briar/android/view/QrCodeView.java

@@ -39,9 +39,6 @@ public class QrCodeView extends FrameLayout {
                         listener.setFullscreen(fullscreen);
                 }
         );
-
-        // TODO remove
-        fullscreenButton.setVisibility(INVISIBLE);
     }
 
     @UiThread

briar-android/src/main/java/org/briarproject/briar/android/view/TrustIndicatorView.java

@@ -3,14 +3,14 @@ package org.briarproject.briar.android.view;
 import android.content.Context;
 import android.support.annotation.UiThread;
 import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.AppCompatImageView;
 import android.util.AttributeSet;
-import android.widget.ImageView;
 
-import org.briarproject.bramble.api.identity.Author.Status;
+import org.briarproject.bramble.api.identity.AuthorInfo.Status;
 import org.briarproject.briar.R;
 
 @UiThread
-public class TrustIndicatorView extends ImageView {
+public class TrustIndicatorView extends AppCompatImageView {
 
 	public TrustIndicatorView(Context context) {
 		super(context);

briar-android/src/main/res/drawable-ldrtl/social_send_now_white.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
+	<!-- Workaround for toolbar icons failing to apply proper layout direction -->
+	<group
+		android:pivotX="12"
+		android:pivotY="12"
+		android:rotation="180">
+		<path
+			android:fillColor="#FFFFFFFF"
+			android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
+	</group>
+</vector>

briar-android/src/main/res/drawable/ic_add_nearby.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportHeight="24.0"
-        android:viewportWidth="24.0">
-	<path
-		android:fillColor="#FFFFFFFF"
-		android:pathData="M12,11c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,13c0,-3.31 -2.69,-6 -6,-6s-6,2.69 -6,6c0,2.22 1.21,4.15 3,5.19l1,-1.74c-1.19,-0.7 -2,-1.97 -2,-3.45 0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,1.48 -0.81,2.75 -2,3.45l1,1.74c1.79,-1.04 3,-2.97 3,-5.19zM12,3C6.48,3 2,7.48 2,13c0,3.7 2.01,6.92 4.99,8.65l1,-1.73C5.61,18.53 4,15.96 4,13c0,-4.42 3.58,-8 8,-8s8,3.58 8,8c0,2.96 -1.61,5.53 -4,6.92l1,1.73c2.99,-1.73 5,-4.95 5,-8.65 0,-5.52 -4.48,-10 -10,-10z"/>
-</vector>

briar-android/src/main/res/drawable/ic_content_copy.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:tint="#2A93C6"
-        android:viewportHeight="24.0"
-        android:viewportWidth="24.0">
-	<path
-		android:fillColor="#FF000000"
-		android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/>
-</vector>

briar-android/src/main/res/drawable/ic_content_paste.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:tint="#2A93C6"
-        android:viewportHeight="24.0"
-        android:viewportWidth="24.0">
-	<path
-		android:fillColor="#FF000000"
-		android:pathData="M19,2h-4.18C14.4,0.84 13.3,0 12,0c-1.3,0 -2.4,0.84 -2.82,2L5,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,4c0,-1.1 -0.9,-2 -2,-2zM12,2c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM19,20L5,20L5,4h2v3h10L17,4h2v16z"/>
-</vector>

briar-android/src/main/res/drawable/ic_link.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportHeight="24.0"
-        android:viewportWidth="24.0">
-	<path
-		android:fillColor="#FFFFFFFF"
-		android:pathData="M3.9,12c0,-1.71 1.39,-3.1 3.1,-3.1h4L11,7L7,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5h4v-1.9L7,15.1c-1.71,0 -3.1,-1.39 -3.1,-3.1zM8,13h8v-2L8,11v2zM17,7h-4v1.9h4c1.71,0 3.1,1.39 3.1,3.1s-1.39,3.1 -3.1,3.1h-4L13,17h4c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5z"/>
-</vector>

briar-android/src/main/res/drawable/ic_link_down.xml

@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportHeight="24"
-        android:viewportWidth="24">
-	<path
-		android:fillColor="#FFFFFF"
-		android:pathData="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"/>
-	<path
-		android:fillColor="#FFFFFF"
-		android:pathData="m21.6598,17.4732h-2.2959v3.0612H17.5118l3,3 3,-3h-1.852z"/>
-</vector>

briar-android/src/main/res/drawable/ic_link_up.xml

@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportHeight="24"
-        android:viewportWidth="24">
-	<path
-		android:fillColor="#FFFFFF"
-		android:pathData="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"/>
-	<path
-		android:fillColor="#FFFFFF"
-		android:pathData="M21.6598,23.5344H19.3639V20.4732H17.5118l3,-3 3,3h-1.852z"/>
-</vector>

briar-android/src/main/res/drawable/ic_person.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
-</vector>

briar-android/src/main/res/drawable/ic_person_add.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
-</vector>

briar-android/src/main/res/drawable/ic_qr_code.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:tint="#2A93C6"
-        android:viewportHeight="24"
-        android:viewportWidth="24">
-	<path
-		android:fillColor="#FFFFFFFF"
-		android:pathData="M3,11H5V13H3V11M11,5H13V9H11V5M9,11H13V15H11V13H9V11M15,11H17V13H19V11H21V13H19V15H21V19H19V21H17V19H13V21H11V17H15V15H17V13H15V11M19,19V15H17V19H19M15,3H21V9H15V3M17,5V7H19V5H17M3,3H9V9H3V3M5,5V7H7V5H5M3,15H9V21H3V15M5,17V19H7V17H5Z"/>
-</vector>

briar-android/src/main/res/drawable/ic_qr_code_scan.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportHeight="24"
-        android:viewportWidth="24">
-	<path
-		android:fillColor="#FFFFFF"
-		android:pathData="M4,4H10V10H4V4M20,4V10H14V4H20M14,15H16V13H14V11H16V13H18V11H20V13H18V15H20V18H18V20H16V18H13V20H11V16H14V15M16,15V18H18V15H16M4,20V14H10V20H4M6,6V8H8V6H6M16,6V8H18V6H16M6,16V18H8V16H6M4,11H6V13H4V11M9,11H13V15H11V13H9V11M11,6H13V10H11V6M2,2V6H0V2A2,2 0 0,1 2,0H6V2H2M22,0A2,2 0 0,1 24,2V6H22V2H18V0H22M2,18V22H6V24H2A2,2 0 0,1 0,22V18H2M22,22V18H24V22A2,2 0 0,1 22,24H18V22H22Z"/>
-</vector>

briar-android/src/main/res/drawable/social_send_now_white.xml

@@ -1,7 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
-        android:autoMirrored="true"
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
 	<path

briar-android/src/main/res/drawable/social_share_blue.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:tint="#2A93C6"
-        android:viewportHeight="24.0"
-        android:viewportWidth="24.0">
-	<path
-		android:fillColor="#FFFFFFFF"
-		android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
-</vector>

briar-android/src/main/res/layout/fragment_alias_dialog.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical"
+	android:padding="16dp">
+
+	<TextView
+		android:id="@+id/titleView"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/set_contact_alias"
+		android:textColor="?android:attr/textColorPrimary"
+		android:textSize="@dimen/text_size_large"
+		android:textStyle="bold"/>
+
+	<EditText
+		android:id="@+id/aliasEditText"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="16dp"
+		android:hint="@string/set_contact_alias_hint"
+		android:inputType="textPersonName"
+		android:textColor="?android:attr/textColorPrimary"
+		android:textSize="@dimen/text_size_medium"/>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginLeft="@dimen/margin_xxlarge"
+		android:layout_marginStart="@dimen/margin_xxlarge"
+		android:gravity="end"
+		android:orientation="horizontal">
+
+		<Button
+			android:id="@+id/cancelButton"
+			style="@style/BriarButtonFlat.Negative"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/cancel"/>
+
+		<Button
+			android:id="@+id/setButton"
+			style="@style/BriarButtonFlat.Positive"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/set_alias"/>
+
+	</LinearLayout>
+
+</LinearLayout>

briar-android/src/main/res/layout/fragment_contact_alias_input.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent">
-
-	<EditText
-		android:id="@+id/contactNameInput"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_margin="@dimen/margin_large"
-		android:hint="@string/contact_name_hint"
-		android:importantForAutofill="no"
-		android:inputType="text|textCapWords"
-		app:layout_constraintBottom_toTopOf="@id/linkInput"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent"
-		app:layout_constraintVertical_chainStyle="packed"/>
-
-	<Button
-		android:id="@+id/addButton"
-		style="@style/BriarButton"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_margin="@dimen/margin_large"
-		android:layout_marginTop="8dp"
-		android:enabled="false"
-		android:text="@string/add_contact_button"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/contactNameInput"
-		tools:enabled="true"/>
-
-</android.support.constraint.ConstraintLayout>

briar-android/src/main/res/layout/fragment_contact_link_exchange.xml

@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent">
-
-	<android.support.constraint.ConstraintLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:padding="@dimen/margin_large">
-
-		<android.support.design.widget.TextInputLayout
-			android:id="@+id/contactNameLayout"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			app:errorEnabled="true"
-			app:hintEnabled="false"
-			app:layout_constraintBottom_toTopOf="@+id/addButton"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/pasteButton">
-
-			<android.support.design.widget.TextInputEditText
-				android:id="@+id/contactNameInput"
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				android:drawableLeft="@drawable/ic_person"
-				android:drawablePadding="8dp"
-				android:drawableStart="@drawable/ic_person"
-				android:drawableTint="?attr/colorControlNormal"
-				android:hint="@string/contact_name_hint"
-				android:importantForAutofill="no"
-				android:inputType="text|textCapWords"/>
-
-		</android.support.design.widget.TextInputLayout>
-
-		<android.support.design.widget.TextInputLayout
-			android:id="@+id/linkInputLayout"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="16dp"
-			app:errorEnabled="true"
-			app:hintEnabled="false"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/copyButton">
-
-			<android.support.design.widget.TextInputEditText
-				android:id="@+id/linkInput"
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				android:drawableLeft="@drawable/ic_link"
-				android:drawablePadding="8dp"
-				android:drawableStart="@drawable/ic_link"
-				android:drawableTint="?attr/colorControlNormal"
-				android:hint="@string/contact_link_hint"
-				android:importantForAutofill="no"
-				android:inputType="textUri"/>
-
-		</android.support.design.widget.TextInputLayout>
-
-		<Button
-			android:id="@+id/pasteButton"
-			style="@style/BriarButtonFlat.Positive.Tiny"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginLeft="8dp"
-			android:layout_marginStart="8dp"
-			android:drawableLeft="@drawable/ic_content_paste"
-			android:drawablePadding="8dp"
-			android:drawableStart="@drawable/ic_content_paste"
-			android:text="@string/paste_button"
-			app:layout_constraintBottom_toTopOf="@+id/contactNameLayout"
-			app:layout_constraintEnd_toStartOf="@id/scanCodeButton"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/linkInputLayout"/>
-
-		<Button
-			android:id="@+id/scanCodeButton"
-			style="@style/BriarButtonFlat.Positive.Tiny"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:drawableLeft="@drawable/ic_qr_code"
-			android:drawablePadding="8dp"
-			android:drawableStart="@drawable/ic_qr_code"
-			android:text="@string/scan_qr_code_button"
-			android:visibility="visible"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintHorizontal_bias="0.5"
-			app:layout_constraintStart_toEndOf="@id/pasteButton"
-			app:layout_constraintTop_toTopOf="@+id/pasteButton"
-			tools:visibility="visible"/>
-
-		<TextView
-			android:id="@+id/linkIntro"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:gravity="left|start"
-			android:text="@string/send_link_instructions"
-			android:textSize="18sp"
-			app:layout_constraintBottom_toTopOf="@+id/linkView"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent"
-			app:layout_constraintVertical_chainStyle="packed"/>
-
-		<TextView
-			android:id="@+id/linkView"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="16dp"
-			android:background="@color/briar_white"
-			android:padding="8dp"
-			android:textColor="@color/briar_primary"
-			android:textIsSelectable="true"
-			android:textSize="18sp"
-			android:typeface="monospace"
-			app:layout_constraintBottom_toTopOf="@+id/copyButton"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/linkIntro"
-			tools:text="briar://scnsdflamslkfjgluoblmksdfbwevlewajfdlkjewwhqliafskfjhskdjhvoieiv"
-			/>
-
-		<Button
-			android:id="@+id/copyButton"
-			style="@style/BriarButtonFlat.Positive.Tiny"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="8dp"
-			android:drawableLeft="@drawable/ic_content_copy"
-			android:drawablePadding="8dp"
-			android:drawableStart="@drawable/ic_content_copy"
-			android:text="@string/copy_button"
-			app:layout_constraintBottom_toTopOf="@+id/linkInputLayout"
-			app:layout_constraintEnd_toStartOf="@id/shareButton"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/linkView"/>
-
-		<Button
-			android:id="@+id/shareButton"
-			style="@style/BriarButtonFlat.Positive.Tiny"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:drawableLeft="@drawable/social_share_blue"
-			android:drawablePadding="8dp"
-			android:drawableStart="@drawable/social_share_blue"
-			android:text="@string/share_button"
-			app:layout_constraintBottom_toBottomOf="@id/copyButton"
-			app:layout_constraintEnd_toStartOf="@id/showCodeButton"
-			app:layout_constraintStart_toEndOf="@id/copyButton"
-			app:layout_constraintTop_toTopOf="@id/copyButton"/>
-
-		<Button
-			android:id="@+id/showCodeButton"
-			style="@style/BriarButtonFlat.Positive.Tiny"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:drawableLeft="@drawable/ic_qr_code"
-			android:drawablePadding="8dp"
-			android:drawableStart="@drawable/ic_qr_code"
-			android:drawableTint="@color/briar_button_text_positive"
-			android:text="@string/show_qr_code_button"
-			android:visibility="visible"
-			app:layout_constraintBottom_toBottomOf="@id/copyButton"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toEndOf="@id/shareButton"
-			app:layout_constraintTop_toTopOf="@id/copyButton"
-			tools:visibility="visible"/>
-
-		<Button
-			android:id="@+id/addButton"
-			style="@style/BriarButton"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginBottom="8dp"
-			android:layout_marginTop="16dp"
-			android:enabled="false"
-			android:text="@string/add_contact_button"
-			app:layout_constraintBottom_toBottomOf="parent"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/contactNameLayout"
-			tools:enabled="true"/>
-
-	</android.support.constraint.ConstraintLayout>
-</ScrollView>

briar-android/src/main/res/layout/fragment_contact_link_input.xml

@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent">
-
-	<EditText
-		android:id="@+id/contactNameInput"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_margin="@dimen/margin_large"
-		android:drawableLeft="@drawable/ic_person"
-		android:drawablePadding="8dp"
-		android:drawableTint="?attr/colorControlNormal"
-		android:hint="@string/contact_name_hint"
-		android:importantForAutofill="no"
-		android:inputType="text|textCapWords"
-		app:layout_constraintBottom_toTopOf="@id/linkInput"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent"
-		app:layout_constraintVertical_chainStyle="packed"
-		android:drawableStart="@drawable/ic_person"/>
-
-	<EditText
-		android:id="@+id/linkInput"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_marginEnd="8dp"
-		android:layout_marginLeft="@dimen/margin_large"
-		android:layout_marginRight="8dp"
-		android:layout_marginStart="@dimen/margin_large"
-		android:layout_marginTop="16dp"
-		android:drawableLeft="@drawable/ic_link"
-		android:drawablePadding="8dp"
-		android:drawableTint="?attr/colorControlNormal"
-		android:hint="@string/contact_link_hint"
-		android:importantForAutofill="no"
-		android:inputType="textUri"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@id/contactNameInput"/>
-
-	<Button
-		android:id="@+id/pasteButton"
-		style="@style/BriarButtonFlat.Positive"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_marginLeft="8dp"
-		android:layout_marginStart="8dp"
-		android:layout_marginTop="8dp"
-		android:drawableLeft="@drawable/ic_content_paste"
-		android:drawablePadding="8dp"
-		android:text="@string/paste_button"
-		app:layout_constraintEnd_toStartOf="@+id/scanCodeButton"
-		app:layout_constraintHorizontal_bias="0.5"
-		app:layout_constraintHorizontal_chainStyle="spread"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/linkInput"/>
-
-	<Button
-		android:id="@+id/scanCodeButton"
-		style="@style/BriarButtonFlat.Positive"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_marginEnd="8dp"
-		android:layout_marginLeft="8dp"
-		android:layout_marginStart="8dp"
-		android:layout_marginTop="8dp"
-		android:drawableLeft="@drawable/ic_qr_code"
-		android:drawablePadding="8dp"
-		android:text="Scan Code"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintHorizontal_bias="0.5"
-		app:layout_constraintStart_toEndOf="@+id/pasteButton"
-		app:layout_constraintTop_toBottomOf="@+id/linkInput"/>
-
-	<Button
-		android:id="@+id/addButton"
-		style="@style/BriarButton"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_margin="@dimen/margin_large"
-		android:layout_marginTop="8dp"
-		android:enabled="false"
-		android:text="@string/add_contact_button"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintHorizontal_bias="0.75"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/pasteButton"
-		tools:enabled="true"/>
-
-</android.support.constraint.ConstraintLayout>