Add transactional helper methods to DbViewModel.

and get rid of ThreadList controllers

.idea/runConfigurations/All_tests.xml

@@ -13,6 +13,7 @@
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-core" run_configuration_type="AndroidJUnit" />
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-android" run_configuration_type="AndroidJUnit" />
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-java" run_configuration_type="AndroidJUnit" />
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in briar-api" run_configuration_type="AndroidJUnit" />
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in briar-core" run_configuration_type="AndroidJUnit" />
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in briar-headless" run_configuration_type="AndroidJUnit" />
     </method>

.idea/runConfigurations/All_tests_in_briar_api.xml

@@ -0,0 +1,14 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="All tests in briar-api" type="AndroidJUnit" factoryName="Android JUnit">
+    <module name="briar.briar-api" />
+    <option name="PACKAGE_NAME" value="" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="package" />
+    <option name="PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/briar-api" />
+    <method v="2">
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    </method>
+  </configuration>
+</component>

bramble-android/build.gradle

@@ -5,14 +5,14 @@ apply plugin: 'witness'
 apply from: 'witness.gradle'
 
 android {
-	compileSdkVersion rootProject.ext.compileSdkVersion
-	buildToolsVersion rootProject.ext.buildToolsVersion
+	compileSdkVersion 30
+	buildToolsVersion '30.0.2'
 
 	defaultConfig {
-		minSdkVersion rootProject.ext.minSdkVersion
-		targetSdkVersion rootProject.ext.targetSdkVersion
-		versionCode rootProject.ext.versionCode
-		versionName rootProject.ext.versionName
+		minSdkVersion 16
+		targetSdkVersion 29
+		versionCode 10213
+		versionName "1.2.13"
 		consumerProguardFiles 'proguard-rules.txt'
 
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

bramble-android/src/main/java/org/briarproject/bramble/system/AndroidWakeLockManagerImpl.java

@@ -2,7 +2,6 @@ package org.briarproject.bramble.system;
 
 import android.app.Application;
 import android.content.Context;
-import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.PowerManager;
 
@@ -106,14 +105,21 @@ class AndroidWakeLockManagerImpl implements AndroidWakeLockManager {
 
 	private String getWakeLockTag(Context ctx) {
 		PackageManager pm = ctx.getPackageManager();
-		for (PackageInfo info : pm.getInstalledPackages(0)) {
-			String name = info.packageName.toLowerCase();
-			if (name.startsWith("com.huawei.powergenie")) {
-				return "LocationManagerService";
-			} else if (name.startsWith("com.evenwell.powermonitor")) {
-				return "AudioIn";
-			}
+		if (isInstalled(pm, "com.huawei.powergenie")) {
+			return "LocationManagerService";
+		} else if (isInstalled(pm, "com.evenwell.PowerMonitor")) {
+			return "AudioIn";
 		}
 		return ctx.getPackageName();
 	}
+
+	private boolean isInstalled(PackageManager pm, String packageName) {
+		try {
+			pm.getPackageInfo(packageName, 0);
+			return true;
+		} catch (PackageManager.NameNotFoundException e) {
+			return false;
+		}
+	}
+
 }

bramble-api/src/main/java/org/briarproject/bramble/api/FeatureFlags.java

@@ -6,4 +6,7 @@ package org.briarproject.bramble.api;
 public interface FeatureFlags {
 
 	boolean shouldEnableImageAttachments();
+
+	boolean shouldEnableProfilePictures();
+
 }

bramble-api/src/main/java/org/briarproject/bramble/api/ThrowingRunnable.java

@@ -0,0 +1,6 @@
+package org.briarproject.bramble.api;
+
+public interface ThrowingRunnable<T extends Throwable> {
+
+	void run() throws T;
+}

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

@@ -11,7 +11,6 @@ import org.briarproject.bramble.api.db.PendingContactExistsException;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorId;
-import org.briarproject.bramble.api.identity.AuthorInfo;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
@@ -179,6 +178,11 @@ public interface ContactManager {
 	 */
 	Collection<Contact> getContacts() throws DbException;
 
+	/**
+	 * Returns all contacts.
+	 */
+	Collection<Contact> getContacts(Transaction txn) throws DbException;
+
 	/**
 	 * Removes a contact and all associated state.
 	 */
@@ -215,16 +219,6 @@ public interface ContactManager {
 	boolean contactExists(AuthorId remoteAuthorId, AuthorId localAuthorId)
 			throws DbException;
 
-	/**
-	 * Returns the {@link AuthorInfo} for the given author.
-	 */
-	AuthorInfo getAuthorInfo(AuthorId a) throws DbException;
-
-	/**
-	 * Returns the {@link AuthorInfo} for the given author.
-	 */
-	AuthorInfo getAuthorInfo(Transaction txn, AuthorId a) throws DbException;
-
 	interface ContactHook {
 
 		/**

bramble-api/src/main/java/org/briarproject/bramble/api/nullsafety/NullSafety.java

@@ -29,4 +29,12 @@ public class NullSafety {
 	public static void requireNull(@Nullable Object o) {
 		if (o != null) throw new AssertionError();
 	}
+
+	/**
+	 * Stand-in for {@code Objects.equals()}.
+	 */
+	public static boolean equals(@Nullable Object a, @Nullable Object b) {
+		return (a == b) || (a != null && a.equals(b));
+	}
+
 }

bramble-api/src/test/java/org/briarproject/bramble/api/identity/AuthorInfoTest.java

@@ -1,42 +0,0 @@
-package org.briarproject.bramble.api.identity;
-
-import org.briarproject.bramble.test.BrambleTestCase;
-import org.junit.Test;
-
-import static org.briarproject.bramble.api.identity.AuthorInfo.Status.NONE;
-import static org.briarproject.bramble.api.identity.AuthorInfo.Status.VERIFIED;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-
-public class AuthorInfoTest extends BrambleTestCase {
-
-	@Test
-	public void testEquals() {
-		assertEquals(
-				new AuthorInfo(NONE),
-				new AuthorInfo(NONE, null)
-		);
-		assertEquals(
-				new AuthorInfo(NONE, "test"),
-				new AuthorInfo(NONE, "test")
-		);
-
-		assertNotEquals(
-				new AuthorInfo(NONE),
-				new AuthorInfo(VERIFIED)
-		);
-		assertNotEquals(
-				new AuthorInfo(NONE, "test"),
-				new AuthorInfo(NONE)
-		);
-		assertNotEquals(
-				new AuthorInfo(NONE),
-				new AuthorInfo(NONE, "test")
-		);
-		assertNotEquals(
-				new AuthorInfo(NONE, "a"),
-				new AuthorInfo(NONE, "b")
-		);
-	}
-
-}

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

@@ -20,9 +20,7 @@ import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.event.EventListener;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorId;
-import org.briarproject.bramble.api.identity.AuthorInfo;
 import org.briarproject.bramble.api.identity.IdentityManager;
-import org.briarproject.bramble.api.identity.LocalAuthor;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.transport.KeyManager;
 
@@ -40,10 +38,6 @@ import javax.inject.Inject;
 
 import static org.briarproject.bramble.api.contact.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;
-import static org.briarproject.bramble.api.identity.AuthorInfo.Status.UNVERIFIED;
-import static org.briarproject.bramble.api.identity.AuthorInfo.Status.VERIFIED;
 import static org.briarproject.bramble.util.StringUtils.toUtf8;
 
 @ThreadSafe
@@ -213,6 +207,11 @@ class ContactManagerImpl implements ContactManager, EventListener {
 		return db.transactionWithResult(true, db::getContacts);
 	}
 
+	@Override
+	public Collection<Contact> getContacts(Transaction txn) throws DbException {
+		return db.getContacts(txn);
+	}
+
 	@Override
 	public void removeContact(ContactId c) throws DbException {
 		db.transaction(false, txn -> removeContact(txn, c));
@@ -256,25 +255,6 @@ class ContactManagerImpl implements ContactManager, EventListener {
 		db.removeContact(txn, c);
 	}
 
-	@Override
-	public AuthorInfo getAuthorInfo(AuthorId a) throws DbException {
-		return db.transactionWithResult(true, txn -> getAuthorInfo(txn, a));
-	}
-
-	@Override
-	public AuthorInfo getAuthorInfo(Transaction txn, AuthorId authorId)
-			throws DbException {
-		LocalAuthor localAuthor = identityManager.getLocalAuthor(txn);
-		if (localAuthor.getId().equals(authorId))
-			return new AuthorInfo(OURSELVES);
-		Collection<Contact> contacts = db.getContactsByAuthorId(txn, authorId);
-		if (contacts.isEmpty()) return new AuthorInfo(UNKNOWN);
-		if (contacts.size() > 1) throw new AssertionError();
-		Contact c = contacts.iterator().next();
-		if (c.isVerified()) return new AuthorInfo(VERIFIED, c.getAlias());
-		else return new AuthorInfo(UNVERIFIED, c.getAlias());
-	}
-
 	@Override
 	public void eventOccurred(Event e) {
 		if (e instanceof PendingContactStateChangedEvent) {

bramble-core/src/main/java/org/briarproject/bramble/properties/TransportPropertyValidator.java

@@ -15,6 +15,9 @@ import org.briarproject.bramble.api.system.Clock;
 import javax.annotation.concurrent.Immutable;
 
 import static org.briarproject.bramble.api.plugin.TransportId.MAX_TRANSPORT_ID_LENGTH;
+import static org.briarproject.bramble.api.properties.TransportPropertyConstants.MSG_KEY_LOCAL;
+import static org.briarproject.bramble.api.properties.TransportPropertyConstants.MSG_KEY_TRANSPORT_ID;
+import static org.briarproject.bramble.api.properties.TransportPropertyConstants.MSG_KEY_VERSION;
 import static org.briarproject.bramble.util.ValidationUtils.checkLength;
 import static org.briarproject.bramble.util.ValidationUtils.checkSize;
 
@@ -43,9 +46,9 @@ class TransportPropertyValidator extends BdfMessageValidator {
 		clientHelper.parseAndValidateTransportProperties(dictionary);
 		// Return the metadata
 		BdfDictionary meta = new BdfDictionary();
-		meta.put("transportId", transportId);
-		meta.put("version", version);
-		meta.put("local", false);
+		meta.put(MSG_KEY_TRANSPORT_ID, transportId);
+		meta.put(MSG_KEY_VERSION, version);
+		meta.put(MSG_KEY_LOCAL, false);
 		return new BdfMessageContext(meta);
 	}
 }

bramble-core/src/main/java/org/briarproject/bramble/sync/DuplexOutgoingSession.java

@@ -1,5 +1,6 @@
 package org.briarproject.bramble.sync;
 
+import org.briarproject.bramble.api.ThrowingRunnable;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.contact.event.ContactRemovedEvent;
 import org.briarproject.bramble.api.db.DatabaseComponent;

bramble-core/src/main/java/org/briarproject/bramble/sync/SimplexOutgoingSession.java

@@ -1,5 +1,6 @@
 package org.briarproject.bramble.sync;
 
+import org.briarproject.bramble.api.ThrowingRunnable;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.contact.event.ContactRemovedEvent;
 import org.briarproject.bramble.api.db.DatabaseComponent;

bramble-core/src/main/java/org/briarproject/bramble/sync/ThrowingRunnable.java

@@ -1,6 +0,0 @@
-package org.briarproject.bramble.sync;
-
-interface ThrowingRunnable<T extends Throwable> {
-
-	void run() throws T;
-}

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

@@ -8,18 +8,15 @@ import org.briarproject.bramble.api.contact.PendingContactState;
 import org.briarproject.bramble.api.crypto.KeyPair;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.db.DatabaseComponent;
-import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.NoSuchContactException;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorId;
-import org.briarproject.bramble.api.identity.AuthorInfo;
 import org.briarproject.bramble.api.identity.IdentityManager;
 import org.briarproject.bramble.api.identity.LocalAuthor;
 import org.briarproject.bramble.api.transport.KeyManager;
 import org.briarproject.bramble.test.BrambleMockTestCase;
 import org.briarproject.bramble.test.DbExpectations;
-import org.jmock.Expectations;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -31,10 +28,6 @@ import static java.util.Collections.singletonList;
 import static org.briarproject.bramble.api.contact.HandshakeLinkConstants.BASE32_LINK_BYTES;
 import static org.briarproject.bramble.api.contact.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;
-import static org.briarproject.bramble.api.identity.AuthorInfo.Status.UNVERIFIED;
-import static org.briarproject.bramble.api.identity.AuthorInfo.Status.VERIFIED;
 import static org.briarproject.bramble.test.TestUtils.getAgreementPrivateKey;
 import static org.briarproject.bramble.test.TestUtils.getAgreementPublicKey;
 import static org.briarproject.bramble.test.TestUtils.getAuthor;
@@ -46,7 +39,6 @@ import static org.briarproject.bramble.test.TestUtils.getSecretKey;
 import static org.briarproject.bramble.util.StringUtils.getRandomBase32String;
 import static org.briarproject.bramble.util.StringUtils.getRandomString;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 public class ContactManagerImplTest extends BrambleMockTestCase {
@@ -212,75 +204,6 @@ public class ContactManagerImplTest extends BrambleMockTestCase {
 		assertTrue(contactManager.contactExists(remote.getId(), local));
 	}
 
-	@Test
-	public void testGetAuthorInfo() throws Exception {
-		Transaction txn = new Transaction(null, true);
-
-		context.checking(new DbExpectations() {{
-			oneOf(identityManager).getLocalAuthor(txn);
-			will(returnValue(localAuthor));
-			oneOf(db).getContactsByAuthorId(txn, remote.getId());
-			will(returnValue(singletonList(contact)));
-		}});
-
-		AuthorInfo authorInfo =
-				contactManager.getAuthorInfo(txn, remote.getId());
-		assertEquals(UNVERIFIED, authorInfo.getStatus());
-		assertEquals(contact.getAlias(), authorInfo.getAlias());
-	}
-
-	@Test
-	public void testGetAuthorInfoTransaction() throws DbException {
-		Transaction txn = new Transaction(null, true);
-
-		// check unknown author
-		context.checking(new Expectations() {{
-			oneOf(identityManager).getLocalAuthor(txn);
-			will(returnValue(localAuthor));
-			oneOf(db).getContactsByAuthorId(txn, remote.getId());
-			will(returnValue(emptyList()));
-		}});
-
-		AuthorInfo authorInfo =
-				contactManager.getAuthorInfo(txn, remote.getId());
-		assertEquals(UNKNOWN, authorInfo.getStatus());
-		assertNull(authorInfo.getAlias());
-
-		// check unverified contact
-		checkAuthorInfoContext(txn, remote.getId(), singletonList(contact));
-		authorInfo = contactManager.getAuthorInfo(txn, remote.getId());
-		assertEquals(UNVERIFIED, authorInfo.getStatus());
-		assertEquals(contact.getAlias(), authorInfo.getAlias());
-
-		// check verified contact
-		Contact verified = getContact(remote, local, true);
-		checkAuthorInfoContext(txn, remote.getId(), singletonList(verified));
-		authorInfo = contactManager.getAuthorInfo(txn, remote.getId());
-		assertEquals(VERIFIED, authorInfo.getStatus());
-		assertEquals(verified.getAlias(), authorInfo.getAlias());
-
-		// check ourselves
-		context.checking(new Expectations() {{
-			oneOf(identityManager).getLocalAuthor(txn);
-			will(returnValue(localAuthor));
-			never(db).getContactsByAuthorId(txn, remote.getId());
-		}});
-
-		authorInfo = contactManager.getAuthorInfo(txn, localAuthor.getId());
-		assertEquals(OURSELVES, authorInfo.getStatus());
-		assertNull(authorInfo.getAlias());
-	}
-
-	private void checkAuthorInfoContext(Transaction txn, AuthorId authorId,
-			Collection<Contact> contacts) throws DbException {
-		context.checking(new Expectations() {{
-			oneOf(identityManager).getLocalAuthor(txn);
-			will(returnValue(localAuthor));
-			oneOf(db).getContactsByAuthorId(txn, authorId);
-			will(returnValue(contacts));
-		}});
-	}
-
 	@Test
 	public void testGetHandshakeLink() throws Exception {
 		Transaction txn = new Transaction(null, true);

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

@@ -22,6 +22,17 @@ public class BrambleCoreIntegrationTestModule {
 
 	@Provides
 	FeatureFlags provideFeatureFlags() {
-		return () -> true;
+		return new FeatureFlags() {
+
+			@Override
+			public boolean shouldEnableImageAttachments() {
+				return true;
+			}
+
+			@Override
+			public boolean shouldEnableProfilePictures() {
+				return true;
+			}
+		};
 	}
 }

briar-android/build.gradle

@@ -16,14 +16,14 @@ def getStdout = { command, defaultValue ->
 }
 
 android {
-	compileSdkVersion rootProject.ext.compileSdkVersion
-	buildToolsVersion rootProject.ext.buildToolsVersion
+	compileSdkVersion 30
+	buildToolsVersion '30.0.2'
 
 	defaultConfig {
-		minSdkVersion rootProject.ext.minSdkVersion
-		targetSdkVersion rootProject.ext.targetSdkVersion
-		versionCode rootProject.ext.versionCode
-		versionName rootProject.ext.versionName
+		minSdkVersion 16
+		targetSdkVersion 29
+		versionCode 10213
+		versionName "1.2.13"
 		applicationId "org.briarproject.briar.android"
 		buildConfigField "String", "GitHash",
 				"\"${getStdout(['git', 'rev-parse', '--short=7', 'HEAD'], 'No commit hash')}\""
@@ -108,7 +108,7 @@ dependencies {
 	implementation 'com.vanniktech:emoji-google:0.6.0' // newer versions need minSdk 21
 	implementation 'com.github.kobakei:MaterialFabSpeedDial:1.2.1'
 	implementation 'com.github.chrisbanes:PhotoView:2.3.0'
-	def glideVersion = '4.10.0'
+	def glideVersion = '4.11.0'
 	implementation("com.github.bumptech.glide:glide:$glideVersion") {
 		exclude group: 'com.android.support'
 		exclude module: 'disklrucache' // when there's no disk cache, we can't accidentally use it
@@ -142,11 +142,9 @@ dependencies {
 	androidTestImplementation "androidx.test.espresso:espresso-intents:$espressoVersion"
 	androidTestAnnotationProcessor "com.google.dagger:dagger-compiler:2.24"
 	androidTestCompileOnly 'javax.annotation:jsr250-api:1.0'
-	androidTestImplementation 'junit:junit:4.12'
-	androidTestScreenshotImplementation('tools.fastlane:screengrab:1.2.0') {
-		// workaround for jetifier issue https://issuetracker.google.com/issues/123060356
-		exclude group: 'com.android.support.test.uiautomator'
-	}
+	androidTestImplementation 'junit:junit:4.13.1'
+	androidTestScreenshotImplementation 'tools.fastlane:screengrab:2.0.0'
+	androidTestScreenshotImplementation 'com.jraska:falcon:2.1.1'
 	androidTestScreenshotImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
 }
 

briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/BriarUiTestComponent.java

@@ -5,6 +5,7 @@ import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.account.BriarAccountModule;
 import org.briarproject.briar.BriarCoreModule;
 import org.briarproject.briar.android.attachment.AttachmentModule;
+import org.briarproject.briar.android.attachment.media.MediaModule;
 import org.briarproject.briar.android.navdrawer.NavDrawerActivityTest;
 
 import javax.inject.Singleton;
@@ -15,6 +16,7 @@ import dagger.Component;
 @Component(modules = {
 		AppModule.class,
 		AttachmentModule.class,
+		MediaModule.class,
 		BriarCoreModule.class,
 		BrambleAndroidModule.class,
 		BriarAccountModule.class,

briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/AbstractAttachmentCreationTaskTest.java

@@ -1,41 +0,0 @@
-package org.briarproject.briar.android.attachment;
-
-import android.content.res.AssetManager;
-
-import org.junit.Before;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import static androidx.test.InstrumentationRegistry.getContext;
-import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
-
-abstract class AbstractAttachmentCreationTaskTest {
-
-	private final ImageHelper imageHelper = new ImageHelperImpl();
-	private final ImageSizeCalculator imageSizeCalculator =
-			new ImageSizeCalculator(imageHelper);
-
-	private AttachmentCreationTask task;
-
-	@Before
-	@SuppressWarnings("ConstantConditions")  // add real objects when needed
-	public void setUp() {
-		task = new AttachmentCreationTask(null,
-				getApplicationContext().getContentResolver(), null,
-				imageSizeCalculator, null, null, true);
-	}
-
-	void testCompress(String filename, String contentType)
-			throws IOException {
-		InputStream is = getAssetManager().open(filename);
-		task.compressImage(is, contentType);
-	}
-
-	static AssetManager getAssetManager() {
-		// pm.getResourcesForApplication(packageName).getAssets() did not work
-		//noinspection deprecation
-		return getContext().getAssets();
-	}
-
-}

briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/AbstractAttachmentRetrieverComponent.java

@@ -0,0 +1,17 @@
+package org.briarproject.briar.android.attachment;
+
+import org.briarproject.briar.android.attachment.media.MediaModule;
+
+import javax.inject.Singleton;
+
+import dagger.Component;
+
+@Singleton
+@Component(modules = {
+		MediaModule.class
+})
+interface AbstractAttachmentRetrieverComponent {
+
+	void inject(AttachmentRetrieverIntegrationTest test);
+
+}

briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/AttachmentRetrieverIntegrationTest.java

@@ -1,15 +1,20 @@
 package org.briarproject.briar.android.attachment;
 
 import org.briarproject.bramble.api.UniqueId;
+import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.MessageId;
-import org.briarproject.briar.api.messaging.Attachment;
-import org.briarproject.briar.api.messaging.AttachmentHeader;
+import org.briarproject.briar.android.attachment.media.ImageHelper;
+import org.briarproject.briar.android.attachment.media.ImageSizeCalculator;
+import org.briarproject.briar.api.attachment.Attachment;
+import org.briarproject.briar.api.attachment.AttachmentHeader;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.io.InputStream;
 import java.util.Random;
 
+import javax.inject.Inject;
+
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import static androidx.test.InstrumentationRegistry.getContext;
@@ -24,16 +29,28 @@ public class AttachmentRetrieverIntegrationTest {
 	private final AttachmentDimensions dimensions = new AttachmentDimensions(
 			100, 50, 200, 75, 300
 	);
+	private final GroupId groupId = new GroupId(getRandomId());
 	private final MessageId msgId = new MessageId(getRandomId());
 
-	private final ImageHelper imageHelper = new ImageHelperImpl();
-	private final AttachmentRetriever retriever =
-			new AttachmentRetrieverImpl(null, null, dimensions, imageHelper,
-					new ImageSizeCalculator(imageHelper));
+	@Inject
+	ImageHelper imageHelper;
+	@Inject
+	ImageSizeCalculator imageSizeCalculator;
+
+	private final AttachmentRetriever retriever;
+
+	public AttachmentRetrieverIntegrationTest() {
+		AbstractAttachmentRetrieverComponent component =
+				DaggerAbstractAttachmentRetrieverComponent.builder().build();
+		component.inject(this);
+
+		retriever = new AttachmentRetrieverImpl(null, null, dimensions,
+				imageHelper, imageSizeCalculator);
+	}
 
 	@Test
 	public void testSmallJpegImage() throws Exception {
-		AttachmentHeader h = new AttachmentHeader(msgId, "image/jpeg");
+		AttachmentHeader h = new AttachmentHeader(groupId, msgId, "image/jpeg");
 		InputStream is = getAssetInputStream("kitten_small.jpg");
 		Attachment a = new Attachment(h, is);
 		AttachmentItem item = retriever.createAttachmentItem(a, true);
@@ -49,7 +66,7 @@ public class AttachmentRetrieverIntegrationTest {
 
 	@Test
 	public void testBigJpegImage() throws Exception {
-		AttachmentHeader h = new AttachmentHeader(msgId, "image/jpeg");
+		AttachmentHeader h = new AttachmentHeader(groupId, msgId, "image/jpeg");
 		InputStream is = getAssetInputStream("kitten_original.jpg");
 		Attachment a = new Attachment(h, is);
 		AttachmentItem item = retriever.createAttachmentItem(a, true);
@@ -65,7 +82,7 @@ public class AttachmentRetrieverIntegrationTest {
 
 	@Test
 	public void testSmallPngImage() throws Exception {
-		AttachmentHeader h = new AttachmentHeader(msgId, "image/png");
+		AttachmentHeader h = new AttachmentHeader(groupId, msgId, "image/png");
 		InputStream is = getAssetInputStream("kitten.png");
 		Attachment a = new Attachment(h, is);
 		AttachmentItem item = retriever.createAttachmentItem(a, true);
@@ -81,7 +98,7 @@ public class AttachmentRetrieverIntegrationTest {
 
 	@Test
 	public void testUberGif() throws Exception {
-		AttachmentHeader h = new AttachmentHeader(msgId, "image/gif");
+		AttachmentHeader h = new AttachmentHeader(groupId, msgId, "image/gif");
 		InputStream is = getAssetInputStream("uber.gif");
 		Attachment a = new Attachment(h, is);
 		AttachmentItem item = retriever.createAttachmentItem(a, true);
@@ -96,7 +113,7 @@ public class AttachmentRetrieverIntegrationTest {
 
 	@Test
 	public void testLottaPixels() throws Exception {
-		AttachmentHeader h = new AttachmentHeader(msgId, "image/jpeg");
+		AttachmentHeader h = new AttachmentHeader(groupId, msgId, "image/jpeg");
 		InputStream is = getAssetInputStream("lottapixel.jpg");
 		Attachment a = new Attachment(h, is);
 		AttachmentItem item = retriever.createAttachmentItem(a, true);
@@ -111,7 +128,7 @@ public class AttachmentRetrieverIntegrationTest {
 
 	@Test
 	public void testImageIoCrash() throws Exception {
-		AttachmentHeader h = new AttachmentHeader(msgId, "image/png");
+		AttachmentHeader h = new AttachmentHeader(groupId, msgId, "image/png");
 		InputStream is = getAssetInputStream("image_io_crash.png");
 		Attachment a = new Attachment(h, is);
 		AttachmentItem item = retriever.createAttachmentItem(a, true);
@@ -126,7 +143,7 @@ public class AttachmentRetrieverIntegrationTest {
 
 	@Test
 	public void testGimpCrash() throws Exception {
-		AttachmentHeader h = new AttachmentHeader(msgId, "image/gif");
+		AttachmentHeader h = new AttachmentHeader(groupId, msgId, "image/gif");
 		InputStream is = getAssetInputStream("gimp_crash.gif");
 		Attachment a = new Attachment(h, is);
 		AttachmentItem item = retriever.createAttachmentItem(a, true);
@@ -141,7 +158,7 @@ public class AttachmentRetrieverIntegrationTest {
 
 	@Test
 	public void testOptiPngAfl() throws Exception {
-		AttachmentHeader h = new AttachmentHeader(msgId, "image/gif");
+		AttachmentHeader h = new AttachmentHeader(groupId, msgId, "image/gif");
 		InputStream is = getAssetInputStream("opti_png_afl.gif");
 		Attachment a = new Attachment(h, is);
 		AttachmentItem item = retriever.createAttachmentItem(a, true);
@@ -156,7 +173,7 @@ public class AttachmentRetrieverIntegrationTest {
 
 	@Test
 	public void testLibrawError() throws Exception {
-		AttachmentHeader h = new AttachmentHeader(msgId, "image/jpeg");
+		AttachmentHeader h = new AttachmentHeader(groupId, msgId, "image/jpeg");
 		InputStream is = getAssetInputStream("libraw_error.jpg");
 		Attachment a = new Attachment(h, is);
 		AttachmentItem item = retriever.createAttachmentItem(a, true);
@@ -165,7 +182,7 @@ public class AttachmentRetrieverIntegrationTest {
 
 	@Test
 	public void testSmallAnimatedGifMaxDimensions() throws Exception {
-		AttachmentHeader h = new AttachmentHeader(msgId, "image/gif");
+		AttachmentHeader h = new AttachmentHeader(groupId, msgId, "image/gif");
 		InputStream is = getAssetInputStream("animated.gif");
 		Attachment a = new Attachment(h, is);
 		AttachmentItem item = retriever.createAttachmentItem(a, true);
@@ -180,7 +197,7 @@ public class AttachmentRetrieverIntegrationTest {
 
 	@Test
 	public void testSmallAnimatedGifHugeDimensions() throws Exception {
-		AttachmentHeader h = new AttachmentHeader(msgId, "image/gif");
+		AttachmentHeader h = new AttachmentHeader(groupId, msgId, "image/gif");
 		InputStream is = getAssetInputStream("animated2.gif");
 		Attachment a = new Attachment(h, is);
 		AttachmentItem item = retriever.createAttachmentItem(a, true);
@@ -195,7 +212,7 @@ public class AttachmentRetrieverIntegrationTest {
 
 	@Test
 	public void testSmallGifLargeDimensions() throws Exception {
-		AttachmentHeader h = new AttachmentHeader(msgId, "image/gif");
+		AttachmentHeader h = new AttachmentHeader(groupId, msgId, "image/gif");
 		InputStream is = getAssetInputStream("error_large.gif");
 		Attachment a = new Attachment(h, is);
 		AttachmentItem item = retriever.createAttachmentItem(a, true);
@@ -210,7 +227,7 @@ public class AttachmentRetrieverIntegrationTest {
 
 	@Test
 	public void testHighError() throws Exception {
-		AttachmentHeader h = new AttachmentHeader(msgId, "image/jpeg");
+		AttachmentHeader h = new AttachmentHeader(groupId, msgId, "image/jpeg");
 		InputStream is = getAssetInputStream("error_high.jpg");
 		Attachment a = new Attachment(h, is);
 		AttachmentItem item = retriever.createAttachmentItem(a, true);
@@ -225,7 +242,7 @@ public class AttachmentRetrieverIntegrationTest {
 
 	@Test
 	public void testWideError() throws Exception {
-		AttachmentHeader h = new AttachmentHeader(msgId, "image/jpeg");
+		AttachmentHeader h = new AttachmentHeader(groupId, msgId, "image/jpeg");
 		InputStream is = getAssetInputStream("error_wide.jpg");
 		Attachment a = new Attachment(h, is);
 		AttachmentItem item = retriever.createAttachmentItem(a, true);

briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/media/AbstractImageCompressorComponent.java

@@ -0,0 +1,15 @@
+package org.briarproject.briar.android.attachment.media;
+
+import javax.inject.Singleton;
+
+import dagger.Component;
+
+@Singleton
+@Component(modules = {
+		MediaModule.class
+})
+interface AbstractImageCompressorComponent {
+
+	void inject(AbstractImageCompressorTest test);
+
+}

briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/media/AbstractImageCompressorTest.java

@@ -0,0 +1,38 @@
+package org.briarproject.briar.android.attachment.media;
+
+import android.content.res.AssetManager;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.inject.Inject;
+
+import static androidx.test.InstrumentationRegistry.getContext;
+
+public abstract class AbstractImageCompressorTest {
+
+	@Inject
+	ImageCompressor imageCompressor;
+
+	public AbstractImageCompressorTest() {
+		AbstractImageCompressorComponent component =
+				DaggerAbstractImageCompressorComponent.builder().build();
+		component.inject(this);
+	}
+
+	protected abstract void inject(
+			AbstractImageCompressorComponent component);
+
+	void testCompress(String filename, String contentType)
+			throws IOException {
+		InputStream is = getAssetManager().open(filename);
+		imageCompressor.compressImage(is, contentType);
+	}
+
+	static AssetManager getAssetManager() {
+		// pm.getResourcesForApplication(packageName).getAssets() did not work
+		//noinspection deprecation
+		return getContext().getAssets();
+	}
+
+}

briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/media/AbstractImageSizeCalculatorComponent.java

@@ -0,0 +1,15 @@
+package org.briarproject.briar.android.attachment.media;
+
+import javax.inject.Singleton;
+
+import dagger.Component;
+
+@Singleton
+@Component(modules = {
+		MediaModule.class
+})
+interface AbstractImageSizeCalculatorComponent {
+
+	void inject(AbstractImageSizeCalculatorTest test);
+
+}

briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/media/AbstractImageSizeCalculatorTest.java

@@ -0,0 +1,51 @@
+package org.briarproject.briar.android.attachment.media;
+
+import android.content.res.AssetManager;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.inject.Inject;
+
+import static androidx.test.InstrumentationRegistry.getContext;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public abstract class AbstractImageSizeCalculatorTest {
+
+	@Inject
+	ImageSizeCalculator imageSizeCalculator;
+
+	public AbstractImageSizeCalculatorTest() {
+		AbstractImageSizeCalculatorComponent component =
+				DaggerAbstractImageSizeCalculatorComponent.builder().build();
+		component.inject(this);
+	}
+
+	protected abstract void inject(
+			AbstractImageSizeCalculatorComponent component);
+
+	void testCanCalculateSize(String filename, String contentType, int width,
+			int height) throws IOException {
+		InputStream is = getAssetManager().open(filename);
+		Size size = imageSizeCalculator.getSize(is, contentType);
+		assertFalse(size.hasError());
+		assertEquals(width, size.getWidth());
+		assertEquals(height, size.getHeight());
+	}
+
+	void testCannotCalculateSize(String filename, String contentType)
+			throws IOException {
+		InputStream is = getAssetManager().open(filename);
+		Size size = imageSizeCalculator.getSize(is, contentType);
+		assertTrue(size.hasError());
+	}
+
+	static AssetManager getAssetManager() {
+		// pm.getResourcesForApplication(packageName).getAssets() did not work
+		//noinspection deprecation
+		return getContext().getAssets();
+	}
+
+}

briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/media/ImageCompressorTest.java

@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.attachment;
+package org.briarproject.briar.android.attachment.media;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -9,8 +9,13 @@ import static android.os.Build.VERSION.SDK_INT;
 import static org.junit.Assume.assumeTrue;
 
 @RunWith(AndroidJUnit4.class)
-public class AttachmentCreationTaskTest
-		extends AbstractAttachmentCreationTaskTest {
+public class ImageCompressorTest
+		extends AbstractImageCompressorTest {
+
+	@Override
+	protected void inject(AbstractImageCompressorComponent component) {
+		component.inject(this);
+	}
 
 	@Test
 	public void testCompressSmallPng() throws Exception {

briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/media/ImageSizeCalculatorTest.java

@@ -0,0 +1,80 @@
+package org.briarproject.briar.android.attachment.media;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import static android.os.Build.VERSION.SDK_INT;
+import static org.junit.Assume.assumeTrue;
+
+@RunWith(AndroidJUnit4.class)
+public class ImageSizeCalculatorTest
+		extends AbstractImageSizeCalculatorTest {
+
+	@Override
+	protected void inject(AbstractImageSizeCalculatorComponent component) {
+		component.inject(this);
+	}
+
+	@Test
+	public void testCalculateSizeKittenSmall() throws Exception {
+		testCanCalculateSize("kitten_small.jpg", "image/jpeg", 160, 240);
+	}
+
+	@Test
+	public void testCalculateSizeKittenSmallNoExif() throws Exception {
+		testCanCalculateSize("kitten_small_noexif.jpg", "image/jpeg", 160, 240);
+	}
+
+	@Test
+	public void testCalculateSizeSmallPng() throws Exception {
+		testCanCalculateSize("red-100x100.png", "image/png", 100, 100);
+	}
+
+	@Test
+	public void testCalculateSizeMediumPng() throws Exception {
+		testCanCalculateSize("blue-500x500.png", "image/png", 500, 500);
+	}
+
+	@Test
+	public void testCalculateSizeLargePng() throws Exception {
+		testCanCalculateSize("green-1000x2000.png", "image/png", 1000, 2000);
+	}
+
+	@Test
+	public void testCalculateSizeTransparentPng() throws Exception {
+		testCanCalculateSize("transparent-100x100.png", "image/png", 100, 100);
+	}
+
+	@Test
+	public void testCalculateSizeVeryHighJpg() throws Exception {
+		testCanCalculateSize("error_high.jpg", "image/jpeg", 1, 10000);
+	}
+
+	@Test
+	public void testCalculateSizeVeryWideJpg() throws Exception {
+		testCanCalculateSize("error_wide.jpg", "image/jpeg", 1920, 1);
+	}
+
+	@Test
+	public void testCalculateSizeAnimatedGif1() throws Exception {
+		// TODO: Remove this assumption when we support large messages
+		assumeTrue(SDK_INT >= 24);
+		testCanCalculateSize("animated.gif", "image/gif", 65535, 65535);
+	}
+
+	@Test
+	public void testCalculateSizeAnimatedGif2() throws Exception {
+		// TODO: Remove this assumption when we support large messages
+		assumeTrue(SDK_INT >= 24);
+		testCanCalculateSize("animated2.gif", "image/gif", 10000, 10000);
+	}
+
+	@Test
+	public void testCalculateSizeVeryLargeGif() throws Exception {
+		// TODO: Remove this assumption when we support large messages
+		assumeTrue(SDK_INT >= 24);
+		testCanCalculateSize("error_large.gif", "image/gif", 16384, 16384);
+	}
+}

briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/media/PngSuiteImageCompressorTest.java

@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.attachment;
+package org.briarproject.briar.android.attachment.media;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -17,11 +17,16 @@ import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeTrue;
 
 @RunWith(Parameterized.class)
-public class PngSuiteAttachmentCreationTaskTest
-		extends AbstractAttachmentCreationTaskTest {
+public class PngSuiteImageCompressorTest
+		extends AbstractImageCompressorTest {
 
 	private static final Logger LOG =
-			getLogger(PngSuiteAttachmentCreationTaskTest.class.getName());
+			getLogger(PngSuiteImageCompressorTest.class.getName());
+
+	@Override
+	protected void inject(AbstractImageCompressorComponent component) {
+		component.inject(this);
+	}
 
 	@Parameters
 	public static Iterable<String> data() throws IOException {
@@ -34,14 +39,14 @@ public class PngSuiteAttachmentCreationTaskTest
 
 	private final String filename;
 
-	public PngSuiteAttachmentCreationTaskTest(String filename) {
+	public PngSuiteImageCompressorTest(String filename) {
 		this.filename = filename;
 	}
 
 	@Test
 	public void testPngSuiteCompress() throws Exception {
 		assumeTrue(isOptionalTestEnabled(
-				PngSuiteAttachmentCreationTaskTest.class));
+				PngSuiteImageCompressorTest.class));
 		LOG.info("Testing " + filename);
 		if (filename.startsWith("x")) {
 			try {

briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/attachment/media/PngSuiteImageSizeCalculatorTest.java

@@ -0,0 +1,80 @@
+package org.briarproject.briar.android.attachment.media;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Logger;
+
+import static java.util.logging.Logger.getLogger;
+import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
+import static org.briarproject.bramble.test.TestUtils.isOptionalTestEnabled;
+import static org.junit.Assume.assumeTrue;
+
+@RunWith(Parameterized.class)
+public class PngSuiteImageSizeCalculatorTest
+		extends AbstractImageSizeCalculatorTest {
+
+	private static final Logger LOG =
+			getLogger(PngSuiteImageSizeCalculatorTest.class.getName());
+
+	@Override
+	protected void inject(AbstractImageSizeCalculatorComponent component) {
+		component.inject(this);
+	}
+
+	@Parameters
+	public static Iterable<String> data() throws IOException {
+		List<String> data = new ArrayList<>();
+		String[] files = requireNonNull(getAssetManager().list("PngSuite"));
+		for (String filename : files)
+			if (filename.endsWith(".png")) data.add(filename);
+		return data;
+	}
+
+	private final String filename;
+
+	public PngSuiteImageSizeCalculatorTest(String filename) {
+		this.filename = filename;
+	}
+
+	//  some files have sizes other than 32x32
+	private Map<String, Size> customSizes = new HashMap<>();
+
+	{
+		customSizes.put("cdfn2c08.png", new Size(8, 32, "image/png"));
+		customSizes.put("cdhn2c08.png", new Size(32, 8, "image/png"));
+		customSizes.put("cdsn2c08.png", new Size(8, 8, "image/png"));
+		customSizes.put("PngSuite.png", new Size(256, 256, "image/png"));
+	}
+
+	@Test
+	public void testPngSuiteCalculateSizes() throws Exception {
+		assumeTrue(isOptionalTestEnabled(
+				PngSuiteImageSizeCalculatorTest.class));
+		LOG.info("Testing " + filename);
+		if (filename.startsWith("x") && !filename.equals("xcsn0g01.png")) {
+			testCannotCalculateSize("PngSuite/" + filename, "image/png");
+		} else if (filename.startsWith("s")) {
+			int size = Integer.parseInt(filename.substring(1, 3));
+			testCanCalculateSize("PngSuite/" + filename, "image/png", size,
+					size);
+		} else {
+			int width = 32;
+			int height = 32;
+			if (customSizes.containsKey(filename)) {
+				Size size = customSizes.get(filename);
+				width = size.getWidth();
+				height = size.getHeight();
+			}
+			testCanCalculateSize("PngSuite/" + filename, "image/png", width,
+					height);
+		}
+	}
+}

briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/BriarUiTestComponent.java

@@ -5,6 +5,7 @@ import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.account.BriarAccountModule;
 import org.briarproject.briar.BriarCoreModule;
 import org.briarproject.briar.android.attachment.AttachmentModule;
+import org.briarproject.briar.android.attachment.media.MediaModule;
 import org.briarproject.briar.android.conversation.ConversationActivityScreenshotTest;
 import org.briarproject.briar.android.settings.SettingsActivityScreenshotTest;
 
@@ -16,6 +17,7 @@ import dagger.Component;
 @Component(modules = {
 		AppModule.class,
 		AttachmentModule.class,
+		MediaModule.class,
 		BriarCoreModule.class,
 		BrambleAndroidModule.class,
 		BriarAccountModule.class,
@@ -26,6 +28,7 @@ public interface BriarUiTestComponent extends AndroidComponent {
 	void inject(SetupDataTest test);
 
 	void inject(ConversationActivityScreenshotTest test);
+
 	void inject(SettingsActivityScreenshotTest test);
 
 }

briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/SetupDataTest.java

@@ -116,7 +116,7 @@ public class SetupDataTest extends ScreenshotTest {
 			throws DbException {
 		Context ctx = getApplicationContext();
 		String bobName = ctx.getString(R.string.screenshot_bob);
-		Contact bob = testDataCreator.addContact(bobName);
+		Contact bob = testDataCreator.addContact(bobName, true);
 
 		// TODO add messages
 

briar-android/src/debug/java/org/briarproject/briar/android/test/TestAvatarCreatorImpl.java

@@ -0,0 +1,105 @@
+/*
+ * Some code was taken from:
+ *
+ * RIG – Random Image Generator
+ * https://github.com/stedi-akk/RandomImageGenerator
+ * licenced under Apache2 license.
+ */
+
+package org.briarproject.briar.android.test;
+
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Rect;
+
+import org.briarproject.briar.android.attachment.media.ImageCompressor;
+import org.briarproject.briar.api.test.TestAvatarCreator;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Random;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+
+public class TestAvatarCreatorImpl implements TestAvatarCreator {
+	private final int WIDTH = 800;
+	private final int HEIGHT = 640;
+
+	private final Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
+	private final float[] hsv = new float[3];
+	private final Random random = new Random();
+
+	private final ImageCompressor imageCompressor;
+
+	@Inject
+	TestAvatarCreatorImpl(ImageCompressor imageCompressor) {
+		this.imageCompressor = imageCompressor;
+	}
+
+	@Nullable
+	@Override
+	public InputStream getAvatarInputStream() throws IOException {
+		Bitmap bitmap = generateBitmap();
+		return imageCompressor.compressImage(bitmap);
+	}
+
+	private Bitmap generateBitmap() {
+		// one pattern is boring, let's at least use two
+		if (random.nextBoolean()) {
+			return generateColoredPixels();
+		} else {
+			return generateColoredCircles();
+		}
+	}
+
+	private Bitmap generateColoredPixels() {
+		Bitmap bitmap = getBitmapWithRandomBackground();
+		Canvas canvas = new Canvas(bitmap);
+		Rect pixel = new Rect();
+		int pixelMultiplier = random.nextInt(500) + 1;
+		for (int x = 0; x < WIDTH; x += pixelMultiplier) {
+			for (int y = 0; y < HEIGHT; y += pixelMultiplier) {
+				pixel.set(x, y, x + pixelMultiplier, y + pixelMultiplier);
+				paint.setColor(getRandomColor());
+				canvas.drawRect(pixel, paint);
+			}
+		}
+		return bitmap;
+	}
+
+	private Bitmap generateColoredCircles() {
+		Bitmap bitmap = getBitmapWithRandomBackground();
+		int biggestSide = Math.max(WIDTH, HEIGHT);
+		int selectedCount = random.nextInt(10) + 2;
+		Canvas canvas = new Canvas(bitmap);
+		float radiusFrom = biggestSide / 12f;
+		float radiusTo = biggestSide / 4f;
+		for (int i = 0; i < selectedCount; i++) {
+			float cx = random.nextInt(WIDTH);
+			float cy = random.nextInt(HEIGHT);
+			float radius =
+					random.nextInt((int) (radiusTo - radiusFrom)) + radiusFrom;
+			paint.setColor(getRandomColor());
+			canvas.drawCircle(cx, cy, radius, paint);
+		}
+		return bitmap;
+	}
+
+	private Bitmap getBitmapWithRandomBackground() {
+		Bitmap bitmap =
+				Bitmap.createBitmap(WIDTH, HEIGHT, Bitmap.Config.ARGB_8888);
+		bitmap.eraseColor(getRandomColor());
+		return bitmap;
+	}
+
+	private int getRandomColor() {
+		hsv[0] = random.nextInt(360);
+		hsv[1] = random.nextFloat();
+		hsv[2] = 1f;
+		return Color.HSVToColor(hsv);
+	}
+
+}

briar-android/src/main/AndroidManifest.xml

@@ -453,6 +453,8 @@
 	<queries>
 		<package android:name="info.guardianproject.ripple" />
 		<package android:name="com.huawei.systemmanager" />
+		<package android:name="com.huawei.powergenie" />
+		<package android:name="com.evenwell.PowerMonitor" />
 
 		<intent>
 			<action android:name="android.intent.action.VIEW" />

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

@@ -32,6 +32,7 @@ import org.briarproject.bramble.plugin.tor.CircumventionProvider;
 import org.briarproject.briar.BriarCoreEagerSingletons;
 import org.briarproject.briar.BriarCoreModule;
 import org.briarproject.briar.android.attachment.AttachmentModule;
+import org.briarproject.briar.android.attachment.media.MediaModule;
 import org.briarproject.briar.android.conversation.glide.BriarModelLoader;
 import org.briarproject.briar.android.login.SignInReminderReceiver;
 import org.briarproject.briar.android.view.EmojiTextInputView;
@@ -39,6 +40,7 @@ import org.briarproject.briar.api.android.AndroidNotificationManager;
 import org.briarproject.briar.api.android.DozeWatchdog;
 import org.briarproject.briar.api.android.LockManager;
 import org.briarproject.briar.api.android.ScreenFilterMonitor;
+import org.briarproject.briar.api.attachment.AttachmentReader;
 import org.briarproject.briar.api.blog.BlogManager;
 import org.briarproject.briar.api.blog.BlogPostFactory;
 import org.briarproject.briar.api.blog.BlogSharingManager;
@@ -47,6 +49,7 @@ import org.briarproject.briar.api.conversation.ConversationManager;
 import org.briarproject.briar.api.feed.FeedManager;
 import org.briarproject.briar.api.forum.ForumManager;
 import org.briarproject.briar.api.forum.ForumSharingManager;
+import org.briarproject.briar.api.identity.AuthorManager;
 import org.briarproject.briar.api.introduction.IntroductionManager;
 import org.briarproject.briar.api.messaging.MessagingManager;
 import org.briarproject.briar.api.messaging.PrivateMessageFactory;
@@ -71,7 +74,8 @@ import dagger.Component;
 		BrambleAndroidModule.class,
 		BriarAccountModule.class,
 		AppModule.class,
-		AttachmentModule.class
+		AttachmentModule.class,
+		MediaModule.class
 })
 public interface AndroidComponent
 		extends BrambleCoreEagerSingletons, BrambleAndroidEagerSingletons,
@@ -94,6 +98,10 @@ public interface AndroidComponent
 
 	IdentityManager identityManager();
 
+	AttachmentReader attachmentReader();
+
+	AuthorManager authorManager();
+
 	PluginManager pluginManager();
 
 	EventBus eventBus();

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

@@ -27,18 +27,26 @@ import org.briarproject.bramble.plugin.tcp.AndroidLanTcpPluginFactory;
 import org.briarproject.bramble.plugin.tor.AndroidTorPluginFactory;
 import org.briarproject.bramble.util.AndroidUtils;
 import org.briarproject.bramble.util.StringUtils;
+import org.briarproject.briar.android.account.DozeHelperModule;
 import org.briarproject.briar.android.account.LockManagerImpl;
+import org.briarproject.briar.android.account.SetupModule;
+import org.briarproject.briar.android.contact.ContactListModule;
 import org.briarproject.briar.android.forum.ForumModule;
 import org.briarproject.briar.android.keyagreement.ContactExchangeModule;
 import org.briarproject.briar.android.login.LoginModule;
 import org.briarproject.briar.android.navdrawer.NavDrawerModule;
+import org.briarproject.briar.android.privategroup.conversation.GroupConversationModule;
+import org.briarproject.briar.android.settings.SettingsModule;
 import org.briarproject.briar.android.privategroup.list.GroupListModule;
 import org.briarproject.briar.android.reporting.DevReportModule;
+import org.briarproject.briar.android.sharing.SharingModule;
+import org.briarproject.briar.android.test.TestAvatarCreatorImpl;
 import org.briarproject.briar.android.viewmodel.ViewModelModule;
 import org.briarproject.briar.api.android.AndroidNotificationManager;
 import org.briarproject.briar.api.android.DozeWatchdog;
 import org.briarproject.briar.api.android.LockManager;
 import org.briarproject.briar.api.android.ScreenFilterMonitor;
+import org.briarproject.briar.api.test.TestAvatarCreator;
 
 import java.io.File;
 import java.security.GeneralSecurityException;
@@ -63,14 +71,20 @@ import static org.briarproject.bramble.api.reporting.ReportingConstants.DEV_PUBL
 import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
 
 @Module(includes = {
+		SetupModule.class,
+		DozeHelperModule.class,
 		ContactExchangeModule.class,
 		LoginModule.class,
 		NavDrawerModule.class,
 		ViewModelModule.class,
+		SettingsModule.class,
 		DevReportModule.class,
+		ContactListModule.class,
 		// below need to be within same scope as ViewModelProvider.Factory
-		ForumModule.BindsModule.class,
+		ForumModule.class,
 		GroupListModule.class,
+		GroupConversationModule.class,
+		SharingModule.class,
 })
 public class AppModule {
 
@@ -182,6 +196,12 @@ public class AppModule {
 		return devConfig;
 	}
 
+	@Provides
+	TestAvatarCreator provideTestAvatarCreator(
+			TestAvatarCreatorImpl testAvatarCreator) {
+		return testAvatarCreator;
+	}
+
 	@Provides
 	SharedPreferences provideSharedPreferences(Application app) {
 		// FIXME unify this with getDefaultSharedPreferences()
@@ -245,6 +265,17 @@ public class AppModule {
 
 	@Provides
 	FeatureFlags provideFeatureFlags() {
-		return () -> IS_DEBUG_BUILD;
+		return new FeatureFlags() {
+
+			@Override
+			public boolean shouldEnableImageAttachments() {
+				return IS_DEBUG_BUILD;
+			}
+
+			@Override
+			public boolean shouldEnableProfilePictures() {
+				return IS_DEBUG_BUILD;
+			}
+		};
 	}
 }

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

@@ -14,6 +14,8 @@ import android.content.ServiceConnection;
 import android.os.Binder;
 import android.os.IBinder;
 
+import com.bumptech.glide.Glide;
+
 import org.briarproject.bramble.api.account.AccountManager;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
@@ -246,10 +248,13 @@ public class BriarService extends Service {
 			LOG.info("Trim memory: near end of LRU list");
 		} else if (level == TRIM_MEMORY_RUNNING_MODERATE) {
 			LOG.info("Trim memory: running moderately low");
+			Glide.get(getApplicationContext()).clearMemory();
 		} else if (level == TRIM_MEMORY_RUNNING_LOW) {
 			LOG.info("Trim memory: running low");
+			// TODO investigate if we can clear Glide cache here as well
 		} else if (level == TRIM_MEMORY_RUNNING_CRITICAL) {
 			LOG.warning("Trim memory: running critically low");
+			// TODO investigate if we can clear Glide cache here as well
 			// If we're not in the foreground, clear the UI to save memory
 			if (app.isRunningInBackground()) hideUi();
 		} else if (LOG.isLoggable(INFO)) {

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

@@ -81,8 +81,7 @@ public class AuthorNameFragment extends SetupFragment {
 	public void onClick(View view) {
 		Editable text = authorNameInput.getText();
 		if (text != null) {
-			setupController.setAuthorName(text.toString().trim());
-			setupController.showPasswordFragment();
+			viewModel.setAuthorName(text.toString().trim());
 		}
 	}
 

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

@@ -104,9 +104,15 @@ public class DozeFragment extends SetupFragment
 
 	@Override
 	public void onClick(View view) {
-		next.setVisibility(INVISIBLE);
-		progressBar.setVisibility(VISIBLE);
-		setupController.createAccount();
+		setNextClicked();
+		viewModel.dozeExceptionConfirmed();
 	}
 
+	@Override
+	void setNextClicked() {
+		super.setNextClicked();
+
+		next.setVisibility(INVISIBLE);
+		progressBar.setVisibility(VISIBLE);
+	}
 }

briar-android/src/main/java/org/briarproject/briar/android/account/DozeHelper.java

@@ -0,0 +1,8 @@
+package org.briarproject.briar.android.account;
+
+import android.content.Context;
+
+interface DozeHelper {
+
+	boolean needToShowDozeFragment(Context context);
+}

briar-android/src/main/java/org/briarproject/briar/android/account/DozeHelperImpl.java

@@ -0,0 +1,14 @@
+package org.briarproject.briar.android.account;
+
+import android.content.Context;
+
+import static org.briarproject.briar.android.account.HuaweiView.needsToBeShown;
+import static org.briarproject.briar.android.util.UiUtils.needsDozeWhitelisting;
+
+class DozeHelperImpl implements DozeHelper {
+	@Override
+	public boolean needToShowDozeFragment(Context context) {
+		return needsDozeWhitelisting(context.getApplicationContext()) ||
+				needsToBeShown(context.getApplicationContext());
+	}
+}

briar-android/src/main/java/org/briarproject/briar/android/account/DozeHelperModule.java

@@ -0,0 +1,13 @@
+package org.briarproject.briar.android.account;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module
+public class DozeHelperModule {
+
+	@Provides
+	DozeHelper provideDozeHelper() {
+		return new DozeHelperImpl();
+	}
+}

briar-android/src/main/java/org/briarproject/briar/android/account/SetPasswordFragment.java

@@ -30,7 +30,6 @@ import static org.briarproject.briar.android.util.UiUtils.setError;
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
 public class SetPasswordFragment extends SetupFragment {
-
 	private final static String TAG = SetPasswordFragment.class.getName();
 
 	private TextInputLayout passwordEntryWrapper;
@@ -56,7 +55,7 @@ public class SetPasswordFragment extends SetupFragment {
 			@Nullable Bundle savedInstanceState) {
 		requireActivity().setTitle(getString(R.string.setup_password_intro));
 		View v = inflater.inflate(R.layout.fragment_setup_password, container,
-						false);
+				false);
 
 		strengthMeter = v.findViewById(R.id.strength_meter);
 		passwordEntryWrapper = v.findViewById(R.id.password_entry_wrapper);
@@ -71,7 +70,7 @@ public class SetPasswordFragment extends SetupFragment {
 		passwordConfirmation.addTextChangedListener(this);
 		nextButton.setOnClickListener(this);
 
-		if (!setupController.needToShowDozeFragment()) {
+		if (!viewModel.needToShowDozeFragment()) {
 			nextButton.setText(R.string.create_account_button);
 			passwordConfirmation.setImeOptions(IME_ACTION_DONE);
 		}
@@ -97,7 +96,7 @@ public class SetPasswordFragment extends SetupFragment {
 
 		strengthMeter
 				.setVisibility(password1.length() > 0 ? VISIBLE : INVISIBLE);
-		float strength = setupController.estimatePasswordStrength(password1);
+		float strength = viewModel.estimatePasswordStrength(password1);
 		strengthMeter.setStrength(strength);
 		boolean strongEnough = strength >= QUITE_WEAK;
 
@@ -117,14 +116,20 @@ public class SetPasswordFragment extends SetupFragment {
 		IBinder token = passwordEntry.getWindowToken();
 		Object o = getContext().getSystemService(INPUT_METHOD_SERVICE);
 		((InputMethodManager) o).hideSoftInputFromWindow(token, 0);
-		setupController.setPassword(passwordEntry.getText().toString());
-		if (setupController.needToShowDozeFragment()) {
-			setupController.showDozeFragment();
-		} else {
-			nextButton.setVisibility(INVISIBLE);
-			progressBar.setVisibility(VISIBLE);
-			setupController.createAccount();
-		}
+
+		setNextClicked();
+		viewModel.setPassword(passwordEntry.getText().toString());
 	}
 
+	@Override
+	void setNextClicked() {
+		super.setNextClicked();
+
+		passwordEntry.setFocusable(false);
+		passwordConfirmation.setFocusable(false);
+		if (!viewModel.needToShowDozeFragment()) {
+			nextButton.setVisibility(INVISIBLE);
+			progressBar.setVisibility(VISIBLE);
+		}
+	}
 }

briar-android/src/main/java/org/briarproject/briar/android/account/SetupActivity.java

@@ -4,7 +4,6 @@ import android.annotation.TargetApi;
 import android.content.Intent;
 import android.os.Bundle;
 
-import org.briarproject.bramble.api.account.AccountManager;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
@@ -15,28 +14,36 @@ import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
+import androidx.lifecycle.ViewModelProvider;
+
 import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
 import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 import static android.content.Intent.FLAG_ACTIVITY_TASK_ON_HOME;
 import static org.briarproject.briar.android.BriarApplication.ENTRY_ACTIVITY;
+import static org.briarproject.briar.android.account.SetupViewModel.State.AUTHOR_NAME;
+import static org.briarproject.briar.android.account.SetupViewModel.State.CREATED;
+import static org.briarproject.briar.android.account.SetupViewModel.State.DOZE;
+import static org.briarproject.briar.android.account.SetupViewModel.State.FAILED;
+import static org.briarproject.briar.android.account.SetupViewModel.State.SET_PASSWORD;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
 public class SetupActivity extends BaseActivity
 		implements BaseFragmentListener {
 
-	private static final String STATE_KEY_AUTHOR_NAME = "authorName";
-	private static final String STATE_KEY_PASSWORD = "password";
-
 	@Inject
-	AccountManager accountManager;
+	ViewModelProvider.Factory viewModelFactory;
+	SetupViewModel viewModel;
 
-	@Inject
-	SetupController setupController;
+	@Override
+	public void injectActivity(ActivityComponent component) {
+		component.inject(this);
 
-	@Nullable
-	private String authorName, password;
+		viewModel = new ViewModelProvider(this, viewModelFactory)
+				.get(SetupViewModel.class);
+		viewModel.getState().observeEvent(this, this::onStateChanged);
+	}
 
 	@Override
 	public void onCreate(@Nullable Bundle state) {
@@ -44,58 +51,27 @@ public class SetupActivity extends BaseActivity
 		// fade-in after splash screen instead of default animation
 		overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
 		setContentView(R.layout.activity_fragment_container);
+	}
 
-		if (state == null) {
-			if (accountManager.accountExists()) throw new AssertionError();
+	private void onStateChanged(SetupViewModel.State state) {
+		if (state == AUTHOR_NAME) {
 			showInitialFragment(AuthorNameFragment.newInstance());
-		} else {
-			authorName = state.getString(STATE_KEY_AUTHOR_NAME);
-			password = state.getString(STATE_KEY_PASSWORD);
+		} else if (state == SET_PASSWORD) {
+			showPasswordFragment();
+		} else if (state == DOZE) {
+			showDozeFragment();
+		} else if (state == CREATED || state == FAILED) {
+			// TODO: Show an error if failed
+			showApp();
 		}
 	}
 
-	@Override
-	public void injectActivity(ActivityComponent component) {
-		component.inject(this);
-		setupController.setSetupActivity(this);
-	}
-
-	@Override
-	protected void onSaveInstanceState(Bundle state) {
-		super.onSaveInstanceState(state);
-		if (authorName != null)
-			state.putString(STATE_KEY_AUTHOR_NAME, authorName);
-		if (password != null)
-			state.putString(STATE_KEY_PASSWORD, password);
-	}
-
-	@Nullable
-	String getAuthorName() {
-		return authorName;
-	}
-
-	void setAuthorName(String authorName) {
-		this.authorName = authorName;
-	}
-
-	@Nullable
-	String getPassword() {
-		return password;
-	}
-
-	void setPassword(String password) {
-		this.password = password;
-	}
-
 	void showPasswordFragment() {
-		if (authorName == null) throw new IllegalStateException();
 		showNextFragment(SetPasswordFragment.newInstance());
 	}
 
 	@TargetApi(23)
 	void showDozeFragment() {
-		if (authorName == null) throw new IllegalStateException();
-		if (password == null) throw new IllegalStateException();
 		showNextFragment(DozeFragment.newInstance());
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/account/SetupController.java

@@ -1,34 +0,0 @@
-package org.briarproject.briar.android.account;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public interface SetupController {
-
-	void setSetupActivity(SetupActivity setupActivity);
-
-	boolean needToShowDozeFragment();
-
-	void setAuthorName(String authorName);
-
-	float estimatePasswordStrength(String password);
-
-	void setPassword(String password);
-
-	/**
-	 * This should be called after the author name has been set.
-	 */
-	void showPasswordFragment();
-
-	/**
-	 * This should be called after the author name and the password have been
-	 * set.
-	 */
-	void showDozeFragment();
-
-	/**
-	 * This should be called after the author name and the password have been
-	 * set.
-	 */
-	void createAccount();
-}

briar-android/src/main/java/org/briarproject/briar/android/account/SetupControllerImpl.java

@@ -1,115 +0,0 @@
-package org.briarproject.briar.android.account;
-
-import org.briarproject.bramble.api.account.AccountManager;
-import org.briarproject.bramble.api.crypto.PasswordStrengthEstimator;
-import org.briarproject.bramble.api.lifecycle.IoExecutor;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.briar.android.controller.handler.ResultHandler;
-import org.briarproject.briar.android.controller.handler.UiResultHandler;
-
-import java.util.concurrent.Executor;
-import java.util.logging.Logger;
-
-import javax.inject.Inject;
-
-import androidx.annotation.Nullable;
-
-@NotNullByDefault
-public class SetupControllerImpl implements SetupController {
-
-	private static final Logger LOG =
-			Logger.getLogger(SetupControllerImpl.class.getName());
-
-	private final AccountManager accountManager;
-	private final PasswordStrengthEstimator strengthEstimator;
-	@IoExecutor
-	private final Executor ioExecutor;
-	@Nullable
-	private volatile SetupActivity setupActivity;
-
-	@Inject
-	SetupControllerImpl(AccountManager accountManager,
-			@IoExecutor Executor ioExecutor,
-			PasswordStrengthEstimator strengthEstimator) {
-		this.accountManager = accountManager;
-		this.strengthEstimator = strengthEstimator;
-		this.ioExecutor = ioExecutor;
-	}
-
-	@Override
-	public void setSetupActivity(SetupActivity setupActivity) {
-		this.setupActivity = setupActivity;
-	}
-
-	@Override
-	public boolean needToShowDozeFragment() {
-		SetupActivity setupActivity = this.setupActivity;
-		if (setupActivity == null) throw new IllegalStateException();
-		return DozeView.needsToBeShown(setupActivity) ||
-				HuaweiView.needsToBeShown(setupActivity);
-	}
-
-	@Override
-	public void setAuthorName(String authorName) {
-		SetupActivity setupActivity = this.setupActivity;
-		if (setupActivity == null) throw new IllegalStateException();
-		setupActivity.setAuthorName(authorName);
-	}
-
-	@Override
-	public float estimatePasswordStrength(String password) {
-		return strengthEstimator.estimateStrength(password);
-	}
-
-	@Override
-	public void setPassword(String password) {
-		SetupActivity setupActivity = this.setupActivity;
-		if (setupActivity == null) throw new IllegalStateException();
-		setupActivity.setPassword(password);
-	}
-
-	@Override
-	public void showPasswordFragment() {
-		SetupActivity setupActivity = this.setupActivity;
-		if (setupActivity == null) throw new IllegalStateException();
-		setupActivity.showPasswordFragment();
-	}
-
-	@Override
-	public void showDozeFragment() {
-		SetupActivity setupActivity = this.setupActivity;
-		if (setupActivity == null) throw new IllegalStateException();
-		setupActivity.showDozeFragment();
-	}
-
-	@Override
-	public void createAccount() {
-		SetupActivity setupActivity = this.setupActivity;
-		UiResultHandler<Boolean> resultHandler =
-				new UiResultHandler<Boolean>(setupActivity) {
-					@Override
-					public void onResultUi(Boolean result) {
-						// TODO: Show an error if result is false
-						if (setupActivity == null)
-							throw new IllegalStateException();
-						setupActivity.showApp();
-					}
-				};
-		createAccount(resultHandler);
-	}
-
-	// Package access for testing
-	void createAccount(ResultHandler<Boolean> resultHandler) {
-		SetupActivity setupActivity = this.setupActivity;
-		if (setupActivity == null) throw new IllegalStateException();
-		String authorName = setupActivity.getAuthorName();
-		if (authorName == null) throw new IllegalStateException();
-		String password = setupActivity.getPassword();
-		if (password == null) throw new IllegalStateException();
-		ioExecutor.execute(() -> {
-			LOG.info("Creating account");
-			resultHandler.onResult(accountManager.createAccount(authorName,
-					password));
-		});
-	}
-}

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

@@ -1,11 +1,13 @@
 package org.briarproject.briar.android.account;
 
+import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
@@ -17,7 +19,10 @@ import org.briarproject.briar.android.fragment.BaseFragment;
 
 import javax.inject.Inject;
 
+import androidx.annotation.CallSuper;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.lifecycle.ViewModelProvider;
 
 import static android.view.inputmethod.EditorInfo.IME_ACTION_DONE;
 import static android.view.inputmethod.EditorInfo.IME_ACTION_NEXT;
@@ -29,8 +34,40 @@ import static org.briarproject.briar.android.util.UiUtils.showOnboardingDialog;
 abstract class SetupFragment extends BaseFragment implements TextWatcher,
 		OnEditorActionListener, OnClickListener {
 
+	private final static String STATE_KEY_CLICKED = "setupFragmentClicked";
+	private boolean clicked = false;
+
 	@Inject
-	SetupController setupController;
+	ViewModelProvider.Factory viewModelFactory;
+	SetupViewModel viewModel;
+
+	@Override
+	public void onCreate(@Nullable Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		viewModel = new ViewModelProvider(requireActivity())
+				.get(SetupViewModel.class);
+	}
+
+	@Override
+	public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+		if (savedInstanceState != null) {
+			clicked = savedInstanceState.getBoolean(STATE_KEY_CLICKED);
+		}
+		if (clicked) {
+			setNextClicked();
+		}
+	}
+
+	@Override
+	public void onSaveInstanceState(@NonNull Bundle outState) {
+		super.onSaveInstanceState(outState);
+		outState.putBoolean(STATE_KEY_CLICKED, clicked);
+	}
+
+	@CallSuper
+	void setNextClicked() {
+		this.clicked = true;
+	}
 
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {

briar-android/src/main/java/org/briarproject/briar/android/account/SetupModule.java

@@ -0,0 +1,18 @@
+package org.briarproject.briar.android.account;
+
+import org.briarproject.briar.android.viewmodel.ViewModelKey;
+
+import androidx.lifecycle.ViewModel;
+import dagger.Binds;
+import dagger.Module;
+import dagger.multibindings.IntoMap;
+
+@Module
+public abstract class SetupModule {
+
+	@Binds
+	@IntoMap
+	@ViewModelKey(SetupViewModel.class)
+	abstract ViewModel bindSetupViewModel(
+			SetupViewModel setupViewModel);
+}

briar-android/src/main/java/org/briarproject/briar/android/account/SetupViewModel.java

@@ -0,0 +1,110 @@
+package org.briarproject.briar.android.account;
+
+import android.app.Application;
+
+import org.briarproject.bramble.api.account.AccountManager;
+import org.briarproject.bramble.api.crypto.PasswordStrengthEstimator;
+import org.briarproject.bramble.api.lifecycle.IoExecutor;
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.briar.android.viewmodel.LiveEvent;
+import org.briarproject.briar.android.viewmodel.MutableLiveEvent;
+
+import java.util.concurrent.Executor;
+import java.util.logging.Logger;
+
+import javax.inject.Inject;
+
+import androidx.annotation.Nullable;
+import androidx.lifecycle.AndroidViewModel;
+
+import static java.util.logging.Logger.getLogger;
+import static org.briarproject.briar.android.account.SetupViewModel.State.AUTHOR_NAME;
+import static org.briarproject.briar.android.account.SetupViewModel.State.CREATED;
+import static org.briarproject.briar.android.account.SetupViewModel.State.DOZE;
+import static org.briarproject.briar.android.account.SetupViewModel.State.FAILED;
+import static org.briarproject.briar.android.account.SetupViewModel.State.SET_PASSWORD;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+class SetupViewModel extends AndroidViewModel {
+	enum State {AUTHOR_NAME, SET_PASSWORD, DOZE, CREATED, FAILED}
+
+	private static final Logger LOG =
+			getLogger(SetupActivity.class.getName());
+
+	@Nullable
+	private String authorName, password;
+	private final MutableLiveEvent<State> state = new MutableLiveEvent<>();
+
+	private final AccountManager accountManager;
+	private final Executor ioExecutor;
+	private final PasswordStrengthEstimator strengthEstimator;
+	private final DozeHelper dozeHelper;
+
+	@Inject
+	SetupViewModel(Application app,
+			AccountManager accountManager,
+			@IoExecutor Executor ioExecutor,
+			PasswordStrengthEstimator strengthEstimator,
+			DozeHelper dozeHelper) {
+		super(app);
+		this.accountManager = accountManager;
+		this.ioExecutor = ioExecutor;
+		this.strengthEstimator = strengthEstimator;
+		this.dozeHelper = dozeHelper;
+
+		ioExecutor.execute(() -> {
+			if (accountManager.accountExists()) {
+				throw new AssertionError();
+			} else {
+				state.postEvent(AUTHOR_NAME);
+			}
+		});
+	}
+
+	LiveEvent<State> getState() {
+		return state;
+	}
+
+	void setAuthorName(String authorName) {
+		this.authorName = authorName;
+		state.setEvent(SET_PASSWORD);
+	}
+
+	void setPassword(String password) {
+		if (authorName == null) throw new IllegalStateException();
+		this.password = password;
+		if (needToShowDozeFragment()) {
+			state.setEvent(DOZE);
+		} else {
+			createAccount();
+		}
+	}
+
+	float estimatePasswordStrength(String password) {
+		return strengthEstimator.estimateStrength(password);
+	}
+
+	boolean needToShowDozeFragment() {
+		return dozeHelper.needToShowDozeFragment(getApplication());
+	}
+
+	void dozeExceptionConfirmed() {
+		createAccount();
+	}
+
+	private void createAccount() {
+		if (authorName == null) throw new IllegalStateException();
+		if (password == null) throw new IllegalStateException();
+		ioExecutor.execute(() -> {
+			if (accountManager.createAccount(authorName, password)) {
+				LOG.info("Created account");
+				state.postEvent(CREATED);
+			} else {
+				LOG.warning("Failed to create account");
+				state.postEvent(FAILED);
+			}
+		});
+	}
+}

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

@@ -21,7 +21,6 @@ import org.briarproject.briar.android.blog.RssFeedImportActivity;
 import org.briarproject.briar.android.blog.RssFeedManageActivity;
 import org.briarproject.briar.android.blog.WriteBlogPostActivity;
 import org.briarproject.briar.android.contact.ContactListFragment;
-import org.briarproject.briar.android.contact.ContactModule;
 import org.briarproject.briar.android.contact.add.remote.AddContactActivity;
 import org.briarproject.briar.android.contact.add.remote.LinkExchangeFragment;
 import org.briarproject.briar.android.contact.add.remote.NicknameFragment;
@@ -33,7 +32,6 @@ import org.briarproject.briar.android.conversation.ImageFragment;
 import org.briarproject.briar.android.forum.CreateForumActivity;
 import org.briarproject.briar.android.forum.ForumActivity;
 import org.briarproject.briar.android.forum.ForumListFragment;
-import org.briarproject.briar.android.forum.ForumModule;
 import org.briarproject.briar.android.fragment.ScreenFilterDialogFragment;
 import org.briarproject.briar.android.introduction.ContactChooserFragment;
 import org.briarproject.briar.android.introduction.IntroductionActivity;
@@ -51,7 +49,6 @@ import org.briarproject.briar.android.navdrawer.TransportsActivity;
 import org.briarproject.briar.android.panic.PanicPreferencesActivity;
 import org.briarproject.briar.android.panic.PanicResponderActivity;
 import org.briarproject.briar.android.privategroup.conversation.GroupActivity;
-import org.briarproject.briar.android.privategroup.conversation.GroupConversationModule;
 import org.briarproject.briar.android.privategroup.creation.CreateGroupActivity;
 import org.briarproject.briar.android.privategroup.creation.CreateGroupFragment;
 import org.briarproject.briar.android.privategroup.creation.CreateGroupModule;
@@ -68,6 +65,7 @@ import org.briarproject.briar.android.privategroup.reveal.RevealContactsFragment
 import org.briarproject.briar.android.reporting.CrashFragment;
 import org.briarproject.briar.android.reporting.CrashReportActivity;
 import org.briarproject.briar.android.reporting.ReportFormFragment;
+import org.briarproject.briar.android.settings.ConfirmAvatarDialogFragment;
 import org.briarproject.briar.android.settings.SettingsActivity;
 import org.briarproject.briar.android.settings.SettingsFragment;
 import org.briarproject.briar.android.sharing.BlogInvitationActivity;
@@ -88,14 +86,11 @@ import dagger.Component;
 @Component(modules = {
 		ActivityModule.class,
 		BlogModule.class,
-		ContactModule.class,
 		CreateGroupModule.class,
-		ForumModule.class,
 		GroupInvitationModule.class,
-		GroupConversationModule.class,
 		GroupMemberModule.class,
 		GroupRevealModule.class,
-		SharingModule.class
+		SharingModule.SharingLegacyModule.class
 }, dependencies = AndroidComponent.class)
 public interface ActivityComponent {
 
@@ -241,4 +236,6 @@ public interface ActivityComponent {
 
 	void inject(CrashFragment crashFragment);
 
+	void inject(ConfirmAvatarDialogFragment fragment);
+
 }

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

@@ -2,8 +2,6 @@ package org.briarproject.briar.android.activity;
 
 import android.app.Activity;
 
-import org.briarproject.briar.android.account.SetupController;
-import org.briarproject.briar.android.account.SetupControllerImpl;
 import org.briarproject.briar.android.controller.BriarController;
 import org.briarproject.briar.android.controller.BriarControllerImpl;
 import org.briarproject.briar.android.controller.DbController;
@@ -35,13 +33,6 @@ public class ActivityModule {
 		return activity;
 	}
 
-	@ActivityScope
-	@Provides
-	SetupController provideSetupController(
-			SetupControllerImpl setupController) {
-		return setupController;
-	}
-
 	@ActivityScope
 	@Provides
 	protected BriarController provideBriarController(

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

@@ -14,7 +14,6 @@ import org.briarproject.briar.android.BriarApplication;
 import org.briarproject.briar.android.DestroyableContext;
 import org.briarproject.briar.android.Localizer;
 import org.briarproject.briar.android.controller.ActivityLifecycleController;
-import org.briarproject.briar.android.forum.ForumModule;
 import org.briarproject.briar.android.fragment.BaseFragment;
 import org.briarproject.briar.android.fragment.ScreenFilterDialogFragment;
 import org.briarproject.briar.android.util.UiUtils;
@@ -87,7 +86,6 @@ public abstract class BaseActivity extends AppCompatActivity
 		activityComponent = DaggerActivityComponent.builder()
 				.androidComponent(applicationComponent)
 				.activityModule(getActivityModule())
-				.forumModule(getForumModule())
 				.build();
 		injectActivity(activityComponent);
 		super.onCreate(state);
@@ -122,11 +120,6 @@ public abstract class BaseActivity extends AppCompatActivity
 		return new ActivityModule(this);
 	}
 
-	// TODO use a test module where this is used in tests
-	protected ForumModule getForumModule() {
-		return new ForumModule();
-	}
-
 	@Override
 	protected void onStart() {
 		super.onStart();

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

@@ -160,7 +160,6 @@ public abstract class BriarActivity extends BaseActivity {
 	 * @param ownLayout true if the custom toolbar brings its own layout
 	 * @return the Toolbar object or null if content view did not contain one
 	 */
-	@Nullable
 	protected Toolbar setUpCustomToolbar(boolean ownLayout) {
 		// Custom Toolbar
 		Toolbar toolbar = findViewById(R.id.toolbar);

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

@@ -16,5 +16,6 @@ public interface RequestCodes {
 	int REQUEST_KEYGUARD_UNLOCK = 12;
 	int REQUEST_ATTACH_IMAGE = 13;
 	int REQUEST_SAVE_ATTACHMENT = 14;
+	int REQUEST_AVATAR_IMAGE = 15;
 
 }

briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreationTask.java

@@ -1,33 +1,24 @@
 package org.briarproject.briar.android.attachment;
 
 import android.content.ContentResolver;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory.Options;
 import android.net.Uri;
 
 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.GroupId;
-import org.briarproject.briar.api.messaging.AttachmentHeader;
+import org.briarproject.briar.android.attachment.media.ImageCompressor;
+import org.briarproject.briar.api.attachment.AttachmentHeader;
 import org.briarproject.briar.api.messaging.MessagingManager;
-import org.jsoup.UnsupportedMimeTypeException;
 
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Collection;
 import java.util.logging.Logger;
 
 import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
 
-import static android.graphics.Bitmap.CompressFormat.JPEG;
-import static android.graphics.BitmapFactory.decodeStream;
 import static java.util.Arrays.asList;
-import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.util.AndroidUtils.getSupportedImageContentTypes;
@@ -35,19 +26,16 @@ 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.api.messaging.MessagingConstants.MAX_IMAGE_SIZE;
 
 @NotNullByDefault
 class AttachmentCreationTask {
 
-	private static Logger LOG =
+	private static final Logger LOG =
 			getLogger(AttachmentCreationTask.class.getName());
 
-	private static final int MAX_ATTACHMENT_DIMENSION = 1000;
-
 	private final MessagingManager messagingManager;
 	private final ContentResolver contentResolver;
-	private final ImageSizeCalculator imageSizeCalculator;
+	private final ImageCompressor imageCompressor;
 	private final GroupId groupId;
 	private final Collection<Uri> uris;
 	private final boolean needsSize;
@@ -59,11 +47,11 @@ class AttachmentCreationTask {
 	AttachmentCreationTask(MessagingManager messagingManager,
 			ContentResolver contentResolver,
 			AttachmentCreator attachmentCreator,
-			ImageSizeCalculator imageSizeCalculator,
+			ImageCompressor imageCompressor,
 			GroupId groupId, Collection<Uri> uris, boolean needsSize) {
 		this.messagingManager = messagingManager;
 		this.contentResolver = contentResolver;
-		this.imageSizeCalculator = imageSizeCalculator;
+		this.imageCompressor = imageCompressor;
 		this.groupId = groupId;
 		this.uris = uris;
 		this.needsSize = needsSize;
@@ -110,66 +98,19 @@ class AttachmentCreationTask {
 		String contentType = contentResolver.getType(uri);
 		if (contentType == null) throw new IOException("null content type");
 		if (!asList(getSupportedImageContentTypes()).contains(contentType)) {
-			String uriString = uri.toString();
-			throw new UnsupportedMimeTypeException("", contentType, uriString);
+			throw new UnsupportedMimeTypeException(contentType, uri);
 		}
 		InputStream is = contentResolver.openInputStream(uri);
 		if (is == null) throw new IOException();
-		is = compressImage(is, contentType);
-		contentType = "image/jpeg";
+		is = imageCompressor
+				.compressImage(is, contentType);
 		long timestamp = System.currentTimeMillis();
 		AttachmentHeader h = messagingManager
-				.addLocalAttachment(groupId, timestamp, contentType, is);
+				.addLocalAttachment(groupId, timestamp,
+						ImageCompressor.MIME_TYPE, is);
 		tryToClose(is, LOG, WARNING);
 		logDuration(LOG, "Storing attachment", start);
 		return h;
 	}
 
-	@VisibleForTesting
-	InputStream compressImage(InputStream is, String contentType)
-			throws IOException {
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		try {
-			Bitmap bitmap = createBitmap(is, contentType);
-			for (int quality = 100; quality >= 0; quality -= 10) {
-				if (!bitmap.compress(JPEG, quality, out))
-					throw new IOException();
-				if (out.size() <= MAX_IMAGE_SIZE) {
-					if (LOG.isLoggable(INFO)) {
-						LOG.info("Compressed image to "
-								+ out.size() + " bytes, quality " + quality);
-					}
-					return new ByteArrayInputStream(out.toByteArray());
-				}
-				out.reset();
-			}
-			throw new IOException();
-		} finally {
-			tryToClose(is, LOG, WARNING);
-		}
-	}
-
-	private Bitmap createBitmap(InputStream is, String contentType)
-			throws IOException {
-		is = new BufferedInputStream(is);
-		Size size = imageSizeCalculator.getSize(is, contentType);
-		if (size.error) throw new IOException();
-		if (LOG.isLoggable(INFO))
-			LOG.info("Original image size: " + size.width + "x" + size.height);
-		int dimension = Math.max(size.width, size.height);
-		int inSampleSize = 1;
-		while (dimension > MAX_ATTACHMENT_DIMENSION) {
-			inSampleSize *= 2;
-			dimension /= 2;
-		}
-		if (LOG.isLoggable(INFO))
-			LOG.info("Scaling attachment by factor of " + inSampleSize);
-		Options options = new Options();
-		options.inSampleSize = inSampleSize;
-		if (contentType.equals("image/png"))
-			options.inPreferredConfig = Bitmap.Config.RGB_565;
-		Bitmap bitmap = decodeStream(is, null, options);
-		if (bitmap == null) throw new IOException();
-		return bitmap;
-	}
 }

briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreator.java

@@ -6,7 +6,7 @@ import org.briarproject.bramble.api.lifecycle.IoExecutor;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.MessageId;
-import org.briarproject.briar.api.messaging.AttachmentHeader;
+import org.briarproject.briar.api.attachment.AttachmentHeader;
 
 import java.util.Collection;
 import java.util.List;

briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentCreatorImpl.java

@@ -10,11 +10,11 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.briar.R;
-import org.briarproject.briar.api.messaging.Attachment;
-import org.briarproject.briar.api.messaging.AttachmentHeader;
-import org.briarproject.briar.api.messaging.FileTooBigException;
+import org.briarproject.briar.android.attachment.media.ImageCompressor;
+import org.briarproject.briar.api.attachment.Attachment;
+import org.briarproject.briar.api.attachment.AttachmentHeader;
+import org.briarproject.briar.api.attachment.FileTooBigException;
 import org.briarproject.briar.api.messaging.MessagingManager;
-import org.jsoup.UnsupportedMimeTypeException;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -36,12 +36,12 @@ import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.briar.android.attachment.AttachmentItem.State.ERROR;
 import static org.briarproject.briar.android.util.UiUtils.observeForeverOnce;
-import static org.briarproject.briar.api.messaging.MessagingConstants.MAX_IMAGE_SIZE;
+import static org.briarproject.briar.api.attachment.MediaConstants.MAX_IMAGE_SIZE;
 
 @NotNullByDefault
 class AttachmentCreatorImpl implements AttachmentCreator {
 
-	private static Logger LOG =
+	private static final Logger LOG =
 			getLogger(AttachmentCreatorImpl.class.getName());
 
 	private final Application app;
@@ -49,7 +49,7 @@ class AttachmentCreatorImpl implements AttachmentCreator {
 	private final Executor ioExecutor;
 	private final MessagingManager messagingManager;
 	private final AttachmentRetriever retriever;
-	private final ImageSizeCalculator imageSizeCalculator;
+	private final ImageCompressor imageCompressor;
 
 	private final CopyOnWriteArrayList<Uri> uris = new CopyOnWriteArrayList<>();
 	private final CopyOnWriteArrayList<AttachmentItemResult> itemResults =
@@ -64,12 +64,12 @@ class AttachmentCreatorImpl implements AttachmentCreator {
 	@Inject
 	AttachmentCreatorImpl(Application app, @IoExecutor Executor ioExecutor,
 			MessagingManager messagingManager, AttachmentRetriever retriever,
-			ImageSizeCalculator imageSizeCalculator) {
+			ImageCompressor imageCompressor) {
 		this.app = app;
 		this.ioExecutor = ioExecutor;
 		this.messagingManager = messagingManager;
 		this.retriever = retriever;
-		this.imageSizeCalculator = imageSizeCalculator;
+		this.imageCompressor = imageCompressor;
 	}
 
 	@Override
@@ -89,7 +89,7 @@ class AttachmentCreatorImpl implements AttachmentCreator {
 			if (id == null) throw new IllegalStateException();
 			boolean needsSize = uris.size() == 1;
 			task = new AttachmentCreationTask(messagingManager,
-					app.getContentResolver(), this, imageSizeCalculator, id,
+					app.getContentResolver(), this, imageCompressor, id,
 					uris, needsSize);
 			ioExecutor.execute(() -> task.storeAttachments());
 		});

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

@@ -4,8 +4,9 @@ import android.os.Parcel;
 import android.os.Parcelable;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.MessageId;
-import org.briarproject.briar.api.messaging.AttachmentHeader;
+import org.briarproject.briar.api.attachment.AttachmentHeader;
 
 import javax.annotation.concurrent.Immutable;
 
@@ -78,6 +79,9 @@ public class AttachmentItem implements Parcelable {
 	}
 
 	protected AttachmentItem(Parcel in) {
+		byte[] groupIdByte = new byte[GroupId.LENGTH];
+		in.readByteArray(groupIdByte);
+		GroupId groupId = new GroupId(groupIdByte);
 		byte[] messageIdByte = new byte[MessageId.LENGTH];
 		in.readByteArray(messageIdByte);
 		MessageId messageId = new MessageId(messageIdByte);
@@ -88,7 +92,7 @@ public class AttachmentItem implements Parcelable {
 		thumbnailWidth = in.readInt();
 		thumbnailHeight = in.readInt();
 		state = State.valueOf(requireNonNull(in.readString()));
-		header = new AttachmentHeader(messageId, mimeType);
+		header = new AttachmentHeader(groupId, messageId, mimeType);
 	}
 
 	public AttachmentHeader getHeader() {
@@ -142,6 +146,7 @@ public class AttachmentItem implements Parcelable {
 
 	@Override
 	public void writeToParcel(Parcel dest, int flags) {
+		dest.writeByteArray(header.getGroupId().getBytes());
 		dest.writeByteArray(header.getMessageId().getBytes());
 		dest.writeInt(width);
 		dest.writeInt(height);

briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentManager.java

@@ -3,7 +3,7 @@ package org.briarproject.briar.android.attachment;
 import android.net.Uri;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.briar.api.messaging.AttachmentHeader;
+import org.briarproject.briar.api.attachment.AttachmentHeader;
 
 import java.util.Collection;
 import java.util.List;

briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentModule.java

@@ -12,16 +12,6 @@ import static org.briarproject.briar.android.attachment.AttachmentDimensions.get
 @Module
 public class AttachmentModule {
 
-	@Provides
-	ImageHelper provideImageHelper(ImageHelperImpl imageHelper) {
-		return imageHelper;
-	}
-
-	@Provides
-	ImageSizeCalculator provideImageSizeCalculator(ImageHelper imageHelper) {
-		return new ImageSizeCalculator(imageHelper);
-	}
-
 	@Provides
 	AttachmentDimensions provideAttachmentDimensions(Application app) {
 		return getAttachmentDimensions(app.getResources());

briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentRetriever.java

@@ -4,8 +4,8 @@ import org.briarproject.bramble.api.db.DatabaseExecutor;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.MessageId;
-import org.briarproject.briar.api.messaging.Attachment;
-import org.briarproject.briar.api.messaging.AttachmentHeader;
+import org.briarproject.briar.api.attachment.Attachment;
+import org.briarproject.briar.api.attachment.AttachmentHeader;
 import org.briarproject.briar.api.messaging.PrivateMessageHeader;
 import org.briarproject.briar.api.messaging.event.AttachmentReceivedEvent;
 
@@ -49,10 +49,10 @@ public interface AttachmentRetriever {
 	 * Loads an {@link AttachmentItem}
 	 * that arrived via an {@link AttachmentReceivedEvent}
 	 * and notifies the associated {@link LiveData}.
-	 *
+	 * <p>
 	 * Note that you need to call {@link #getAttachmentItems(PrivateMessageHeader)}
 	 * first to get the LiveData.
-	 *
+	 * <p>
 	 * It is possible that no LiveData is available,
 	 * because the message of the AttachmentItem did not arrive, yet.
 	 * In this case, the load wil be deferred until the message arrives.

briar-android/src/main/java/org/briarproject/briar/android/attachment/AttachmentRetrieverImpl.java

@@ -6,9 +6,12 @@ import org.briarproject.bramble.api.db.NoSuchMessageException;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.briar.android.attachment.AttachmentItem.State;
-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.android.attachment.media.ImageHelper;
+import org.briarproject.briar.android.attachment.media.ImageSizeCalculator;
+import org.briarproject.briar.android.attachment.media.Size;
+import org.briarproject.briar.api.attachment.Attachment;
+import org.briarproject.briar.api.attachment.AttachmentHeader;
+import org.briarproject.briar.api.attachment.AttachmentReader;
 import org.briarproject.briar.api.messaging.PrivateMessageHeader;
 
 import java.io.BufferedInputStream;
@@ -43,7 +46,7 @@ class AttachmentRetrieverImpl implements AttachmentRetriever {
 
 	@DatabaseExecutor
 	private final Executor dbExecutor;
-	private final MessagingManager messagingManager;
+	private final AttachmentReader attachmentReader;
 	private final ImageHelper imageHelper;
 	private final ImageSizeCalculator imageSizeCalculator;
 	private final int defaultSize;
@@ -57,11 +60,10 @@ class AttachmentRetrieverImpl implements AttachmentRetriever {
 
 	@Inject
 	AttachmentRetrieverImpl(@DatabaseExecutor Executor dbExecutor,
-			MessagingManager messagingManager,
-			AttachmentDimensions dimensions, ImageHelper imageHelper,
-			ImageSizeCalculator imageSizeCalculator) {
+			AttachmentReader attachmentReader, AttachmentDimensions dimensions,
+			ImageHelper imageHelper, ImageSizeCalculator imageSizeCalculator) {
 		this.dbExecutor = dbExecutor;
-		this.messagingManager = messagingManager;
+		this.attachmentReader = attachmentReader;
 		this.imageHelper = imageHelper;
 		this.imageSizeCalculator = imageSizeCalculator;
 		defaultSize = dimensions.defaultSize;
@@ -75,7 +77,7 @@ class AttachmentRetrieverImpl implements AttachmentRetriever {
 	@DatabaseExecutor
 	public Attachment getMessageAttachment(AttachmentHeader h)
 			throws DbException {
-		return messagingManager.getAttachment(h);
+		return attachmentReader.getAttachment(h);
 	}
 
 	@Override
@@ -86,13 +88,11 @@ class AttachmentRetrieverImpl implements AttachmentRetriever {
 		boolean needsSize = headers.size() == 1;
 		for (AttachmentHeader h : headers) {
 			// try cache for existing item live data
-			MutableLiveData<AttachmentItem> liveData;
-			if (needsSize) liveData = itemsWithSize.get(h.getMessageId());
-			else {
-				// try items with size first, as they work as well
-				liveData = itemsWithSize.get(h.getMessageId());
-				if (liveData == null)
-					liveData = itemsWithoutSize.get(h.getMessageId());
+			MutableLiveData<AttachmentItem> liveData =
+					itemsWithSize.get(h.getMessageId());
+			if (!needsSize && liveData == null) {
+				// check cache for items that don't need the size
+				liveData = itemsWithoutSize.get(h.getMessageId());
 			}
 
 			// create new live data with LOADING item if cache miss
@@ -131,7 +131,7 @@ class AttachmentRetrieverImpl implements AttachmentRetriever {
 		// If a live data is already cached we don't need to do anything
 		if (itemsWithSize.containsKey(h.getMessageId())) return;
 		try {
-			Attachment a = messagingManager.getAttachment(h);
+			Attachment a = attachmentReader.getAttachment(h);
 			AttachmentItem item = createAttachmentItem(a, true);
 			MutableLiveData<AttachmentItem> liveData =
 					new MutableLiveData<>(item);
@@ -173,7 +173,7 @@ class AttachmentRetrieverImpl implements AttachmentRetriever {
 		Attachment a;
 		AttachmentItem item;
 		try {
-			a = messagingManager.getAttachment(h);
+			a = attachmentReader.getAttachment(h);
 			item = createAttachmentItem(a, needsSize);
 		} catch (NoSuchMessageException e) {
 			LOG.info("Attachment not received yet");
@@ -210,26 +210,30 @@ class AttachmentRetrieverImpl implements AttachmentRetriever {
 
 	private AttachmentItem createAttachmentItem(AttachmentHeader h, Size size) {
 		// calculate thumbnail size
-		Size thumbnailSize = new Size(defaultSize, defaultSize, size.mimeType);
-		if (!size.error) {
+		Size thumbnailSize =
+				new Size(defaultSize, defaultSize, size.getMimeType());
+		if (!size.hasError()) {
 			thumbnailSize =
-					getThumbnailSize(size.width, size.height, size.mimeType);
+					getThumbnailSize(size.getWidth(), size.getHeight(),
+							size.getMimeType());
 		}
 		// get file extension
-		String extension = imageHelper.getExtensionFromMimeType(size.mimeType);
-		boolean hasError = extension == null || size.error;
-		if (!h.getContentType().equals(size.mimeType)) {
+		String extension =
+				imageHelper.getExtensionFromMimeType(size.getMimeType());
+		boolean hasError = extension == null || size.hasError();
+		if (!h.getContentType().equals(size.getMimeType())) {
 			if (LOG.isLoggable(WARNING)) {
 				LOG.warning("Header has different mime type (" +
-						h.getContentType() + ") than image (" + size.mimeType +
-						").");
+						h.getContentType() + ") than image (" +
+						size.getMimeType() + ").");
 			}
 			hasError = true;
 		}
 		if (extension == null) extension = "";
 		State state = hasError ? ERROR : AVAILABLE;
-		return new AttachmentItem(h, size.width, size.height,
-				extension, thumbnailSize.width, thumbnailSize.height, state);
+		return new AttachmentItem(h, size.getWidth(), size.getHeight(),
+				extension, thumbnailSize.getWidth(), thumbnailSize.getHeight(),
+				state);
 	}
 
 	private Size getThumbnailSize(int width, int height, String mimeType) {

briar-android/src/main/java/org/briarproject/briar/android/attachment/Size.java

@@ -1,23 +0,0 @@
-package org.briarproject.briar.android.attachment;
-
-class Size {
-
-	final int width;
-	final int height;
-	final String mimeType;
-	final boolean error;
-
-	Size(int width, int height, String mimeType) {
-		this.width = width;
-		this.height = height;
-		this.mimeType = mimeType;
-		this.error = false;
-	}
-
-	Size() {
-		this.width = 0;
-		this.height = 0;
-		this.mimeType = "";
-		this.error = true;
-	}
-}

briar-android/src/main/java/org/briarproject/briar/android/attachment/UnsupportedMimeTypeException.java

@@ -0,0 +1,24 @@
+package org.briarproject.briar.android.attachment;
+
+import android.net.Uri;
+
+import java.io.IOException;
+
+public class UnsupportedMimeTypeException extends IOException {
+
+	private final String mimeType;
+	private final Uri uri;
+
+	public UnsupportedMimeTypeException(String mimeType, Uri uri) {
+		this.mimeType = mimeType;
+		this.uri = uri;
+	}
+
+	public String getMimeType() {
+		return mimeType;
+	}
+
+	public Uri getUri() {
+		return uri;
+	}
+}

briar-android/src/main/java/org/briarproject/briar/android/attachment/media/ImageCompressor.java

@@ -0,0 +1,39 @@
+package org.briarproject.briar.android.attachment.media;
+
+import android.graphics.Bitmap;
+import android.net.Uri;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public interface ImageCompressor {
+
+	/**
+	 * The MIME type of compressed images
+	 */
+	String MIME_TYPE = "image/jpeg";
+
+	/**
+	 * Load an image from {@code is}, compress it and return an InputStream
+	 * from which the resulting image can be read. The image will be compressed
+	 * as a JPEG image such that it fits into a message.
+	 *
+	 * @param is the stream to read the source image from
+	 * @param contentType the mimetype of the source image such as "image/jpeg"
+	 * as obtained by {@link android.content.ContentResolver#getType(Uri)}
+	 * @return a stream from which the resulting image can be read
+	 */
+	InputStream compressImage(InputStream is, String contentType)
+			throws IOException;
+
+	/**
+	 * Compress an image and return an InputStream from which the resulting
+	 * image can be read. The image will be compressed as a JPEG image such that
+	 * it fits into a message.
+	 *
+	 * @param bitmap the source image
+	 * @return a stream from which the resulting image can be read
+	 */
+	InputStream compressImage(Bitmap bitmap) throws IOException;
+
+}

briar-android/src/main/java/org/briarproject/briar/android/attachment/media/ImageCompressorImpl.java

@@ -0,0 +1,92 @@
+package org.briarproject.briar.android.attachment.media;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.logging.Logger;
+
+import javax.inject.Inject;
+
+import static android.graphics.Bitmap.CompressFormat.JPEG;
+import static android.graphics.BitmapFactory.decodeStream;
+import static java.util.logging.Level.INFO;
+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.briar.api.attachment.MediaConstants.MAX_IMAGE_SIZE;
+
+class ImageCompressorImpl implements ImageCompressor {
+
+	private static final Logger LOG =
+			getLogger(ImageCompressorImpl.class.getName());
+
+	private static final int MAX_ATTACHMENT_DIMENSION = 1000;
+
+	private final ImageSizeCalculator imageSizeCalculator;
+
+	@Inject
+	ImageCompressorImpl(ImageSizeCalculator imageSizeCalculator) {
+		this.imageSizeCalculator = imageSizeCalculator;
+	}
+
+	@Override
+	public InputStream compressImage(InputStream is, String contentType)
+			throws IOException {
+		try {
+			Bitmap bitmap =
+					createBitmap(is, contentType, MAX_ATTACHMENT_DIMENSION);
+			return compressImage(bitmap);
+		} finally {
+			tryToClose(is, LOG, WARNING);
+		}
+	}
+
+	@Override
+	public InputStream compressImage(Bitmap bitmap) throws IOException {
+		ByteArrayOutputStream out = new ByteArrayOutputStream();
+		for (int quality = 100; quality >= 0; quality -= 10) {
+			if (!bitmap.compress(JPEG, quality, out))
+				throw new IOException();
+			if (out.size() <= MAX_IMAGE_SIZE) {
+				if (LOG.isLoggable(INFO)) {
+					LOG.info("Compressed image to "
+							+ out.size() + " bytes, quality " + quality);
+				}
+				return new ByteArrayInputStream(out.toByteArray());
+			}
+			out.reset();
+		}
+		throw new IOException();
+	}
+
+	private Bitmap createBitmap(InputStream is, String contentType, int maxSize)
+			throws IOException {
+		is = new BufferedInputStream(is);
+		Size size = imageSizeCalculator.getSize(is, contentType);
+		if (size.hasError()) throw new IOException();
+		if (LOG.isLoggable(INFO))
+			LOG.info("Original image size: " + size.getWidth() + "x" +
+					size.getHeight());
+		int dimension = Math.max(size.getWidth(), size.getHeight());
+		int inSampleSize = 1;
+		while (dimension > maxSize) {
+			inSampleSize *= 2;
+			dimension /= 2;
+		}
+		if (LOG.isLoggable(INFO))
+			LOG.info("Scaling attachment by factor of " + inSampleSize);
+		BitmapFactory.Options options = new BitmapFactory.Options();
+		options.inSampleSize = inSampleSize;
+		if (contentType.equals("image/png"))
+			options.inPreferredConfig = Bitmap.Config.RGB_565;
+		Bitmap bitmap = decodeStream(is, null, options);
+		if (bitmap == null) throw new IOException();
+		return bitmap;
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/attachment/media/ImageHelper.java

@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.attachment;
+package org.briarproject.briar.android.attachment.media;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 

briar-android/src/main/java/org/briarproject/briar/android/attachment/media/ImageHelperImpl.java

@@ -1,4 +1,4 @@
-package org.briarproject.briar.android.attachment;
+package org.briarproject.briar.android.attachment.media;
 
 import android.graphics.BitmapFactory;
 import android.webkit.MimeTypeMap;

briar-android/src/main/java/org/briarproject/briar/android/attachment/media/ImageSizeCalculator.java

@@ -0,0 +1,18 @@
+package org.briarproject.briar.android.attachment.media;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+import java.io.InputStream;
+
+@NotNullByDefault
+public interface ImageSizeCalculator {
+
+	/**
+	 * Determine the size of the image that can be read from {@code is}.
+	 *
+	 * @param contentType the mime type of the image. If "image/jpeg" is passed,
+	 * the implementation will try to determine the size from the Exif header
+	 */
+	Size getSize(InputStream is, String contentType);
+
+}

briar-android/src/main/java/org/briarproject/briar/android/attachment/media/ImageSizeCalculatorImpl.java

@@ -1,9 +1,9 @@
-package org.briarproject.briar.android.attachment;
+package org.briarproject.briar.android.attachment.media;
 
 import com.bumptech.glide.util.MarkEnforcingInputStream;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.briar.android.attachment.ImageHelper.DecodeResult;
+import org.briarproject.briar.android.attachment.media.ImageHelper.DecodeResult;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -23,20 +23,21 @@ import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.util.LogUtils.logException;
 
 @NotNullByDefault
-class ImageSizeCalculator {
+class ImageSizeCalculatorImpl implements ImageSizeCalculator {
 
 	private static final Logger LOG =
-			getLogger(ImageSizeCalculator.class.getName());
+			getLogger(ImageSizeCalculatorImpl.class.getName());
 
 	private static final int READ_LIMIT = 1024 * 8192;
 
 	private final ImageHelper imageHelper;
 
-	ImageSizeCalculator(ImageHelper imageHelper) {
+	ImageSizeCalculatorImpl(ImageHelper imageHelper) {
 		this.imageHelper = imageHelper;
 	}
 
-	Size getSize(InputStream is, String contentType) {
+	@Override
+	public Size getSize(InputStream is, String contentType) {
 		Size size = new Size();
 		is = new MarkEnforcingInputStream(is);
 		is.mark(READ_LIMIT);
@@ -49,7 +50,7 @@ class ImageSizeCalculator {
 				logException(LOG, WARNING, e);
 			}
 		}
-		if (size.error) {
+		if (size.hasError()) {
 			// need to mark again to re-add read limit
 			is.mark(READ_LIMIT);
 			try {

briar-android/src/main/java/org/briarproject/briar/android/attachment/media/MediaModule.java

@@ -0,0 +1,24 @@
+package org.briarproject.briar.android.attachment.media;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module
+public class MediaModule {
+
+	@Provides
+	ImageHelper provideImageHelper(ImageHelperImpl imageHelper) {
+		return imageHelper;
+	}
+
+	@Provides
+	ImageSizeCalculator provideImageSizeCalculator(ImageHelper imageHelper) {
+		return new ImageSizeCalculatorImpl(imageHelper);
+	}
+
+	@Provides
+	ImageCompressor provideImageCompressor(
+			ImageCompressorImpl imageCompressor) {
+		return imageCompressor;
+	}
+}

briar-android/src/main/java/org/briarproject/briar/android/attachment/media/Size.java

@@ -0,0 +1,46 @@
+package org.briarproject.briar.android.attachment.media;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+import javax.annotation.concurrent.Immutable;
+
+@Immutable
+@NotNullByDefault
+public class Size {
+
+	private final int width;
+	private final int height;
+	private final String mimeType;
+	private final boolean error;
+
+	public Size(int width, int height, String mimeType) {
+		this.width = width;
+		this.height = height;
+		this.mimeType = mimeType;
+		this.error = false;
+	}
+
+	public Size() {
+		this.width = 0;
+		this.height = 0;
+		this.mimeType = "";
+		this.error = true;
+	}
+
+	public int getWidth() {
+		return width;
+	}
+
+	public int getHeight() {
+		return height;
+	}
+
+	public String getMimeType() {
+		return mimeType;
+	}
+
+	public boolean hasError() {
+		return error;
+	}
+
+}

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

@@ -1,7 +1,7 @@
 package org.briarproject.briar.android.blog;
 
 import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.bramble.api.identity.AuthorInfo;
+import org.briarproject.briar.api.identity.AuthorInfo;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.briar.api.blog.BlogPostHeader;

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

@@ -20,7 +20,7 @@ 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.api.messaging.AttachmentHeader;
+import org.briarproject.briar.api.attachment.AttachmentHeader;
 
 import java.util.List;
 
@@ -156,16 +156,16 @@ public class ReblogFragment extends BaseFragment implements SendListener {
 			progressBar = v.findViewById(R.id.progressBar);
 			post = new BlogPostViewHolder(v.findViewById(R.id.postLayout),
 					true, new OnBlogPostClickListener() {
-						@Override
-						public void onBlogPostClick(BlogPostItem post) {
-							// do nothing
-						}
+				@Override
+				public void onBlogPostClick(BlogPostItem post) {
+					// do nothing
+				}
 
-						@Override
-						public void onAuthorClick(BlogPostItem post) {
-							// probably don't want to allow author clicks here
-						}
-					}, getFragmentManager());
+				@Override
+				public void onAuthorClick(BlogPostItem post) {
+					// probably don't want to allow author clicks here
+				}
+			}, getFragmentManager());
 			input = v.findViewById(R.id.inputText);
 		}
 	}

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

@@ -19,10 +19,10 @@ 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.api.android.AndroidNotificationManager;
+import org.briarproject.briar.api.attachment.AttachmentHeader;
 import org.briarproject.briar.api.blog.BlogManager;
 import org.briarproject.briar.api.blog.BlogPost;
 import org.briarproject.briar.api.blog.BlogPostFactory;
-import org.briarproject.briar.api.messaging.AttachmentHeader;
 
 import java.security.GeneralSecurityException;
 import java.util.List;

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

@@ -3,14 +3,12 @@ package org.briarproject.briar.android.contact;
 import android.content.Context;
 import android.view.View;
 
-import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.briar.android.util.BriarAdapter;
 
 import javax.annotation.Nullable;
 
 import androidx.annotation.NonNull;
 
-import static androidx.recyclerview.widget.SortedList.INVALID_POSITION;
 import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName;
 
 public abstract class BaseContactListAdapter<I extends ContactItem, VH extends ContactItemViewHolder<I>>
@@ -47,15 +45,6 @@ public abstract class BaseContactListAdapter<I extends ContactItem, VH extends C
 		return true;
 	}
 
-	int findItemPosition(ContactId c) {
-		for (int i = 0; i < getItemCount(); i++) {
-			I item = getItemAt(i);
-			if (item != null && item.getContact().getId().equals(c))
-				return i;
-		}
-		return INVALID_POSITION; // Not found
-	}
-
 	public interface OnContactClickListener<I> {
 		void onItemClick(View view, I item);
 	}

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

@@ -2,22 +2,26 @@ package org.briarproject.briar.android.contact;
 
 import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.briar.api.identity.AuthorInfo;
 
-import javax.annotation.concurrent.NotThreadSafe;
+import javax.annotation.concurrent.Immutable;
 
-@NotThreadSafe
+@Immutable
 @NotNullByDefault
 public class ContactItem {
 
 	private final Contact contact;
-	private boolean connected;
+	private final AuthorInfo authorInfo;
+	private final boolean connected;
 
-	public ContactItem(Contact contact) {
-		this(contact, false);
+	public ContactItem(Contact contact, AuthorInfo authorInfo) {
+		this(contact, authorInfo, false);
 	}
 
-	public ContactItem(Contact contact, boolean connected) {
+	public ContactItem(Contact contact, AuthorInfo authorInfo,
+			boolean connected) {
 		this.contact = contact;
+		this.authorInfo = authorInfo;
 		this.connected = connected;
 	}
 
@@ -25,12 +29,12 @@ public class ContactItem {
 		return contact;
 	}
 
+	public AuthorInfo getAuthorInfo() {
+		return authorInfo;
+	}
+
 	boolean isConnected() {
 		return connected;
 	}
 
-	void setConnected(boolean connected) {
-		this.connected = connected;
-	}
-
 }

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

@@ -5,7 +5,6 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.contact.BaseContactListAdapter.OnContactClickListener;
@@ -14,9 +13,9 @@ import javax.annotation.Nullable;
 
 import androidx.annotation.UiThread;
 import androidx.recyclerview.widget.RecyclerView;
-import im.delight.android.identicons.IdenticonDrawable;
 
 import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName;
+import static org.briarproject.briar.android.view.AuthorView.setAvatar;
 
 @UiThread
 @NotNullByDefault
@@ -40,9 +39,7 @@ public class ContactItemViewHolder<I extends ContactItem>
 	}
 
 	protected void bind(I item, @Nullable OnContactClickListener<I> listener) {
-		Author author = item.getContact().getAuthor();
-		avatar.setImageDrawable(
-				new IdenticonDrawable(author.getId().getBytes()));
+		setAvatar(avatar, item);
 		name.setText(getContactDisplayName(item.getContact()));
 
 		if (bulb != null) {

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

@@ -1,50 +1,73 @@
 package org.briarproject.briar.android.contact;
 
-import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.NullSafety;
 import org.briarproject.briar.R;
+import org.briarproject.briar.android.contact.BaseContactListAdapter.OnContactClickListener;
+
+import androidx.recyclerview.widget.DiffUtil.ItemCallback;
+import androidx.recyclerview.widget.ListAdapter;
 
 @NotNullByDefault
 public class ContactListAdapter extends
-		BaseContactListAdapter<ContactListItem, ContactListItemViewHolder> {
+		ListAdapter<ContactListItem, ContactListItemViewHolder> {
 
-	public ContactListAdapter(Context context,
+	// TODO: using the click listener interface from BaseContactListAdapter on
+	// purpose here because it is entangled with ContactListItemViewHolder. At
+	// some point we probably want to change that.
+	protected final OnContactClickListener<ContactListItem> listener;
+
+	public ContactListAdapter(
 			OnContactClickListener<ContactListItem> listener) {
-		super(context, ContactListItem.class, listener);
+		super(new ContactListCallback());
+		this.listener = listener;
+	}
+
+	@NotNullByDefault
+	private static class ContactListCallback
+			extends ItemCallback<ContactListItem> {
+		@Override
+		public boolean areItemsTheSame(ContactListItem c1, ContactListItem c2) {
+			return c1.getContact().equals(c2.getContact());
+		}
+
+		@Override
+		public boolean areContentsTheSame(ContactListItem c1,
+				ContactListItem c2) {
+			// check for all properties that influence visual
+			// representation of contact
+			if (c1.isEmpty() != c2.isEmpty()) {
+				return false;
+			}
+			if (c1.getUnreadCount() != c2.getUnreadCount()) {
+				return false;
+			}
+			if (c1.getTimestamp() != c2.getTimestamp()) {
+				return false;
+			}
+			if (c1.isConnected() != c2.isConnected()) {
+				return false;
+			}
+			return NullSafety.equals(c1.getAuthorInfo().getAvatarHeader(),
+					c2.getAuthorInfo().getAvatarHeader());
+		}
 	}
 
 	@Override
 	public ContactListItemViewHolder onCreateViewHolder(ViewGroup viewGroup,
-			int i) {
+			int viewType) {
 		View v = LayoutInflater.from(viewGroup.getContext()).inflate(
 				R.layout.list_item_contact, viewGroup, false);
-
 		return new ContactListItemViewHolder(v);
 	}
 
 	@Override
-	public boolean areContentsTheSame(ContactListItem c1, ContactListItem c2) {
-		// check for all properties that influence visual
-		// representation of contact
-		if (c1.isEmpty() != c2.isEmpty()) {
-			return false;
-		}
-		if (c1.getUnreadCount() != c2.getUnreadCount()) {
-			return false;
-		}
-		if (c1.getTimestamp() != c2.getTimestamp()) {
-			return false;
-		}
-		return c1.isConnected() == c2.isConnected();
+	public void onBindViewHolder(ContactListItemViewHolder viewHolder,
+			int position) {
+		viewHolder.bind(getItem(position), listener);
 	}
-
-	@Override
-	public int compare(ContactListItem c1, ContactListItem c2) {
-		return Long.compare(c2.getTimestamp(), c1.getTimestamp());
-	}
-
 }

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

@@ -10,23 +10,9 @@ import android.widget.TextView;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
 
-import org.briarproject.bramble.api.connection.ConnectionRegistry;
-import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.contact.ContactManager;
-import org.briarproject.bramble.api.contact.event.ContactAddedEvent;
-import org.briarproject.bramble.api.contact.event.ContactRemovedEvent;
-import org.briarproject.bramble.api.contact.event.PendingContactAddedEvent;
-import org.briarproject.bramble.api.contact.event.PendingContactRemovedEvent;
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.NoSuchContactException;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.event.EventListener;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
-import org.briarproject.bramble.api.plugin.event.ContactConnectedEvent;
-import org.briarproject.bramble.api.plugin.event.ContactDisconnectedEvent;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.contact.BaseContactListAdapter.OnContactClickListener;
@@ -37,55 +23,35 @@ import org.briarproject.briar.android.fragment.BaseFragment;
 import org.briarproject.briar.android.keyagreement.ContactExchangeActivity;
 import org.briarproject.briar.android.util.BriarSnackbarBuilder;
 import org.briarproject.briar.android.view.BriarRecyclerView;
-import org.briarproject.briar.api.android.AndroidNotificationManager;
-import org.briarproject.briar.api.client.MessageTracker.GroupCount;
-import org.briarproject.briar.api.conversation.ConversationManager;
-import org.briarproject.briar.api.conversation.ConversationMessageHeader;
-import org.briarproject.briar.api.conversation.event.ConversationMessageReceivedEvent;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
 import androidx.annotation.UiThread;
-import androidx.core.app.ActivityCompat;
-import androidx.core.app.ActivityOptionsCompat;
-import androidx.core.util.Pair;
+import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import io.github.kobakei.materialfabspeeddial.FabSpeedDial;
 import io.github.kobakei.materialfabspeeddial.FabSpeedDial.OnMenuItemClickListener;
 
-import static android.os.Build.VERSION.SDK_INT;
-import static androidx.core.app.ActivityOptionsCompat.makeSceneTransitionAnimation;
-import static androidx.core.view.ViewCompat.getTransitionName;
 import static com.google.android.material.snackbar.BaseTransientBottomBar.LENGTH_INDEFINITE;
-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.api.nullsafety.NullSafety.requireNonNull;
 import static org.briarproject.briar.android.conversation.ConversationActivity.CONTACT_ID;
-import static org.briarproject.briar.android.util.UiUtils.isSamsung7;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
-public class ContactListFragment extends BaseFragment implements EventListener,
-		OnMenuItemClickListener {
+public class ContactListFragment extends BaseFragment
+		implements OnMenuItemClickListener,
+		OnContactClickListener<ContactListItem> {
 
 	public static final String TAG = ContactListFragment.class.getName();
-	private static final Logger LOG = Logger.getLogger(TAG);
 
 	@Inject
-	ConnectionRegistry connectionRegistry;
-	@Inject
-	EventBus eventBus;
-	@Inject
-	AndroidNotificationManager notificationManager;
+	ViewModelProvider.Factory viewModelFactory;
 
-	private ContactListAdapter adapter;
+	private ContactListViewModel viewModel;
+	private final ContactListAdapter adapter = new ContactListAdapter(this);
 	private BriarRecyclerView list;
+
 	/**
 	 * The Snackbar is non-null when shown and null otherwise.
 	 * Use {@link #showSnackBar()} and {@link #dismissSnackBar()} to interact.
@@ -93,12 +59,6 @@ public class ContactListFragment extends BaseFragment implements EventListener,
 	@Nullable
 	private Snackbar snackbar = null;
 
-	// Fields that are accessed from background threads must be volatile
-	@Inject
-	volatile ContactManager contactManager;
-	@Inject
-	volatile ConversationManager conversationManager;
-
 	public static ContactListFragment newInstance() {
 		Bundle args = new Bundle();
 		ContactListFragment fragment = new ContactListFragment();
@@ -114,6 +74,8 @@ public class ContactListFragment extends BaseFragment implements EventListener,
 	@Override
 	public void injectFragment(ActivityComponent component) {
 		component.inject(this);
+		viewModel = new ViewModelProvider(this, viewModelFactory)
+				.get(ContactListViewModel.class);
 	}
 
 	@Nullable
@@ -129,37 +91,6 @@ public class ContactListFragment extends BaseFragment implements EventListener,
 		FabSpeedDial speedDial = contentView.findViewById(R.id.speedDial);
 		speedDial.addOnMenuItemClickListener(this);
 
-		OnContactClickListener<ContactListItem> onContactClickListener =
-				(view, item) -> {
-					Intent i = new Intent(getActivity(),
-							ConversationActivity.class);
-					ContactId contactId = item.getContact().getId();
-					i.putExtra(CONTACT_ID, contactId.getInt());
-
-					if (SDK_INT >= 23 && !isSamsung7()) {
-						ContactListItemViewHolder holder =
-								(ContactListItemViewHolder) list
-										.getRecyclerView()
-										.findViewHolderForAdapterPosition(
-												adapter.findItemPosition(item));
-						Pair<View, String> avatar =
-								Pair.create(holder.avatar,
-										getTransitionName(holder.avatar));
-						Pair<View, String> bulb =
-								Pair.create(holder.bulb,
-										getTransitionName(holder.bulb));
-						ActivityOptionsCompat options =
-								makeSceneTransitionAnimation(getActivity(),
-										avatar, bulb);
-						ActivityCompat.startActivity(getActivity(), i,
-								options.toBundle());
-					} else {
-						// work-around for android bug #224270
-						startActivity(i);
-					}
-				};
-		adapter = new ContactListAdapter(requireContext(),
-				onContactClickListener);
 		list = contentView.findViewById(R.id.list);
 		list.setLayoutManager(new LinearLayoutManager(requireContext()));
 		list.setAdapter(adapter);
@@ -167,9 +98,30 @@ public class ContactListFragment extends BaseFragment implements EventListener,
 		list.setEmptyText(getString(R.string.no_contacts));
 		list.setEmptyAction(getString(R.string.no_contacts_action));
 
+		viewModel.getContactListItems()
+				.observe(getViewLifecycleOwner(), result -> {
+					result.onError(this::handleException).onSuccess(items -> {
+						adapter.submitList(items);
+						if (requireNonNull(items).size() == 0) list.showData();
+					});
+				});
+		viewModel.getHasPendingContacts()
+				.observe(getViewLifecycleOwner(), hasPending -> {
+					if (hasPending) showSnackBar();
+					else dismissSnackBar();
+				});
+
 		return contentView;
 	}
 
+	@Override
+	public void onItemClick(View view, ContactListItem item) {
+		Intent i = new Intent(getActivity(), ConversationActivity.class);
+		ContactId contactId = item.getContact().getId();
+		i.putExtra(CONTACT_ID, contactId.getInt());
+		startActivity(i);
+	}
+
 	@Override
 	public void onMenuItemClick(FloatingActionButton fab, @Nullable TextView v,
 			int itemId) {
@@ -188,131 +140,20 @@ public class ContactListFragment extends BaseFragment implements EventListener,
 	@Override
 	public void onStart() {
 		super.onStart();
-		eventBus.addListener(this);
-		notificationManager.clearAllContactNotifications();
-		notificationManager.clearAllContactAddedNotifications();
-		loadContacts();
-		checkForPendingContacts();
+		viewModel.clearAllContactNotifications();
+		viewModel.clearAllContactAddedNotifications();
+		viewModel.loadContacts();
+		viewModel.checkForPendingContacts();
 		list.startPeriodicUpdate();
 	}
 
-	private void checkForPendingContacts() {
-		listener.runOnDbThread(() -> {
-			try {
-				if (contactManager.getPendingContacts().isEmpty()) {
-					runOnUiThreadUnlessDestroyed(this::dismissSnackBar);
-				} else {
-					runOnUiThreadUnlessDestroyed(this::showSnackBar);
-				}
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
-	}
-
 	@Override
 	public void onStop() {
 		super.onStop();
-		eventBus.removeListener(this);
-		adapter.clear();
-		list.showProgressBar();
 		list.stopPeriodicUpdate();
 		dismissSnackBar();
 	}
 
-	private void loadContacts() {
-		int revision = adapter.getRevision();
-		listener.runOnDbThread(() -> {
-			try {
-				long start = now();
-				List<ContactListItem> contacts = new ArrayList<>();
-				for (Contact c : contactManager.getContacts()) {
-					try {
-						ContactId id = c.getId();
-						GroupCount count =
-								conversationManager.getGroupCount(id);
-						boolean connected =
-								connectionRegistry.isConnected(c.getId());
-						contacts.add(new ContactListItem(c, connected, count));
-					} catch (NoSuchContactException e) {
-						// Continue
-					}
-				}
-				logDuration(LOG, "Full load", start);
-				displayContacts(revision, contacts);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
-	}
-
-	private void displayContacts(int revision, List<ContactListItem> contacts) {
-		runOnUiThreadUnlessDestroyed(() -> {
-			if (revision == adapter.getRevision()) {
-				adapter.incrementRevision();
-				if (contacts.isEmpty()) list.showData();
-				else adapter.replaceAll(contacts);
-			} else {
-				LOG.info("Concurrent update, reloading");
-				loadContacts();
-			}
-		});
-	}
-
-	@Override
-	public void eventOccurred(Event e) {
-		if (e instanceof ContactAddedEvent) {
-			LOG.info("Contact added, reloading");
-			loadContacts();
-		} else if (e instanceof ContactConnectedEvent) {
-			setConnected(((ContactConnectedEvent) e).getContactId(), true);
-		} else if (e instanceof ContactDisconnectedEvent) {
-			setConnected(((ContactDisconnectedEvent) e).getContactId(), false);
-		} else if (e instanceof ContactRemovedEvent) {
-			LOG.info("Contact removed, removing item");
-			removeItem(((ContactRemovedEvent) e).getContactId());
-		} else if (e instanceof ConversationMessageReceivedEvent) {
-			LOG.info("Conversation message received, updating item");
-			ConversationMessageReceivedEvent<?> p =
-					(ConversationMessageReceivedEvent<?>) e;
-			ConversationMessageHeader h = p.getMessageHeader();
-			updateItem(p.getContactId(), h);
-		} else if (e instanceof PendingContactAddedEvent ||
-				e instanceof PendingContactRemovedEvent) {
-			checkForPendingContacts();
-		}
-	}
-
-	@UiThread
-	private void updateItem(ContactId c, ConversationMessageHeader h) {
-		adapter.incrementRevision();
-		int position = adapter.findItemPosition(c);
-		ContactListItem item = adapter.getItemAt(position);
-		if (item != null) {
-			item.addMessage(h);
-			adapter.updateItemAt(position, item);
-		}
-	}
-
-	@UiThread
-	private void removeItem(ContactId c) {
-		adapter.incrementRevision();
-		int position = adapter.findItemPosition(c);
-		ContactListItem item = adapter.getItemAt(position);
-		if (item != null) adapter.remove(item);
-	}
-
-	@UiThread
-	private void setConnected(ContactId c, boolean connected) {
-		adapter.incrementRevision();
-		int position = adapter.findItemPosition(c);
-		ContactListItem item = adapter.getItemAt(position);
-		if (item != null) {
-			item.setConnected(connected);
-			adapter.updateItemAt(position, item);
-		}
-	}
-
 	@UiThread
 	private void showSnackBar() {
 		if (snackbar != null) return;
@@ -335,5 +176,4 @@ public class ContactListFragment extends BaseFragment implements EventListener,
 		Intent i = new Intent(getContext(), PendingContactListActivity.class);
 		startActivity(i);
 	}
-
 }

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

@@ -2,31 +2,58 @@ package org.briarproject.briar.android.contact;
 
 import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.briar.api.attachment.AttachmentHeader;
 import org.briarproject.briar.api.client.MessageTracker.GroupCount;
 import org.briarproject.briar.api.conversation.ConversationMessageHeader;
+import org.briarproject.briar.api.identity.AuthorInfo;
 
-import javax.annotation.concurrent.NotThreadSafe;
+import javax.annotation.concurrent.Immutable;
 
-@NotThreadSafe
+@Immutable
 @NotNullByDefault
-public class ContactListItem extends ContactItem {
+public class ContactListItem extends ContactItem
+		implements Comparable<ContactListItem> {
 
-	private boolean empty;
-	private long timestamp;
-	private int unread;
+	private final boolean empty;
+	private final long timestamp;
+	private final int unread;
 
-	public ContactListItem(Contact contact, boolean connected,
-			GroupCount count) {
-		super(contact, connected);
+	public ContactListItem(Contact contact, AuthorInfo authorInfo,
+			boolean connected, GroupCount count) {
+		super(contact, authorInfo, connected);
 		this.empty = count.getMsgCount() == 0;
 		this.unread = count.getUnreadCount();
 		this.timestamp = count.getLatestMsgTime();
 	}
 
-	void addMessage(ConversationMessageHeader h) {
-		empty = false;
-		if (h.getTimestamp() > timestamp) timestamp = h.getTimestamp();
-		if (!h.isRead()) unread++;
+	private ContactListItem(Contact contact, AuthorInfo authorInfo,
+			boolean connected, boolean empty, int unread, long timestamp) {
+		super(contact, authorInfo, connected);
+		this.empty = empty;
+		this.timestamp = timestamp;
+		this.unread = unread;
+	}
+
+	ContactListItem(ContactListItem item, boolean connected) {
+		this(item.getContact(), item.getAuthorInfo(), connected, item.empty,
+				item.unread, item.timestamp);
+	}
+
+	ContactListItem(ContactListItem item, ConversationMessageHeader h) {
+		this(item.getContact(), item.getAuthorInfo(), item.isConnected(), false,
+				h.isRead() ? item.unread : item.unread + 1,
+				Math.max(h.getTimestamp(), item.timestamp));
+	}
+
+	/**
+	 * Creates a new copy of the given item with a new avatar
+	 * referenced by the given attachment header.
+	 */
+	ContactListItem(ContactListItem item,
+			AttachmentHeader attachmentHeader) {
+		this(item.getContact(), new AuthorInfo(item.getAuthorInfo().getStatus(),
+						item.getAuthorInfo().getAlias(), attachmentHeader),
+				item.isConnected(), item.empty, item.unread, item.timestamp);
 	}
 
 	boolean isEmpty() {
@@ -41,4 +68,8 @@ public class ContactListItem extends ContactItem {
 		return unread;
 	}
 
+	@Override
+	public int compareTo(ContactListItem o) {
+		return Long.compare(o.getTimestamp(), timestamp);
+	}
 }

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

@@ -3,11 +3,9 @@ package org.briarproject.briar.android.contact;
 import android.view.View;
 import android.widget.TextView;
 
-import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.contact.BaseContactListAdapter.OnContactClickListener;
-import org.briarproject.briar.android.util.UiUtils;
 
 import java.util.Locale;
 
@@ -15,7 +13,6 @@ import javax.annotation.Nullable;
 
 import androidx.annotation.UiThread;
 
-import static androidx.core.view.ViewCompat.setTransitionName;
 import static org.briarproject.briar.android.util.UiUtils.formatDate;
 
 @UiThread
@@ -39,7 +36,8 @@ class ContactListItemViewHolder extends ContactItemViewHolder<ContactListItem> {
 		// unread count
 		int unreadCount = item.getUnreadCount();
 		if (unreadCount > 0) {
-			unread.setText(String.format(Locale.getDefault(), "%d", unreadCount));
+			unread.setText(
+					String.format(Locale.getDefault(), "%d", unreadCount));
 			unread.setVisibility(View.VISIBLE);
 		} else {
 			unread.setVisibility(View.INVISIBLE);
@@ -52,10 +50,6 @@ class ContactListItemViewHolder extends ContactItemViewHolder<ContactListItem> {
 			long timestamp = item.getTimestamp();
 			date.setText(formatDate(date.getContext(), timestamp));
 		}
-
-		ContactId c = item.getContact().getId();
-		setTransitionName(avatar, UiUtils.getAvatarTransitionName(c));
-		setTransitionName(bulb, UiUtils.getBulbTransitionName(c));
 	}
 
 }

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

@@ -0,0 +1,19 @@
+package org.briarproject.briar.android.contact;
+
+import org.briarproject.briar.android.viewmodel.ViewModelKey;
+
+import androidx.lifecycle.ViewModel;
+import dagger.Binds;
+import dagger.Module;
+import dagger.multibindings.IntoMap;
+
+@Module
+public abstract class ContactListModule {
+
+	@Binds
+	@IntoMap
+	@ViewModelKey(ContactListViewModel.class)
+	abstract ViewModel bindContactListViewModel(
+			ContactListViewModel contactListViewModel);
+
+}

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

@@ -0,0 +1,188 @@
+package org.briarproject.briar.android.contact;
+
+import android.app.Application;
+
+import org.briarproject.bramble.api.connection.ConnectionRegistry;
+import org.briarproject.bramble.api.contact.Contact;
+import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.contact.ContactManager;
+import org.briarproject.bramble.api.contact.event.ContactAddedEvent;
+import org.briarproject.bramble.api.contact.event.ContactRemovedEvent;
+import org.briarproject.bramble.api.contact.event.PendingContactAddedEvent;
+import org.briarproject.bramble.api.contact.event.PendingContactRemovedEvent;
+import org.briarproject.bramble.api.db.DatabaseExecutor;
+import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.db.Transaction;
+import org.briarproject.bramble.api.db.TransactionManager;
+import org.briarproject.bramble.api.event.Event;
+import org.briarproject.bramble.api.event.EventBus;
+import org.briarproject.bramble.api.event.EventListener;
+import org.briarproject.bramble.api.lifecycle.LifecycleManager;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.plugin.event.ContactConnectedEvent;
+import org.briarproject.bramble.api.plugin.event.ContactDisconnectedEvent;
+import org.briarproject.bramble.api.system.AndroidExecutor;
+import org.briarproject.briar.android.viewmodel.DbViewModel;
+import org.briarproject.briar.android.viewmodel.LiveResult;
+import org.briarproject.briar.api.android.AndroidNotificationManager;
+import org.briarproject.briar.api.avatar.event.AvatarUpdatedEvent;
+import org.briarproject.briar.api.client.MessageTracker;
+import org.briarproject.briar.api.conversation.ConversationManager;
+import org.briarproject.briar.api.conversation.ConversationMessageHeader;
+import org.briarproject.briar.api.conversation.event.ConversationMessageReceivedEvent;
+import org.briarproject.briar.api.identity.AuthorInfo;
+import org.briarproject.briar.api.identity.AuthorManager;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.logging.Logger;
+
+import javax.inject.Inject;
+
+import androidx.arch.core.util.Function;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+
+import static java.util.logging.Logger.getLogger;
+import static org.briarproject.bramble.util.LogUtils.logDuration;
+import static org.briarproject.bramble.util.LogUtils.now;
+
+@NotNullByDefault
+class ContactListViewModel extends DbViewModel implements EventListener {
+
+	private static final Logger LOG =
+			getLogger(ContactListViewModel.class.getName());
+
+	private final ContactManager contactManager;
+	private final AuthorManager authorManager;
+	private final ConversationManager conversationManager;
+	private final ConnectionRegistry connectionRegistry;
+	private final EventBus eventBus;
+	private final AndroidNotificationManager notificationManager;
+
+	private final MutableLiveData<LiveResult<List<ContactListItem>>>
+			contactListItems = new MutableLiveData<>();
+
+	private final MutableLiveData<Boolean> hasPendingContacts =
+			new MutableLiveData<>();
+
+	@Inject
+	ContactListViewModel(Application application,
+			@DatabaseExecutor Executor dbExecutor,
+			LifecycleManager lifecycleManager, TransactionManager db,
+			AndroidExecutor androidExecutor, ContactManager contactManager,
+			AuthorManager authorManager,
+			ConversationManager conversationManager,
+			ConnectionRegistry connectionRegistry, EventBus eventBus,
+			AndroidNotificationManager notificationManager) {
+		super(application, dbExecutor, lifecycleManager, db, androidExecutor);
+		this.contactManager = contactManager;
+		this.authorManager = authorManager;
+		this.conversationManager = conversationManager;
+		this.connectionRegistry = connectionRegistry;
+		this.eventBus = eventBus;
+		this.notificationManager = notificationManager;
+		this.eventBus.addListener(this);
+	}
+
+	@Override
+	protected void onCleared() {
+		super.onCleared();
+		eventBus.removeListener(this);
+	}
+
+	void loadContacts() {
+		loadList(this::loadContacts, contactListItems::setValue);
+	}
+
+	private List<ContactListItem> loadContacts(Transaction txn)
+			throws DbException {
+		long start = now();
+		List<ContactListItem> contacts = new ArrayList<>();
+		for (Contact c : contactManager.getContacts(txn)) {
+			ContactId id = c.getId();
+			AuthorInfo authorInfo = authorManager.getAuthorInfo(txn, c);
+			MessageTracker.GroupCount count =
+					conversationManager.getGroupCount(txn, id);
+			boolean connected = connectionRegistry.isConnected(c.getId());
+			contacts.add(new ContactListItem(c, authorInfo, connected, count));
+		}
+		Collections.sort(contacts);
+		logDuration(LOG, "Full load", start);
+		return contacts;
+	}
+
+	@Override
+	public void eventOccurred(Event e) {
+		if (e instanceof ContactAddedEvent) {
+			LOG.info("Contact added, reloading");
+			loadContacts();
+		} else if (e instanceof ContactConnectedEvent) {
+			updateItem(((ContactConnectedEvent) e).getContactId(),
+					item -> new ContactListItem(item, true), false);
+		} else if (e instanceof ContactDisconnectedEvent) {
+			updateItem(((ContactDisconnectedEvent) e).getContactId(),
+					item -> new ContactListItem(item, false), false);
+		} else if (e instanceof ContactRemovedEvent) {
+			LOG.info("Contact removed, removing item");
+			removeItem(((ContactRemovedEvent) e).getContactId());
+		} else if (e instanceof ConversationMessageReceivedEvent) {
+			LOG.info("Conversation message received, updating item");
+			ConversationMessageReceivedEvent<?> p =
+					(ConversationMessageReceivedEvent<?>) e;
+			ConversationMessageHeader h = p.getMessageHeader();
+			updateItem(p.getContactId(), item -> new ContactListItem(item, h),
+					true);
+		} else if (e instanceof PendingContactAddedEvent ||
+				e instanceof PendingContactRemovedEvent) {
+			checkForPendingContacts();
+		} else if (e instanceof AvatarUpdatedEvent) {
+			AvatarUpdatedEvent a = (AvatarUpdatedEvent) e;
+			updateItem(a.getContactId(), item -> new ContactListItem(item,
+					a.getAttachmentHeader()), false);
+		}
+	}
+
+	LiveData<LiveResult<List<ContactListItem>>> getContactListItems() {
+		return contactListItems;
+	}
+
+	LiveData<Boolean> getHasPendingContacts() {
+		return hasPendingContacts;
+	}
+
+	private void updateItem(ContactId c,
+			Function<ContactListItem, ContactListItem> replacer, boolean sort) {
+		List<ContactListItem> list = updateListItems(contactListItems,
+				itemToTest -> itemToTest.getContact().getId().equals(c),
+				replacer);
+		if (list == null) return;
+		if (sort) Collections.sort(list);
+		contactListItems.setValue(new LiveResult<>(list));
+	}
+
+	private void removeItem(ContactId c) {
+		List<ContactListItem> list = removeListItems(contactListItems,
+				itemToTest -> itemToTest.getContact().getId().equals(c));
+		if (list == null) return;
+		contactListItems.setValue(new LiveResult<>(list));
+	}
+
+	void checkForPendingContacts() {
+		runOnDbThreadOrLogException(() -> {
+			boolean hasPending = !contactManager.getPendingContacts().isEmpty();
+			hasPendingContacts.postValue(hasPending);
+		});
+	}
+
+	void clearAllContactNotifications() {
+		notificationManager.clearAllContactNotifications();
+	}
+
+	void clearAllContactAddedNotifications() {
+		notificationManager.clearAllContactAddedNotifications();
+	}
+
+}

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

@@ -1,7 +0,0 @@
-package org.briarproject.briar.android.contact;
-
-import dagger.Module;
-
-@Module
-public class ContactModule {
-}

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

@@ -0,0 +1,50 @@
+package org.briarproject.briar.android.contact;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.briar.R;
+
+@NotNullByDefault
+public class LegacyContactListAdapter extends
+		BaseContactListAdapter<ContactListItem, ContactListItemViewHolder> {
+
+	public LegacyContactListAdapter(Context context,
+			OnContactClickListener<ContactListItem> listener) {
+		super(context, ContactListItem.class, listener);
+	}
+
+	@Override
+	public ContactListItemViewHolder onCreateViewHolder(ViewGroup viewGroup,
+			int i) {
+		View v = LayoutInflater.from(viewGroup.getContext()).inflate(
+				R.layout.list_item_contact, viewGroup, false);
+
+		return new ContactListItemViewHolder(v);
+	}
+
+	@Override
+	public boolean areContentsTheSame(ContactListItem c1, ContactListItem c2) {
+		// check for all properties that influence visual
+		// representation of contact
+		if (c1.isEmpty() != c2.isEmpty()) {
+			return false;
+		}
+		if (c1.getUnreadCount() != c2.getUnreadCount()) {
+			return false;
+		}
+		if (c1.getTimestamp() != c2.getTimestamp()) {
+			return false;
+		}
+		return c1.isConnected() == c2.isConnected();
+	}
+
+	@Override
+	public int compare(ContactListItem c1, ContactListItem c2) {
+		return Long.compare(c2.getTimestamp(), c1.getTimestamp());
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/AddContactViewModel.java

@@ -2,12 +2,9 @@ package org.briarproject.briar.android.contact.add.remote;
 
 import android.app.Application;
 
-import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.UnsupportedVersionException;
 import org.briarproject.bramble.api.contact.ContactManager;
 import org.briarproject.bramble.api.contact.PendingContact;
 import org.briarproject.bramble.api.db.DatabaseExecutor;
-import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.NoSuchPendingContactException;
 import org.briarproject.bramble.api.db.TransactionManager;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
@@ -18,7 +15,6 @@ import org.briarproject.briar.android.viewmodel.LiveEvent;
 import org.briarproject.briar.android.viewmodel.LiveResult;
 import org.briarproject.briar.android.viewmodel.MutableLiveEvent;
 
-import java.security.GeneralSecurityException;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 
@@ -66,15 +62,10 @@ public class AddContactViewModel extends DbViewModel {
 	}
 
 	private void loadHandshakeLink() {
-		runOnDbThread(() -> {
-			try {
-				handshakeLink.postValue(contactManager.getHandshakeLink());
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-				// the UI should stay disabled in this case,
-				// leaving the user unable to proceed
-			}
-		});
+		// If an exception is thrown the UI should stay disabled,
+		// leaving the user unable to proceed
+		runOnDbThreadOrLogException(() ->
+				handshakeLink.postValue(contactManager.getHandshakeLink()));
 	}
 
 	LiveData<String> getHandshakeLink() {
@@ -106,17 +97,11 @@ public class AddContactViewModel extends DbViewModel {
 	void addContact(String nickname) {
 		if (remoteHandshakeLink == null) throw new IllegalStateException();
 		runOnDbThread(() -> {
-			try {
-				contactManager.addPendingContact(remoteHandshakeLink, nickname);
-				addContactResult.postValue(new LiveResult<>(true));
-			} catch (UnsupportedVersionException e) {
-				logException(LOG, WARNING, e);
-				addContactResult.postValue(new LiveResult<>(e));
-			} catch (DbException | FormatException
-					| GeneralSecurityException e) {
-				logException(LOG, WARNING, e);
-				addContactResult.postValue(new LiveResult<>(e));
-			}
+			contactManager.addPendingContact(remoteHandshakeLink, nickname);
+			addContactResult.postValue(new LiveResult<>(true));
+		}, e -> {
+			logException(LOG, WARNING, e);
+			addContactResult.postValue(new LiveResult<>(e));
 		});
 	}
 
@@ -126,13 +111,13 @@ public class AddContactViewModel extends DbViewModel {
 
 	public void updatePendingContact(String name, PendingContact p) {
 		runOnDbThread(() -> {
-			try {
-				contactManager.removePendingContact(p.getId());
-				addContact(name);
-			} catch (NoSuchPendingContactException e) {
+			contactManager.removePendingContact(p.getId());
+			addContact(name);
+		}, e -> {
+			if (e instanceof NoSuchPendingContactException) {
 				logException(LOG, WARNING, e);
 				// no error in UI as pending contact was converted into contact
-			} catch (DbException e) {
+			} else {
 				logException(LOG, WARNING, e);
 				addContactResult.postValue(new LiveResult<>(e));
 			}

briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/PendingContactListViewModel.java

@@ -10,7 +10,6 @@ import org.briarproject.bramble.api.contact.PendingContactState;
 import org.briarproject.bramble.api.contact.event.PendingContactRemovedEvent;
 import org.briarproject.bramble.api.contact.event.PendingContactStateChangedEvent;
 import org.briarproject.bramble.api.db.DatabaseExecutor;
-import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.TransactionManager;
 import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.event.EventBus;
@@ -33,10 +32,8 @@ import javax.inject.Inject;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
-import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.api.contact.PendingContactState.OFFLINE;
-import static org.briarproject.bramble.util.LogUtils.logException;
 
 @NotNullByDefault
 public class PendingContactListViewModel extends DbViewModel
@@ -90,24 +87,20 @@ public class PendingContactListViewModel extends DbViewModel
 	}
 
 	private void loadPendingContacts() {
-		runOnDbThread(() -> {
-			try {
-				Collection<Pair<PendingContact, PendingContactState>> pairs =
-						contactManager.getPendingContacts();
-				List<PendingContactItem> items = new ArrayList<>(pairs.size());
-				boolean online = pairs.isEmpty();
-				for (Pair<PendingContact, PendingContactState> pair : pairs) {
-					PendingContact p = pair.getFirst();
-					PendingContactState state = pair.getSecond();
-					long lastPoll = rendezvousPoller.getLastPollTime(p.getId());
-					items.add(new PendingContactItem(p, state, lastPoll));
-					online = online || state != OFFLINE;
-				}
-				pendingContacts.postValue(items);
-				hasInternetConnection.postValue(online);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
+		runOnDbThreadOrLogException(() -> {
+			Collection<Pair<PendingContact, PendingContactState>> pairs =
+					contactManager.getPendingContacts();
+			List<PendingContactItem> items = new ArrayList<>(pairs.size());
+			boolean online = pairs.isEmpty();
+			for (Pair<PendingContact, PendingContactState> pair : pairs) {
+				PendingContact p = pair.getFirst();
+				PendingContactState state = pair.getSecond();
+				long lastPoll = rendezvousPoller.getLastPollTime(p.getId());
+				items.add(new PendingContactItem(p, state, lastPoll));
+				online = online || state != OFFLINE;
 			}
+			pendingContacts.postValue(items);
+			hasInternetConnection.postValue(online);
 		});
 	}
 
@@ -116,13 +109,8 @@ public class PendingContactListViewModel extends DbViewModel
 	}
 
 	void removePendingContact(PendingContactId id) {
-		runOnDbThread(() -> {
-			try {
-				contactManager.removePendingContact(id);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
+		runOnDbThreadOrLogException(() ->
+				contactManager.removePendingContact(id));
 	}
 
 	LiveData<Boolean> getHasInternetConnection() {

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

@@ -10,6 +10,8 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.briar.android.controller.DbControllerImpl;
 import org.briarproject.briar.android.controller.handler.ResultExceptionHandler;
+import org.briarproject.briar.api.identity.AuthorInfo;
+import org.briarproject.briar.api.identity.AuthorManager;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -31,11 +33,14 @@ public abstract class ContactSelectorControllerImpl
 			Logger.getLogger(ContactSelectorControllerImpl.class.getName());
 
 	private final ContactManager contactManager;
+	private final AuthorManager authorManager;
 
 	public ContactSelectorControllerImpl(@DatabaseExecutor Executor dbExecutor,
-			LifecycleManager lifecycleManager, ContactManager contactManager) {
+			LifecycleManager lifecycleManager, ContactManager contactManager,
+			AuthorManager authorManager) {
 		super(dbExecutor, lifecycleManager);
 		this.contactManager = contactManager;
+		this.authorManager = authorManager;
 	}
 
 	@Override
@@ -45,12 +50,13 @@ public abstract class ContactSelectorControllerImpl
 			try {
 				Collection<SelectableContactItem> contacts = new ArrayList<>();
 				for (Contact c : contactManager.getContacts()) {
+					AuthorInfo authorInfo = authorManager.getAuthorInfo(c);
 					// was this contact already selected?
 					boolean selected = selection.contains(c.getId());
 					// can this contact be selected?
 					boolean disabled = isDisabled(g, c);
-					contacts.add(new SelectableContactItem(c, selected,
-							disabled));
+					contacts.add(new SelectableContactItem(c, authorInfo,
+							selected, disabled));
 				}
 				handler.onResult(contacts);
 			} catch (DbException e) {

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

@@ -3,6 +3,7 @@ package org.briarproject.briar.android.contactselection;
 import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.android.contact.ContactItem;
+import org.briarproject.briar.api.identity.AuthorInfo;
 
 import javax.annotation.concurrent.NotThreadSafe;
 
@@ -10,11 +11,12 @@ import javax.annotation.concurrent.NotThreadSafe;
 @NotNullByDefault
 public class SelectableContactItem extends ContactItem {
 
-	private boolean selected, disabled;
+	private boolean selected;
+	private final boolean disabled;
 
-	public SelectableContactItem(Contact contact, boolean selected,
-			boolean disabled) {
-		super(contact);
+	public SelectableContactItem(Contact contact, AuthorInfo authorInfo,
+			boolean selected, boolean disabled) {
+		super(contact, authorInfo);
 		this.selected = selected;
 		this.disabled = disabled;
 	}

briar-android/src/main/java/org/briarproject/briar/android/controller/SharingController.java

@@ -7,6 +7,7 @@ import java.util.Collection;
 
 import androidx.annotation.UiThread;
 
+@Deprecated
 @NotNullByDefault
 public interface SharingController {
 

briar-android/src/main/java/org/briarproject/briar/android/controller/SharingControllerImpl.java

@@ -18,6 +18,7 @@ import javax.inject.Inject;
 
 import androidx.annotation.UiThread;
 
+@Deprecated
 @NotNullByDefault
 public class SharingControllerImpl implements SharingController, EventListener {
 

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

@@ -21,7 +21,6 @@ import javax.inject.Inject;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatDialogFragment;
 import androidx.lifecycle.ViewModelProvider;
-import androidx.lifecycle.ViewModelProviders;
 
 import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE;
 import static java.util.Objects.requireNonNull;
@@ -59,7 +58,7 @@ public class AliasDialogFragment extends AppCompatDialogFragment {
 
 		setStyle(STYLE_NO_TITLE, R.style.BriarDialogTheme);
 
-		viewModel = ViewModelProviders.of(requireActivity(), viewModelFactory)
+		viewModel = new ViewModelProvider(requireActivity(), viewModelFactory)
 				.get(ConversationViewModel.class);
 	}
 
@@ -72,7 +71,8 @@ public class AliasDialogFragment extends AppCompatDialogFragment {
 
 		aliasEditLayout = v.findViewById(R.id.aliasEditLayout);
 		aliasEditText = v.findViewById(R.id.aliasEditText);
-		Contact contact = requireNonNull(viewModel.getContact().getValue());
+		Contact contact = requireNonNull(viewModel.getContactItem().getValue())
+				.getContact();
 		String alias = contact.getAlias();
 		aliasEditText.setText(alias);
 		if (alias != null) aliasEditText.setSelection(alias.length());

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

@@ -59,6 +59,7 @@ import org.briarproject.briar.android.view.TextAttachmentController.AttachmentLi
 import org.briarproject.briar.android.view.TextInputView;
 import org.briarproject.briar.android.view.TextSendController;
 import org.briarproject.briar.api.android.AndroidNotificationManager;
+import org.briarproject.briar.api.attachment.AttachmentHeader;
 import org.briarproject.briar.api.blog.BlogSharingManager;
 import org.briarproject.briar.api.client.ProtocolStateException;
 import org.briarproject.briar.api.client.SessionId;
@@ -71,7 +72,6 @@ import org.briarproject.briar.api.conversation.DeletionResult;
 import org.briarproject.briar.api.conversation.event.ConversationMessageReceivedEvent;
 import org.briarproject.briar.api.forum.ForumSharingManager;
 import org.briarproject.briar.api.introduction.IntroductionManager;
-import org.briarproject.briar.api.messaging.AttachmentHeader;
 import org.briarproject.briar.api.messaging.MessagingManager;
 import org.briarproject.briar.api.messaging.PrivateMessageHeader;
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager;
@@ -106,14 +106,12 @@ import androidx.recyclerview.selection.StorageStrategy;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import de.hdodenhof.circleimageview.CircleImageView;
-import im.delight.android.identicons.IdenticonDrawable;
 import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt;
 
 import static android.os.Build.VERSION.SDK_INT;
 import static android.view.Gravity.RIGHT;
 import static android.widget.Toast.LENGTH_SHORT;
 import static androidx.core.app.ActivityOptionsCompat.makeSceneTransitionAnimation;
-import static androidx.core.view.ViewCompat.setTransitionName;
 import static androidx.lifecycle.Lifecycle.State.STARTED;
 import static androidx.recyclerview.widget.SortedList.INVALID_POSITION;
 import static java.util.Collections.sort;
@@ -134,9 +132,8 @@ import static org.briarproject.briar.android.conversation.ImageActivity.ATTACHME
 import static org.briarproject.briar.android.conversation.ImageActivity.DATE;
 import static org.briarproject.briar.android.conversation.ImageActivity.ITEM_ID;
 import static org.briarproject.briar.android.conversation.ImageActivity.NAME;
-import static org.briarproject.briar.android.util.UiUtils.getAvatarTransitionName;
-import static org.briarproject.briar.android.util.UiUtils.getBulbTransitionName;
 import static org.briarproject.briar.android.util.UiUtils.observeOnce;
+import static org.briarproject.briar.android.view.AuthorView.setAvatar;
 import static org.briarproject.briar.api.messaging.MessagingConstants.MAX_ATTACHMENTS_PER_MESSAGE;
 import static org.briarproject.briar.api.messaging.MessagingConstants.MAX_PRIVATE_MESSAGE_TEXT_LENGTH;
 
@@ -236,10 +233,9 @@ public class ConversationActivity extends BriarActivity
 		toolbarStatus = toolbar.findViewById(R.id.contactStatus);
 		toolbarTitle = toolbar.findViewById(R.id.contactName);
 
-		observeOnce(viewModel.getContactAuthorId(), this, authorId -> {
-			requireNonNull(authorId);
-			toolbarAvatar.setImageDrawable(
-					new IdenticonDrawable(authorId.getBytes()));
+		viewModel.getContactItem().observe(this, contactItem -> {
+			requireNonNull(contactItem);
+			setAvatar(toolbarAvatar, contactItem);
 		});
 		viewModel.getContactDisplayName().observe(this, contactName -> {
 			requireNonNull(contactName);
@@ -252,9 +248,6 @@ public class ConversationActivity extends BriarActivity
 		viewModel.getAddedPrivateMessage().observeEvent(this,
 				this::onAddedPrivateMessage);
 
-		setTransitionName(toolbarAvatar, getAvatarTransitionName(contactId));
-		setTransitionName(toolbarStatus, getBulbTransitionName(contactId));
-
 		visitor = new ConversationVisitor(this, this, this,
 				viewModel.getContactDisplayName());
 		adapter = new ConversationAdapter(this, this);
@@ -372,7 +365,7 @@ public class ConversationActivity extends BriarActivity
 			}
 		});
 		// enable alias action if available
-		observeOnce(viewModel.getContact(), this, contact ->
+		observeOnce(viewModel.getContactItem(), this, contact ->
 				menu.findItem(R.id.action_set_alias).setEnabled(true));
 
 		return super.onCreateOptionsMenu(menu);

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

@@ -14,7 +14,6 @@ import org.briarproject.bramble.api.db.TransactionManager;
 import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.event.EventListener;
-import org.briarproject.bramble.api.identity.AuthorId;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.settings.Settings;
@@ -27,11 +26,15 @@ import org.briarproject.briar.android.attachment.AttachmentCreator;
 import org.briarproject.briar.android.attachment.AttachmentManager;
 import org.briarproject.briar.android.attachment.AttachmentResult;
 import org.briarproject.briar.android.attachment.AttachmentRetriever;
+import org.briarproject.briar.android.contact.ContactItem;
 import org.briarproject.briar.android.util.UiUtils;
 import org.briarproject.briar.android.viewmodel.DbViewModel;
 import org.briarproject.briar.android.viewmodel.LiveEvent;
 import org.briarproject.briar.android.viewmodel.MutableLiveEvent;
-import org.briarproject.briar.api.messaging.AttachmentHeader;
+import org.briarproject.briar.api.attachment.AttachmentHeader;
+import org.briarproject.briar.api.avatar.event.AvatarUpdatedEvent;
+import org.briarproject.briar.api.identity.AuthorInfo;
+import org.briarproject.briar.api.identity.AuthorManager;
 import org.briarproject.briar.api.messaging.MessagingManager;
 import org.briarproject.briar.api.messaging.PrivateMessage;
 import org.briarproject.briar.api.messaging.PrivateMessageFactory;
@@ -49,8 +52,8 @@ import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.Transformations;
 
+import static androidx.lifecycle.Transformations.map;
 import static java.util.Objects.requireNonNull;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
@@ -76,6 +79,7 @@ public class ConversationViewModel extends DbViewModel
 	private final EventBus eventBus;
 	private final MessagingManager messagingManager;
 	private final ContactManager contactManager;
+	private final AuthorManager authorManager;
 	private final SettingsManager settingsManager;
 	private final PrivateMessageFactory privateMessageFactory;
 	private final AttachmentRetriever attachmentRetriever;
@@ -83,11 +87,10 @@ public class ConversationViewModel extends DbViewModel
 
 	@Nullable
 	private ContactId contactId = null;
-	private final MutableLiveData<Contact> contact = new MutableLiveData<>();
-	private final LiveData<AuthorId> contactAuthorId =
-			Transformations.map(contact, c -> c.getAuthor().getId());
-	private final LiveData<String> contactName =
-			Transformations.map(contact, UiUtils::getContactDisplayName);
+	private final MutableLiveData<ContactItem> contactItem =
+			new MutableLiveData<>();
+	private final LiveData<String> contactName = map(contactItem, c ->
+			UiUtils.getContactDisplayName(c.getContact()));
 	private final LiveData<GroupId> messagingGroupId;
 	private final MutableLiveData<Boolean> imageSupport =
 			new MutableLiveData<>();
@@ -111,6 +114,7 @@ public class ConversationViewModel extends DbViewModel
 			EventBus eventBus,
 			MessagingManager messagingManager,
 			ContactManager contactManager,
+			AuthorManager authorManager,
 			SettingsManager settingsManager,
 			PrivateMessageFactory privateMessageFactory,
 			AttachmentRetriever attachmentRetriever,
@@ -120,12 +124,13 @@ public class ConversationViewModel extends DbViewModel
 		this.eventBus = eventBus;
 		this.messagingManager = messagingManager;
 		this.contactManager = contactManager;
+		this.authorManager = authorManager;
 		this.settingsManager = settingsManager;
 		this.privateMessageFactory = privateMessageFactory;
 		this.attachmentRetriever = attachmentRetriever;
 		this.attachmentCreator = attachmentCreator;
-		messagingGroupId = Transformations
-				.map(contact, c -> messagingManager.getContactGroup(c).getId());
+		messagingGroupId = map(contactItem, c ->
+				messagingManager.getContactGroup(c.getContact()).getId());
 		contactDeleted.setValue(false);
 
 		eventBus.addListener(this);
@@ -144,12 +149,36 @@ public class ConversationViewModel extends DbViewModel
 			AttachmentReceivedEvent a = (AttachmentReceivedEvent) e;
 			if (a.getContactId().equals(contactId)) {
 				LOG.info("Attachment received");
-				runOnDbThread(() -> attachmentRetriever
+				runOnDbThreadOrLogException(() -> attachmentRetriever
 						.loadAttachmentItem(a.getMessageId()));
 			}
+		} else if (e instanceof AvatarUpdatedEvent) {
+			AvatarUpdatedEvent a = (AvatarUpdatedEvent) e;
+			if (a.getContactId().equals(contactId)) {
+				LOG.info("Avatar updated");
+				updateAvatar(a);
+			}
 		}
 	}
 
+	@UiThread
+	private void updateAvatar(AvatarUpdatedEvent a) {
+		// Make sure that contactItem has been set by the task initiated
+		// by loadContact() before we update the avatar.
+		observeForeverOnce(contactItem, oldContactItem -> {
+			requireNonNull(oldContactItem);
+
+			AuthorInfo oldAuthorInfo = oldContactItem.getAuthorInfo();
+
+			AuthorInfo newAuthorInfo = new AuthorInfo(oldAuthorInfo.getStatus(),
+					oldAuthorInfo.getAlias(), a.getAttachmentHeader());
+			ContactItem newContactItem =
+					new ContactItem(oldContactItem.getContact(), newAuthorInfo);
+
+			contactItem.setValue(newContactItem);
+		});
+	}
+
 	/**
 	 * Setting the {@link ContactId} automatically triggers loading of other
 	 * data.
@@ -165,43 +194,36 @@ public class ConversationViewModel extends DbViewModel
 
 	private void loadContact(ContactId contactId) {
 		runOnDbThread(() -> {
-			try {
-				long start = now();
-				Contact c = contactManager.getContact(contactId);
-				contact.postValue(c);
-				logDuration(LOG, "Loading contact", start);
-				start = now();
-				checkFeaturesAndOnboarding(contactId);
-				logDuration(LOG, "Checking for image support", start);
-			} catch (NoSuchContactException e) {
+			long start = now();
+			Contact c = contactManager.getContact(contactId);
+			AuthorInfo authorInfo = authorManager.getAuthorInfo(c);
+			contactItem.postValue(new ContactItem(c, authorInfo));
+			logDuration(LOG, "Loading contact", start);
+			start = now();
+			checkFeaturesAndOnboarding(contactId);
+			logDuration(LOG, "Checking for image support", start);
+		}, e -> {
+			if (e instanceof NoSuchContactException) {
 				contactDeleted.postValue(true);
-			} catch (DbException e) {
+			} else {
 				logException(LOG, WARNING, e);
 			}
 		});
 	}
 
 	void markMessageRead(GroupId g, MessageId m) {
-		runOnDbThread(() -> {
-			try {
-				long start = now();
-				messagingManager.setReadFlag(g, m, true);
-				logDuration(LOG, "Marking read", start);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
+		runOnDbThreadOrLogException(() -> {
+			long start = now();
+			messagingManager.setReadFlag(g, m, true);
+			logDuration(LOG, "Marking read", start);
 		});
 	}
 
 	void setContactAlias(String alias) {
-		runOnDbThread(() -> {
-			try {
-				contactManager.setContactAlias(requireNonNull(contactId),
-						alias.isEmpty() ? null : alias);
-				loadContact(contactId);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
+		runOnDbThreadOrLogException(() -> {
+			contactManager.setContactAlias(requireNonNull(contactId),
+					alias.isEmpty() ? null : alias);
+			loadContact(contactId);
 		});
 	}
 
@@ -297,21 +319,17 @@ public class ConversationViewModel extends DbViewModel
 	@UiThread
 	private void storeMessage(PrivateMessage m) {
 		attachmentCreator.onAttachmentsSent(m.getMessage().getId());
-		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, true, false, false,
-						m.hasText(), m.getAttachmentHeaders());
-				// TODO add text to cache when available here
-				addedHeader.postEvent(h);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
+		runOnDbThreadOrLogException(() -> {
+			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,
+					m.hasText(), m.getAttachmentHeaders());
+			// TODO add text to cache when available here
+			addedHeader.postEvent(h);
 		});
 	}
 
@@ -319,12 +337,8 @@ public class ConversationViewModel extends DbViewModel
 		return attachmentRetriever;
 	}
 
-	LiveData<Contact> getContact() {
-		return contact;
-	}
-
-	LiveData<AuthorId> getContactAuthorId() {
-		return contactAuthorId;
+	LiveData<ContactItem> getContactItem() {
+		return contactItem;
 	}
 
 	LiveData<String> getContactDisplayName() {
@@ -357,12 +371,7 @@ public class ConversationViewModel extends DbViewModel
 
 	@UiThread
 	void recheckFeaturesAndOnboarding(ContactId contactId) {
-		runOnDbThread(() -> {
-			try {
-				checkFeaturesAndOnboarding(contactId);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
+		runOnDbThreadOrLogException(() ->
+				checkFeaturesAndOnboarding(contactId));
 	}
 }

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

@@ -121,7 +121,7 @@ public class ImageFragment extends Fragment
 
 	private void loadImage() {
 		GlideApp.with(this)
-				.load(attachment)
+				.load(attachment.getHeader())
 				// TODO allow if size < maxTextureSize ?
 //					.override(SIZE_ORIGINAL)
 				.diskCacheStrategy(NONE)

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

@@ -77,7 +77,7 @@ class ImageViewHolder extends ViewHolder {
 	private void loadImage(AttachmentItem a, Radii r) {
 		Transformation<Bitmap> transformation = new BriarImageTransformation(r);
 		GlideApp.with(imageView)
-				.load(a)
+				.load(a.getHeader())
 				.diskCacheStrategy(NONE)
 				.error(ERROR_RES)
 				.transform(transformation)

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

@@ -6,7 +6,6 @@ import android.net.Uri;
 import android.view.View;
 
 import org.briarproject.bramble.api.db.DatabaseExecutor;
-import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.TransactionManager;
 import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.event.EventBus;
@@ -20,8 +19,8 @@ import org.briarproject.briar.android.attachment.AttachmentItem;
 import org.briarproject.briar.android.viewmodel.DbViewModel;
 import org.briarproject.briar.android.viewmodel.LiveEvent;
 import org.briarproject.briar.android.viewmodel.MutableLiveEvent;
-import org.briarproject.briar.api.messaging.Attachment;
-import org.briarproject.briar.api.messaging.MessagingManager;
+import org.briarproject.briar.api.attachment.Attachment;
+import org.briarproject.briar.api.attachment.AttachmentReader;
 import org.briarproject.briar.api.messaging.event.AttachmentReceivedEvent;
 
 import java.io.File;
@@ -56,7 +55,7 @@ public class ImageViewModel extends DbViewModel implements EventListener {
 
 	private static final Logger LOG = getLogger(ImageViewModel.class.getName());
 
-	private final MessagingManager messagingManager;
+	private final AttachmentReader attachmentReader;
 	private final EventBus eventBus;
 	@IoExecutor
 	private final Executor ioExecutor;
@@ -75,16 +74,14 @@ public class ImageViewModel extends DbViewModel implements EventListener {
 	private int toolbarTop, toolbarBottom;
 
 	@Inject
-	ImageViewModel(Application application,
-			MessagingManager messagingManager,
-			EventBus eventBus,
-			@DatabaseExecutor Executor dbExecutor,
+	ImageViewModel(Application application, AttachmentReader attachmentReader,
+			EventBus eventBus, @DatabaseExecutor Executor dbExecutor,
 			LifecycleManager lifecycleManager,
 			TransactionManager db,
 			AndroidExecutor androidExecutor,
 			@IoExecutor Executor ioExecutor) {
 		super(application, dbExecutor, lifecycleManager, db, androidExecutor);
-		this.messagingManager = messagingManager;
+		this.attachmentReader = attachmentReader;
 		this.eventBus = eventBus;
 		this.ioExecutor = ioExecutor;
 
@@ -200,14 +197,12 @@ public class ImageViewModel extends DbViewModel implements EventListener {
 	private void saveImage(AttachmentItem attachment, OutputStreamProvider osp,
 			@Nullable Runnable afterCopy) {
 		runOnDbThread(() -> {
-			try {
-				Attachment a =
-						messagingManager.getAttachment(attachment.getHeader());
-				copyImageFromDb(a, osp, afterCopy);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-				saveState.postEvent(true);
-			}
+			Attachment a =
+					attachmentReader.getAttachment(attachment.getHeader());
+			copyImageFromDb(a, osp, afterCopy);
+		}, e -> {
+			logException(LOG, WARNING, e);
+			saveState.postEvent(true);
 		});
 	}
 

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

@@ -7,9 +7,9 @@ import com.bumptech.glide.load.data.DataFetcher;
 import org.briarproject.bramble.api.db.DatabaseExecutor;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.briar.android.attachment.AttachmentItem;
-import org.briarproject.briar.api.messaging.Attachment;
-import org.briarproject.briar.api.messaging.MessagingManager;
+import org.briarproject.briar.api.attachment.Attachment;
+import org.briarproject.briar.api.attachment.AttachmentHeader;
+import org.briarproject.briar.api.attachment.AttachmentReader;
 
 import java.io.InputStream;
 import java.util.concurrent.Executor;
@@ -30,21 +30,22 @@ class BriarDataFetcher implements DataFetcher<InputStream> {
 	private final static Logger LOG =
 			getLogger(BriarDataFetcher.class.getName());
 
-	private final MessagingManager messagingManager;
+	private final AttachmentReader attachmentReader;
 	@DatabaseExecutor
 	private final Executor dbExecutor;
-	private final AttachmentItem attachment;
+	private final AttachmentHeader attachmentHeader;
 
 	@Nullable
 	private volatile InputStream inputStream;
 	private volatile boolean cancel = false;
 
 	@Inject
-	BriarDataFetcher(MessagingManager messagingManager,
-			@DatabaseExecutor Executor dbExecutor, AttachmentItem attachment) {
-		this.messagingManager = messagingManager;
+	BriarDataFetcher(AttachmentReader attachmentReader,
+			@DatabaseExecutor Executor dbExecutor,
+			AttachmentHeader attachmentHeader) {
+		this.attachmentReader = attachmentReader;
 		this.dbExecutor = dbExecutor;
-		this.attachment = attachment;
+		this.attachmentHeader = attachmentHeader;
 	}
 
 	@Override
@@ -53,8 +54,7 @@ class BriarDataFetcher implements DataFetcher<InputStream> {
 		dbExecutor.execute(() -> {
 			if (cancel) return;
 			try {
-				Attachment a =
-						messagingManager.getAttachment(attachment.getHeader());
+				Attachment a = attachmentReader.getAttachment(attachmentHeader);
 				inputStream = a.getStream();
 				callback.onDataReady(inputStream);
 			} catch (DbException e) {

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

@@ -2,8 +2,8 @@ package org.briarproject.briar.android.conversation.glide;
 
 import org.briarproject.bramble.api.db.DatabaseExecutor;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.briar.android.attachment.AttachmentItem;
-import org.briarproject.briar.api.messaging.MessagingManager;
+import org.briarproject.briar.api.attachment.AttachmentHeader;
+import org.briarproject.briar.api.attachment.AttachmentReader;
 
 import java.util.concurrent.Executor;
 
@@ -12,19 +12,19 @@ import javax.inject.Inject;
 @NotNullByDefault
 public class BriarDataFetcherFactory {
 
-	private final MessagingManager messagingManager;
+	private final AttachmentReader attachmentReader;
 	@DatabaseExecutor
 	private final Executor dbExecutor;
 
 	@Inject
-	public BriarDataFetcherFactory(MessagingManager messagingManager,
+	public BriarDataFetcherFactory(AttachmentReader attachmentReader,
 			@DatabaseExecutor Executor dbExecutor) {
-		this.messagingManager = messagingManager;
+		this.attachmentReader = attachmentReader;
 		this.dbExecutor = dbExecutor;
 	}
 
-	BriarDataFetcher createBriarDataFetcher(AttachmentItem model) {
-		return new BriarDataFetcher(messagingManager, dbExecutor, model);
+	BriarDataFetcher createBriarDataFetcher(AttachmentHeader model) {
+		return new BriarDataFetcher(attachmentReader, dbExecutor, model);
 	}
 
 }