Count 7 bits at a time.

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

@@ -13,8 +13,6 @@ import java.util.Collection;
 
 import javax.annotation.Nullable;
 
-import static org.briarproject.bramble.api.contact.PendingContact.PendingContactState.FAILED;
-
 @NotNullByDefault
 public interface ContactManager {
 
@@ -54,35 +52,6 @@ public interface ContactManager {
 			long timestamp, boolean alice, boolean verified, boolean active)
 			throws DbException;
 
-	/**
-	 * Returns the static link that needs to be sent to the contact to be added.
-	 */
-	String getRemoteContactLink();
-
-	/**
-	 * Returns true if the given link is syntactically valid.
-	 */
-	boolean isValidRemoteContactLink(String link);
-
-	/**
-	 * Requests a new contact to be added via the given {@code link}.
-	 *
-	 * @param link The link received from the contact we want to add.
-	 * @param alias The alias the user has given this contact.
-	 * @return A PendingContact representing the contact to be added.
-	 */
-	PendingContact addRemoteContactRequest(String link, String alias);
-
-	/**
-	 * Returns a list of {@link PendingContact}s.
-	 */
-	Collection<PendingContact> getPendingContacts();
-
-	/**
-	 * Removes a {@link PendingContact} that is in state {@link FAILED}.
-	 */
-	void removePendingContact(PendingContact pendingContact);
-
 	/**
 	 * Returns the contact with the given ID.
 	 */

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

@@ -1,54 +0,0 @@
-package org.briarproject.bramble.api.contact;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-@Immutable
-@NotNullByDefault
-public class PendingContact {
-
-	public enum PendingContactState {
-		WAITING_FOR_CONNECTION,
-		CONNECTED,
-		ADDING_CONTACT,
-		FAILED
-	}
-
-	private final PendingContactId id;
-	private final String alias;
-	private final PendingContactState state;
-	private final long timestamp;
-
-	public PendingContact(PendingContactId id, String alias,
-			PendingContactState state, long timestamp) {
-		this.id = id;
-		this.alias = alias;
-		this.state = state;
-		this.timestamp = timestamp;
-	}
-
-	public String getAlias() {
-		return alias;
-	}
-
-	public PendingContactState getState() {
-		return state;
-	}
-
-	public long getTimestamp() {
-		return timestamp;
-	}
-
-	@Override
-	public int hashCode() {
-		return id.hashCode();
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		return o instanceof PendingContact &&
-				id.equals(((PendingContact) o).id);
-	}
-
-}

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

@@ -1,11 +0,0 @@
-package org.briarproject.bramble.api.contact;
-
-import org.briarproject.bramble.api.UniqueId;
-
-public class PendingContactId extends UniqueId {
-
-	public PendingContactId(byte[] id) {
-		super(id);
-	}
-
-}

bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/PendingContactStateChangedEvent.java

@@ -1,34 +0,0 @@
-package org.briarproject.bramble.api.contact.event;
-
-import org.briarproject.bramble.api.contact.PendingContact.PendingContactState;
-import org.briarproject.bramble.api.contact.PendingContactId;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a pending contact's state is changed.
- */
-@Immutable
-@NotNullByDefault
-public class PendingContactStateChangedEvent extends Event {
-
-	private final PendingContactId id;
-	private final PendingContactState state;
-
-	public PendingContactStateChangedEvent(PendingContactId id,
-			PendingContactState state) {
-		this.id = id;
-		this.state = state;
-	}
-
-	public PendingContactId getId() {
-		return id;
-	}
-
-	public PendingContactState getPendingContactState() {
-		return state;
-	}
-
-}

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

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

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

@@ -1,5 +1,7 @@
 package org.briarproject.bramble.util;
 
+import org.briarproject.bramble.api.FormatException;
+
 public class ByteUtils {
 
 	/**
@@ -12,15 +14,26 @@ public class ByteUtils {
 	 */
 	public static final long MAX_32_BIT_UNSIGNED = 4294967295L; // 2^32 - 1
 
-	/** The number of bytes needed to encode a 16-bit integer. */
+	/**
+	 * The number of bytes needed to encode a 16-bit integer.
+	 */
 	public static final int INT_16_BYTES = 2;
 
-	/** The number of bytes needed to encode a 32-bit integer. */
+	/**
+	 * The number of bytes needed to encode a 32-bit integer.
+	 */
 	public static final int INT_32_BYTES = 4;
 
-	/** The number of bytes needed to encode a 64-bit integer. */
+	/**
+	 * The number of bytes needed to encode a 64-bit integer.
+	 */
 	public static final int INT_64_BYTES = 8;
 
+	/**
+	 * The maximum number of bytes needed to encode a variable-length integer.
+	 */
+	public static final int MAX_VARINT_BYTES = 9;
+
 	public static void writeUint16(int src, byte[] dest, int offset) {
 		if (src < 0) throw new IllegalArgumentException();
 		if (src > MAX_16_BIT_UNSIGNED) throw new IllegalArgumentException();
@@ -55,6 +68,42 @@ public class ByteUtils {
 		dest[offset + 7] = (byte) (src & 0xFF);
 	}
 
+	/**
+	 * Returns the number of bytes needed to represent 'src' as a
+	 * variable-length integer.
+	 * <p>
+	 * 'src' must not be negative.
+	 */
+	public static int getVarIntBytes(long src) {
+		if (src < 0) throw new IllegalArgumentException();
+		int len = 1;
+		while ((src >>= 7) > 0) len++;
+		return len;
+	}
+
+	/**
+	 * Writes 'src' to 'dest' as a variable-length integer, starting at
+	 * 'offset', and returns the number of bytes written.
+	 * <p>
+	 * `src` must not be negative.
+	 */
+	public static int writeVarInt(long src, byte[] dest, int offset) {
+		if (src < 0) throw new IllegalArgumentException();
+		int len = getVarIntBytes(src);
+		if (dest.length < offset + len) throw new IllegalArgumentException();
+		// Work backwards from the end
+		int end = offset + len - 1;
+		for (int i = end; i >= offset; i--) {
+			// Encode 7 bits
+			dest[i] = (byte) (src & 0x7F);
+			// Raise the continuation flag, except for the last byte
+			if (i < end) dest[i] |= (byte) 0x80;
+			// Shift out the bits that were encoded
+			src >>= 7;
+		}
+		return len;
+	}
+
 	public static int readUint16(byte[] src, int offset) {
 		if (src.length < offset + INT_16_BYTES)
 			throw new IllegalArgumentException();
@@ -83,14 +132,46 @@ public class ByteUtils {
 				| (src[offset + 7] & 0xFFL);
 	}
 
-	public static int readUint(byte[] src, int bits) {
-		if (src.length << 3 < bits) throw new IllegalArgumentException();
-		int dest = 0;
-		for (int i = 0; i < bits; i++) {
-			if ((src[i >> 3] & 128 >> (i & 7)) != 0) dest |= 1 << bits - i - 1;
+	/**
+	 * Returns the length in bytes of a variable-length integer encoded in
+	 * 'src' starting at 'offset'.
+	 *
+	 * @throws FormatException if there is not a valid variable-length integer
+	 * at the specified position.
+	 */
+	public static int getVarIntBytes(byte[] src, int offset)
+			throws FormatException {
+		if (src.length < offset) throw new IllegalArgumentException();
+		for (int i = 0; i < MAX_VARINT_BYTES && offset + i < src.length; i++) {
+			// If the continuation flag is lowered, this is the last byte
+			if ((src[offset + i] & 0x80) == 0) return i + 1;
 		}
-		if (dest < 0) throw new AssertionError();
-		if (dest >= 1 << bits) throw new AssertionError();
-		return dest;
+		// We've read 9 bytes or reached the end of the input without finding
+		// the last byte
+		throw new FormatException();
+	}
+
+	/**
+	 * Reads a variable-length integer from 'src' starting at 'offset' and
+	 * returns it.
+	 *
+	 * @throws FormatException if there is not a valid variable-length integer
+	 * at the specified position.
+	 */
+	public static long readVarInt(byte[] src, int offset)
+			throws FormatException {
+		if (src.length < offset) throw new IllegalArgumentException();
+		long dest = 0;
+		for (int i = 0; i < MAX_VARINT_BYTES && offset + i < src.length; i++) {
+			// Decode 7 bits
+			dest |= src[offset + i] & 0x7F;
+			// If the continuation flag is lowered, this is the last byte
+			if ((src[offset + i] & 0x80) == 0) return dest;
+			// Make room for the next 7 bits
+			dest <<= 7;
+		}
+		// We've read 9 bytes or reached the end of the input without finding
+		// the last byte
+		throw new FormatException();
 	}
 }

bramble-core/src/main/java/org/briarproject/bramble/contact/ContactManagerImpl.java

@@ -3,8 +3,6 @@ package org.briarproject.bramble.contact;
 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.PendingContact;
-import org.briarproject.bramble.api.contact.PendingContactId;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.db.DatabaseComponent;
 import org.briarproject.bramble.api.db.DbException;
@@ -21,16 +19,12 @@ import org.briarproject.bramble.api.transport.KeyManager;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Random;
 import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.regex.Pattern;
 
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 import javax.inject.Inject;
 
-import static java.util.Collections.emptyList;
-import static org.briarproject.bramble.api.contact.PendingContact.PendingContactState.WAITING_FOR_CONNECTION;
 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;
@@ -42,12 +36,6 @@ import static org.briarproject.bramble.util.StringUtils.toUtf8;
 @NotNullByDefault
 class ContactManagerImpl implements ContactManager {
 
-	private static final int LINK_LENGTH = 64;
-	private static final String REMOTE_CONTACT_LINK =
-			"briar://" + getRandomBase32String(LINK_LENGTH);
-	private static final Pattern LINK_REGEX =
-			Pattern.compile("(briar://)?([a-z2-7]{" + LINK_LENGTH + "})");
-
 	private final DatabaseComponent db;
 	private final KeyManager keyManager;
 	private final IdentityManager identityManager;
@@ -96,48 +84,6 @@ class ContactManagerImpl implements ContactManager {
 						verified, active));
 	}
 
-	@Override
-	public String getRemoteContactLink() {
-		// TODO replace with real implementation
-		return REMOTE_CONTACT_LINK;
-	}
-
-	@SuppressWarnings("SameParameterValue")
-	private static String getRandomBase32String(int length) {
-		Random random = new Random();
-		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);
-	}
-
-	@Override
-	public boolean isValidRemoteContactLink(String link) {
-		return LINK_REGEX.matcher(link).matches();
-	}
-
-	@Override
-	public PendingContact addRemoteContactRequest(String link, String alias) {
-		// TODO replace with real implementation
-		PendingContactId id = new PendingContactId(link.getBytes());
-		return new PendingContact(id, alias, WAITING_FOR_CONNECTION,
-				System.currentTimeMillis());
-	}
-
-	@Override
-	public Collection<PendingContact> getPendingContacts() {
-		// TODO replace with real implementation
-		return emptyList();
-	}
-
-	@Override
-	public void removePendingContact(PendingContact pendingContact) {
-		// TODO replace with real implementation
-	}
-
 	@Override
 	public Contact getContact(ContactId c) throws DbException {
 		return db.transactionWithResult(true, txn -> db.getContact(txn, c));

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

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

bramble-core/src/test/java/org/briarproject/bramble/util/ByteUtilsTest.java

@@ -1,118 +1,135 @@
 package org.briarproject.bramble.util;
 
+import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.test.BrambleTestCase;
 import org.junit.Test;
 
+import java.util.Random;
+
+import static java.util.Arrays.fill;
 import static org.briarproject.bramble.util.ByteUtils.MAX_16_BIT_UNSIGNED;
 import static org.briarproject.bramble.util.ByteUtils.MAX_32_BIT_UNSIGNED;
+import static org.briarproject.bramble.util.ByteUtils.MAX_VARINT_BYTES;
+import static org.briarproject.bramble.util.ByteUtils.getVarIntBytes;
+import static org.briarproject.bramble.util.ByteUtils.readUint16;
+import static org.briarproject.bramble.util.ByteUtils.readUint32;
+import static org.briarproject.bramble.util.ByteUtils.readUint64;
+import static org.briarproject.bramble.util.ByteUtils.readVarInt;
+import static org.briarproject.bramble.util.ByteUtils.writeUint16;
+import static org.briarproject.bramble.util.ByteUtils.writeUint32;
+import static org.briarproject.bramble.util.ByteUtils.writeUint64;
+import static org.briarproject.bramble.util.ByteUtils.writeVarInt;
+import static org.briarproject.bramble.util.StringUtils.fromHexString;
+import static org.briarproject.bramble.util.StringUtils.toHexString;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
+@SuppressWarnings("ResultOfMethodCallIgnored")
 public class ByteUtilsTest extends BrambleTestCase {
 
 	@Test
 	public void testReadUint16() {
-		byte[] b = StringUtils.fromHexString("00000000");
-		assertEquals(0, ByteUtils.readUint16(b, 1));
-		b = StringUtils.fromHexString("00000100");
-		assertEquals(1, ByteUtils.readUint16(b, 1));
-		b = StringUtils.fromHexString("007FFF00");
-		assertEquals(Short.MAX_VALUE, ByteUtils.readUint16(b, 1));
-		b = StringUtils.fromHexString("00FFFF00");
-		assertEquals(65535, ByteUtils.readUint16(b, 1));
+		byte[] b = fromHexString("00000000");
+		assertEquals(0, readUint16(b, 1));
+		b = fromHexString("00000100");
+		assertEquals(1, readUint16(b, 1));
+		b = fromHexString("007FFF00");
+		assertEquals(Short.MAX_VALUE, readUint16(b, 1));
+		b = fromHexString("00FFFF00");
+		assertEquals(65535, readUint16(b, 1));
 	}
 
 	@Test(expected = IllegalArgumentException.class)
 	public void testReadUint16ValidatesArguments1() {
-		ByteUtils.readUint16(new byte[1], 0);
+		readUint16(new byte[1], 0);
 	}
 
 	@Test(expected = IllegalArgumentException.class)
 	public void testReadUint16ValidatesArguments2() {
-		ByteUtils.readUint16(new byte[2], 1);
+		readUint16(new byte[2], 1);
 	}
 
 	@Test
 	public void testReadUint32() {
-		byte[] b = StringUtils.fromHexString("000000000000");
-		assertEquals(0, ByteUtils.readUint32(b, 1));
-		b = StringUtils.fromHexString("000000000100");
-		assertEquals(1, ByteUtils.readUint32(b, 1));
-		b = StringUtils.fromHexString("007FFFFFFF00");
-		assertEquals(Integer.MAX_VALUE, ByteUtils.readUint32(b, 1));
-		b = StringUtils.fromHexString("00FFFFFFFF00");
-		assertEquals(4294967295L, ByteUtils.readUint32(b, 1));
+		byte[] b = fromHexString("000000000000");
+		assertEquals(0, readUint32(b, 1));
+		b = fromHexString("000000000100");
+		assertEquals(1, readUint32(b, 1));
+		b = fromHexString("007FFFFFFF00");
+		assertEquals(Integer.MAX_VALUE, readUint32(b, 1));
+		b = fromHexString("00FFFFFFFF00");
+		assertEquals(4294967295L, readUint32(b, 1));
 	}
 
 	@Test(expected = IllegalArgumentException.class)
 	public void testReadUint32ValidatesArguments1() {
-		ByteUtils.readUint32(new byte[3], 0);
+		readUint32(new byte[3], 0);
 	}
 
 	@Test(expected = IllegalArgumentException.class)
 	public void testReadUint32ValidatesArguments2() {
-		ByteUtils.readUint32(new byte[4], 1);
+		readUint32(new byte[4], 1);
 	}
 
 	@Test
 	public void testReadUint64() {
-		byte[] b = StringUtils.fromHexString("00000000000000000000");
-		assertEquals(0L, ByteUtils.readUint64(b, 1));
-		b = StringUtils.fromHexString("00000000000000000100");
-		assertEquals(1L, ByteUtils.readUint64(b, 1));
-		b = StringUtils.fromHexString("007FFFFFFFFFFFFFFF00");
-		assertEquals(Long.MAX_VALUE, ByteUtils.readUint64(b, 1));
-		b = StringUtils.fromHexString("00800000000000000000");
-		assertEquals(Long.MIN_VALUE, ByteUtils.readUint64(b, 1));
-		b = StringUtils.fromHexString("00FFFFFFFFFFFFFFFF00");
-		assertEquals(-1L, ByteUtils.readUint64(b, 1));
+		byte[] b = fromHexString("00000000000000000000");
+		assertEquals(0L, readUint64(b, 1));
+		b = fromHexString("00000000000000000100");
+		assertEquals(1L, readUint64(b, 1));
+		b = fromHexString("007FFFFFFFFFFFFFFF00");
+		assertEquals(Long.MAX_VALUE, readUint64(b, 1));
+		b = fromHexString("00800000000000000000");
+		assertEquals(Long.MIN_VALUE, readUint64(b, 1));
+		b = fromHexString("00FFFFFFFFFFFFFFFF00");
+		assertEquals(-1L, readUint64(b, 1));
 	}
 
 	@Test(expected = IllegalArgumentException.class)
 	public void testReadUint64ValidatesArguments1() {
-		ByteUtils.readUint64(new byte[7], 0);
+		readUint64(new byte[7], 0);
 	}
 
 	@Test(expected = IllegalArgumentException.class)
 	public void testReadUint64ValidatesArguments2() {
-		ByteUtils.readUint64(new byte[8], 1);
+		readUint64(new byte[8], 1);
 	}
 
 	@Test
 	public void testWriteUint16() {
 		byte[] b = new byte[4];
-		ByteUtils.writeUint16(0, b, 1);
-		assertEquals("00000000", StringUtils.toHexString(b));
-		ByteUtils.writeUint16(1, b, 1);
-		assertEquals("00000100", StringUtils.toHexString(b));
-		ByteUtils.writeUint16(Short.MAX_VALUE, b, 1);
-		assertEquals("007FFF00", StringUtils.toHexString(b));
-		ByteUtils.writeUint16(MAX_16_BIT_UNSIGNED, b, 1);
-		assertEquals("00FFFF00", StringUtils.toHexString(b));
+		writeUint16(0, b, 1);
+		assertEquals("00000000", toHexString(b));
+		writeUint16(1, b, 1);
+		assertEquals("00000100", toHexString(b));
+		writeUint16(Short.MAX_VALUE, b, 1);
+		assertEquals("007FFF00", toHexString(b));
+		writeUint16(MAX_16_BIT_UNSIGNED, b, 1);
+		assertEquals("00FFFF00", toHexString(b));
 	}
 
 	@Test
 	public void testWriteUint16ValidatesArguments() {
 		try {
-			ByteUtils.writeUint16(0, new byte[1], 0);
+			writeUint16(0, new byte[1], 0);
 			fail();
 		} catch (IllegalArgumentException expected) {
 			// Expected
 		}
 		try {
-			ByteUtils.writeUint16(0, new byte[2], 1);
+			writeUint16(0, new byte[2], 1);
 			fail();
 		} catch (IllegalArgumentException expected) {
 			// Expected
 		}
 		try {
-			ByteUtils.writeUint16(-1, new byte[2], 0);
+			writeUint16(-1, new byte[2], 0);
 			fail();
 		} catch (IllegalArgumentException expected) {
 			// Expected
 		}
 		try {
-			ByteUtils.writeUint16(MAX_16_BIT_UNSIGNED + 1, new byte[2], 0);
+			writeUint16(MAX_16_BIT_UNSIGNED + 1, new byte[2], 0);
 			fail();
 		} catch (IllegalArgumentException expected) {
 			// Expected
@@ -122,38 +139,38 @@ public class ByteUtilsTest extends BrambleTestCase {
 	@Test
 	public void testWriteUint32() {
 		byte[] b = new byte[6];
-		ByteUtils.writeUint32(0, b, 1);
-		assertEquals("000000000000", StringUtils.toHexString(b));
-		ByteUtils.writeUint32(1, b, 1);
-		assertEquals("000000000100", StringUtils.toHexString(b));
-		ByteUtils.writeUint32(Integer.MAX_VALUE, b, 1);
-		assertEquals("007FFFFFFF00", StringUtils.toHexString(b));
-		ByteUtils.writeUint32(MAX_32_BIT_UNSIGNED, b, 1);
-		assertEquals("00FFFFFFFF00", StringUtils.toHexString(b));
+		writeUint32(0, b, 1);
+		assertEquals("000000000000", toHexString(b));
+		writeUint32(1, b, 1);
+		assertEquals("000000000100", toHexString(b));
+		writeUint32(Integer.MAX_VALUE, b, 1);
+		assertEquals("007FFFFFFF00", toHexString(b));
+		writeUint32(MAX_32_BIT_UNSIGNED, b, 1);
+		assertEquals("00FFFFFFFF00", toHexString(b));
 	}
 
 	@Test
 	public void testWriteUint32ValidatesArguments() {
 		try {
-			ByteUtils.writeUint32(0, new byte[3], 0);
+			writeUint32(0, new byte[3], 0);
 			fail();
 		} catch (IllegalArgumentException expected) {
 			// Expected
 		}
 		try {
-			ByteUtils.writeUint32(0, new byte[4], 1);
+			writeUint32(0, new byte[4], 1);
 			fail();
 		} catch (IllegalArgumentException expected) {
 			// Expected
 		}
 		try {
-			ByteUtils.writeUint32(-1, new byte[4], 0);
+			writeUint32(-1, new byte[4], 0);
 			fail();
 		} catch (IllegalArgumentException expected) {
 			// Expected
 		}
 		try {
-			ByteUtils.writeUint32(MAX_32_BIT_UNSIGNED + 1, new byte[4], 0);
+			writeUint32(MAX_32_BIT_UNSIGNED + 1, new byte[4], 0);
 			fail();
 		} catch (IllegalArgumentException expected) {
 			// Expected
@@ -163,30 +180,30 @@ public class ByteUtilsTest extends BrambleTestCase {
 	@Test
 	public void testWriteUint64() {
 		byte[] b = new byte[10];
-		ByteUtils.writeUint64(0, b, 1);
-		assertEquals("00000000000000000000", StringUtils.toHexString(b));
-		ByteUtils.writeUint64(1, b, 1);
-		assertEquals("00000000000000000100", StringUtils.toHexString(b));
-		ByteUtils.writeUint64(Long.MAX_VALUE, b, 1);
-		assertEquals("007FFFFFFFFFFFFFFF00", StringUtils.toHexString(b));
+		writeUint64(0, b, 1);
+		assertEquals("00000000000000000000", toHexString(b));
+		writeUint64(1, b, 1);
+		assertEquals("00000000000000000100", toHexString(b));
+		writeUint64(Long.MAX_VALUE, b, 1);
+		assertEquals("007FFFFFFFFFFFFFFF00", toHexString(b));
 	}
 
 	@Test
 	public void testWriteUint64ValidatesArguments() {
 		try {
-			ByteUtils.writeUint64(0, new byte[7], 0);
+			writeUint64(0, new byte[7], 0);
 			fail();
 		} catch (IllegalArgumentException expected) {
 			// Expected
 		}
 		try {
-			ByteUtils.writeUint64(0, new byte[8], 1);
+			writeUint64(0, new byte[8], 1);
 			fail();
 		} catch (IllegalArgumentException expected) {
 			// Expected
 		}
 		try {
-			ByteUtils.writeUint64(-1, new byte[8], 0);
+			writeUint64(-1, new byte[8], 0);
 			fail();
 		} catch (IllegalArgumentException expected) {
 			// Expected
@@ -194,17 +211,170 @@ public class ByteUtilsTest extends BrambleTestCase {
 	}
 
 	@Test
-	public void testReadUint() {
-		byte[] b = new byte[1];
-		b[0] = (byte) 128;
-		for (int i = 0; i < 8; i++) {
-			assertEquals(1 << i, ByteUtils.readUint(b, i + 1));
-		}
-		b = new byte[2];
-		for (int i = 0; i < 65535; i++) {
-			ByteUtils.writeUint16(i, b, 0);
-			assertEquals(i, ByteUtils.readUint(b, 16));
-			assertEquals(i >> 1, ByteUtils.readUint(b, 15));
+	public void testGetVarIntBytesToWrite() {
+		assertEquals(1, getVarIntBytes(0));
+		assertEquals(1, getVarIntBytes(0x7F)); // Max 7-bit int
+		assertEquals(2, getVarIntBytes(0x7F + 1));
+		assertEquals(2, getVarIntBytes(0x3FFF)); // Max 14-bit int
+		assertEquals(3, getVarIntBytes(0x3FFF + 1));
+		assertEquals(3, getVarIntBytes(0x1FFFFF)); // Max 21-bit int
+		assertEquals(4, getVarIntBytes(0x1FFFFF + 1));
+		assertEquals(4, getVarIntBytes(0xFFFFFFF)); // Max 28-bit int
+		assertEquals(5, getVarIntBytes(0xFFFFFFF + 1));
+		assertEquals(5, getVarIntBytes(0x7FFFFFFFFL)); // Max 35-bit int
+		assertEquals(6, getVarIntBytes(0x7FFFFFFFFL + 1));
+		assertEquals(6, getVarIntBytes(0x3FFFFFFFFFFL)); // Max 42-bit int
+		assertEquals(7, getVarIntBytes(0x3FFFFFFFFFFL + 1));
+		assertEquals(7, getVarIntBytes(0x1FFFFFFFFFFFFL)); // Max 49-bit int
+		assertEquals(8, getVarIntBytes(0x1FFFFFFFFFFFFL + 1));
+		assertEquals(8, getVarIntBytes(0xFFFFFFFFFFFFFFL)); // Max 56-bit int
+		assertEquals(9, getVarIntBytes(0xFFFFFFFFFFFFFFL + 1));
+		assertEquals(9, getVarIntBytes(0x7FFFFFFFFFFFFFFFL)); // Max 63-bit int
+		assertEquals(MAX_VARINT_BYTES, getVarIntBytes(Long.MAX_VALUE)); // Same
+	}
+
+	@Test
+	public void testWriteVarInt() {
+		testWriteVarInt(0, 1, "00");
+		testWriteVarInt(1, 1, "01");
+		testWriteVarInt(0x7F, 1, "7F"); // Max 7-bit int
+		testWriteVarInt(0x7F + 1, 2, "8100");
+		testWriteVarInt(0x3FFF, 2, "FF7F"); // Max 14-bit int
+		testWriteVarInt(0x3FFF + 1, 3, "818000");
+		testWriteVarInt(0x1FFFFF, 3, "FFFF7F"); // Max 21-bit int
+		testWriteVarInt(0x1FFFFF + 1, 4, "81808000");
+		testWriteVarInt(0xFFFFFFF, 4, "FFFFFF7F"); // Max 28-bit int
+		testWriteVarInt(0xFFFFFFF + 1, 5, "8180808000");
+		testWriteVarInt(0x7FFFFFFFFL, 5, "FFFFFFFF7F"); // Max 35-bit int
+		testWriteVarInt(0x7FFFFFFFFL + 1, 6, "818080808000");
+		testWriteVarInt(0x3FFFFFFFFFFL, 6, "FFFFFFFFFF7F"); // Max 42-bit int
+		testWriteVarInt(0x3FFFFFFFFFFL + 1, 7, "81808080808000");
+		testWriteVarInt(0x1FFFFFFFFFFFFL, 7, "FFFFFFFFFFFF7F"); // Max 49
+		testWriteVarInt(0x1FFFFFFFFFFFFL + 1, 8, "8180808080808000");
+		testWriteVarInt(0xFFFFFFFFFFFFFFL, 8, "FFFFFFFFFFFFFF7F"); // Max 56
+		testWriteVarInt(0xFFFFFFFFFFFFFFL + 1, 9, "818080808080808000");
+		testWriteVarInt(0x7FFFFFFFFFFFFFFFL, 9, "FFFFFFFFFFFFFFFF7F"); // Max 63
+		testWriteVarInt(Long.MAX_VALUE, MAX_VARINT_BYTES, "FFFFFFFFFFFFFFFF7F");
+	}
+
+	private void testWriteVarInt(long src, int len, String destHex) {
+		byte[] dest = new byte[9];
+		assertEquals(len, writeVarInt(src, dest, 0));
+		assertEquals(destHex, toHexString(dest).substring(0, len * 2));
+	}
+
+	@Test
+	public void testGetVarIntBytesToRead() throws FormatException {
+		testGetVarIntBytesToRead(1, "00", 0);
+		testGetVarIntBytesToRead(1, "01", 0);
+		testGetVarIntBytesToRead(1, "7F", 0); // Max 7-bit int
+		testGetVarIntBytesToRead(2, "8100", 0);
+		testGetVarIntBytesToRead(2, "FF7F", 0); // Max 14-bit int
+		testGetVarIntBytesToRead(3, "818000", 0);
+		testGetVarIntBytesToRead(3, "FFFF7F", 0); // Max 21-bit int
+		testGetVarIntBytesToRead(4, "81808000", 0);
+		testGetVarIntBytesToRead(4, "FFFFFF7F", 0); // Max 28-bit int
+		testGetVarIntBytesToRead(5, "8180808000", 0);
+		testGetVarIntBytesToRead(5, "FFFFFFFF7F", 0); // Max 35-bit int
+		testGetVarIntBytesToRead(6, "818080808000", 0);
+		testGetVarIntBytesToRead(6, "FFFFFFFFFF7F", 0); // Max 42-bit int
+		testGetVarIntBytesToRead(7, "81808080808000", 0);
+		testGetVarIntBytesToRead(7, "FFFFFFFFFFFF7F", 0); // Max 49-bit int
+		testGetVarIntBytesToRead(8, "8180808080808000", 0);
+		testGetVarIntBytesToRead(8, "FFFFFFFFFFFFFF7F", 0); // Max 56-bit int
+		testGetVarIntBytesToRead(9, "818080808080808000", 0);
+		testGetVarIntBytesToRead(9, "FFFFFFFFFFFFFFFF7F", 0); // Max 63-bit int
+		// Start at offset, ignore trailing data
+		testGetVarIntBytesToRead(1, "FF0000", 1);
+		testGetVarIntBytesToRead(9, "00FFFFFFFFFFFFFFFF7F00", 1);
+	}
+
+	private void testGetVarIntBytesToRead(int len, String srcHex, int offset)
+			throws FormatException {
+		assertEquals(len, getVarIntBytes(fromHexString(srcHex), offset));
+	}
+
+	@Test(expected = FormatException.class)
+	public void testGetVarIntBytesToReadThrowsExceptionAtEndOfInput()
+			throws FormatException {
+		byte[] src = new byte[MAX_VARINT_BYTES - 1];
+		fill(src, (byte) 0xFF);
+		// Reaches end of input without finding lowered continuation flag
+		getVarIntBytes(src, 0);
+	}
+
+	@Test(expected = FormatException.class)
+	public void testGetVarIntBytesToReadThrowsExceptionAfterNineBytes()
+			throws FormatException {
+		byte[] src = new byte[MAX_VARINT_BYTES];
+		fill(src, (byte) 0xFF);
+		// Reaches max length without finding lowered continuation flag
+		getVarIntBytes(src, 0);
+	}
+
+	@Test
+	public void testReadVarInt() throws FormatException {
+		testReadVarInt(0, "00", 0);
+		testReadVarInt(1, "01", 0);
+		testReadVarInt(0x7F, "7F", 0); // Max 7-bit int
+		testReadVarInt(0x7F + 1, "8100", 0);
+		testReadVarInt(0x3FFF, "FF7F", 0); // Max 14-bit int
+		testReadVarInt(0x3FFF + 1, "818000", 0);
+		testReadVarInt(0x1FFFFF, "FFFF7F", 0); // Max 21-bit int
+		testReadVarInt(0x1FFFFF + 1, "81808000", 0);
+		testReadVarInt(0xFFFFFFF, "FFFFFF7F", 0); // Max 28-bit int
+		testReadVarInt(0xFFFFFFF + 1, "8180808000", 0);
+		testReadVarInt(0x7FFFFFFFFL, "FFFFFFFF7F", 0); // Max 35-bit int
+		testReadVarInt(0x7FFFFFFFFL + 1, "818080808000", 0);
+		testReadVarInt(0x3FFFFFFFFFFL, "FFFFFFFFFF7F", 0); // Max 42-bit int
+		testReadVarInt(0x3FFFFFFFFFFL + 1, "81808080808000", 0);
+		testReadVarInt(0x1FFFFFFFFFFFFL, "FFFFFFFFFFFF7F", 0); // Max 49-bit int
+		testReadVarInt(0x1FFFFFFFFFFFFL + 1, "8180808080808000", 0);
+		testReadVarInt(0xFFFFFFFFFFFFFFL, "FFFFFFFFFFFFFF7F", 0); // Max 56
+		testReadVarInt(0xFFFFFFFFFFFFFFL + 1, "818080808080808000", 0);
+		testReadVarInt(0x7FFFFFFFFFFFFFFFL, "FFFFFFFFFFFFFFFF7F", 0); // Max 63
+		testReadVarInt(Long.MAX_VALUE, "FFFFFFFFFFFFFFFF7F", 0);
+		// Start at offset, ignore trailing data
+		testReadVarInt(0, "FF0000", 1);
+		testReadVarInt(Long.MAX_VALUE, "00FFFFFFFFFFFFFFFF7F00", 1);
+	}
+
+	private void testReadVarInt(long dest, String srcHex, int offset)
+			throws FormatException {
+		assertEquals(dest, readVarInt(fromHexString(srcHex), offset));
+	}
+
+	@Test(expected = FormatException.class)
+	public void testReadVarIntThrowsExceptionAtEndOfInput()
+			throws FormatException {
+		byte[] src = new byte[MAX_VARINT_BYTES - 1];
+		fill(src, (byte) 0xFF);
+		// Reaches end of input without finding lowered continuation flag
+		readVarInt(src, 0);
+	}
+
+	@Test(expected = FormatException.class)
+	public void testReadVarIntThrowsExceptionAfterNineBytes()
+			throws FormatException {
+		byte[] src = new byte[MAX_VARINT_BYTES];
+		fill(src, (byte) 0xFF);
+		// Reaches max length without finding lowered continuation flag
+		readVarInt(src, 0);
+	}
+
+	@Test
+	public void testWriteAndReadVarInt() throws FormatException {
+		Random random = new Random();
+		int padding = 10;
+		byte[] buf = new byte[MAX_VARINT_BYTES + padding];
+		for (int i = 0; i < 1000; i++) {
+			long src = random.nextLong() & 0x7FFFFFFFFFFFFFFFL; // Non-negative
+			int offset = random.nextInt(padding);
+			int len = getVarIntBytes(src);
+			assertEquals(len, writeVarInt(src, buf, offset));
+			assertEquals(len, getVarIntBytes(buf, offset));
+			assertEquals(src, readVarInt(buf, offset));
+			fill(buf, (byte) 0);
 		}
 	}
 }

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

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

briar-android/build.gradle

@@ -105,7 +105,6 @@ dependencies {
 	implementation "com.android.support:cardview-v7:$supportVersion"
 	implementation "com.android.support:support-annotations:$supportVersion"
 	implementation "com.android.support:exifinterface:$supportVersion"
-	implementation "com.android.support:palette-v7:$supportVersion"
 	implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 	implementation "android.arch.lifecycle:extensions:1.1.1"
 

briar-android/src/main/AndroidManifest.xml

@@ -17,7 +17,6 @@
 	<uses-permission android:name="android.permission.USE_FINGERPRINT"/>
 	<uses-permission android:name="android.permission.VIBRATE" />
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	<uses-permission-sdk-23 android:name="android.permission.ACCESS_COARSE_LOCATION" />
 	<uses-permission-sdk-23 android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
 	<uses-permission-sdk-23 android:name="android.permission.USE_BIOMETRIC" />

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

@@ -32,7 +32,7 @@ import org.briarproject.briar.BriarCoreModule;
 import org.briarproject.briar.android.conversation.glide.BriarModelLoader;
 import org.briarproject.briar.android.login.SignInReminderReceiver;
 import org.briarproject.briar.android.reporting.BriarReportSender;
-import org.briarproject.briar.android.view.EmojiTextInputView;
+import org.briarproject.briar.android.view.TextInputView;
 import org.briarproject.briar.api.android.AndroidNotificationManager;
 import org.briarproject.briar.api.android.DozeWatchdog;
 import org.briarproject.briar.api.android.LockManager;
@@ -169,7 +169,7 @@ public interface AndroidComponent
 
 	void inject(NotificationCleanupService notificationCleanupService);
 
-	void inject(EmojiTextInputView textInputView);
+	void inject(TextInputView textInputView);
 
 	void inject(BriarModelLoader briarModelLoader);
 

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

@@ -30,10 +30,4 @@ public interface TestingConstants {
 	long EXPIRY_DATE = IS_DEBUG_BUILD || IS_BETA_BUILD ?
 			BuildConfig.BuildTimestamp + 90 * 24 * 60 * 60 * 1000L :
 			Long.MAX_VALUE;
-
-	/**
-	 * Feature flag for enabling image attachments.
-	 */
-	boolean FEATURE_FLAG_IMAGE_ATTACHMENTS = IS_DEBUG_BUILD;
-
 }

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

@@ -14,7 +14,5 @@ public interface RequestCodes {
 	int REQUEST_BLUETOOTH_DISCOVERABLE = 10;
 	int REQUEST_UNLOCK = 11;
 	int REQUEST_KEYGUARD_UNLOCK = 12;
-	int REQUEST_ATTACH_IMAGE = 13;
-	int REQUEST_SAVE_ATTACHMENT = 14;
 
 }

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

@@ -1,6 +1,5 @@
 package org.briarproject.briar.android.blog;
 
-import android.net.Uri;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -19,10 +18,7 @@ import org.briarproject.briar.android.controller.handler.UiExceptionHandler;
 import org.briarproject.briar.android.controller.handler.UiResultExceptionHandler;
 import org.briarproject.briar.android.fragment.BaseFragment;
 import org.briarproject.briar.android.view.TextInputView;
-import org.briarproject.briar.android.view.TextSendController;
-import org.briarproject.briar.android.view.TextSendController.SendListener;
-
-import java.util.List;
+import org.briarproject.briar.android.view.TextInputView.TextInputListener;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
@@ -33,11 +29,10 @@ import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
 import static org.briarproject.briar.android.activity.BriarActivity.GROUP_ID;
 import static org.briarproject.briar.android.blog.BasePostFragment.POST_ID;
-import static org.briarproject.briar.api.blog.BlogConstants.MAX_BLOG_POST_TEXT_LENGTH;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
-public class ReblogFragment extends BaseFragment implements SendListener {
+public class ReblogFragment extends BaseFragment implements TextInputListener {
 
 	public static final String TAG = ReblogFragment.class.getName();
 
@@ -82,11 +77,7 @@ public class ReblogFragment extends BaseFragment implements SendListener {
 		View v = inflater.inflate(R.layout.fragment_reblog, container, false);
 		ui = new ViewHolder(v);
 		ui.post.setTransitionName(postId);
-		TextSendController sendController =
-				new TextSendController(ui.input, this, true);
-		ui.input.setSendController(sendController);
-		ui.input.setEnabled(false);
-		ui.input.setMaxTextLength(MAX_BLOG_POST_TEXT_LENGTH);
+		ui.input.setSendButtonEnabled(false);
 		showProgressBar();
 
 		return v;
@@ -121,14 +112,16 @@ public class ReblogFragment extends BaseFragment implements SendListener {
 		ui.post.bindItem(item);
 		ui.post.hideReblogButton();
 
-		ui.input.setEnabled(true);
+		ui.input.setListener(this);
+		ui.input.setSendButtonEnabled(true);
 		ui.scrollView.post(() -> ui.scrollView.fullScroll(FOCUS_DOWN));
 	}
 
 	@Override
-	public void onSendClick(@Nullable String text, List<Uri> imageUris) {
+	public void onSendClick(String text) {
 		ui.input.hideSoftKeyboard();
-		feedController.repeatPost(item, text,
+		String comment = getComment();
+		feedController.repeatPost(item, comment,
 				new UiExceptionHandler<DbException>(this) {
 					@Override
 					public void onExceptionUi(DbException exception) {
@@ -138,6 +131,12 @@ public class ReblogFragment extends BaseFragment implements SendListener {
 		finish();
 	}
 
+	@Nullable
+	private String getComment() {
+		if (ui.input.getText().length() == 0) return null;
+		return ui.input.getText().toString();
+	}
+
 	private void showProgressBar() {
 		ui.progressBar.setVisibility(VISIBLE);
 		ui.input.setVisibility(GONE);

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

@@ -1,9 +1,9 @@
 package org.briarproject.briar.android.blog;
 
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.view.KeyEvent;
 import android.view.MenuItem;
 import android.widget.ProgressBar;
@@ -14,22 +14,19 @@ import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.identity.IdentityManager;
 import org.briarproject.bramble.api.identity.LocalAuthor;
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
+import org.briarproject.bramble.util.StringUtils;
 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.TextInputView;
-import org.briarproject.briar.android.view.TextSendController;
-import org.briarproject.briar.android.view.TextSendController.SendListener;
+import org.briarproject.briar.android.view.TextInputView.TextInputListener;
 import org.briarproject.briar.api.android.AndroidNotificationManager;
 import org.briarproject.briar.api.blog.BlogManager;
 import org.briarproject.briar.api.blog.BlogPost;
 import org.briarproject.briar.api.blog.BlogPostFactory;
 
 import java.security.GeneralSecurityException;
-import java.util.List;
 import java.util.logging.Logger;
 
 import javax.inject.Inject;
@@ -38,13 +35,10 @@ import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.util.LogUtils.logException;
-import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
 import static org.briarproject.briar.api.blog.BlogConstants.MAX_BLOG_POST_TEXT_LENGTH;
 
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
 public class WriteBlogPostActivity extends BriarActivity
-		implements OnEditorActionListener, SendListener {
+		implements OnEditorActionListener, TextInputListener {
 
 	private static final Logger LOG =
 			Logger.getLogger(WriteBlogPostActivity.class.getName());
@@ -64,8 +58,9 @@ public class WriteBlogPostActivity extends BriarActivity
 	@Inject
 	volatile BlogManager blogManager;
 
+	@SuppressWarnings("ConstantConditions")
 	@Override
-	public void onCreate(@Nullable Bundle state) {
+	public void onCreate(Bundle state) {
 		super.onCreate(state);
 
 		Intent i = getIntent();
@@ -76,10 +71,24 @@ public class WriteBlogPostActivity extends BriarActivity
 		setContentView(R.layout.activity_write_blog_post);
 
 		input = findViewById(R.id.textInput);
-		TextSendController sendController =
-				new TextSendController(input, this, false);
-		input.setSendController(sendController);
-		input.setMaxTextLength(MAX_BLOG_POST_TEXT_LENGTH);
+		input.setSendButtonEnabled(false);
+		input.addTextChangedListener(new TextWatcher() {
+			@Override
+			public void beforeTextChanged(CharSequence s, int start, int count,
+					int after) {
+			}
+
+			@Override
+			public void onTextChanged(CharSequence s, int start, int before,
+					int count) {
+			}
+
+			@Override
+			public void afterTextChanged(Editable s) {
+				enableOrDisablePublishButton();
+			}
+		});
+		input.setListener(this);
 
 		progressBar = findViewById(R.id.progressBar);
 	}
@@ -118,15 +127,18 @@ public class WriteBlogPostActivity extends BriarActivity
 		return true;
 	}
 
-	@Override
-	public void onSendClick(@Nullable String text, List<Uri> imageUris) {
-		if (isNullOrEmpty(text)) throw new AssertionError();
+	private void enableOrDisablePublishButton() {
+		input.setSendButtonEnabled(input.getText().length() > 0);
+	}
 
+	@Override
+	public void onSendClick(String text) {
 		// hide publish button, show progress bar
 		input.hideSoftKeyboard();
 		input.setVisibility(GONE);
 		progressBar.setVisibility(VISIBLE);
 
+		text = StringUtils.truncateUtf8(text, MAX_BLOG_POST_TEXT_LENGTH);
 		storePost(text);
 	}
 

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

@@ -4,7 +4,6 @@ import android.content.res.Resources;
 import android.graphics.BitmapFactory;
 import android.support.annotation.Nullable;
 import android.support.media.ExifInterface;
-import android.webkit.MimeTypeMap;
 
 import org.briarproject.bramble.api.Pair;
 import org.briarproject.bramble.api.db.DatabaseExecutor;
@@ -16,7 +15,6 @@ import org.briarproject.briar.api.messaging.Attachment;
 import org.briarproject.briar.api.messaging.AttachmentHeader;
 import org.briarproject.briar.api.messaging.MessagingManager;
 
-import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -91,44 +89,22 @@ class AttachmentController {
 		return attachments;
 	}
 
-	/**
-	 * Creates {@link AttachmentItem}s from the passed headers and Attachments.
-	 *
-	 * Note: This closes the {@link Attachment}'s {@link InputStream}.
-	 */
 	List<AttachmentItem> getAttachmentItems(
 			List<Pair<AttachmentHeader, Attachment>> attachments) {
-		boolean needsSize = attachments.size() == 1;
 		List<AttachmentItem> items = new ArrayList<>(attachments.size());
 		for (Pair<AttachmentHeader, Attachment> a : attachments) {
 			AttachmentItem item =
-					getAttachmentItem(a.getFirst(), a.getSecond(), needsSize);
+					getAttachmentItem(a.getFirst(), a.getSecond());
 			items.add(item);
 		}
 		return items;
 	}
 
-	/**
-	 * Creates an {@link AttachmentItem} from the {@link Attachment}'s
-	 * {@link InputStream} which will be closed when this method returns.
-	 */
-	AttachmentItem getAttachmentItem(AttachmentHeader h, Attachment a,
-			boolean needsSize) {
+	private AttachmentItem getAttachmentItem(AttachmentHeader h, Attachment a) {
 		MessageId messageId = h.getMessageId();
-		if (!needsSize) {
-			String mimeType = h.getContentType();
-			String extension = getExtensionFromMimeType(mimeType);
-			boolean hasError = false;
-			if (extension == null) {
-				extension = "";
-				hasError = true;
-			}
-			return new AttachmentItem(messageId, 0, 0, mimeType, extension, 0,
-					0, hasError);
-		}
-
 		Size size = new Size();
-		InputStream is = new BufferedInputStream(a.getStream());
+
+		InputStream is = a.getStream();
 		is.mark(Integer.MAX_VALUE);
 		try {
 			// use exif to get size
@@ -151,25 +127,12 @@ class AttachmentController {
 		}
 
 		// calculate thumbnail size
-		Size thumbnailSize = new Size(defaultSize, defaultSize, size.mimeType);
+		Size thumbnailSize = new Size(defaultSize, defaultSize);
 		if (!size.error) {
-			thumbnailSize =
-					getThumbnailSize(size.width, size.height, size.mimeType);
-		}
-		// get file extension
-		String extension = getExtensionFromMimeType(size.mimeType);
-		if (extension == null) {
-			return new AttachmentItem(messageId, 0, 0, "", "", 0, 0, true);
+			thumbnailSize = getThumbnailSize(size.width, size.height);
 		}
 		return new AttachmentItem(messageId, size.width, size.height,
-				size.mimeType, extension, thumbnailSize.width,
-				thumbnailSize.height, size.error);
-	}
-
-	@Nullable
-	private String getExtensionFromMimeType(String mimeType) {
-		MimeTypeMap mimeTypeMap = MimeTypeMap.getSingleton();
-		return mimeTypeMap.getExtensionFromMimeType(mimeType);
+				thumbnailSize.width, thumbnailSize.height, size.error);
 	}
 
 	/**
@@ -188,9 +151,9 @@ class AttachmentController {
 				orientation == ORIENTATION_TRANSVERSE ||
 				orientation == ORIENTATION_TRANSPOSE) {
 			//noinspection SuspiciousNameCombination
-			return new Size(height, width, "image/jpeg");
+			return new Size(height, width);
 		}
-		return new Size(width, height, "image/jpeg");
+		return new Size(width, height);
 	}
 
 	/**
@@ -202,11 +165,10 @@ class AttachmentController {
 		BitmapFactory.decodeStream(is, null, options);
 		if (options.outWidth < 1 || options.outHeight < 1)
 			return new Size();
-		return new Size(options.outWidth, options.outHeight,
-				options.outMimeType);
+		return new Size(options.outWidth, options.outHeight);
 	}
 
-	private Size getThumbnailSize(int width, int height, String mimeType) {
+	private Size getThumbnailSize(int width, int height) {
 		float widthPercentage = maxWidth / (float) width;
 		float heightPercentage = maxHeight / (float) height;
 		float scaleFactor = Math.min(widthPercentage, heightPercentage);
@@ -222,27 +184,24 @@ class AttachmentController {
 			if (thumbnailWidth > maxWidth) thumbnailWidth = maxWidth;
 			if (thumbnailHeight > maxHeight) thumbnailHeight = maxHeight;
 		}
-		return new Size(thumbnailWidth, thumbnailHeight, mimeType);
+		return new Size(thumbnailWidth, thumbnailHeight);
 	}
 
 	private static class Size {
 
 		private final int width;
 		private final int height;
-		private final String mimeType;
 		private final boolean error;
 
-		private Size(int width, int height, String mimeType) {
+		private Size(int width, int height) {
 			this.width = width;
 			this.height = height;
-			this.mimeType = mimeType;
 			this.error = false;
 		}
 
 		private Size() {
 			this.width = 0;
 			this.height = 0;
-			this.mimeType = "";
 			this.error = true;
 		}
 	}

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

@@ -14,7 +14,6 @@ public class AttachmentItem implements Parcelable {
 
 	private final MessageId messageId;
 	private final int width, height;
-	private final String mimeType, extension;
 	private final int thumbnailWidth, thumbnailHeight;
 	private final boolean hasError;
 
@@ -31,14 +30,11 @@ public class AttachmentItem implements Parcelable {
 				}
 			};
 
-	AttachmentItem(MessageId messageId, int width, int height, String mimeType,
-			String extension, int thumbnailWidth, int thumbnailHeight,
-			boolean hasError) {
+	AttachmentItem(MessageId messageId, int width, int height,
+			int thumbnailWidth, int thumbnailHeight, boolean hasError) {
 		this.messageId = messageId;
 		this.width = width;
 		this.height = height;
-		this.mimeType = mimeType;
-		this.extension = extension;
 		this.thumbnailWidth = thumbnailWidth;
 		this.thumbnailHeight = thumbnailHeight;
 		this.hasError = hasError;
@@ -50,8 +46,6 @@ public class AttachmentItem implements Parcelable {
 		messageId = new MessageId(messageIdByte);
 		width = in.readInt();
 		height = in.readInt();
-		mimeType = in.readString();
-		extension = in.readString();
 		thumbnailWidth = in.readInt();
 		thumbnailHeight = in.readInt();
 		hasError = in.readByte() != 0;
@@ -69,14 +63,6 @@ public class AttachmentItem implements Parcelable {
 		return height;
 	}
 
-	String getMimeType() {
-		return mimeType;
-	}
-
-	String getExtension() {
-		return extension;
-	}
-
 	int getThumbnailWidth() {
 		return thumbnailWidth;
 	}
@@ -104,8 +90,6 @@ public class AttachmentItem implements Parcelable {
 		dest.writeByteArray(messageId.getBytes());
 		dest.writeInt(width);
 		dest.writeInt(height);
-		dest.writeString(mimeType);
-		dest.writeString(extension);
 		dest.writeInt(thumbnailWidth);
 		dest.writeInt(thumbnailHeight);
 		dest.writeByte((byte) (hasError ? 1 : 0));

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

@@ -1,12 +1,10 @@
 package org.briarproject.briar.android.conversation;
 
-import android.annotation.SuppressLint;
 import android.arch.lifecycle.Observer;
 import android.arch.lifecycle.ViewModelProvider;
 import android.arch.lifecycle.ViewModelProviders;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.annotation.UiThread;
@@ -29,6 +27,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.Pair;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.contact.ContactManager;
@@ -48,9 +47,11 @@ import org.briarproject.bramble.api.plugin.event.ContactDisconnectedEvent;
 import org.briarproject.bramble.api.settings.Settings;
 import org.briarproject.bramble.api.settings.SettingsManager;
 import org.briarproject.bramble.api.sync.GroupId;
+import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.bramble.api.sync.event.MessagesAckedEvent;
 import org.briarproject.bramble.api.sync.event.MessagesSentEvent;
+import org.briarproject.bramble.util.StringUtils;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.activity.BriarActivity;
@@ -61,12 +62,8 @@ import org.briarproject.briar.android.forum.ForumActivity;
 import org.briarproject.briar.android.introduction.IntroductionActivity;
 import org.briarproject.briar.android.privategroup.conversation.GroupActivity;
 import org.briarproject.briar.android.view.BriarRecyclerView;
-import org.briarproject.briar.android.view.ImagePreview;
-import org.briarproject.briar.android.view.TextAttachmentController;
-import org.briarproject.briar.android.view.TextAttachmentController.AttachImageListener;
 import org.briarproject.briar.android.view.TextInputView;
-import org.briarproject.briar.android.view.TextSendController;
-import org.briarproject.briar.android.view.TextSendController.SendListener;
+import org.briarproject.briar.android.view.TextInputView.TextInputListener;
 import org.briarproject.briar.api.android.AndroidNotificationManager;
 import org.briarproject.briar.api.blog.BlogSharingManager;
 import org.briarproject.briar.api.client.ProtocolStateException;
@@ -81,6 +78,7 @@ import org.briarproject.briar.api.introduction.IntroductionManager;
 import org.briarproject.briar.api.messaging.Attachment;
 import org.briarproject.briar.api.messaging.AttachmentHeader;
 import org.briarproject.briar.api.messaging.MessagingManager;
+import org.briarproject.briar.api.messaging.PrivateMessage;
 import org.briarproject.briar.api.messaging.PrivateMessageFactory;
 import org.briarproject.briar.api.messaging.PrivateMessageHeader;
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager;
@@ -106,8 +104,7 @@ import static android.os.Build.VERSION.SDK_INT;
 import static android.support.v4.app.ActivityOptionsCompat.makeSceneTransitionAnimation;
 import static android.support.v4.view.ViewCompat.setTransitionName;
 import static android.support.v7.util.SortedList.INVALID_POSITION;
-import static android.view.Gravity.RIGHT;
-import static android.widget.Toast.LENGTH_LONG;
+import static android.view.Gravity.END;
 import static android.widget.Toast.LENGTH_SHORT;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.sort;
@@ -117,9 +114,6 @@ import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.util.LogUtils.logDuration;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.bramble.util.LogUtils.now;
-import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
-import static org.briarproject.briar.android.TestingConstants.FEATURE_FLAG_IMAGE_ATTACHMENTS;
-import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_ATTACH_IMAGE;
 import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_INTRODUCTION;
 import static org.briarproject.briar.android.conversation.ImageActivity.ATTACHMENT;
 import static org.briarproject.briar.android.conversation.ImageActivity.DATE;
@@ -135,8 +129,8 @@ import static uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt.S
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
 public class ConversationActivity extends BriarActivity
-		implements EventListener, ConversationListener, SendListener,
-		TextCache, AttachmentCache, AttachImageListener {
+		implements EventListener, ConversationListener, TextInputListener,
+		TextCache, AttachmentCache {
 
 	public static final String CONTACT_ID = "briar.CONTACT_ID";
 
@@ -166,7 +160,6 @@ public class ConversationActivity extends BriarActivity
 	private BriarRecyclerView list;
 	private LinearLayoutManager layoutManager;
 	private TextInputView textInputView;
-	private TextSendController sendController;
 
 	// Fields that are accessed from background threads must be volatile
 	@Inject
@@ -193,6 +186,8 @@ public class ConversationActivity extends BriarActivity
 	ViewModelProvider.Factory viewModelFactory;
 
 	private volatile ContactId contactId;
+	@Nullable
+	private volatile GroupId messagingGroupId;
 
 	private final Observer<String> contactNameObserver = name -> {
 		requireNonNull(name);
@@ -202,9 +197,7 @@ public class ConversationActivity extends BriarActivity
 	@Override
 	public void onCreate(@Nullable Bundle state) {
 		if (SDK_INT >= 21) {
-			// Spurious lint warning - using END causes a crash
-			@SuppressLint("RtlHardcoded")
-			Transition slide = new Slide(RIGHT);
+			Transition slide = new Slide(END);
 			setSceneTransitionAnimation(slide, null, slide);
 		}
 		super.onCreate(state);
@@ -240,8 +233,6 @@ public class ConversationActivity extends BriarActivity
 			requireNonNull(deleted);
 			if (deleted) finish();
 		});
-		viewModel.getAddedPrivateMessage()
-				.observe(this, this::onAddedPrivateMessage);
 
 		setTransitionName(toolbarAvatar, getAvatarTransitionName(contactId));
 		setTransitionName(toolbarStatus, getBulbTransitionName(contactId));
@@ -256,16 +247,7 @@ public class ConversationActivity extends BriarActivity
 		list.setEmptyText(getString(R.string.no_private_messages));
 
 		textInputView = findViewById(R.id.text_input_container);
-		if (FEATURE_FLAG_IMAGE_ATTACHMENTS) {
-			ImagePreview imagePreview = findViewById(R.id.imagePreview);
-			sendController = new TextAttachmentController(textInputView,
-					imagePreview, this, this);
-		} else {
-			sendController = new TextSendController(textInputView, this, false);
-		}
-		textInputView.setSendController(sendController);
-		textInputView.setMaxTextLength(MAX_PRIVATE_MESSAGE_TEXT_LENGTH);
-		textInputView.setEnabled(false);
+		textInputView.setListener(this);
 	}
 
 	@Override
@@ -282,9 +264,6 @@ public class ConversationActivity extends BriarActivity
 					Snackbar.LENGTH_SHORT);
 			snackbar.getView().setBackgroundResource(R.color.briar_primary);
 			snackbar.show();
-		} else if (request == REQUEST_ATTACH_IMAGE && result == RESULT_OK) {
-			// remove cast when removing FEATURE_FLAG_IMAGE_ATTACHMENTS
-			((TextAttachmentController) sendController).onImageReceived(data);
 		}
 	}
 
@@ -394,7 +373,7 @@ public class ConversationActivity extends BriarActivity
 								textCache.put(id, text);
 							}
 						}
-						if (h.getAttachmentHeaders().size() == 1) {
+						if (!h.getAttachmentHeaders().isEmpty()) {
 							List<AttachmentItem> items =
 									attachmentController.get(id);
 							if (items == null) {
@@ -423,7 +402,7 @@ public class ConversationActivity extends BriarActivity
 		runOnUiThreadUnlessDestroyed(() -> {
 			if (revision == adapter.getRevision()) {
 				adapter.incrementRevision();
-				textInputView.setEnabled(true);
+				textInputView.setSendButtonEnabled(true);
 				List<ConversationItem> items = createItems(headers);
 				adapter.addAll(items);
 				list.showData();
@@ -483,7 +462,7 @@ public class ConversationActivity extends BriarActivity
 			try {
 				List<Pair<AttachmentHeader, Attachment>> attachments =
 						attachmentController.getMessageAttachments(headers);
-				// TODO move getting the items off to IoExecutor, if size == 1
+				// TODO move getting the items off to the IoExecutor
 				List<AttachmentItem> items =
 						attachmentController.getAttachmentItems(attachments);
 				displayMessageAttachments(messageId, items);
@@ -591,18 +570,14 @@ public class ConversationActivity extends BriarActivity
 	}
 
 	@Override
-	public void onAttachImage(Intent intent) {
-		startActivityForResult(intent, REQUEST_ATTACH_IMAGE);
-	}
-
-	@Override
-	public void onSendClick(@Nullable String text, List<Uri> imageUris) {
-		if (isNullOrEmpty(text) && imageUris.isEmpty())
-			throw new AssertionError();
+	public void onSendClick(String text) {
+		if (text.isEmpty()) return;
+		text = StringUtils.truncateUtf8(text, MAX_PRIVATE_MESSAGE_TEXT_LENGTH);
 		long timestamp = System.currentTimeMillis();
 		timestamp = Math.max(timestamp, getMinTimestampForNewMessage());
-		viewModel.sendMessage(text, imageUris, timestamp);
-		textInputView.clearText();
+		if (messagingGroupId == null) loadGroupId(text, timestamp);
+		else createMessage(text, timestamp);
+		textInputView.setText("");
 	}
 
 	private long getMinTimestampForNewMessage() {
@@ -611,10 +586,48 @@ public class ConversationActivity extends BriarActivity
 		return item == null ? 0 : item.getTime() + 1;
 	}
 
-	private void onAddedPrivateMessage(@Nullable PrivateMessageHeader h) {
-		if (h == null) return;
-		addConversationItem(h.accept(visitor));
-		viewModel.onAddedPrivateMessageSeen();
+	private void loadGroupId(String text, long timestamp) {
+		runOnDbThread(() -> {
+			try {
+				messagingGroupId =
+						messagingManager.getConversationId(contactId);
+				createMessage(text, timestamp);
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+			}
+
+		});
+	}
+
+	private void createMessage(String text, long timestamp) {
+		cryptoExecutor.execute(() -> {
+			try {
+				//noinspection ConstantConditions init in loadGroupId()
+				storeMessage(privateMessageFactory.createPrivateMessage(
+						messagingGroupId, timestamp, text, emptyList()), text);
+			} catch (FormatException e) {
+				throw new RuntimeException(e);
+			}
+		});
+	}
+
+	private void storeMessage(PrivateMessage m, String text) {
+		runOnDbThread(() -> {
+			try {
+				long start = now();
+				messagingManager.addLocalMessage(m);
+				logDuration(LOG, "Storing message", start);
+				Message message = m.getMessage();
+				PrivateMessageHeader h = new PrivateMessageHeader(
+						message.getId(), message.getGroupId(),
+						message.getTimestamp(), true, false, false, false,
+						true, emptyList());
+				textCache.put(message.getId(), text);
+				addConversationItem(h.accept(visitor));
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+			}
+		});
 	}
 
 	private void askToRemoveContact() {

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

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

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

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

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

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

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

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

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

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

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

@@ -5,36 +5,19 @@ import android.arch.lifecycle.AndroidViewModel;
 import android.arch.lifecycle.LiveData;
 import android.arch.lifecycle.MutableLiveData;
 import android.arch.lifecycle.Transformations;
-import android.content.ContentResolver;
-import android.net.Uri;
 import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
 
-import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.Pair;
 import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.contact.ContactManager;
-import org.briarproject.bramble.api.crypto.CryptoExecutor;
 import org.briarproject.bramble.api.db.DatabaseExecutor;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.NoSuchContactException;
 import org.briarproject.bramble.api.identity.AuthorId;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.GroupId;
-import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.briar.android.util.UiUtils;
-import org.briarproject.briar.api.messaging.Attachment;
-import org.briarproject.briar.api.messaging.AttachmentHeader;
 import org.briarproject.briar.api.messaging.MessagingManager;
-import org.briarproject.briar.api.messaging.PrivateMessage;
-import org.briarproject.briar.api.messaging.PrivateMessageFactory;
-import org.briarproject.briar.api.messaging.PrivateMessageHeader;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
@@ -43,11 +26,9 @@ import javax.inject.Inject;
 import static java.util.Objects.requireNonNull;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
-import static org.briarproject.bramble.util.IoUtils.tryToClose;
 import static org.briarproject.bramble.util.LogUtils.logDuration;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.bramble.util.LogUtils.now;
-import static org.briarproject.briar.android.util.UiUtils.observeForeverOnce;
 
 @NotNullByDefault
 public class ConversationViewModel extends AndroidViewModel {
@@ -57,11 +38,7 @@ public class ConversationViewModel extends AndroidViewModel {
 
 	@DatabaseExecutor
 	private final Executor dbExecutor;
-	@CryptoExecutor
-	private final Executor cryptoExecutor;
-	private final MessagingManager messagingManager;
 	private final ContactManager contactManager;
-	private final PrivateMessageFactory privateMessageFactory;
 	private final AttachmentController attachmentController;
 
 	@Nullable
@@ -73,24 +50,14 @@ public class ConversationViewModel extends AndroidViewModel {
 			Transformations.map(contact, UiUtils::getContactDisplayName);
 	private final MutableLiveData<Boolean> contactDeleted =
 			new MutableLiveData<>();
-	private final MutableLiveData<GroupId> messagingGroupId =
-			new MutableLiveData<>();
-	private final MutableLiveData<PrivateMessageHeader> addedHeader =
-			new MutableLiveData<>();
 
 	@Inject
 	ConversationViewModel(Application application,
 			@DatabaseExecutor Executor dbExecutor,
-			@CryptoExecutor Executor cryptoExecutor,
-			MessagingManager messagingManager,
-			ContactManager contactManager,
-			PrivateMessageFactory privateMessageFactory) {
+			ContactManager contactManager, MessagingManager messagingManager) {
 		super(application);
 		this.dbExecutor = dbExecutor;
-		this.cryptoExecutor = cryptoExecutor;
-		this.messagingManager = messagingManager;
 		this.contactManager = contactManager;
-		this.privateMessageFactory = privateMessageFactory;
 		this.attachmentController = new AttachmentController(messagingManager,
 				application.getResources());
 		contactDeleted.setValue(false);
@@ -133,119 +100,6 @@ public class ConversationViewModel extends AndroidViewModel {
 		});
 	}
 
-	void sendMessage(@Nullable String text, List<Uri> uris, long timestamp) {
-		if (messagingGroupId.getValue() == null) loadGroupId();
-		observeForeverOnce(messagingGroupId, groupId -> {
-			if (groupId == null) return;
-			// calls through to creating and storing the message
-			storeAttachments(groupId, text, uris, timestamp);
-		});
-	}
-
-	private void loadGroupId() {
-		if (contactId == null) throw new IllegalStateException();
-		dbExecutor.execute(() -> {
-			try {
-				messagingGroupId.postValue(
-						messagingManager.getConversationId(contactId));
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
-	}
-
-	private void storeAttachments(GroupId groupId, @Nullable String text,
-			List<Uri> uris, long timestamp) {
-		dbExecutor.execute(() -> {
-			long start = now();
-			List<AttachmentHeader> attachments = new ArrayList<>();
-			List<AttachmentItem> items = new ArrayList<>();
-			boolean needsSize = uris.size() == 1;
-			for (Uri uri : uris) {
-				Pair<AttachmentHeader, AttachmentItem> pair =
-						createAttachmentHeader(groupId, uri, timestamp,
-								needsSize);
-				if (pair == null) continue;
-				attachments.add(pair.getFirst());
-				items.add(pair.getSecond());
-			}
-			logDuration(LOG, "Storing attachments", start);
-			createMessage(groupId, text, attachments, items, timestamp);
-		});
-	}
-
-	@Nullable
-	@DatabaseExecutor
-	private Pair<AttachmentHeader, AttachmentItem> createAttachmentHeader(
-			GroupId groupId, Uri uri, long timestamp, boolean needsSize) {
-		InputStream is = null;
-		try {
-			ContentResolver contentResolver =
-					getApplication().getContentResolver();
-			is = contentResolver.openInputStream(uri);
-			if (is == null) throw new IOException();
-			String contentType = contentResolver.getType(uri);
-			if (contentType == null) throw new IOException("null content type");
-			AttachmentHeader h = messagingManager
-					.addLocalAttachment(groupId, timestamp, contentType, is);
-			is.close();
-			// re-open stream to get AttachmentItem
-			is = contentResolver.openInputStream(uri);
-			if (is == null) throw new IOException();
-			AttachmentItem item = attachmentController
-					.getAttachmentItem(h, new Attachment(is), needsSize);
-			return new Pair<>(h, item);
-		} catch (DbException | IOException e) {
-			logException(LOG, WARNING, e);
-			return null;
-		} finally {
-			if (is != null) tryToClose(is, LOG, WARNING);
-		}
-	}
-
-	private void createMessage(GroupId groupId, @Nullable String text,
-			List<AttachmentHeader> attachments, List<AttachmentItem> aItems,
-			long timestamp) {
-		cryptoExecutor.execute(() -> {
-			try {
-				// TODO remove when text can be null in the backend
-				String msgText = text == null ? "null" : text;
-				PrivateMessage pm = privateMessageFactory
-						.createPrivateMessage(groupId, timestamp, msgText,
-								attachments);
-				attachmentController.put(pm.getMessage().getId(), aItems);
-				storeMessage(pm, msgText, attachments);
-			} catch (FormatException e) {
-				throw new RuntimeException(e);
-			}
-		});
-	}
-
-	private void storeMessage(PrivateMessage m, @Nullable String text,
-			List<AttachmentHeader> attachments) {
-		dbExecutor.execute(() -> {
-			try {
-				long start = now();
-				messagingManager.addLocalMessage(m);
-				logDuration(LOG, "Storing message", start);
-				Message message = m.getMessage();
-				PrivateMessageHeader h = new PrivateMessageHeader(
-						message.getId(), message.getGroupId(),
-						message.getTimestamp(), true, true, false, false,
-						text != null, attachments);
-				// TODO add text to cache when available here
-				addedHeader.postValue(h);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
-	}
-
-	@UiThread
-	void onAddedPrivateMessageSeen() {
-		addedHeader.setValue(null);
-	}
-
 	AttachmentController getAttachmentController() {
 		return attachmentController;
 	}
@@ -266,8 +120,4 @@ public class ConversationViewModel extends AndroidViewModel {
 		return contactDeleted;
 	}
 
-	LiveData<PrivateMessageHeader> getAddedPrivateMessage() {
-		return addedHeader;
-	}
-
 }

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

@@ -1,23 +1,14 @@
 package org.briarproject.briar.android.conversation;
 
-import android.arch.lifecycle.ViewModelProvider;
-import android.arch.lifecycle.ViewModelProviders;
-import android.content.DialogInterface.OnClickListener;
-import android.content.Intent;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
 import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.Snackbar;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v7.app.AlertDialog.Builder;
 import android.support.v7.widget.Toolbar;
 import android.transition.Fade;
 import android.transition.Transition;
-import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.Window;
@@ -35,18 +26,8 @@ import org.briarproject.briar.android.activity.BriarActivity;
 import org.briarproject.briar.android.conversation.glide.GlideApp;
 import org.briarproject.briar.android.view.PullDownLayout;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
-import javax.inject.Inject;
-
-import static android.content.Intent.ACTION_CREATE_DOCUMENT;
-import static android.content.Intent.CATEGORY_OPENABLE;
-import static android.content.Intent.EXTRA_TITLE;
 import static android.graphics.Color.TRANSPARENT;
 import static android.os.Build.VERSION.SDK_INT;
-import static android.support.design.widget.Snackbar.LENGTH_LONG;
 import static android.view.View.GONE;
 import static android.view.View.SYSTEM_UI_FLAG_FULLSCREEN;
 import static android.view.View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN;
@@ -56,7 +37,6 @@ import static android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS;
 import static android.widget.ImageView.ScaleType.FIT_START;
 import static com.bumptech.glide.load.engine.DiskCacheStrategy.NONE;
 import static java.util.Objects.requireNonNull;
-import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_SAVE_ATTACHMENT;
 import static org.briarproject.briar.android.util.UiUtils.formatDateAbsolute;
 
 public class ImageActivity extends BriarActivity
@@ -66,14 +46,9 @@ public class ImageActivity extends BriarActivity
 	final static String NAME = "name";
 	final static String DATE = "date";
 
-	@Inject
-	ViewModelProvider.Factory viewModelFactory;
-
-	private ImageViewModel viewModel;
 	private PullDownLayout layout;
 	private AppBarLayout appBarLayout;
 	private PhotoView photoView;
-	private AttachmentItem attachment;
 
 	@Override
 	public void injectActivity(ActivityComponent component) {
@@ -92,11 +67,6 @@ public class ImageActivity extends BriarActivity
 			setSceneTransitionAnimation(transition, null, transition);
 		}
 
-		// get View Model
-		viewModel = ViewModelProviders.of(this, viewModelFactory)
-				.get(ImageViewModel.class);
-		viewModel.getSaveState().observe(this, this::onImageSaveStateChanged);
-
 		// inflate layout
 		setContentView(R.layout.activity_image);
 		layout = findViewById(R.id.layout);
@@ -118,7 +88,7 @@ public class ImageActivity extends BriarActivity
 		TextView dateView = toolbar.findViewById(R.id.dateView);
 
 		// Intent Extras
-		attachment = getIntent().getParcelableExtra(ATTACHMENT);
+		AttachmentItem attachment = getIntent().getParcelableExtra(ATTACHMENT);
 		String name = getIntent().getStringExtra(NAME);
 		long time = getIntent().getLongExtra(DATE, 0);
 		String date = formatDateAbsolute(this, time);
@@ -173,34 +143,17 @@ public class ImageActivity extends BriarActivity
 				.into(photoView);
 	}
 
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		getMenuInflater().inflate(R.menu.image_actions, menu);
-		return super.onCreateOptionsMenu(menu);
-	}
-
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
 			case android.R.id.home:
 				onBackPressed();
 				return true;
-			case R.id.action_save_image:
-				showSaveImageDialog();
-				return true;
 			default:
 				return super.onOptionsItemSelected(item);
 		}
 	}
 
-	@Override
-	protected void onActivityResult(int request, int result, Intent data) {
-		super.onActivityResult(request, result, data);
-		if (request == REQUEST_SAVE_ATTACHMENT && result == RESULT_OK) {
-			viewModel.saveImage(attachment, data.getData());
-		}
-	}
-
 	@Override
 	public void onPullStart() {
 		appBarLayout.animate()
@@ -237,8 +190,9 @@ public class ImageActivity extends BriarActivity
 
 	@RequiresApi(api = 16)
 	private void hideSystemUi(View decorView) {
-		decorView.setSystemUiVisibility(SYSTEM_UI_FLAG_FULLSCREEN |
-				SYSTEM_UI_FLAG_LAYOUT_STABLE | SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+		decorView.setSystemUiVisibility(SYSTEM_UI_FLAG_LAYOUT_STABLE
+				| SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+				| SYSTEM_UI_FLAG_FULLSCREEN
 		);
 		appBarLayout.animate()
 				.translationYBy(-1 * appBarLayout.getHeight())
@@ -250,7 +204,8 @@ public class ImageActivity extends BriarActivity
 	@RequiresApi(api = 16)
 	private void showSystemUi(View decorView) {
 		decorView.setSystemUiVisibility(
-				SYSTEM_UI_FLAG_LAYOUT_STABLE | SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+				SYSTEM_UI_FLAG_LAYOUT_STABLE
+						| SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
 		);
 		appBarLayout.animate()
 				.translationYBy(appBarLayout.getHeight())
@@ -275,49 +230,4 @@ public class ImageActivity extends BriarActivity
 				drawableTop != appBarLayout.getTop();
 	}
 
-	private void showSaveImageDialog() {
-		OnClickListener okListener = (dialog, which) -> {
-			if (SDK_INT >= 19) {
-				Intent intent = getCreationIntent();
-				startActivityForResult(intent, REQUEST_SAVE_ATTACHMENT);
-			} else {
-				viewModel.saveImage(attachment);
-			}
-		};
-		Builder builder = new Builder(this, R.style.BriarDialogTheme);
-		builder.setTitle(getString(R.string.dialog_title_save_image));
-		builder.setMessage(getString(R.string.dialog_message_save_image));
-		Drawable icon = ContextCompat.getDrawable(this, R.drawable.ic_security);
-		DrawableCompat.setTint(requireNonNull(icon),
-				ContextCompat.getColor(this, R.color.color_primary));
-		builder.setIcon(icon);
-		builder.setPositiveButton(R.string.save_image, okListener);
-		builder.setNegativeButton(R.string.cancel, null);
-		builder.show();
-	}
-
-	@RequiresApi(api = 19)
-	private Intent getCreationIntent() {
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss",
-				Locale.getDefault());
-		String fileName = sdf.format(new Date());
-		Intent intent = new Intent(ACTION_CREATE_DOCUMENT);
-		intent.addCategory(CATEGORY_OPENABLE);
-		intent.setType(attachment.getMimeType());
-		intent.putExtra(EXTRA_TITLE, fileName);
-		return intent;
-	}
-
-	private void onImageSaveStateChanged(@Nullable Boolean error) {
-		if (error == null) return;
-		int stringRes = error ?
-				R.string.save_image_error : R.string.save_image_success;
-		int colorRes = error ?
-				R.color.briar_red : R.color.briar_primary;
-		Snackbar s = Snackbar.make(layout, stringRes, LENGTH_LONG);
-		s.getView().setBackgroundResource(colorRes);
-		s.show();
-		viewModel.onSaveStateSeen();
-	}
-
 }

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

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

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

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

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

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

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

@@ -1,166 +0,0 @@
-package org.briarproject.briar.android.conversation;
-
-import android.app.Application;
-import android.arch.lifecycle.AndroidViewModel;
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.MutableLiveData;
-import android.net.Uri;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
-
-import org.briarproject.bramble.api.db.DatabaseExecutor;
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.lifecycle.IoExecutor;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.MessageId;
-import org.briarproject.briar.api.messaging.Attachment;
-import org.briarproject.briar.api.messaging.MessagingManager;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-import java.util.concurrent.Executor;
-import java.util.logging.Logger;
-
-import javax.inject.Inject;
-
-import static android.media.MediaScannerConnection.scanFile;
-import static android.os.Environment.DIRECTORY_PICTURES;
-import static android.os.Environment.getExternalStoragePublicDirectory;
-import static java.util.logging.Level.WARNING;
-import static java.util.logging.Logger.getLogger;
-import static org.briarproject.bramble.util.IoUtils.copyAndClose;
-import static org.briarproject.bramble.util.LogUtils.logException;
-
-@NotNullByDefault
-public class ImageViewModel extends AndroidViewModel {
-
-	private static Logger LOG = getLogger(ImageViewModel.class.getName());
-
-	private final MessagingManager messagingManager;
-	@DatabaseExecutor
-	private final Executor dbExecutor;
-	@IoExecutor
-	private final Executor ioExecutor;
-
-	private final MutableLiveData<Boolean> saveState = new MutableLiveData<>();
-
-	@Inject
-	ImageViewModel(Application application,
-			MessagingManager messagingManager,
-			@DatabaseExecutor Executor dbExecutor,
-			@IoExecutor Executor ioExecutor) {
-		super(application);
-		this.messagingManager = messagingManager;
-		this.dbExecutor = dbExecutor;
-		this.ioExecutor = ioExecutor;
-	}
-
-	/**
-	 * A LiveData that is true if the image was saved,
-	 * false if there was an error and null otherwise.
-	 *
-	 * Call {@link #onSaveStateSeen()} after consuming an update.
-	 */
-	LiveData<Boolean> getSaveState() {
-		return saveState;
-	}
-
-	@UiThread
-	void onSaveStateSeen() {
-		saveState.setValue(null);
-	}
-
-	/**
-	 * Saves the attachment to a writeable {@link Uri}.
-	 */
-	@UiThread
-	void saveImage(AttachmentItem attachment, @Nullable Uri uri) {
-		if (uri == null) {
-			saveState.setValue(false);
-		} else {
-			saveImage(attachment, () -> getOutputStream(uri), null);
-		}
-	}
-
-	/**
-	 * Saves the attachment on external storage,
-	 * assuming the permission was granted during install time.
-	 */
-	void saveImage(AttachmentItem attachment) {
-		File file = getImageFile(attachment);
-		saveImage(attachment, () -> getOutputStream(file), () -> scanFile(
-				getApplication(), new String[] {file.toString()}, null, null));
-	}
-
-	private void saveImage(AttachmentItem attachment, OutputStreamProvider osp,
-			@Nullable Runnable afterCopy) {
-		MessageId messageId = attachment.getMessageId();
-		dbExecutor.execute(() -> {
-			try {
-				Attachment a = messagingManager.getAttachment(messageId);
-				copyImageFromDb(a, osp, afterCopy);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-				saveState.postValue(true);
-			}
-		});
-	}
-
-	private void copyImageFromDb(Attachment a, OutputStreamProvider osp,
-			@Nullable Runnable afterCopy) {
-		ioExecutor.execute(() -> {
-			try {
-				InputStream is = a.getStream();
-				OutputStream os = osp.getOutputStream();
-				copyAndClose(is, os);
-				if (afterCopy != null) afterCopy.run();
-				saveState.postValue(false);
-			} catch (IOException e) {
-				logException(LOG, WARNING, e);
-				saveState.postValue(true);
-			}
-		});
-	}
-
-	private String getFileName() {
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss",
-				Locale.getDefault());
-		return sdf.format(new Date());
-	}
-
-	private File getImageFile(AttachmentItem attachment) {
-		File path = getExternalStoragePublicDirectory(DIRECTORY_PICTURES);
-		//noinspection ResultOfMethodCallIgnored
-		path.mkdirs();
-		String fileName = getFileName();
-		String ext = "." + attachment.getExtension();
-		File file = new File(path, fileName + ext);
-		int i = 1;
-		while (file.exists()) {
-			file = new File(path, fileName + " (" + i + ")" + ext);
-		}
-		return file;
-	}
-
-	private OutputStream getOutputStream(File file) throws IOException {
-		return new FileOutputStream(file);
-	}
-
-	private OutputStream getOutputStream(Uri uri) throws IOException {
-		OutputStream os =
-				getApplication().getContentResolver().openOutputStream(uri);
-		if (os == null) throw new IOException();
-		return os;
-	}
-
-	private interface OutputStreamProvider {
-		OutputStream getOutputStream() throws IOException;
-	}
-
-}

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

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

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

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

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

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

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

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

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

@@ -1,8 +1,8 @@
 package org.briarproject.briar.android.introduction;
 
 import android.content.Context;
-import android.net.Uri;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.app.ActionBar;
 import android.view.LayoutInflater;
@@ -17,17 +17,14 @@ import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.contact.ContactManager;
 import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.bramble.util.StringUtils;
 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.TextInputView;
-import org.briarproject.briar.android.view.TextSendController;
-import org.briarproject.briar.android.view.TextSendController.SendListener;
+import org.briarproject.briar.android.view.TextInputView.TextInputListener;
 import org.briarproject.briar.api.introduction.IntroductionManager;
 
-import java.util.List;
 import java.util.logging.Logger;
 
 import javax.inject.Inject;
@@ -44,10 +41,8 @@ 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;
 
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
 public class IntroductionMessageFragment extends BaseFragment
-		implements SendListener {
+		implements TextInputListener {
 
 	public static final String TAG =
 			IntroductionMessageFragment.class.getName();
@@ -89,9 +84,8 @@ public class IntroductionMessageFragment extends BaseFragment
 	}
 
 	@Override
-	public View onCreateView(LayoutInflater inflater,
-			@Nullable ViewGroup container,
-			@Nullable Bundle savedInstanceState) {
+	public View onCreateView(@NonNull LayoutInflater inflater,
+			ViewGroup container, Bundle savedInstanceState) {
 
 		// change toolbar text
 		ActionBar actionBar = introductionActivity.getSupportActionBar();
@@ -103,11 +97,7 @@ public class IntroductionMessageFragment extends BaseFragment
 		View v = inflater.inflate(R.layout.introduction_message, container,
 				false);
 		ui = new ViewHolder(v);
-		TextSendController sendController =
-				new TextSendController(ui.message, this, true);
-		ui.message.setSendController(sendController);
-		ui.message.setMaxTextLength(MAX_INTRODUCTION_TEXT_LENGTH);
-		ui.message.setEnabled(false);
+		ui.message.setSendButtonEnabled(false);
 
 		return v;
 	}
@@ -166,10 +156,13 @@ public class IntroductionMessageFragment extends BaseFragment
 			ui.progressBar.setVisibility(GONE);
 
 			if (possible) {
+				// set button action
+				ui.message.setListener(IntroductionMessageFragment.this);
+
 				// show views
 				ui.notPossible.setVisibility(GONE);
 				ui.message.setVisibility(VISIBLE);
-				ui.message.setEnabled(true);
+				ui.message.setSendButtonEnabled(true);
 				ui.message.showSoftKeyboard();
 			} else {
 				ui.notPossible.setVisibility(VISIBLE);
@@ -191,11 +184,14 @@ public class IntroductionMessageFragment extends BaseFragment
 	}
 
 	@Override
-	public void onSendClick(@Nullable String text, List<Uri> imageUris) {
+	public void onSendClick(@NonNull String text) {
 		// disable button to prevent accidental double invitations
-		ui.message.setEnabled(false);
+		ui.message.setSendButtonEnabled(false);
 
-		makeIntroduction(contact1, contact2, text);
+		String txt = ui.message.getText().toString();
+		if (txt.isEmpty()) txt = null;
+		else txt = StringUtils.truncateUtf8(txt, MAX_INTRODUCTION_TEXT_LENGTH);
+		makeIntroduction(contact1, contact2, txt);
 
 		// don't wait for the introduction to be made before finishing activity
 		introductionActivity.hideSoftKeyboard(ui.message);

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

@@ -196,7 +196,7 @@ public class GroupActivity extends
 
 	private void setGroupEnabled(boolean enabled) {
 		isDissolved = !enabled;
-		textInput.setEnabled(enabled);
+		textInput.setSendButtonEnabled(enabled);
 		list.getRecyclerView().setAlpha(enabled ? 1f : 0.5f);
 
 		if (!enabled) {

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

@@ -1,7 +1,5 @@
 package org.briarproject.briar.android.privategroup.creation;
 
-import android.support.annotation.Nullable;
-
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@@ -20,7 +18,6 @@ public interface CreateGroupController
 			ResultExceptionHandler<GroupId, DbException> result);
 
 	void sendInvitation(GroupId g, Collection<ContactId> contacts,
-			@Nullable String text,
-			ResultExceptionHandler<Void, DbException> result);
+			String text, ResultExceptionHandler<Void, DbException> result);
 
 }

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

@@ -1,7 +1,5 @@
 package org.briarproject.briar.android.privategroup.creation;
 
-import android.support.annotation.Nullable;
-
 import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.contact.ContactManager;
@@ -125,8 +123,7 @@ class CreateGroupControllerImpl extends ContactSelectorControllerImpl
 
 	@Override
 	public void sendInvitation(GroupId g, Collection<ContactId> contactIds,
-			@Nullable String text,
-			ResultExceptionHandler<Void, DbException> handler) {
+			String text, ResultExceptionHandler<Void, DbException> handler) {
 		runOnDbThread(() -> {
 			try {
 				LocalAuthor localAuthor = identityManager.getLocalAuthor();
@@ -147,7 +144,7 @@ class CreateGroupControllerImpl extends ContactSelectorControllerImpl
 	}
 
 	private void signInvitations(GroupId g, LocalAuthor localAuthor,
-			Collection<Contact> contacts, @Nullable String text,
+			Collection<Contact> contacts, String text,
 			ResultExceptionHandler<Void, DbException> handler) {
 		cryptoExecutor.execute(() -> {
 			long timestamp = clock.currentTimeMillis();
@@ -163,14 +160,15 @@ class CreateGroupControllerImpl extends ContactSelectorControllerImpl
 	}
 
 	private void sendInvitations(GroupId g,
-			Collection<InvitationContext> contexts, @Nullable String text,
+			Collection<InvitationContext> contexts, String text,
 			ResultExceptionHandler<Void, DbException> handler) {
 		runOnDbThread(() -> {
 			try {
+				String txt = text.isEmpty() ? null : text;
 				for (InvitationContext context : contexts) {
 					try {
 						groupInvitationManager.sendInvitation(g,
-								context.contactId, text, context.timestamp,
+								context.contactId, txt, context.timestamp,
 								context.signature);
 					} catch (NoSuchContactException e) {
 						// Continue

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

@@ -55,7 +55,7 @@ public class GroupInviteActivity extends ContactSelectorActivity
 	}
 
 	@Override
-	public void onButtonClick(@Nullable String text) {
+	public boolean onButtonClick(String text) {
 		if (groupId == null)
 			throw new IllegalStateException("GroupId was not initialized");
 		controller.sendInvitation(groupId, contacts, text,
@@ -72,6 +72,7 @@ public class GroupInviteActivity extends ContactSelectorActivity
 						handleDbException(exception);
 					}
 				});
+		return true;
 	}
 
 	@Override

briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportPrimer.java

@@ -42,7 +42,6 @@ import static android.content.Context.WIFI_SERVICE;
 import static android.net.ConnectivityManager.TYPE_MOBILE;
 import static android.net.ConnectivityManager.TYPE_WIFI;
 import static android.net.wifi.WifiManager.WIFI_STATE_ENABLED;
-import static org.briarproject.bramble.util.PrivacyUtils.scrubInetAddress;
 import static org.briarproject.bramble.util.PrivacyUtils.scrubMacAddress;
 
 public class BriarReportPrimer implements ReportPrimer {
@@ -193,7 +192,7 @@ public class BriarReportPrimer implements ReportPrimer {
 					int ip3 = (ip >> 16) & 0xFF;
 					int ip4 = (ip >> 24) & 0xFF;
 					String address = ip1 + "." + ip2 + "." + ip3 + "." + ip4;
-					customData.put("Wi-Fi address", scrubInetAddress(address));
+					customData.put("Wi-Fi address", address);
 				}
 			}
 

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

@@ -1,31 +1,28 @@
 package org.briarproject.briar.android.sharing;
 
 import android.content.Context;
-import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.support.annotation.UiThread;
+import android.support.design.widget.Snackbar;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.fragment.BaseFragment;
 import org.briarproject.briar.android.view.LargeTextInputView;
-import org.briarproject.briar.android.view.TextSendController;
-import org.briarproject.briar.android.view.TextSendController.SendListener;
+import org.briarproject.briar.android.view.TextInputView.TextInputListener;
 
-import java.util.List;
+import static android.support.design.widget.Snackbar.LENGTH_SHORT;
+import static org.briarproject.bramble.util.StringUtils.truncateUtf8;
+import static org.briarproject.bramble.util.StringUtils.utf8IsTooLong;
+import static org.briarproject.briar.api.sharing.SharingConstants.MAX_INVITATION_TEXT_LENGTH;
 
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
 public abstract class BaseMessageFragment extends BaseFragment
-		implements SendListener {
+		implements TextInputListener {
 
 	protected LargeTextInputView message;
 	private MessageFragmentListener listener;
@@ -37,20 +34,16 @@ public abstract class BaseMessageFragment extends BaseFragment
 	}
 
 	@Override
-	public View onCreateView(@Nullable LayoutInflater inflater,
-			@Nullable ViewGroup container,
-			@Nullable Bundle savedInstanceState) {
+	public View onCreateView(LayoutInflater inflater, ViewGroup container,
+			Bundle savedInstanceState) {
 
 		// inflate view
 		View v = inflater.inflate(R.layout.fragment_message, container,
 				false);
 		message = v.findViewById(R.id.messageView);
-		TextSendController sendController =
-				new TextSendController(message, this, true);
-		message.setSendController(sendController);
-		message.setMaxTextLength(listener.getMaximumTextLength());
 		message.setButtonText(getString(getButtonText()));
 		message.setHint(getHintText());
+		message.setListener(this);
 
 		return v;
 	}
@@ -83,12 +76,21 @@ public abstract class BaseMessageFragment extends BaseFragment
 	}
 
 	@Override
-	public void onSendClick(@Nullable String text, List<Uri> imageUris) {
+	public void onSendClick(String text) {
+		if (utf8IsTooLong(text, listener.getMaximumTextLength())) {
+			Snackbar.make(message, R.string.text_too_long, LENGTH_SHORT).show();
+			return;
+		}
+
 		// disable button to prevent accidental double actions
-		message.setEnabled(false);
+		message.setSendButtonEnabled(false);
 		message.hideSoftKeyboard();
 
-		listener.onButtonClick(text);
+		text = truncateUtf8(text, MAX_INVITATION_TEXT_LENGTH);
+		if(!listener.onButtonClick(text)) {
+			message.setSendButtonEnabled(true);
+			message.showSoftKeyboard();
+		}
 	}
 
 	@UiThread
@@ -99,7 +101,8 @@ public abstract class BaseMessageFragment extends BaseFragment
 
 		void setTitle(@StringRes int titleRes);
 
-		void onButtonClick(@Nullable String text);
+		/** Returns true when the button click has been consumed. */
+		boolean onButtonClick(String text);
 
 		int getMaximumTextLength();
 

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

@@ -41,12 +41,13 @@ public abstract class ShareActivity extends ContactSelectorActivity
 
 	@UiThread
 	@Override
-	public void onButtonClick(@Nullable String text) {
+	public boolean onButtonClick(String text) {
 		share(contacts, text);
 		setResult(RESULT_OK);
 		supportFinishAfterTransition();
+		return true;
 	}
 
-	abstract void share(Collection<ContactId> contacts, @Nullable String text);
+	abstract void share(Collection<ContactId> contacts, String text);
 
 }

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

@@ -51,7 +51,7 @@ public class ShareBlogActivity extends ShareActivity {
 	}
 
 	@Override
-	void share(Collection<ContactId> contacts, @Nullable String text) {
+	void share(Collection<ContactId> contacts, String text) {
 		controller.share(groupId, contacts, text,
 				new UiExceptionHandler<DbException>(this) {
 					@Override

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

@@ -9,12 +9,10 @@ import org.briarproject.briar.android.controller.handler.ExceptionHandler;
 
 import java.util.Collection;
 
-import javax.annotation.Nullable;
-
 public interface ShareBlogController
 		extends ContactSelectorController<SelectableContactItem> {
 
-	void share(GroupId g, Collection<ContactId> contacts, @Nullable String text,
+	void share(GroupId g, Collection<ContactId> contacts, String text,
 			ExceptionHandler<DbException> handler);
 
 }

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

@@ -20,12 +20,12 @@ import java.util.Collection;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
-import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
 
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.util.LogUtils.logException;
+import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
 
 @Immutable
 @NotNullByDefault
@@ -56,16 +56,17 @@ class ShareBlogControllerImpl extends ContactSelectorControllerImpl
 	}
 
 	@Override
-	public void share(GroupId g, Collection<ContactId> contacts, @Nullable
-			String text, ExceptionHandler<DbException> handler) {
+	public void share(GroupId g, Collection<ContactId> contacts, String text,
+			ExceptionHandler<DbException> handler) {
 		runOnDbThread(() -> {
 			try {
+				String txt = isNullOrEmpty(text) ? null : text;
 				for (ContactId c : contacts) {
 					try {
 						long time = Math.max(clock.currentTimeMillis(),
 								conversationManager.getGroupCount(c)
 										.getLatestMsgTime() + 1);
-						blogSharingManager.sendInvitation(g, c, text, time);
+						blogSharingManager.sendInvitation(g, c, txt, time);
 					} catch (NoSuchContactException | NoSuchGroupException e) {
 						logException(LOG, WARNING, e);
 					}

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

@@ -51,7 +51,7 @@ public class ShareForumActivity extends ShareActivity {
 	}
 
 	@Override
-	void share(Collection<ContactId> contacts, @Nullable String text) {
+	void share(Collection<ContactId> contacts, String text) {
 		controller.share(groupId, contacts, text,
 				new UiExceptionHandler<DbException>(this) {
 					@Override

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

@@ -9,12 +9,10 @@ import org.briarproject.briar.android.controller.handler.ExceptionHandler;
 
 import java.util.Collection;
 
-import javax.annotation.Nullable;
-
 public interface ShareForumController
 		extends ContactSelectorController<SelectableContactItem> {
 
-	void share(GroupId g, Collection<ContactId> contacts, @Nullable String text,
+	void share(GroupId g, Collection<ContactId> contacts, String text,
 			ExceptionHandler<DbException> handler);
 
 }

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

@@ -13,19 +13,19 @@ import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.briar.android.contactselection.ContactSelectorControllerImpl;
 import org.briarproject.briar.android.controller.handler.ExceptionHandler;
-import org.briarproject.briar.api.conversation.ConversationManager;
 import org.briarproject.briar.api.forum.ForumSharingManager;
+import org.briarproject.briar.api.conversation.ConversationManager;
 
 import java.util.Collection;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
-import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
 
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.util.LogUtils.logException;
+import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
 
 @Immutable
 @NotNullByDefault
@@ -57,15 +57,16 @@ class ShareForumControllerImpl extends ContactSelectorControllerImpl
 
 	@Override
 	public void share(GroupId g, Collection<ContactId> contacts,
-			@Nullable String text, ExceptionHandler<DbException> handler) {
+			String text, ExceptionHandler<DbException> handler) {
 		runOnDbThread(() -> {
 			try {
+				String txt = isNullOrEmpty(text) ? null : text;
 				for (ContactId c : contacts) {
 					try {
 						long time = Math.max(clock.currentTimeMillis(),
 								conversationManager.getGroupCount(c)
 										.getLatestMsgTime() + 1);
-						forumSharingManager.sendInvitation(g, c, text, time);
+						forumSharingManager.sendInvitation(g, c, txt, time);
 					} catch (NoSuchContactException | NoSuchGroupException e) {
 						logException(LOG, WARNING, e);
 					}

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

@@ -1,7 +1,6 @@
 package org.briarproject.briar.android.threaded;
 
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.CallSuper;
 import android.support.annotation.StringRes;
@@ -27,15 +26,13 @@ import org.briarproject.briar.android.threaded.ThreadItemAdapter.ThreadItemListe
 import org.briarproject.briar.android.threaded.ThreadListController.ThreadListDataSource;
 import org.briarproject.briar.android.threaded.ThreadListController.ThreadListListener;
 import org.briarproject.briar.android.view.BriarRecyclerView;
-import org.briarproject.briar.android.view.KeyboardAwareLinearLayout;
 import org.briarproject.briar.android.view.TextInputView;
-import org.briarproject.briar.android.view.TextSendController;
-import org.briarproject.briar.android.view.TextSendController.SendListener;
+import org.briarproject.briar.android.view.TextInputView.TextInputListener;
 import org.briarproject.briar.android.view.UnreadMessageButton;
 import org.briarproject.briar.api.client.NamedGroup;
+import org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout;
 
 import java.util.Collection;
-import java.util.List;
 import java.util.logging.Logger;
 
 import javax.annotation.Nullable;
@@ -45,14 +42,14 @@ import static android.support.design.widget.Snackbar.make;
 import static android.support.v7.widget.RecyclerView.NO_POSITION;
 import static android.support.v7.widget.RecyclerView.SCROLL_STATE_IDLE;
 import static java.util.logging.Level.INFO;
-import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
+import static org.briarproject.bramble.util.StringUtils.utf8IsTooLong;
 import static org.briarproject.briar.android.threaded.ThreadItemAdapter.UnreadCount;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
 public abstract class ThreadListActivity<G extends NamedGroup, I extends ThreadItem, A extends ThreadItemAdapter<I>>
 		extends BriarActivity
-		implements ThreadListListener<I>, SendListener, SharingListener,
+		implements ThreadListListener<I>, TextInputListener, SharingListener,
 		ThreadItemListener<I>, ThreadListDataSource {
 
 	protected static final String KEY_REPLY_ID = "replyId";
@@ -89,10 +86,7 @@ public abstract class ThreadListActivity<G extends NamedGroup, I extends ThreadI
 		getController().setGroupId(groupId);
 
 		textInput = findViewById(R.id.text_input_container);
-		TextSendController sendController =
-				new TextSendController(textInput, this, false);
-		textInput.setSendController(sendController);
-		textInput.setMaxTextLength(getMaxTextLength());
+		textInput.setListener(this);
 		list = findViewById(R.id.list);
 		layoutManager = new LinearLayoutManager(this);
 		// FIXME pre-fetching messes with read state, find better solution #1289
@@ -272,7 +266,7 @@ public abstract class ThreadListActivity<G extends NamedGroup, I extends ThreadI
 	@Override
 	public void onBackPressed() {
 		if (adapter.getHighlightedItem() != null) {
-			textInput.clearText();
+			textInput.setText("");
 			replyId = null;
 			updateTextInput();
 		} else {
@@ -354,9 +348,13 @@ public abstract class ThreadListActivity<G extends NamedGroup, I extends ThreadI
 	}
 
 	@Override
-	public void onSendClick(@Nullable String text, List<Uri> imageUris) {
-		if (isNullOrEmpty(text)) throw new AssertionError();
-
+	public void onSendClick(String text) {
+		if (text.trim().length() == 0)
+			return;
+		if (utf8IsTooLong(text, getMaxTextLength())) {
+			displaySnackbar(R.string.text_too_long);
+			return;
+		}
 		I replyItem = adapter.getHighlightedItem();
 		UiResultExceptionHandler<I, DbException> handler =
 				new UiResultExceptionHandler<I, DbException>(this) {
@@ -372,7 +370,7 @@ public abstract class ThreadListActivity<G extends NamedGroup, I extends ThreadI
 				};
 		getController().createAndStoreMessage(text, replyItem, handler);
 		textInput.hideSoftKeyboard();
-		textInput.clearText();
+		textInput.setText("");
 		replyId = null;
 		updateTextInput();
 	}

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

@@ -14,9 +14,9 @@ import android.os.PowerManager;
 import android.support.annotation.AttrRes;
 import android.support.annotation.ColorInt;
 import android.support.annotation.ColorRes;
+import android.support.annotation.MainThread;
 import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
-import android.support.annotation.UiThread;
 import android.support.design.widget.TextInputLayout;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.content.ContextCompat;
@@ -56,7 +56,6 @@ import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 import static android.os.Build.MANUFACTURER;
 import static android.os.Build.VERSION.SDK_INT;
 import static android.provider.Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS;
-import static android.support.v4.view.ViewCompat.LAYOUT_DIRECTION_RTL;
 import static android.support.v7.app.AppCompatDelegate.MODE_NIGHT_AUTO;
 import static android.support.v7.app.AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
 import static android.support.v7.app.AppCompatDelegate.MODE_NIGHT_NO;
@@ -208,7 +207,7 @@ public class UiUtils {
 				runnable.run();
 			}
 		};
-		ssb.setSpan(cSpan, start, end, 0);
+		ssb.setSpan(cSpan, start + 1, end, 0);
 		textView.setText(ssb);
 		textView.setMovementMethod(new LinkMovementMethod());
 	}
@@ -343,7 +342,7 @@ public class UiUtils {
 	 * If the LiveData's value is available, the {@link Observer} will be
 	 * called right away.
 	 */
-	@UiThread
+	@MainThread
 	public static <T> void observeOnce(LiveData<T> liveData,
 			LifecycleOwner owner, Observer<T> observer) {
 		liveData.observe(owner, new Observer<T>() {
@@ -355,28 +354,4 @@ public class UiUtils {
 		});
 	}
 
-	/**
-	 * Same as {@link #observeOnce(LiveData, LifecycleOwner, Observer)},
-	 * but without a {@link LifecycleOwner}.
-	 *
-	 * Warning: Do NOT call from objects that have a lifecycle.
-	 */
-	@UiThread
-	public static <T> void observeForeverOnce(LiveData<T> liveData,
-			Observer<T> observer) {
-		liveData.observeForever(new Observer<T>() {
-			@Override
-			public void onChanged(@Nullable T t) {
-				observer.onChanged(t);
-				liveData.removeObserver(this);
-			}
-		});
-	}
-
-	public static boolean isRtl(Context ctx) {
-		if (SDK_INT < 17) return false;
-		return ctx.getResources().getConfiguration().getLayoutDirection() ==
-				LAYOUT_DIRECTION_RTL;
-	}
-
 }

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

@@ -1,239 +0,0 @@
-package org.briarproject.briar.android.view;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Rect;
-import android.os.IBinder;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v7.widget.AppCompatImageButton;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.EditText;
-
-import com.vanniktech.emoji.EmojiEditText;
-import com.vanniktech.emoji.EmojiPopup;
-import com.vanniktech.emoji.RecentEmoji;
-
-import org.briarproject.briar.R;
-import org.briarproject.briar.android.BriarApplication;
-
-import javax.inject.Inject;
-
-import static android.content.Context.INPUT_METHOD_SERVICE;
-import static android.content.Context.LAYOUT_INFLATER_SERVICE;
-import static android.view.KeyEvent.KEYCODE_ENTER;
-import static android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT;
-import static java.util.Objects.requireNonNull;
-import static org.briarproject.bramble.util.StringUtils.utf8IsTooLong;
-
-public class EmojiTextInputView extends KeyboardAwareLinearLayout implements
-		TextWatcher {
-
-	@Inject
-	RecentEmoji recentEmoji;
-
-	private final AppCompatImageButton emojiToggle;
-	private final EmojiPopup emojiPopup;
-	private final EditText editText;
-
-	@Nullable
-	private TextInputListener listener;
-	private int maxLength = Integer.MAX_VALUE;
-	private boolean emptyTextAllowed = false;
-	private boolean isEmpty = true;
-
-	public EmojiTextInputView(Context context) {
-		this(context, null);
-	}
-
-	public EmojiTextInputView(Context context, @Nullable AttributeSet attrs) {
-		this(context, attrs, 0);
-	}
-
-	public EmojiTextInputView(Context context, @Nullable AttributeSet attrs,
-			int defStyleAttr) {
-		super(context, attrs, defStyleAttr);
-
-		// inflate layout
-		LayoutInflater inflater = (LayoutInflater) requireNonNull(
-				context.getSystemService(LAYOUT_INFLATER_SERVICE));
-		inflater.inflate(R.layout.emoji_text_input_view, this, true);
-
-		// get attributes
-		TypedArray a = context.obtainStyledAttributes(attrs,
-				R.styleable.EmojiTextInputView);
-		int paddingBottom = a.getDimensionPixelSize(
-				R.styleable.EmojiTextInputView_textPaddingBottom, 0);
-		int paddingEnd = a.getDimensionPixelSize(
-				R.styleable.EmojiTextInputView_textPaddingEnd, 0);
-		int maxLines =
-				a.getInteger(R.styleable.EmojiTextInputView_maxTextLines, 0);
-		a.recycle();
-
-		// apply attributes to editText
-		editText = findViewById(R.id.input_text);
-		editText.setPadding(0, 0, paddingEnd, paddingBottom);
-		if (maxLines > 0) editText.setMaxLines(maxLines);
-		editText.setOnClickListener(v -> showSoftKeyboard());
-		editText.addTextChangedListener(this);
-		// support sending with Ctrl+Enter
-		editText.setOnKeyListener((v, keyCode, event) -> {
-			if (listener != null && keyCode == KEYCODE_ENTER &&
-					event.isCtrlPressed()) {
-				listener.onSendEvent();
-				return true;
-			}
-			return false;
-		});
-		emojiToggle = findViewById(R.id.emoji_toggle);
-
-		// stuff we can't do in edit mode goes below
-		if (isInEditMode()) {
-			emojiPopup = null;
-			return;
-		}
-		BriarApplication app =
-				(BriarApplication) context.getApplicationContext();
-		app.getApplicationComponent().inject(this);
-		emojiPopup = EmojiPopup.Builder
-				.fromRootView(this)
-				.setRecentEmoji(recentEmoji)
-				.setOnEmojiPopupShownListener(this::showKeyboardIcon)
-				.setOnEmojiPopupDismissListener(this::showEmojiIcon)
-				.build((EmojiEditText) editText);
-		emojiToggle.setOnClickListener(v -> emojiPopup.toggle());
-	}
-
-	@Override
-	public void beforeTextChanged(CharSequence s, int start, int count,
-			int after) {
-	}
-
-	@Override
-	public void onTextChanged(CharSequence s, int start, int before,
-			int count) {
-		// Need to start at position 0 to change empty
-		if (start != 0 || emptyTextAllowed || listener == null) return;
-		if (s.length() == 0) {
-			if (!isEmpty) {
-				isEmpty = true;
-				listener.onTextIsEmptyChanged(true);
-			}
-		} else if (isEmpty) {
-			isEmpty = false;
-			listener.onTextIsEmptyChanged(false);
-		}
-	}
-
-	@Override
-	public void afterTextChanged(Editable s) {
-	}
-
-	@Override
-	public void setEnabled(boolean enabled) {
-		super.setEnabled(enabled);
-		editText.setEnabled(enabled);
-		emojiToggle.setEnabled(enabled);
-	}
-
-	@Override
-	public void setGravity(int gravity) {
-		editText.setGravity(gravity);
-	}
-
-	@Override
-	public boolean requestFocus(int direction, Rect previouslyFocusedRect) {
-		return editText.requestFocus(direction, previouslyFocusedRect);
-	}
-
-	@Override
-	public void onDetachedFromWindow() {
-		super.onDetachedFromWindow();
-		if (emojiPopup.isShowing()) emojiPopup.dismiss();
-	}
-
-	void setTextInputListener(@Nullable TextInputListener listener) {
-		this.listener = listener;
-	}
-
-	void setAllowEmptyText(boolean emptyTextAllowed) {
-		this.emptyTextAllowed = emptyTextAllowed;
-	}
-
-	void setMaxLength(int maxLength) {
-		this.maxLength = maxLength;
-	}
-
-	void setMaxLines(int maxLines) {
-		editText.setMaxLines(maxLines);
-	}
-
-	/**
-	 * Returns the current text or {@code null},
-	 * if it is empty or only consists of white-spaces.
-	 */
-	@Nullable
-	String getText() {
-		Editable editable = editText.getText();
-		String str = editable == null ? null : editable.toString().trim();
-		if (str == null || str.length() == 0) return null;
-		return str;
-	}
-
-	void clearText() {
-		editText.setText(null);
-	}
-
-	boolean isEmpty() {
-		return getText() == null;
-	}
-
-	boolean isTooLong() {
-		return editText.getText() != null &&
-				utf8IsTooLong(editText.getText().toString().trim(), maxLength);
-	}
-
-	CharSequence getHint() {
-		return editText.getHint();
-	}
-
-	void setHint(@StringRes int res) {
-		setHint(getContext().getString(res));
-	}
-
-	void setHint(CharSequence hint) {
-		editText.setHint(hint);
-	}
-
-	private void showEmojiIcon() {
-		emojiToggle.setImageResource(R.drawable.ic_emoji_toggle);
-	}
-
-	private void showKeyboardIcon() {
-		emojiToggle.setImageResource(R.drawable.ic_keyboard);
-	}
-
-	void showSoftKeyboard() {
-		Object o = getContext().getSystemService(INPUT_METHOD_SERVICE);
-		InputMethodManager imm = (InputMethodManager) requireNonNull(o);
-		imm.showSoftInput(editText, SHOW_IMPLICIT);
-	}
-
-	void hideSoftKeyboard() {
-		if (emojiPopup.isShowing()) emojiPopup.dismiss();
-		IBinder token = editText.getWindowToken();
-		Object o = getContext().getSystemService(INPUT_METHOD_SERVICE);
-		InputMethodManager imm = (InputMethodManager) requireNonNull(o);
-		imm.hideSoftInputFromWindow(token, 0);
-	}
-
-	interface TextInputListener {
-		void onTextIsEmptyChanged(boolean isEmpty);
-		void onSendEvent();
-	}
-
-}

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

@@ -1,119 +0,0 @@
-package org.briarproject.briar.android.view;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.support.annotation.Nullable;
-import android.support.constraint.ConstraintLayout;
-import android.support.v7.graphics.Palette;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.widget.ImageView;
-import android.widget.Toast;
-
-import com.bumptech.glide.load.DataSource;
-import com.bumptech.glide.load.engine.GlideException;
-import com.bumptech.glide.request.RequestListener;
-import com.bumptech.glide.request.target.Target;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.briar.R;
-import org.briarproject.briar.android.conversation.glide.GlideApp;
-
-import java.util.List;
-
-import static android.content.Context.LAYOUT_INFLATER_SERVICE;
-import static android.graphics.Color.BLACK;
-import static android.graphics.Color.WHITE;
-import static android.support.v7.app.AppCompatDelegate.MODE_NIGHT_YES;
-import static android.support.v7.app.AppCompatDelegate.getDefaultNightMode;
-import static android.widget.Toast.LENGTH_LONG;
-import static com.bumptech.glide.load.engine.DiskCacheStrategy.NONE;
-import static com.bumptech.glide.load.resource.bitmap.DownsampleStrategy.FIT_CENTER;
-import static java.util.Objects.requireNonNull;
-
-@NotNullByDefault
-public class ImagePreview extends ConstraintLayout {
-
-	private final ImageView imageView;
-	private final int backgroundColor =
-			getDefaultNightMode() == MODE_NIGHT_YES ? BLACK : WHITE;
-
-	@Nullable
-	private ImagePreviewListener listener;
-
-	public ImagePreview(Context context) {
-		this(context, null);
-	}
-
-	public ImagePreview(Context context, @Nullable AttributeSet attrs) {
-		this(context, attrs, 0);
-	}
-
-	public ImagePreview(Context context, @Nullable AttributeSet attrs,
-			int defStyleAttr) {
-		super(context, attrs, defStyleAttr);
-
-		// inflate layout
-		LayoutInflater inflater = (LayoutInflater) requireNonNull(
-				context.getSystemService(LAYOUT_INFLATER_SERVICE));
-		inflater.inflate(R.layout.image_preview, this, true);
-
-		// find image view and set background color
-		imageView = findViewById(R.id.imageView);
-		imageView.setBackgroundColor(backgroundColor);
-
-		// set cancel listener
-		findViewById(R.id.imageCancelButton).setOnClickListener(view -> {
-			if (listener != null) listener.onCancel();
-		});
-	}
-
-	void setImagePreviewListener(ImagePreviewListener listener) {
-		this.listener = listener;
-	}
-
-	void showPreview(List<Uri> imageUris) {
-		setVisibility(VISIBLE);
-		GlideApp.with(imageView)
-				.asBitmap()
-				.load(imageUris.get(0))  // TODO show more than the first
-				.diskCacheStrategy(NONE)
-				.downsample(FIT_CENTER)
-				.addListener(new RequestListener<Bitmap>() {
-					@Override
-					public boolean onLoadFailed(@Nullable GlideException e,
-							Object model, Target<Bitmap> target,
-							boolean isFirstResource) {
-						if (listener != null) listener.onCancel();
-						Toast.makeText(imageView.getContext(),
-								R.string.image_attach_error, LENGTH_LONG)
-								.show();
-						return false;
-					}
-
-					@Override
-					public boolean onResourceReady(Bitmap resource,
-							Object model, Target<Bitmap> target,
-							DataSource dataSource, boolean isFirstResource) {
-						Palette.from(resource).generate(
-								ImagePreview.this::onPaletteGenerated);
-						return false;
-					}
-				})
-				.into(imageView);
-	}
-
-	void onPaletteGenerated(@Nullable Palette palette) {
-		if (palette == null) return;
-		int color = getDefaultNightMode() == MODE_NIGHT_YES ?
-				palette.getDarkMutedColor(backgroundColor) :
-				palette.getLightMutedColor(backgroundColor);
-		imageView.setBackgroundColor(color);
-	}
-
-	interface ImagePreviewListener {
-		void onCancel();
-	}
-
-}

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

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.support.annotation.UiThread;
 import android.util.AttributeSet;
+import android.view.LayoutInflater;
 import android.view.ViewGroup;
 import android.widget.Button;
 
@@ -13,7 +14,6 @@ import org.briarproject.briar.R;
 
 import javax.annotation.Nullable;
 
-import static android.view.Gravity.BOTTOM;
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 
 @UiThread
@@ -32,6 +32,18 @@ public class LargeTextInputView extends TextInputView {
 	public LargeTextInputView(Context context, @Nullable AttributeSet attrs,
 			int defStyleAttr) {
 		super(context, attrs, defStyleAttr);
+	}
+
+	@Override
+	protected void inflateLayout(Context context) {
+		LayoutInflater inflater = (LayoutInflater) context
+				.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+		inflater.inflate(R.layout.text_input_view_large, this, true);
+	}
+
+	@Override
+	protected void setUpViews(Context context, @Nullable AttributeSet attrs) {
+		super.setUpViews(context, attrs);
 
 		// get attributes
 		TypedArray attributes = context.obtainStyledAttributes(attrs,
@@ -45,27 +57,21 @@ public class LargeTextInputView extends TextInputView {
 		attributes.recycle();
 
 		if (buttonText != null) setButtonText(buttonText);
-		if (maxLines > 0) textInput.setMaxLines(maxLines);
+		if (maxLines > 0) editText.setMaxLines(maxLines);
 		if (fillHeight) {
 			ViewGroup layout = findViewById(R.id.input_layout);
 			LayoutParams params = (LayoutParams) layout.getLayoutParams();
 			params.height = 0;
 			params.weight = 1;
 			layout.setLayoutParams(params);
-			ViewGroup.LayoutParams inputParams = textInput.getLayoutParams();
-			inputParams.height = MATCH_PARENT;
-			textInput.setLayoutParams(inputParams);
+			ViewGroup.LayoutParams editParams = editText.getLayoutParams();
+			editParams.height = MATCH_PARENT;
+			editText.setLayoutParams(editParams);
 		}
-		textInput.setGravity(BOTTOM);
-	}
-
-	@Override
-	protected int getLayout() {
-		return R.layout.text_input_view_large;
 	}
 
 	public void setButtonText(String text) {
-		((Button) findViewById(R.id.btn_send)).setText(text);
+		((Button) sendButton).setText(text);
 	}
 
 }

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

@@ -1,214 +0,0 @@
-package org.briarproject.briar.android.view;
-
-import android.content.ClipData;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
-import android.support.v4.view.AbsSavedState;
-import android.support.v7.widget.AppCompatImageButton;
-
-import org.briarproject.briar.R;
-import org.briarproject.briar.android.view.ImagePreview.ImagePreviewListener;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static android.content.Intent.ACTION_GET_CONTENT;
-import static android.content.Intent.ACTION_OPEN_DOCUMENT;
-import static android.content.Intent.CATEGORY_OPENABLE;
-import static android.content.Intent.EXTRA_ALLOW_MULTIPLE;
-import static android.os.Build.VERSION.SDK_INT;
-import static android.support.v4.view.AbsSavedState.EMPTY_STATE;
-import static android.view.View.GONE;
-import static android.view.View.INVISIBLE;
-import static android.view.View.VISIBLE;
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
-import static java.util.Objects.requireNonNull;
-
-@UiThread
-public class TextAttachmentController extends TextSendController
-		implements ImagePreviewListener {
-
-	private final AppCompatImageButton imageButton;
-	private final ImagePreview imagePreview;
-
-	private final AttachImageListener imageListener;
-
-	private CharSequence textHint;
-	private List<Uri> imageUris = emptyList();
-
-	public TextAttachmentController(TextInputView v, ImagePreview imagePreview,
-			SendListener listener, AttachImageListener imageListener) {
-		super(v, listener, false);
-		this.imageListener = imageListener;
-		this.imagePreview = imagePreview;
-		this.imagePreview.setImagePreviewListener(this);
-
-		imageButton = v.findViewById(R.id.imageButton);
-		imageButton.setOnClickListener(view -> onImageButtonClicked());
-
-		textHint = textInput.getHint();
-
-		// show image button
-		showImageButton(true);
-	}
-
-	@Override
-	public void onTextIsEmptyChanged(boolean isEmpty) {
-		if (imageUris.isEmpty()) showImageButton(isEmpty);
-	}
-
-	@Override
-	public void onSendEvent() {
-		if (canSend()) {
-			listener.onSendClick(textInput.getText(), imageUris);
-			reset();
-		}
-	}
-
-	@Override
-	protected boolean canSendEmptyText() {
-		return !imageUris.isEmpty();
-	}
-
-	private void onImageButtonClicked() {
-		Intent intent = new Intent(SDK_INT >= 19 ?
-				ACTION_OPEN_DOCUMENT : ACTION_GET_CONTENT);
-		intent.addCategory(CATEGORY_OPENABLE);
-		intent.setType("image/*");
-		if (SDK_INT >= 18)  // TODO set true to allow attaching multiple images
-			intent.putExtra(EXTRA_ALLOW_MULTIPLE, false);
-		requireNonNull(imageListener).onAttachImage(intent);
-	}
-
-	public void onImageReceived(@Nullable Intent resultData) {
-		if (resultData == null) return;
-		if (resultData.getData() != null) {
-			imageUris = singletonList(resultData.getData());
-			onNewUris();
-		} else if (SDK_INT >= 18 && resultData.getClipData() != null) {
-			ClipData clipData = resultData.getClipData();
-			imageUris = new ArrayList<>(clipData.getItemCount());
-			for (int i = 0; i < clipData.getItemCount(); i++) {
-				imageUris.add(clipData.getItemAt(i).getUri());
-			}
-			onNewUris();
-		}
-	}
-
-	private void onNewUris() {
-		if (imageUris.isEmpty()) return;
-		showImageButton(false);
-		textInput.setHint(R.string.image_caption_hint);
-		imagePreview.showPreview(imageUris);
-	}
-
-	private void showImageButton(boolean showImageButton) {
-		if (showImageButton) {
-			imageButton.setVisibility(VISIBLE);
-			sendButton.setEnabled(false);
-			if (SDK_INT <= 15) {
-				sendButton.setVisibility(INVISIBLE);
-				imageButton.setEnabled(true);
-			} else {
-				sendButton.clearAnimation();
-				sendButton.animate().alpha(0f).withEndAction(() -> {
-					sendButton.setVisibility(INVISIBLE);
-					imageButton.setEnabled(true);
-				}).start();
-				imageButton.clearAnimation();
-				imageButton.animate().alpha(1f).start();
-			}
-		} else {
-			sendButton.setVisibility(VISIBLE);
-			// enable/disable buttons right away to allow fast sending
-			sendButton.setEnabled(enabled);
-			imageButton.setEnabled(false);
-			if (SDK_INT <= 15) {
-				imageButton.setVisibility(INVISIBLE);
-			} else {
-				sendButton.clearAnimation();
-				sendButton.animate().alpha(1f).start();
-				imageButton.clearAnimation();
-				imageButton.animate().alpha(0f).withEndAction(() ->
-						imageButton.setVisibility(INVISIBLE)
-				).start();
-			}
-		}
-	}
-
-	private void reset() {
-		// restore hint
-		textInput.setHint(textHint);
-		// hide image layout
-		imagePreview.setVisibility(GONE);
-		// reset image URIs
-		imageUris = emptyList();
-		// show the image button again, so images can get attached
-		showImageButton(true);
-	}
-
-	@Override
-	public Parcelable onSaveInstanceState(@Nullable Parcelable superState) {
-		SavedState state =
-				new SavedState(superState == null ? EMPTY_STATE : superState);
-		state.imageUris = imageUris;
-		return state;
-	}
-
-	@Override
-	@Nullable
-	public Parcelable onRestoreInstanceState(@NonNull Parcelable inState) {
-		SavedState state = (SavedState) inState;
-		imageUris = state.imageUris;
-		onNewUris();
-		return state.getSuperState();
-	}
-
-	@Override
-	public void onCancel() {
-		textInput.clearText();
-		reset();
-	}
-
-	private static class SavedState extends AbsSavedState {
-		private List<Uri> imageUris;
-
-		private SavedState(Parcelable superState) {
-			super(superState);
-		}
-
-		private SavedState(Parcel in) {
-			super(in);
-			//noinspection unchecked
-			imageUris = in.readArrayList(Uri.class.getClassLoader());
-		}
-
-		@Override
-		public void writeToParcel(Parcel out, int flags) {
-			super.writeToParcel(out, flags);
-			out.writeList(imageUris);
-		}
-
-		public static final Parcelable.Creator<SavedState> CREATOR
-				= new Parcelable.Creator<SavedState>() {
-			public SavedState createFromParcel(Parcel in) {
-				return new SavedState(in);
-			}
-
-			public SavedState[] newArray(int size) {
-				return new SavedState[size];
-			}
-		};
-	}
-
-	public interface AttachImageListener {
-		void onAttachImage(Intent intent);
-	}
-
-}

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

@@ -4,31 +4,51 @@ import android.animation.LayoutTransition;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Rect;
-import android.os.Parcelable;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.Nullable;
+import android.os.IBinder;
+import android.support.annotation.CallSuper;
 import android.support.annotation.StringRes;
 import android.support.annotation.UiThread;
+import android.support.v7.widget.AppCompatImageButton;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
-import android.widget.LinearLayout;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+
+import com.vanniktech.emoji.EmojiEditText;
+import com.vanniktech.emoji.EmojiPopup;
+import com.vanniktech.emoji.RecentEmoji;
 
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
-import org.briarproject.briar.android.view.KeyboardAwareLinearLayout.OnKeyboardShownListener;
+import org.briarproject.briar.android.BriarApplication;
+import org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout;
 
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+
+import static android.content.Context.INPUT_METHOD_SERVICE;
 import static android.content.Context.LAYOUT_INFLATER_SERVICE;
-import static java.util.Objects.requireNonNull;
+import static android.view.KeyEvent.KEYCODE_ENTER;
+import static android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT;
 
 @UiThread
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
-public class TextInputView extends LinearLayout {
+public class TextInputView extends KeyboardAwareLinearLayout {
+
+	@Inject
+	RecentEmoji recentEmoji;
 
 	@Nullable
-	TextSendController textSendController;
-	final EmojiTextInputView textInput;
+	TextInputListener listener;
+
+	AppCompatImageButton emojiToggle;
+	EmojiEditText editText;
+	EmojiPopup emojiPopup;
+	View sendButton;
 
 	public TextInputView(Context context) {
 		this(context, null);
@@ -41,109 +61,118 @@ public class TextInputView extends LinearLayout {
 	public TextInputView(Context context, @Nullable AttributeSet attrs,
 			int defStyleAttr) {
 		super(context, attrs, defStyleAttr);
-		setSaveEnabled(true);
+		if (!isInEditMode()) {
+			BriarApplication app =
+					(BriarApplication) context.getApplicationContext();
+			app.getApplicationComponent().inject(this);
+		}
 		setOrientation(VERTICAL);
 		setLayoutTransition(new LayoutTransition());
+		inflateLayout(context);
+		setUpViews(context, attrs);
+	}
 
-		// inflate layout
-		LayoutInflater inflater = (LayoutInflater) requireNonNull(
-				context.getSystemService(LAYOUT_INFLATER_SERVICE));
-		inflater.inflate(getLayout(), this, true);
+	protected void inflateLayout(Context context) {
+		LayoutInflater inflater = (LayoutInflater) context
+				.getSystemService(LAYOUT_INFLATER_SERVICE);
+		inflater.inflate(R.layout.text_input_view, this, true);
+	}
+
+	@CallSuper
+	protected void setUpViews(Context context, @Nullable AttributeSet attrs) {
+		emojiToggle = findViewById(R.id.emoji_toggle);
+		editText = findViewById(R.id.input_text);
+		emojiPopup = EmojiPopup.Builder
+				.fromRootView(this)
+				.setRecentEmoji(recentEmoji)
+				.setOnEmojiPopupShownListener(this::showKeyboardIcon)
+				.setOnEmojiPopupDismissListener(this::showEmojiIcon)
+				.build(editText);
+		sendButton = findViewById(R.id.btn_send);
 
 		// get attributes
 		TypedArray attributes = context.obtainStyledAttributes(attrs,
 				R.styleable.TextInputView);
 		String hint = attributes.getString(R.styleable.TextInputView_hint);
-		boolean allowEmptyText = attributes
-				.getBoolean(R.styleable.TextInputView_allowEmptyText, false);
 		attributes.recycle();
 
-		textInput = findViewById(R.id.emojiTextInput);
-		textInput.setAllowEmptyText(allowEmptyText);
-		if (hint != null) textInput.setHint(hint);
+		if (hint != null) editText.setHint(hint);
+
+		emojiToggle.setOnClickListener(v -> emojiPopup.toggle());
+		editText.setOnClickListener(v -> showSoftKeyboard());
+		editText.setOnKeyListener((v, keyCode, event) -> {
+			if (keyCode == KEYCODE_ENTER && event.isCtrlPressed()) {
+				trySendMessage();
+				return true;
+			}
+			return false;
+		});
+		sendButton.setOnClickListener(v -> trySendMessage());
 	}
 
-	@LayoutRes
-	protected int getLayout() {
-		return R.layout.text_input_view;
+	private void showEmojiIcon() {
+		emojiToggle.setImageResource(R.drawable.ic_emoji_toggle);
 	}
 
-	@Nullable
-	@Override
-	protected Parcelable onSaveInstanceState() {
-		Parcelable superState = super.onSaveInstanceState();
-		if (textSendController != null) {
-			superState = textSendController.onSaveInstanceState(superState);
+	private void showKeyboardIcon() {
+		emojiToggle.setImageResource(R.drawable.ic_keyboard);
+	}
+
+	private void trySendMessage() {
+		if (listener != null) {
+			listener.onSendClick(editText.getText().toString());
 		}
-		return superState;
-	}
-
-	@Override
-	protected void onRestoreInstanceState(Parcelable state) {
-		if (textSendController != null) {
-			Parcelable outState =
-					textSendController.onRestoreInstanceState(state);
-			super.onRestoreInstanceState(outState);
-		} else {
-			super.onRestoreInstanceState(state);
-		}
-	}
-
-	/**
-	 * Call this in onCreate() before any other methods of this class.
-	 */
-	public <T extends TextSendController> void setSendController(T controller) {
-		textSendController = controller;
-		textInput.setTextInputListener(textSendController);
-	}
-
-	@Override
-	public void setEnabled(boolean enabled) {
-		super.setEnabled(enabled);
-		textInput.setEnabled(enabled);
-		requireNonNull(textSendController).setEnabled(enabled);
 	}
 
 	@Override
 	public boolean requestFocus(int direction, Rect previouslyFocusedRect) {
-		return textInput.requestFocus(direction, previouslyFocusedRect);
+		return editText.requestFocus(direction, previouslyFocusedRect);
 	}
 
-	EmojiTextInputView getEmojiTextInputView() {
-		return textInput;
+	@Override
+	public void onDetachedFromWindow() {
+		super.onDetachedFromWindow();
+		if (emojiPopup.isShowing()) emojiPopup.dismiss();
 	}
 
-	public void clearText() {
-		textInput.clearText();
+	public void setText(String text) {
+		editText.setText(text);
+	}
+
+	public Editable getText() {
+		return editText.getText();
 	}
 
 	public void setHint(@StringRes int res) {
-		textInput.setHint(getContext().getString(res));
+		editText.setHint(res);
 	}
 
-	public void setMaxTextLength(int maxLength) {
-		textInput.setMaxLength(maxLength);
+	public void setSendButtonEnabled(boolean enabled) {
+		sendButton.setEnabled(enabled);
 	}
 
-	public boolean isKeyboardOpen() {
-		return textInput.isKeyboardOpen();
+	public void addTextChangedListener(TextWatcher watcher) {
+		editText.addTextChangedListener(watcher);
+	}
+
+	public void setListener(TextInputListener listener) {
+		this.listener = listener;
 	}
 
 	public void showSoftKeyboard() {
-		textInput.showSoftKeyboard();
+		Object o = getContext().getSystemService(INPUT_METHOD_SERVICE);
+		((InputMethodManager) o).showSoftInput(editText, SHOW_IMPLICIT);
 	}
 
 	public void hideSoftKeyboard() {
-		textInput.hideSoftKeyboard();
+		if (emojiPopup.isShowing()) emojiPopup.dismiss();
+		IBinder token = editText.getWindowToken();
+		Object o = getContext().getSystemService(INPUT_METHOD_SERVICE);
+		((InputMethodManager) o).hideSoftInputFromWindow(token, 0);
 	}
 
-	public void addOnKeyboardShownListener(OnKeyboardShownListener listener) {
-		textInput.addOnKeyboardShownListener(listener);
-	}
-
-	public void removeOnKeyboardShownListener(
-			OnKeyboardShownListener listener) {
-		textInput.removeOnKeyboardShownListener(listener);
+	public interface TextInputListener {
+		void onSendClick(String text);
 	}
 
 }

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

@@ -1,88 +0,0 @@
-package org.briarproject.briar.android.view;
-
-import android.net.Uri;
-import android.os.Parcelable;
-import android.support.annotation.CallSuper;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
-import android.support.design.widget.Snackbar;
-import android.view.View;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.briar.R;
-import org.briarproject.briar.android.view.EmojiTextInputView.TextInputListener;
-
-import java.util.List;
-
-import static android.support.design.widget.Snackbar.LENGTH_SHORT;
-import static java.util.Collections.emptyList;
-
-@UiThread
-@NotNullByDefault
-public class TextSendController implements TextInputListener {
-
-	protected final EmojiTextInputView textInput;
-	protected final View sendButton;
-	protected final SendListener listener;
-	protected boolean enabled = true;
-	protected final boolean allowEmptyText;
-
-	private boolean wasEmpty = true;
-
-	public TextSendController(TextInputView v, SendListener listener,
-			boolean allowEmptyText) {
-		this.sendButton = v.findViewById(R.id.btn_send);
-		this.sendButton.setOnClickListener(view -> onSendEvent());
-		this.sendButton.setEnabled(allowEmptyText);
-		this.listener = listener;
-		this.textInput = v.getEmojiTextInputView();
-		this.allowEmptyText = allowEmptyText;
-	}
-
-	@Override
-	public void onTextIsEmptyChanged(boolean isEmpty) {
-		sendButton.setEnabled(enabled && (!isEmpty || canSendEmptyText()));
-		wasEmpty = isEmpty;
-	}
-
-	@Override
-	public void onSendEvent() {
-		if (canSend()) {
-			listener.onSendClick(textInput.getText(), emptyList());
-		}
-	}
-
-	protected final boolean canSend() {
-		if (textInput.isTooLong()) {
-			Snackbar.make(sendButton, R.string.text_too_long, LENGTH_SHORT)
-					.show();
-			return false;
-		}
-		return enabled && (canSendEmptyText() || !textInput.isEmpty());
-	}
-
-	protected boolean canSendEmptyText() {
-		return allowEmptyText;
-	}
-
-	@Nullable
-	public Parcelable onSaveInstanceState(@Nullable Parcelable superState) {
-		return superState;
-	}
-
-	@Nullable
-	public Parcelable onRestoreInstanceState(Parcelable state) {
-		return state;
-	}
-
-	@CallSuper
-	public void setEnabled(boolean enabled) {
-		sendButton.setEnabled(enabled && (!wasEmpty || canSendEmptyText()));
-		this.enabled = enabled;
-	}
-
-	public interface SendListener {
-		void onSendClick(@Nullable String text, List<Uri> imageUris);
-	}
-
-}

briar-android/src/main/java/org/briarproject/briar/android/viewmodel/ViewModelModule.java

@@ -4,7 +4,6 @@ import android.arch.lifecycle.ViewModel;
 import android.arch.lifecycle.ViewModelProvider;
 
 import org.briarproject.briar.android.conversation.ConversationViewModel;
-import org.briarproject.briar.android.conversation.ImageViewModel;
 
 import javax.inject.Singleton;
 
@@ -21,12 +20,6 @@ public abstract class ViewModelModule {
 	abstract ViewModel bindConversationViewModel(
 			ConversationViewModel conversationViewModel);
 
-	@Binds
-	@IntoMap
-	@ViewModelKey(ImageViewModel.class)
-	abstract ViewModel bindImageViewModel(
-			ImageViewModel imageViewModel);
-
 	@Binds
 	@Singleton
 	abstract ViewModelProvider.Factory bindViewModelFactory(

briar-android/src/main/java/org/thoughtcrime/securesms/LICENSE

@@ -0,0 +1,621 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS

briar-android/src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java

@@ -1,8 +1,4 @@
-/*
-  Taken from Signal, licences under GPLv3
- */
-
-package org.briarproject.briar.android.view;
+package org.thoughtcrime.securesms.components;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -28,7 +24,6 @@ import javax.annotation.Nullable;
 import static android.content.Context.WINDOW_SERVICE;
 import static android.view.Surface.ROTATION_270;
 import static android.view.Surface.ROTATION_90;
-import static java.util.Objects.requireNonNull;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 
@@ -43,6 +38,8 @@ public class KeyboardAwareLinearLayout extends LinearLayout {
 			Logger.getLogger(KeyboardAwareLinearLayout.class.getName());
 
 	private final Rect rect = new Rect();
+	private final Set<OnKeyboardHiddenListener> hiddenListeners =
+			new HashSet<>();
 	private final Set<OnKeyboardShownListener> shownListeners = new HashSet<>();
 	private final int minKeyboardSize;
 	private final int minCustomKeyboardSize;
@@ -156,6 +153,7 @@ public class KeyboardAwareLinearLayout extends LinearLayout {
 	protected void onKeyboardClose() {
 		LOG.info("onKeyboardClose()");
 		keyboardOpen = false;
+		notifyHiddenListeners();
 	}
 
 	public boolean isKeyboardOpen() {
@@ -175,7 +173,7 @@ public class KeyboardAwareLinearLayout extends LinearLayout {
 	private int getDeviceRotation() {
 		WindowManager windowManager =
 				(WindowManager) getContext().getSystemService(WINDOW_SERVICE);
-		return requireNonNull(windowManager).getDefaultDisplay().getRotation();
+		return windowManager.getDefaultDisplay().getRotation();
 	}
 
 	private int getKeyboardLandscapeHeight() {
@@ -201,6 +199,43 @@ public class KeyboardAwareLinearLayout extends LinearLayout {
 		prefs.edit().putInt("keyboard_height_portrait", height).apply();
 	}
 
+	public void postOnKeyboardClose(Runnable runnable) {
+		if (keyboardOpen) {
+			addOnKeyboardHiddenListener(new OnKeyboardHiddenListener() {
+				@Override
+				public void onKeyboardHidden() {
+					removeOnKeyboardHiddenListener(this);
+					runnable.run();
+				}
+			});
+		} else {
+			runnable.run();
+		}
+	}
+
+	public void postOnKeyboardOpen(Runnable runnable) {
+		if (!keyboardOpen) {
+			addOnKeyboardShownListener(new OnKeyboardShownListener() {
+				@Override
+				public void onKeyboardShown() {
+					removeOnKeyboardShownListener(this);
+					runnable.run();
+				}
+			});
+		} else {
+			runnable.run();
+		}
+	}
+
+	public void addOnKeyboardHiddenListener(OnKeyboardHiddenListener listener) {
+		hiddenListeners.add(listener);
+	}
+
+	public void removeOnKeyboardHiddenListener(
+			OnKeyboardHiddenListener listener) {
+		hiddenListeners.remove(listener);
+	}
+
 	public void addOnKeyboardShownListener(OnKeyboardShownListener listener) {
 		shownListeners.add(listener);
 	}
@@ -210,6 +245,15 @@ public class KeyboardAwareLinearLayout extends LinearLayout {
 		shownListeners.remove(listener);
 	}
 
+	private void notifyHiddenListeners() {
+		// Make a copy as listeners may remove themselves when called
+		Set<OnKeyboardHiddenListener> listeners =
+				new HashSet<>(hiddenListeners);
+		for (OnKeyboardHiddenListener listener : listeners) {
+			listener.onKeyboardHidden();
+		}
+	}
+
 	private void notifyShownListeners() {
 		// Make a copy as listeners may remove themselves when called
 		Set<OnKeyboardShownListener> listeners = new HashSet<>(shownListeners);
@@ -218,8 +262,11 @@ public class KeyboardAwareLinearLayout extends LinearLayout {
 		}
 	}
 
+	public interface OnKeyboardHiddenListener {
+		void onKeyboardHidden();
+	}
+
 	public interface OnKeyboardShownListener {
 		void onKeyboardShown();
 	}
-
 }

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

@@ -1,10 +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="#000000"
-		android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
-</vector>

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

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12 5.16,-1.26 9,-6.45 9,-12L21,5l-9,-4zM12,11.99h7c-0.53,4.12 -3.28,7.79 -7,8.94L12,12L5,12L5,6.3l7,-3.11v8.8z"/>
-</vector>

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

@@ -5,7 +5,6 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:animateLayoutChanges="true"
 	android:orientation="vertical"
 	tools:context=".android.conversation.ConversationActivity">
 
@@ -33,9 +32,9 @@
 					android:layout_height="match_parent"
 					android:layout_marginLeft="@dimen/margin_medium"
 					android:layout_marginStart="@dimen/margin_medium"
-					android:ellipsize="end"
 					android:gravity="center"
 					android:maxLines="1"
+					android:ellipsize="end"
 					android:textColor="@color/action_bar_text"
 					tools:text="Contact Name of someone who chose a long name"/>
 
@@ -49,15 +48,7 @@
 		android:id="@+id/conversationView"
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
-		android:layout_weight="2"/>
-
-	<org.briarproject.briar.android.view.ImagePreview
-		android:id="@+id/imagePreview"
-		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:layout_weight="1"
-		android:visibility="gone"
-		tools:visibility="visible"/>
+		android:layout_weight="1"/>
 
 	<org.briarproject.briar.android.view.TextInputView
 		android:id="@+id/text_input_container"

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

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge
-	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:orientation="horizontal"
-	tools:parentTag="org.briarproject.briar.android.view.KeyboardAwareLinearLayout"
-	tools:showIn="@layout/fragment_reblog">
-
-	<android.support.v7.widget.AppCompatImageButton
-		android:id="@+id/emoji_toggle"
-		android:layout_width="@dimen/text_input_height"
-		android:layout_height="@dimen/text_input_height"
-		android:layout_gravity="bottom"
-		android:background="?attr/selectableItemBackground"
-		android:padding="@dimen/margin_small"
-		android:scaleType="center"
-		android:src="@drawable/ic_emoji_toggle"
-		app:tint="?attr/colorControlNormal"/>
-
-	<com.vanniktech.emoji.EmojiEditText
-		android:id="@+id/input_text"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_gravity="bottom"
-		android:background="@android:color/transparent"
-		android:inputType="textMultiLine|textCapSentences|textAutoCorrect"
-		android:minHeight="@dimen/text_input_height"
-		android:textColor="?android:attr/textColorPrimary"
-		tools:text="Line 1\nLine 2\nLine 3"/>
-
-</merge>

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

@@ -5,7 +5,6 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	app:allowEmptyText="true"
 	app:buttonText="@string/forum_share_button"
 	app:fillHeight="true"
 	app:hint="@string/forum_share_message"/>

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

@@ -39,7 +39,6 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:gravity="bottom"
-		app:allowEmptyText="true"
 		app:buttonText="@string/blogs_reblog_button"
 		app:hint="@string/blogs_reblog_comment_hint"
 		app:maxLines="5"/>

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

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge
-	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:animateLayoutChanges="true"
-	tools:parentTag="android.support.constraint.ConstraintLayout"
-	tools:showIn="@layout/activity_conversation">
-
-	<View
-		android:id="@+id/divider"
-		style="@style/Divider.Horizontal"
-		android:layout_alignParentTop="true"
-		app:layout_constraintBottom_toTopOf="@+id/imageView"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent"/>
-
-	<ImageView
-		android:id="@+id/imageView"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/divider"
-		tools:ignore="ContentDescription"
-		tools:srcCompat="@tools:sample/avatars"/>
-
-	<android.support.design.widget.FloatingActionButton
-		android:id="@+id/imageCancelButton"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_marginBottom="8dp"
-		android:layout_marginEnd="8dp"
-		android:layout_marginRight="8dp"
-		android:layout_marginTop="8dp"
-		android:src="@drawable/ic_close"
-		app:backgroundTint="@color/briar_red"
-		app:fabCustomSize="26dp"
-		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintTop_toTopOf="parent"
-		app:layout_constraintVertical_bias="0"
-		app:maxImageSize="18dp"/>
-
-</merge>

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

@@ -118,7 +118,6 @@
 			android:layout_height="wrap_content"
 			android:layout_marginTop="@dimen/margin_large"
 			android:visibility="gone"
-			app:allowEmptyText="true"
 			app:buttonText="@string/introduction_button"
 			app:hint="@string/introduction_message_hint"
 			app:layout_constraintBottom_toBottomOf="parent"

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

@@ -15,19 +15,15 @@
 	android:background="@drawable/msg_in"
 	android:elevation="@dimen/message_bubble_elevation">
 
-	<android.support.v7.widget.RecyclerView
-		android:id="@+id/imageList"
+	<ImageView
+		android:id="@+id/imageView"
 		android:layout_width="@dimen/message_bubble_image_default"
 		android:layout_height="@dimen/message_bubble_image_default"
-		android:orientation="vertical"
-		app:layoutManager="android.support.v7.widget.StaggeredGridLayoutManager"
 		app:layout_constraintBottom_toTopOf="@+id/text"
-		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
-		app:spanCount="2"
 		tools:ignore="ContentDescription"
-		tools:listitem="@layout/list_item_image"/>
+		tools:src="@drawable/alerts_and_states_error"/>
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/text"
@@ -42,10 +38,10 @@
 		android:visibility="gone"
 		app:layout_constrainedWidth="true"
 		app:layout_constraintBottom_toTopOf="@+id/statusLayout"
-		app:layout_constraintEnd_toEndOf="@+id/imageList"
+		app:layout_constraintEnd_toEndOf="@+id/imageView"
 		app:layout_constraintHorizontal_bias="0.0"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/imageList"
+		app:layout_constraintTop_toBottomOf="@+id/imageView"
 		tools:text="The text of a message which can sometimes be a bit longer as well"/>
 
 	<LinearLayout
@@ -57,7 +53,7 @@
 		android:layout_marginRight="@dimen/message_bubble_padding_sides_inner"
 		android:background="@drawable/msg_status_bubble"
 		android:orientation="horizontal"
-		app:layout_constraintBottom_toBottomOf="@+id/imageList"
+		app:layout_constraintBottom_toBottomOf="@+id/imageView"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintHorizontal_bias="1.0"
 		app:layout_constraintStart_toStartOf="parent">

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

@@ -15,19 +15,15 @@
 	android:background="@drawable/msg_in"
 	android:elevation="@dimen/message_bubble_elevation">
 
-	<android.support.v7.widget.RecyclerView
-		android:id="@+id/imageList"
+	<ImageView
+		android:id="@+id/imageView"
 		android:layout_width="@dimen/message_bubble_image_default"
 		android:layout_height="@dimen/message_bubble_image_default"
-		android:orientation="vertical"
-		app:layoutManager="android.support.v7.widget.StaggeredGridLayoutManager"
 		app:layout_constraintBottom_toTopOf="@+id/text"
-		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
-		app:spanCount="2"
 		tools:ignore="ContentDescription"
-		tools:listitem="@layout/list_item_image"/>
+		tools:src="@drawable/alerts_and_states_error"/>
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/text"
@@ -41,10 +37,10 @@
 		android:textColor="?android:attr/textColorPrimary"
 		app:layout_constrainedWidth="true"
 		app:layout_constraintBottom_toTopOf="@+id/statusLayout"
-		app:layout_constraintEnd_toEndOf="@+id/imageList"
+		app:layout_constraintEnd_toEndOf="@+id/imageView"
 		app:layout_constraintHorizontal_bias="0.0"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/imageList"
+		app:layout_constraintTop_toBottomOf="@+id/imageView"
 		tools:text="The text of a message which can sometimes be a bit longer as well"/>
 
 	<LinearLayout

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

@@ -15,20 +15,15 @@
 	android:background="@drawable/msg_in"
 	android:elevation="@dimen/message_bubble_elevation">
 
-	<android.support.v7.widget.RecyclerView
-		android:id="@+id/imageList"
+	<ImageView
+		android:id="@+id/imageView"
 		android:layout_width="@dimen/message_bubble_image_default"
 		android:layout_height="@dimen/message_bubble_image_default"
-		android:orientation="vertical"
 		android:visibility="gone"
-		app:layoutManager="android.support.v7.widget.StaggeredGridLayoutManager"
 		app:layout_constraintBottom_toTopOf="@+id/text"
-		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
-		app:spanCount="2"
-		tools:ignore="ContentDescription"
-		tools:listitem="@layout/list_item_image"/>
+		tools:ignore="ContentDescription"/>
 
 	<com.vanniktech.emoji.EmojiTextView
 		android:id="@+id/text"
@@ -45,7 +40,7 @@
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintHorizontal_bias="0.0"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/imageList"
+		app:layout_constraintTop_toBottomOf="@+id/imageView"
 		tools:text="The text of a message which can sometimes be a bit longer as well"/>
 
 	<LinearLayout

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

@@ -21,18 +21,14 @@
 		android:background="@drawable/msg_out"
 		android:elevation="@dimen/message_bubble_elevation">
 
-		<android.support.v7.widget.RecyclerView
-			android:id="@+id/imageList"
+		<ImageView
+			android:id="@+id/imageView"
 			android:layout_width="@dimen/message_bubble_image_default"
 			android:layout_height="@dimen/message_bubble_image_default"
-			android:orientation="vertical"
 			android:visibility="gone"
-			app:layoutManager="android.support.v7.widget.StaggeredGridLayoutManager"
 			app:layout_constraintBottom_toTopOf="@+id/text"
-			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toTopOf="parent"
-			app:spanCount="2"
 			tools:ignore="ContentDescription"
 			tools:src="@drawable/alerts_and_states_error"/>
 
@@ -51,7 +47,7 @@
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintHorizontal_bias="0.0"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/imageList"
+			app:layout_constraintTop_toBottomOf="@+id/imageView"
 			tools:text="This is a long long long message that spans over several lines.\n\nIt ends here."/>
 
 		<LinearLayout

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

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ImageView
-	android:id="@+id/imageView"
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="@dimen/message_bubble_image_default"
-	android:layout_height="@dimen/message_bubble_image_default"
-	android:scaleType="centerCrop"
-	tools:ignore="ContentDescription"
-	tools:srcCompat="@tools:sample/avatars"/>

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

@@ -5,7 +5,6 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:animateLayoutChanges="true"
 	tools:showIn="@layout/activity_conversation">
 
 	<View
@@ -17,48 +16,46 @@
 		android:layout_height="wrap_content"
 		android:background="@color/card_background">
 
-		<org.briarproject.briar.android.view.EmojiTextInputView
-			android:id="@+id/emojiTextInput"
+		<android.support.v7.widget.AppCompatImageButton
+			android:id="@+id/emoji_toggle"
+			android:layout_width="@dimen/text_input_height"
+			android:layout_height="@dimen/text_input_height"
+			android:layout_gravity="bottom"
+			android:background="?attr/selectableItemBackground"
+			android:padding="@dimen/margin_small"
+			android:scaleType="center"
+			android:src="@drawable/ic_emoji_toggle"
+			app:tint="?attr/colorControlNormal"/>
+
+		<com.vanniktech.emoji.EmojiEditText
+			android:id="@+id/input_text"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			app:maxTextLines="4"/>
+			android:background="@android:color/transparent"
+			android:inputType="textMultiLine|textCapSentences"
+			android:maxLines="4"
+			android:minHeight="@dimen/text_input_height"
+			android:paddingLeft="2dp"
+			android:paddingStart="2dp"
+			android:textColor="?android:attr/textColorPrimary"
+			tools:ignore="RtlSymmetry"
+			tools:text="Line 1\nLine 2\nLine 3"/>
 
-		<FrameLayout
+		<android.support.v7.widget.AppCompatImageButton
+			android:id="@+id/btn_send"
 			android:layout_width="@dimen/text_input_height"
 			android:layout_height="@dimen/text_input_height"
-			android:layout_gravity="bottom">
-
-			<android.support.v7.widget.AppCompatImageButton
-				android:id="@+id/imageButton"
-				android:layout_width="@dimen/text_input_height"
-				android:layout_height="@dimen/text_input_height"
-				android:background="?attr/selectableItemBackground"
-				android:clickable="true"
-				android:contentDescription="@string/image_attach"
-				android:enabled="false"
-				android:focusable="true"
-				android:padding="4dp"
-				android:scaleType="center"
-				android:src="@drawable/ic_image"
-				android:visibility="invisible"
-				app:tint="?attr/colorControlNormal"/>
-
-			<android.support.v7.widget.AppCompatImageButton
-				android:id="@+id/btn_send"
-				android:layout_width="@dimen/text_input_height"
-				android:layout_height="@dimen/text_input_height"
-				android:background="?attr/selectableItemBackground"
-				android:clickable="true"
-				android:contentDescription="@string/send"
-				android:enabled="false"
-				android:focusable="true"
-				android:padding="4dp"
-				android:scaleType="center"
-				android:src="@drawable/social_send_now_white"
-				app:tint="@color/briar_accent"/>
-
-		</FrameLayout>
+			android:layout_gravity="bottom"
+			android:background="?attr/selectableItemBackground"
+			android:clickable="true"
+			android:contentDescription="@string/send"
+			android:enabled="false"
+			android:focusable="true"
+			android:padding="4dp"
+			android:scaleType="center"
+			android:src="@drawable/social_send_now_white"
+			app:tint="@color/briar_accent"/>
 
 	</LinearLayout>
 

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

@@ -22,12 +22,39 @@
 		app:cardCornerRadius="0dp"
 		app:cardUseCompatPadding="false">
 
-		<org.briarproject.briar.android.view.EmojiTextInputView
-			android:id="@+id/emojiTextInput"
+		<LinearLayout
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
-			app:textPaddingBottom="10dp"
-			app:textPaddingEnd="@dimen/margin_medium"/>
+			android:orientation="horizontal">
+
+			<android.support.v7.widget.AppCompatImageButton
+				android:id="@+id/emoji_toggle"
+				android:layout_width="@dimen/text_input_height"
+				android:layout_height="@dimen/text_input_height"
+				android:layout_gravity="bottom"
+				android:background="?attr/selectableItemBackground"
+				android:padding="@dimen/margin_small"
+				android:scaleType="center"
+				android:src="@drawable/ic_emoji_toggle"
+				app:tint="?attr/colorControlNormal"/>
+
+			<com.vanniktech.emoji.EmojiEditText
+				android:id="@+id/input_text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:background="@android:color/transparent"
+				android:gravity="bottom"
+				android:inputType="textMultiLine|textLongMessage|textCapSentences|textAutoCorrect"
+				android:minHeight="@dimen/text_input_height"
+				android:paddingBottom="10dp"
+				android:paddingEnd="@dimen/margin_small"
+				android:paddingRight="@dimen/margin_small"
+				android:paddingTop="@dimen/margin_small"
+				android:textColor="?android:attr/textColorPrimary"
+				tools:ignore="RtlSymmetry"
+				tools:text="Line 1\nLine 2\nLine 3"/>
+
+		</LinearLayout>
 
 	</android.support.v7.widget.CardView>
 
@@ -37,7 +64,6 @@
 		android:layout_marginEnd="@dimen/margin_small"
 		android:layout_marginLeft="@dimen/margin_small"
 		android:layout_marginRight="@dimen/margin_small"
-		android:layout_marginStart="@dimen/margin_small"
-		tools:text="@string/send"/>
+		android:layout_marginStart="@dimen/margin_small"/>
 
 </merge>

briar-android/src/main/res/menu/image_actions.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto">
-
-	<item
-		android:id="@+id/action_save_image"
-		android:title="@string/save_image"
-		app:showAsAction="never"/>
-</menu>

briar-android/src/main/res/values/attrs.xml

@@ -19,15 +19,8 @@
 		</attr>
 	</declare-styleable>
 
-	<declare-styleable name="EmojiTextInputView">
-		<attr name="textPaddingBottom" format="dimension"/>
-		<attr name="textPaddingEnd" format="dimension"/>
-		<attr name="maxTextLines" format="integer"/>
-	</declare-styleable>
-
 	<declare-styleable name="TextInputView">
 		<attr name="hint" format="string"/>
-		<attr name="allowEmptyText" format="boolean"/>
 	</declare-styleable>
 
 	<declare-styleable name="LargeTextInputView">

briar-android/src/main/res/values/dimens.xml

@@ -43,7 +43,7 @@
 	<dimen name="message_bubble_radius_top_inner">@dimen/message_bubble_radius_small</dimen>
 	<dimen name="message_bubble_radius_top_outer">@dimen/message_bubble_radius_big</dimen>
 	<dimen name="message_bubble_margin">6dp</dimen>
-	<dimen name="message_bubble_image_default">115dp</dimen>
+	<dimen name="message_bubble_image_default">210dp</dimen>
 	<dimen name="message_bubble_image_min_width">150dp</dimen>
 	<dimen name="message_bubble_image_max_width">240dp</dimen>
 	<dimen name="message_bubble_image_min_height">100dp</dimen>

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

@@ -127,9 +127,6 @@
 	<string name="date_no_private_messages">No messages.</string>
 	<string name="no_private_messages">No messages to show</string>
 	<string name="message_hint">Type message</string>
-	<string name="image_caption_hint">Add a caption (optional)</string>
-	<string name="image_attach">Attach image</string>
-	<string name="image_attach_error">Could not attach image</string>
 	<string name="set_contact_alias">Change contact name</string>
 	<string name="set_contact_alias_hint">Contact name</string>
 	<string name="set_alias_button">Change</string>
@@ -139,11 +136,6 @@
 	<string name="contact_deleted_toast">Contact deleted</string>
 	<!-- This is shown in the action bar when opening an image in fullscreen that the user sent -->
 	<string name="you">You</string>
-	<string name="save_image">Save image</string>
-	<string name="dialog_title_save_image">Save Image?</string>
-	<string name="dialog_message_save_image">Saving this image will allow other apps to access it.\n\nAre you sure you want to save?</string>
-	<string name="save_image_success">Image was saved</string>
-	<string name="save_image_error">Could not save image</string>
 
 	<!-- Adding Contacts -->
 	<string name="add_contact_title">Add a Contact</string>

briar-android/witness.gradle

@@ -40,7 +40,6 @@ dependencyVerification {
         'com.android.support:interpolator:28.0.0:interpolator-28.0.0.aar:7bc7ee86a0db39a4b51956f3e89842d2bd962118d57d779eb6ed6b34ba0677ea',
         'com.android.support:loader:28.0.0:loader-28.0.0.aar:920b85efd72dc33e915b0f88a883fe73b88483c6df8751a741e17611f2460341',
         'com.android.support:localbroadcastmanager:28.0.0:localbroadcastmanager-28.0.0.aar:d287c823af5fdde72c099fcfc5f630efe9687af7a914343ae6fd92de32c8a806',
-        'com.android.support:palette-v7:28.0.0:palette-v7-28.0.0.aar:317202dddb953d152d0677dbd8bb3b9d8ef8dcd0bdee0da4f40c98826e4960e6',
         'com.android.support:preference-v14:28.0.0:preference-v14-28.0.0.aar:8133c6e19233fa51e036a341e6d3f4adeead3375cebf777efced0fe154c3267e',
         'com.android.support:preference-v7:28.0.0:preference-v7-28.0.0.aar:75eabe936d1fc3b178450a554c4d433466036f2be6d6dccdf971eac9590fdbf5',
         'com.android.support:print:28.0.0:print-28.0.0.aar:4be8a812d73e4a80e35b91ceae127def3f0bb9726bf3bc439aa0cc81503f5728',

briar-api/src/main/java/org/briarproject/briar/api/messaging/MessagingManager.java

@@ -8,8 +8,7 @@ import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.briar.api.conversation.ConversationManager.ConversationClient;
 
-import java.io.IOException;
-import java.io.InputStream;
+import java.nio.ByteBuffer;
 
 @NotNullByDefault
 public interface MessagingManager extends ConversationClient {
@@ -38,7 +37,7 @@ public interface MessagingManager extends ConversationClient {
 	 * Stores a local attachment message.
 	 */
 	AttachmentHeader addLocalAttachment(GroupId groupId, long timestamp,
-			String contentType, InputStream is) throws DbException, IOException;
+			String contentType, ByteBuffer data) throws DbException;
 
 	/**
 	 * Returns the ID of the contact with the given private conversation.

briar-core/src/main/java/org/briarproject/briar/messaging/MessagingManagerImpl.java

@@ -32,11 +32,9 @@ import org.briarproject.briar.api.messaging.PrivateMessageHeader;
 import org.briarproject.briar.api.messaging.event.PrivateMessageReceivedEvent;
 import org.briarproject.briar.client.ConversationClientImpl;
 
-import java.io.IOException;
-import java.io.InputStream;
+import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
@@ -44,7 +42,6 @@ import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
 
 import static java.util.Collections.emptyList;
-import static java.util.logging.Logger.getLogger;
 import static org.briarproject.briar.client.MessageTrackerConstants.MSG_KEY_READ;
 
 @Immutable
@@ -155,9 +152,8 @@ class MessagingManagerImpl extends ConversationClientImpl
 
 	@Override
 	public AttachmentHeader addLocalAttachment(GroupId groupId, long timestamp,
-			String contentType, InputStream is) throws IOException {
+			String contentType, ByteBuffer data) {
 		// TODO add real implementation
-		if (is.available() == 0) throw new IOException();
 		byte[] b = new byte[MessageId.LENGTH];
 		new Random().nextBytes(b);
 		return new AttachmentHeader(new MessageId(b), "image/png");
@@ -219,18 +215,8 @@ class MessagingManagerImpl extends ConversationClientImpl
 				long timestamp = meta.getLong("timestamp");
 				boolean local = meta.getBoolean("local");
 				boolean read = meta.getBoolean("read");
-				// TODO replace fake attachments by real ones
-				int num = (int) (timestamp % 5);
-				boolean hasText = num == 0 || id.hashCode() % 2 == 0;
-				List<AttachmentHeader> attachments = new ArrayList<>(num);
-				for (int i = 0; i < num; i++) {
-					byte[] aIdBytes = id.getBytes().clone();
-					aIdBytes[0] = (byte) i;
-					MessageId aId = new MessageId(aIdBytes);
-					attachments.add(new AttachmentHeader(aId, "image/jpeg"));
-				}
 				headers.add(new PrivateMessageHeader(id, g, timestamp, local,
-						read, s.isSent(), s.isSeen(), hasText, attachments));
+						read, s.isSent(), s.isSeen(), true, emptyList()));
 			} catch (FormatException e) {
 				throw new DbException(e);
 			}
@@ -251,30 +237,7 @@ class MessagingManagerImpl extends ConversationClientImpl
 	@Override
 	public Attachment getAttachment(MessageId m) {
 		// TODO add real implementation
-		String[] files = new String[] {
-//				"error_animated.gif",
-//				"error_high.jpg",
-//				"error_wide.jpg",
-//				"error_huge.gif",
-//				"error_large.gif",
-//				"error_malformed.jpg",
-//				"wide.jpg",
-//				"high.jpg",
-//				"small.png",
-				"kitten1.jpg",
-				"kitten2.jpg",
-				"kitten3.gif",
-				"kitten4.jpg",
-				"kitten5.jpg",
-				"kitten6.png",
-		};
-		int index = Math.abs(m.hashCode() % files.length);
-		String file = files[index];
-		getLogger(MessagingManagerImpl.class.getName())
-				.warning("Loading file: " + file);
-
-		InputStream is = getClass().getClassLoader().getResourceAsStream(file);
-		return new Attachment(is);
+		throw new IllegalStateException("Not yet implemented");
 	}
 
 }

briar-headless/build.gradle

@@ -30,9 +30,6 @@ dependencies {
 	testRuntime "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
 	testImplementation "io.mockk:mockk:1.8.12"
 	testImplementation "org.skyscreamer:jsonassert:1.5.0"
-	testImplementation 'khttp:khttp:0.1.0'
-
-	kaptTest 'com.google.dagger:dagger-compiler:2.19'
 }
 
 jar {
@@ -51,7 +48,6 @@ jar {
 idea {
 	module {
 		sourceDirs += file('build/generated/source/kapt/main')
-		testSourceDirs += file('build/generated/source/kapt/test')
 		generatedSourceDirs += file('build/generated/source/kapt/main')
 	}
 }

briar-headless/src/main/java/org/briarproject/briar/headless/BriarService.kt

@@ -13,22 +13,17 @@ import javax.annotation.concurrent.Immutable
 import javax.inject.Inject
 import javax.inject.Singleton
 
-interface BriarService {
-    fun start()
-    fun stop()
-}
-
 @Immutable
 @Singleton
-internal class BriarServiceImpl
+internal class BriarService
 @Inject
 constructor(
     private val accountManager: AccountManager,
     private val lifecycleManager: LifecycleManager,
     private val passwordStrengthEstimator: PasswordStrengthEstimator
-) : BriarService {
+) {
 
-    override fun start() {
+    fun start() {
         if (!accountManager.accountExists()) {
             createAccount()
         } else {
@@ -41,10 +36,9 @@ constructor(
         }
         val dbKey = accountManager.databaseKey ?: throw AssertionError()
         lifecycleManager.startServices(dbKey)
-        lifecycleManager.waitForStartup()
     }
 
-    override fun stop() {
+    fun stop() {
         lifecycleManager.stopServices()
         lifecycleManager.waitForShutdown()
     }

briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt

@@ -56,10 +56,6 @@ import javax.net.SocketFactory
 )
 internal class HeadlessModule(private val appDir: File) {
 
-    @Provides
-    @Singleton
-    internal fun provideBriarService(briarService: BriarServiceImpl): BriarService = briarService
-
     @Provides
     @Singleton
     internal fun provideDatabaseConfig(): DatabaseConfig {
@@ -75,21 +71,30 @@ internal class HeadlessModule(private val appDir: File) {
         locationUtils: LocationUtils, eventBus: EventBus, resourceProvider: ResourceProvider,
         circumventionProvider: CircumventionProvider, batteryManager: BatteryManager, clock: Clock
     ): PluginConfig {
-        val duplex: List<DuplexPluginFactory> = if (isLinux() || isMac()) {
-            val torDirectory = File(appDir, "tor")
+        val torDirectory = File(appDir, "tor")
+        val duplex: List<DuplexPluginFactory>
+        if (isLinux() || isMac()) {
             val tor = UnixTorPluginFactory(
                 ioExecutor, networkManager, locationUtils, eventBus, torSocketFactory,
                 backoffFactory, resourceProvider, circumventionProvider, batteryManager, clock,
                 torDirectory
             )
-            listOf(tor)
+            duplex = listOf(tor)
         } else {
-            emptyList()
+            duplex = emptyList()
         }
         return object : PluginConfig {
-            override fun getDuplexFactories(): Collection<DuplexPluginFactory> = duplex
-            override fun getSimplexFactories(): Collection<SimplexPluginFactory> = emptyList()
-            override fun shouldPoll(): Boolean = true
+            override fun getDuplexFactories(): Collection<DuplexPluginFactory> {
+                return duplex
+            }
+
+            override fun getSimplexFactories(): Collection<SimplexPluginFactory> {
+                return emptyList()
+            }
+
+            override fun shouldPoll(): Boolean {
+                return true
+            }
         }
     }
 
@@ -99,14 +104,21 @@ internal class HeadlessModule(private val appDir: File) {
         return object : DevConfig {
             override fun getDevPublicKey(): PublicKey {
                 try {
-                    return crypto.messageKeyParser.parsePublicKey(fromHexString(DEV_PUBLIC_KEY_HEX))
+                    return crypto.messageKeyParser
+                        .parsePublicKey(fromHexString(DEV_PUBLIC_KEY_HEX))
                 } catch (e: GeneralSecurityException) {
                     throw RuntimeException(e)
                 }
+
             }
 
-            override fun getDevOnionAddress(): String = DEV_ONION_ADDRESS
-            override fun getReportDir(): File = File(appDir, "reportDir")
+            override fun getDevOnionAddress(): String {
+                return DEV_ONION_ADDRESS
+            }
+
+            override fun getReportDir(): File {
+                return File(appDir, "reportDir")
+            }
         }
     }