Remember to return

.gitlab-ci.yml

@@ -2,7 +2,6 @@ image: briar/ci-image-android:latest
 
 stages:
 - test
-- optional_tests
 - check_reproducibility
 
 test:
@@ -32,33 +31,3 @@ test_reproducible:
     - "curl -X POST -F token=${RELEASE_CHECK_TOKEN} -F ref=master -F variables[RELEASE_TAG]=${CI_COMMIT_REF_NAME} https://code.briarproject.org/api/v4/projects/61/trigger/pipeline"
   only:
     - tags
-
-.optional_tests:
-  stage: optional_tests
-  before_script:
-    - set -e
-    - export GRADLE_USER_HOME=$PWD/.gradle
-
-  cache:
-    paths:
-      - .gradle/wrapper
-      - .gradle/caches
-
-  script:
-    - OPTIONAL_TESTS=org.briarproject.bramble.plugin.tor.BridgeTest ./gradlew --info bramble-java:test --tests BridgeTest
-
-  after_script:
-    # these file change every time but should not be cached
-    - rm -f $GRADLE_USER_HOME/caches/modules-2/modules-2.lock
-    - rm -fr $GRADLE_USER_HOME/caches/*/plugin-resolution/
-
-manual_tests:
-  extends: .optional_tests
-  when: manual
-  except:
-    - tags
-
-pre_release_tests:
-  extends: .optional_tests
-  only:
-    - tags

.idea/dictionaries/briar.xml

@@ -1,14 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="briar">
-    <words>
-      <w>briar</w>
-      <w>briarproject</w>
-      <w>emoji</w>
-      <w>encrypter</w>
-      <w>identicon</w>
-      <w>introducee</w>
-      <w>introducer</w>
-      <w>onboarding</w>
-    </words>
-  </dictionary>
-</component>

bramble-android/build.gradle

@@ -8,15 +8,11 @@ android {
 	compileSdkVersion 30
 	buildToolsVersion '30.0.2'
 
-	packagingOptions {
-		doNotStrip '**/*.so'
-	}
-
 	defaultConfig {
 		minSdkVersion 16
 		targetSdkVersion 29
-		versionCode 10218
-		versionName "1.2.18"
+		versionCode 10213
+		versionName "1.2.13"
 		consumerProguardFiles 'proguard-rules.txt'
 
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -42,8 +38,8 @@ configurations {
 
 dependencies {
 	implementation project(path: ':bramble-core', configuration: 'default')
-	tor 'org.briarproject:tor-android:0.3.5.13@zip'
-	tor 'org.briarproject:obfs4proxy-android:0.0.12-dev-40245c4a@zip'
+	tor 'org.briarproject:tor-android:0.3.5.12@zip'
+	tor 'org.briarproject:obfs4proxy-android:0.0.11-2@zip'
 
 	annotationProcessor 'com.google.dagger:dagger-compiler:2.24'
 

bramble-android/src/main/java/org/briarproject/bramble/util/AndroidUtils.java

@@ -31,7 +31,6 @@ public class AndroidUtils {
 	private static final String FAKE_BLUETOOTH_ADDRESS = "02:00:00:00:00:00";
 
 	private static final String STORED_REPORTS = "dev-reports";
-	private static final String STORED_LOGCAT = "dev-logcat";
 
 	public static Collection<String> getSupportedArchitectures() {
 		List<String> abis = new ArrayList<>();
@@ -108,10 +107,6 @@ public class AndroidUtils {
 		return ctx.getDir(STORED_REPORTS, MODE_PRIVATE);
 	}
 
-	public static File getLogcatFile(Context ctx) {
-		return new File(ctx.getFilesDir(), STORED_LOGCAT);
-	}
-
 	/**
 	 * Returns an array of supported content types for image attachments.
 	 * GIFs can't be compressed on API < 24 so they're not supported.

bramble-android/witness.gradle

@@ -75,8 +75,8 @@ dependencyVerification {
         'org.beanshell:bsh:1.3.0:bsh-1.3.0.jar:9b04edc75d19db54f1b4e8b5355e9364384c6cf71eb0a1b9724c159d779879f8',
         'org.bouncycastle:bcpkix-jdk15on:1.56:bcpkix-jdk15on-1.56.jar:7043dee4e9e7175e93e0b36f45b1ec1ecb893c5f755667e8b916eb8dd201c6ca',
         'org.bouncycastle:bcprov-jdk15on:1.56:bcprov-jdk15on-1.56.jar:963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349',
-        'org.briarproject:obfs4proxy-android:0.0.12-dev-40245c4a:obfs4proxy-android-0.0.12-dev-40245c4a.zip:8ab05a8f8391be2cb5ab2b665c281a06d9e3a756bd0f95a40a36ca927866ea82',
-        'org.briarproject:tor-android:0.3.5.13:tor-android-0.3.5.13.zip:e0978db136731dae07774b722970cdae1e462fb5adc82845dd80a7e2d87f356c',
+        'org.briarproject:obfs4proxy-android:0.0.11-2:obfs4proxy-android-0.0.11-2.zip:57e55cbe87aa2aac210fdbb6cd8cdeafe15f825406a08ebf77a8b787aa2c6a8a',
+        'org.briarproject:tor-android:0.3.5.12:tor-android-0.3.5.12.zip:db71fb3290acff79d572af0752570eaf6aad7c4d88c9b9aa0b4d5afe2b9ead9c',
         'org.checkerframework:checker-compat-qual:2.5.3:checker-compat-qual-2.5.3.jar:d76b9afea61c7c082908023f0cbc1427fab9abd2df915c8b8a3e7a509bccbc6d',
         'org.checkerframework:checker-qual:2.5.2:checker-qual-2.5.2.jar:64b02691c8b9d4e7700f8ee2e742dce7ea2c6e81e662b7522c9ee3bf568c040a',
         'org.checkerframework:checker-qual:2.8.1:checker-qual-2.8.1.jar:9103499008bcecd4e948da29b17864abb64304e15706444ae209d17ebe0575df',

bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamDecrypterFactory.java

@@ -19,10 +19,4 @@ public interface StreamDecrypterFactory {
 	 */
 	StreamDecrypter createContactExchangeStreamDecrypter(InputStream in,
 			SecretKey headerKey);
-
-	/**
-	 * Creates a {@link StreamDecrypter} for decrypting a log stream.
-	 */
-	StreamDecrypter createLogStreamDecrypter(InputStream in,
-			SecretKey headerKey);
 }

bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamEncrypterFactory.java

@@ -17,12 +17,6 @@ public interface StreamEncrypterFactory {
 	 * Creates a {@link StreamEncrypter} for encrypting a contact exchange
 	 * stream.
 	 */
-	StreamEncrypter createContactExchangeStreamEncrypter(OutputStream out,
-			SecretKey headerKey);
-
-	/**
-	 * Creates a {@link StreamEncrypter} for encrypting a log stream.
-	 */
-	StreamEncrypter createLogStreamEncrypter(OutputStream out,
+	StreamEncrypter createContactExchangeStreamDecrypter(OutputStream out,
 			SecretKey headerKey);
 }

bramble-api/src/main/java/org/briarproject/bramble/api/reporting/DevConfig.java

@@ -13,6 +13,4 @@ public interface DevConfig {
 	String getDevOnionAddress();
 
 	File getReportDir();
-
-	File getLogcatFile();
 }

bramble-api/src/main/java/org/briarproject/bramble/api/transport/StreamReaderFactory.java

@@ -16,13 +16,8 @@ public interface StreamReaderFactory {
 
 	/**
 	 * Creates an {@link InputStream InputStream} for reading from a contact
-	 * exchange stream.
+	 * exchangestream.
 	 */
 	InputStream createContactExchangeStreamReader(InputStream in,
 			SecretKey headerKey);
-
-	/**
-	 * Creates an {@link InputStream} for reading from a log stream.
-	 */
-	InputStream createLogStreamReader(InputStream in, SecretKey headerKey);
 }

bramble-api/src/main/java/org/briarproject/bramble/api/transport/StreamWriterFactory.java

@@ -7,19 +7,17 @@ import java.io.OutputStream;
 
 @NotNullByDefault
 public interface StreamWriterFactory {
+
 	/**
-	 * Creates a {@link StreamWriter} for writing to a transport stream.
+	 * Creates an {@link OutputStream OutputStream} for writing to a
+	 * transport stream
 	 */
 	StreamWriter createStreamWriter(OutputStream out, StreamContext ctx);
 
 	/**
-	 * Creates a {@link StreamWriter} for writing to a contact exchange stream.
+	 * Creates an {@link OutputStream OutputStream} for writing to a contact
+	 * exchange stream.
 	 */
 	StreamWriter createContactExchangeStreamWriter(OutputStream out,
 			SecretKey headerKey);
-
-	/**
-	 * Creates a {@link StreamWriter} for writing to a log stream.
-	 */
-	StreamWriter createLogStreamWriter(OutputStream out, SecretKey headerKey);
 }

bramble-core/src/main/java/org/briarproject/bramble/crypto/ScryptKdf.java

@@ -9,16 +9,14 @@ import java.util.logging.Logger;
 
 import javax.inject.Inject;
 
-import static java.lang.Math.min;
 import static java.util.logging.Level.INFO;
-import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.util.LogUtils.logDuration;
 import static org.briarproject.bramble.util.LogUtils.now;
 
 class ScryptKdf implements PasswordBasedKdf {
 
 	private static final Logger LOG =
-			getLogger(ScryptKdf.class.getName());
+			Logger.getLogger(ScryptKdf.class.getName());
 
 	private static final int MIN_COST = 256; // Min parameter N
 	private static final int MAX_COST = 1024 * 1024; // Max parameter N
@@ -35,20 +33,10 @@ class ScryptKdf implements PasswordBasedKdf {
 
 	@Override
 	public int chooseCostParameter() {
-		// Scrypt uses at least 128 * N * r bytes of memory. Don't use more
-		// than half of the JVM's max heap size or we may run out of memory.
-		// https://blog.filippo.io/the-scrypt-parameters/
-		long maxMemory = Runtime.getRuntime().maxMemory();
-		long maxCost = min(MAX_COST, maxMemory / BLOCK_SIZE / 256);
-		if (LOG.isLoggable(INFO) && maxCost < MAX_COST) {
-			LOG.info("Max cost capped at " + maxCost
-					+ " due to max heap size " + maxMemory);
-		}
 		// Increase the cost from min to max while measuring performance
 		int cost = MIN_COST;
-		while (cost * 2 <= maxCost && measureDuration(cost) * 2 <= TARGET_MS) {
+		while (cost * 2 <= MAX_COST && measureDuration(cost) * 2 <= TARGET_MS)
 			cost *= 2;
-		}
 		if (LOG.isLoggable(INFO))
 			LOG.info("KDF cost parameter " + cost);
 		return cost;

bramble-core/src/main/java/org/briarproject/bramble/crypto/StreamDecrypterFactoryImpl.java

@@ -36,10 +36,4 @@ class StreamDecrypterFactoryImpl implements StreamDecrypterFactory {
 			SecretKey headerKey) {
 		return new StreamDecrypterImpl(in, cipherProvider.get(), 0, headerKey);
 	}
-
-	@Override
-	public StreamDecrypter createLogStreamDecrypter(InputStream in,
-			SecretKey headerKey) {
-		return createContactExchangeStreamDecrypter(in, headerKey);
-	}
 }

bramble-core/src/main/java/org/briarproject/bramble/crypto/StreamEncrypterFactoryImpl.java

@@ -51,7 +51,7 @@ class StreamEncrypterFactoryImpl implements StreamEncrypterFactory {
 	}
 
 	@Override
-	public StreamEncrypter createContactExchangeStreamEncrypter(
+	public StreamEncrypter createContactExchangeStreamDecrypter(
 			OutputStream out, SecretKey headerKey) {
 		AuthenticatedCipher cipher = cipherProvider.get();
 		byte[] streamHeaderNonce = new byte[STREAM_HEADER_NONCE_LENGTH];
@@ -60,10 +60,4 @@ class StreamEncrypterFactoryImpl implements StreamEncrypterFactory {
 		return new StreamEncrypterImpl(out, cipher, 0, null, streamHeaderNonce,
 				headerKey, frameKey);
 	}
-
-	@Override
-	public StreamEncrypter createLogStreamEncrypter(OutputStream out,
-			SecretKey headerKey) {
-		return createContactExchangeStreamEncrypter(out, headerKey);
-	}
 }

bramble-core/src/main/java/org/briarproject/bramble/transport/StreamReaderFactoryImpl.java

@@ -24,21 +24,15 @@ class StreamReaderFactoryImpl implements StreamReaderFactory {
 
 	@Override
 	public InputStream createStreamReader(InputStream in, StreamContext ctx) {
-		return new StreamReaderImpl(streamDecrypterFactory
-				.createStreamDecrypter(in, ctx));
+		return new StreamReaderImpl(
+				streamDecrypterFactory.createStreamDecrypter(in, ctx));
 	}
 
 	@Override
 	public InputStream createContactExchangeStreamReader(InputStream in,
 			SecretKey headerKey) {
-		return new StreamReaderImpl(streamDecrypterFactory
-				.createContactExchangeStreamDecrypter(in, headerKey));
-	}
-
-	@Override
-	public InputStream createLogStreamReader(InputStream in,
-			SecretKey headerKey) {
-		return new StreamReaderImpl(streamDecrypterFactory
-				.createLogStreamDecrypter(in, headerKey));
+		return new StreamReaderImpl(
+				streamDecrypterFactory.createContactExchangeStreamDecrypter(in,
+						headerKey));
 	}
 }

bramble-core/src/main/java/org/briarproject/bramble/transport/StreamWriterFactoryImpl.java

@@ -26,21 +26,15 @@ class StreamWriterFactoryImpl implements StreamWriterFactory {
 	@Override
 	public StreamWriter createStreamWriter(OutputStream out,
 			StreamContext ctx) {
-		return new StreamWriterImpl(streamEncrypterFactory
-				.createStreamEncrypter(out, ctx));
+		return new StreamWriterImpl(
+				streamEncrypterFactory.createStreamEncrypter(out, ctx));
 	}
 
 	@Override
 	public StreamWriter createContactExchangeStreamWriter(OutputStream out,
 			SecretKey headerKey) {
-		return new StreamWriterImpl(streamEncrypterFactory
-				.createContactExchangeStreamEncrypter(out, headerKey));
+		return new StreamWriterImpl(
+				streamEncrypterFactory.createContactExchangeStreamDecrypter(out,
+						headerKey));
 	}
-
-	@Override
-	public StreamWriter createLogStreamWriter(OutputStream out,
-			SecretKey headerKey) {
-		return new StreamWriterImpl(streamEncrypterFactory
-				.createLogStreamEncrypter(out, headerKey));
-	}
-}
+}

bramble-core/src/main/resources/bridges

@@ -2,11 +2,12 @@ Bridge obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUV
 Bridge obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1
 Bridge obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0
 Bridge obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0
-Bridge obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0
+Bridge obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0
 Bridge obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0
 Bridge obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0
 Bridge obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0
 Bridge obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0
+Bridge obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0
 Bridge obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0
 Bridge obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0
 Bridge obfs4 78.46.188.239:37356 5A2D2F4158D0453E00C7C176978D3F41D69C45DB cert=3c0SwxpOisbohNxEc4tb875RVW8eOu1opRTVXJhafaKA/PNNtI7ElQIVOVZg1AdL5bxGCw iat-mode=0

bramble-java/build.gradle

@@ -16,8 +16,8 @@ dependencies {
 	implementation fileTree(dir: 'libs', include: '*.jar')
 	implementation 'net.java.dev.jna:jna:4.5.2'
 	implementation 'net.java.dev.jna:jna-platform:4.5.2'
-	tor 'org.briarproject:tor:0.3.5.13-1@zip'
-	tor 'org.briarproject:obfs4proxy:0.0.12-dev-40245c4a@zip'
+	tor 'org.briarproject:tor:0.3.5.12@zip'
+	tor 'org.briarproject:obfs4proxy:0.0.7@zip'
 
 	annotationProcessor 'com.google.dagger:dagger-compiler:2.24'
 

bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPluginFactory.java

@@ -25,7 +25,6 @@ import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
 import javax.net.SocketFactory;
 
-import static java.util.logging.Level.INFO;
 import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.util.OsUtils.isLinux;
 
@@ -97,15 +96,8 @@ public class UnixTorPluginFactory implements DuplexPluginFactory {
 		String architecture = null;
 		if (isLinux()) {
 			String arch = System.getProperty("os.arch");
-			if (LOG.isLoggable(INFO)) {
-				LOG.info("System's os.arch is " + arch);
-			}
 			if (arch.equals("amd64")) {
 				architecture = "linux-x86_64";
-			} else if (arch.equals("aarch64")) {
-				architecture = "linux-aarch64";
-			} else if (arch.equals("arm")) {
-				architecture = "linux-armhf";
 			}
 		}
 		if (architecture == null) {
@@ -113,10 +105,6 @@ public class UnixTorPluginFactory implements DuplexPluginFactory {
 			return null;
 		}
 
-		if (LOG.isLoggable(INFO)) {
-			LOG.info("The selected architecture for Tor is " + architecture);
-		}
-
 		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
 				MAX_POLLING_INTERVAL, BACKOFF_BASE);
 		TorRendezvousCrypto torRendezvousCrypto = new TorRendezvousCryptoImpl();

bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java

@@ -53,7 +53,7 @@ public class BridgeTest extends BrambleTestCase {
 		return component.getCircumventionProvider().getBridges(false);
 	}
 
-	private final static long TIMEOUT = SECONDS.toMillis(60);
+	private final static long TIMEOUT = SECONDS.toMillis(30);
 
 	private final static Logger LOG = getLogger(BridgeTest.class.getName());
 

bramble-java/witness.gradle

@@ -23,8 +23,8 @@ dependencyVerification {
         'org.apache.ant:ant-launcher:1.9.4:ant-launcher-1.9.4.jar:7bccea20b41801ca17bcbc909a78c835d0f443f12d639c77bd6ae3d05861608d',
         'org.apache.ant:ant:1.9.4:ant-1.9.4.jar:649ae0730251de07b8913f49286d46bba7b92d47c5f332610aa426c4f02161d8',
         'org.beanshell:bsh:1.3.0:bsh-1.3.0.jar:9b04edc75d19db54f1b4e8b5355e9364384c6cf71eb0a1b9724c159d779879f8',
-        'org.briarproject:obfs4proxy:0.0.12-dev-40245c4a:obfs4proxy-0.0.12-dev-40245c4a.zip:172029e7058b3a83ac93ac4991a44bf76e16ce8d46f558f5836d57da3cb3a766',
-        'org.briarproject:tor:0.3.5.13-1:tor-0.3.5.13-1.zip:ef35c16bf8dc1f4c75ed71d9f55e4514f383d124ec96b859aca647c990927c99',
+        'org.briarproject:obfs4proxy:0.0.7:obfs4proxy-0.0.7.zip:5b2f693262ce43a7e130f7cc7d5d1617925330640a2eb6d71085e95df8ee0642',
+        'org.briarproject:tor:0.3.5.12:tor-0.3.5.12.zip:2f542c4befd216f2226bf7c76e3b8b2d99af6f146a8cb28bf727f42014587006',
         'org.checkerframework:checker-compat-qual:2.5.3:checker-compat-qual-2.5.3.jar:d76b9afea61c7c082908023f0cbc1427fab9abd2df915c8b8a3e7a509bccbc6d',
         'org.checkerframework:checker-qual:2.5.2:checker-qual-2.5.2.jar:64b02691c8b9d4e7700f8ee2e742dce7ea2c6e81e662b7522c9ee3bf568c040a',
         'org.codehaus.mojo:animal-sniffer-annotations:1.17:animal-sniffer-annotations-1.17.jar:92654f493ecfec52082e76354f0ebf87648dc3d5cec2e3c3cdb947c016747a53',

briar-android/artwork/notification_signout.svg

@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M16,17V14H9V10H16V7L21,12L16,17M14,2A2,2 0 0,1 16,4V6H14V4H5V20H14V18H16V20A2,2 0 0,1 14,22H5A2,2 0 0,1 3,20V4A2,2 0 0,1 5,2H14Z" /></svg>

briar-android/build.gradle

@@ -19,18 +19,12 @@ android {
 	compileSdkVersion 30
 	buildToolsVersion '30.0.2'
 
-	packagingOptions {
-		doNotStrip '**/*.so'
-	}
-
 	defaultConfig {
 		minSdkVersion 16
 		targetSdkVersion 29
-		versionCode 10218
-		versionName "1.2.18"
+		versionCode 10213
+		versionName "1.2.13"
 		applicationId "org.briarproject.briar.android"
-
-		vectorDrawables.useSupportLibrary = true
 		buildConfigField "String", "GitHash",
 				"\"${getStdout(['git', 'rev-parse', '--short=7', 'HEAD'], 'No commit hash')}\""
 		def now = (long) (System.currentTimeMillis() / 1000)
@@ -99,7 +93,6 @@ dependencies {
 	implementation project(path: ':bramble-core', configuration: 'default')
 	implementation project(':bramble-android')
 
-	implementation 'androidx.fragment:fragment:1.3.0'
 	implementation 'androidx.preference:preference:1.1.1'
 	implementation 'androidx.exifinterface:exifinterface:1.3.1'
 	implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
@@ -141,7 +134,6 @@ dependencies {
 	testImplementation "org.jmock:jmock:$jmockVersion"
 	testImplementation "org.jmock:jmock-junit4:$jmockVersion"
 	testImplementation "org.jmock:jmock-legacy:$jmockVersion"
-	testAnnotationProcessor "com.google.dagger:dagger-compiler:2.24"
 
 	androidTestImplementation project(path: ':bramble-api', configuration: 'testOutput')
 	androidTestImplementation 'androidx.test.ext:junit:1.1.2'

briar-android/src/main/AndroidManifest.xml

@@ -448,6 +448,12 @@
 			android:label="@string/pending_contact_requests"
 			android:theme="@style/BriarTheme" />
 
+		<activity
+			android:name=".android.bluetoothsetup.BluetoothSetupActivity"
+			android:label="Bluetooth Setup"
+			android:theme="@style/BriarTheme"
+			android:windowSoftInputMode="adjustResize|stateHidden" />
+
 	</application>
 
 	<queries>

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

@@ -34,7 +34,6 @@ 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.logging.CachingLogHandler;
 import org.briarproject.briar.android.login.SignInReminderReceiver;
 import org.briarproject.briar.android.view.EmojiTextInputView;
 import org.briarproject.briar.api.android.AndroidNotificationManager;
@@ -180,10 +179,6 @@ public interface AndroidComponent
 
 	AndroidWakeLockManager wakeLockManager();
 
-	CachingLogHandler logHandler();
-
-	Thread.UncaughtExceptionHandler exceptionHandler();
-
 	void inject(SignInReminderReceiver briarService);
 
 	void inject(BriarService briarService);

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

@@ -255,7 +255,7 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 				R.string.ongoing_notification_title;
 		int text = locked ? R.string.lock_tap_to_unlock :
 				R.string.ongoing_notification_text;
-		int icon = locked ? R.drawable.notification_lock :
+		int icon = locked ? R.drawable.startup_lock :
 				R.drawable.notification_ongoing;
 		// Ongoing foreground notification that shows BriarService is running
 		NotificationCompat.Builder b =
@@ -624,7 +624,7 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 
 		NotificationCompat.Builder b =
 				new NotificationCompat.Builder(appContext, REMINDER_CHANNEL_ID);
-		b.setSmallIcon(R.drawable.notification_signout);
+		b.setSmallIcon(R.drawable.ic_signout);
 		b.setColor(getColor(appContext, R.color.briar_primary));
 		b.setContentTitle(
 				appContext.getText(R.string.reminder_notification_title));

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

@@ -30,17 +30,15 @@ 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.bluetoothsetup.BluetoothSetupModule;
 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.logging.LoggingModule;
 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.privategroup.list.GroupListModule;
 import org.briarproject.briar.android.reporting.DevReportModule;
 import org.briarproject.briar.android.settings.SettingsModule;
-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;
@@ -75,18 +73,16 @@ import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
 		SetupModule.class,
 		DozeHelperModule.class,
 		ContactExchangeModule.class,
-		LoggingModule.class,
 		LoginModule.class,
 		NavDrawerModule.class,
 		ViewModelModule.class,
 		SettingsModule.class,
 		DevReportModule.class,
 		ContactListModule.class,
+		BluetoothSetupModule.class,
 		// below need to be within same scope as ViewModelProvider.Factory
-		ForumModule.class,
+		ForumModule.BindsModule.class,
 		GroupListModule.class,
-		GroupConversationModule.class,
-		SharingModule.class,
 })
 public class AppModule {
 
@@ -194,11 +190,6 @@ public class AppModule {
 			public File getReportDir() {
 				return AndroidUtils.getReportDir(app.getApplicationContext());
 			}
-
-			@Override
-			public File getLogcatFile() {
-				return AndroidUtils.getLogcatFile(app.getApplicationContext());
-			}
 		};
 		return devConfig;
 	}

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

@@ -6,6 +6,9 @@ import android.content.SharedPreferences;
 import org.briarproject.bramble.BrambleApplication;
 import org.briarproject.briar.android.navdrawer.NavDrawerActivity;
 
+import java.util.Collection;
+import java.util.logging.LogRecord;
+
 /**
  * This exists so that the Application object will not necessarily be cast
  * directly to the Briar application object.
@@ -14,6 +17,8 @@ public interface BriarApplication extends BrambleApplication {
 
 	Class<? extends Activity> ENTRY_ACTIVITY = NavDrawerActivity.class;
 
+	Collection<LogRecord> getRecentLogRecords();
+
 	AndroidComponent getApplicationComponent();
 
 	SharedPreferences getDefaultSharedPreferences();

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

@@ -20,10 +20,12 @@ import org.briarproject.bramble.BrambleCoreEagerSingletons;
 import org.briarproject.briar.BriarCoreEagerSingletons;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.logging.CachingLogHandler;
+import org.briarproject.briar.android.reporting.BriarExceptionHandler;
 import org.briarproject.briar.android.util.UiUtils;
 
-import java.lang.Thread.UncaughtExceptionHandler;
+import java.util.Collection;
 import java.util.logging.Handler;
+import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 
 import androidx.annotation.NonNull;
@@ -40,18 +42,22 @@ public class BriarApplicationImpl extends Application
 	private static final Logger LOG =
 			getLogger(BriarApplicationImpl.class.getName());
 
+	private final CachingLogHandler logHandler = new CachingLogHandler();
+	private final BriarExceptionHandler exceptionHandler =
+			new BriarExceptionHandler(this);
+
 	private AndroidComponent applicationComponent;
 	private volatile SharedPreferences prefs;
 
 	@Override
 	protected void attachBaseContext(Context base) {
+		Thread.setDefaultUncaughtExceptionHandler(exceptionHandler);
 		if (prefs == null)
 			prefs = PreferenceManager.getDefaultSharedPreferences(base);
 		// Loading the language needs to be done here.
 		Localizer.initialize(prefs);
 		super.attachBaseContext(
 				Localizer.getInstance().setLocale(base));
-		Localizer.getInstance().setLocale(this);
 		setTheme(base, prefs);
 	}
 
@@ -61,11 +67,6 @@ public class BriarApplicationImpl extends Application
 
 		if (IS_DEBUG_BUILD) enableStrictMode();
 
-		applicationComponent = createApplicationComponent();
-		UncaughtExceptionHandler exceptionHandler =
-				applicationComponent.exceptionHandler();
-		Thread.setDefaultUncaughtExceptionHandler(exceptionHandler);
-
 		Logger rootLogger = getLogger("");
 		Handler[] handlers = rootLogger.getHandlers();
 		// Disable the Android logger for release builds
@@ -77,12 +78,12 @@ public class BriarApplicationImpl extends Application
 			// Restore the default handlers after the level raising handler
 			for (Handler handler : handlers) rootLogger.addHandler(handler);
 		}
-		CachingLogHandler logHandler = applicationComponent.logHandler();
 		rootLogger.addHandler(logHandler);
 		rootLogger.setLevel(IS_DEBUG_BUILD ? FINE : INFO);
 
 		LOG.info("Created");
 
+		applicationComponent = createApplicationComponent();
 		EmojiManager.install(new GoogleEmojiProvider());
 	}
 
@@ -135,6 +136,11 @@ public class BriarApplicationImpl extends Application
 		return applicationComponent;
 	}
 
+	@Override
+	public Collection<LogRecord> getRecentLogRecords() {
+		return logHandler.getRecentLogRecords();
+	}
+
 	@Override
 	public AndroidComponent getApplicationComponent() {
 		return applicationComponent;

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

@@ -37,7 +37,7 @@ import javax.inject.Inject;
 import androidx.core.app.NotificationCompat;
 
 import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
-import static android.app.NotificationManager.IMPORTANCE_LOW;
+import static android.app.NotificationManager.IMPORTANCE_NONE;
 import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
 import static android.content.Intent.ACTION_SHUTDOWN;
 import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
@@ -46,7 +46,6 @@ import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS;
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 import static android.content.Intent.FLAG_ACTIVITY_NO_ANIMATION;
 import static android.os.Build.VERSION.SDK_INT;
-import static android.os.Process.myPid;
 import static androidx.core.app.NotificationCompat.VISIBILITY_SECRET;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
@@ -57,10 +56,8 @@ import static org.briarproject.briar.android.BriarApplication.ENTRY_ACTIVITY;
 import static org.briarproject.briar.api.android.AndroidNotificationManager.FAILURE_CHANNEL_ID;
 import static org.briarproject.briar.api.android.AndroidNotificationManager.FAILURE_NOTIFICATION_ID;
 import static org.briarproject.briar.api.android.AndroidNotificationManager.ONGOING_CHANNEL_ID;
-import static org.briarproject.briar.api.android.AndroidNotificationManager.ONGOING_CHANNEL_OLD_ID;
 import static org.briarproject.briar.api.android.AndroidNotificationManager.ONGOING_NOTIFICATION_ID;
 import static org.briarproject.briar.api.android.LockManager.ACTION_LOCK;
-import static org.briarproject.briar.api.android.LockManager.EXTRA_PID;
 
 public class BriarService extends Service {
 
@@ -123,17 +120,11 @@ public class BriarService extends Service {
 			if (SDK_INT >= 26) {
 				NotificationManager nm = (NotificationManager)
 						requireNonNull(getSystemService(NOTIFICATION_SERVICE));
-				// Delete the old notification channel, which had
-				// IMPORTANCE_NONE and showed a badge
-				nm.deleteNotificationChannel(ONGOING_CHANNEL_OLD_ID);
-				// Use IMPORTANCE_LOW so the system doesn't show its own
-				// notification on API 26-27
 				NotificationChannel ongoingChannel = new NotificationChannel(
 						ONGOING_CHANNEL_ID,
 						getString(R.string.ongoing_notification_title),
-						IMPORTANCE_LOW);
+						IMPORTANCE_NONE);
 				ongoingChannel.setLockscreenVisibility(VISIBILITY_SECRET);
-				ongoingChannel.setShowBadge(false);
 				nm.createNotificationChannel(ongoingChannel);
 				NotificationChannel failureChannel = new NotificationChannel(
 						FAILURE_CHANNEL_ID,
@@ -179,7 +170,6 @@ public class BriarService extends Service {
 	@Override
 	protected void attachBaseContext(Context base) {
 		super.attachBaseContext(Localizer.getInstance().setLocale(base));
-		Localizer.getInstance().setLocale(this);
 	}
 
 	private void showStartupFailureNotification(StartResult result) {
@@ -212,12 +202,7 @@ public class BriarService extends Service {
 	@Override
 	public int onStartCommand(Intent intent, int flags, int startId) {
 		if (ACTION_LOCK.equals(intent.getAction())) {
-			int pid = intent.getIntExtra(EXTRA_PID, -1);
-			if (pid == myPid()) lockManager.setLocked(true);
-			else if (LOG.isLoggable(WARNING)) {
-				LOG.warning("Tried to lock process " + pid + " but this is " +
-						myPid());
-			}
+			lockManager.setLocked(true);
 		}
 		return START_NOT_STICKY; // Don't restart automatically if killed
 	}

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

@@ -68,21 +68,7 @@ public class Localizer {
 			return new Locale(tag);
 	}
 
-	/*
-	 * Apply localization to the specified context.
-	 *
-	 * It updates the configuration of the context's resources object but can
-	 * also return a new context derived from the context parameter. Hence
-	 * make sure to work with the return value of this method instead of
-	 * the context you passed as a parameter.
-	 *
-	 * This method also has side-effects as it calls Locale#setDefault().
-	 *
-	 * When using this in attachBaseContext() of Application, Service or
-	 * Activity subclasses, it is important to not only apply this method to the
-	 * base Context parameter received in that method, but also apply it on the
-	 * class itself which also extends Context.
-	 */
+	// Returns the localized version of context
 	public Context setLocale(Context context) {
 		Resources res = context.getResources();
 		Configuration conf = res.getConfiguration();
@@ -96,7 +82,7 @@ public class Localizer {
 		Locale.setDefault(locale);
 		if (SDK_INT >= 17) {
 			conf.setLocale(locale);
-			context = context.createConfigurationContext(conf);
+			context.createConfigurationContext(conf);
 		} else
 			conf.locale = locale;
 		//noinspection deprecation

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

@@ -33,6 +33,7 @@ public class DozeFragment extends SetupFragment
 	private DozeView dozeView;
 	private HuaweiView huaweiView;
 	private Button next;
+	private ProgressBar progressBar;
 	private boolean secondAttempt = false;
 
 	public static DozeFragment newInstance() {
@@ -57,19 +58,11 @@ public class DozeFragment extends SetupFragment
 		huaweiView = v.findViewById(R.id.huaweiView);
 		huaweiView.setOnCheckedChangedListener(this);
 		next = v.findViewById(R.id.next);
-		ProgressBar progressBar = v.findViewById(R.id.progress);
+		progressBar = v.findViewById(R.id.progress);
 
 		dozeView.setOnButtonClickListener(this::askForDozeWhitelisting);
 		next.setOnClickListener(this);
 
-		viewModel.getIsCreatingAccount()
-				.observe(getViewLifecycleOwner(), isCreatingAccount -> {
-					if (isCreatingAccount) {
-						next.setVisibility(INVISIBLE);
-						progressBar.setVisibility(VISIBLE);
-					}
-				});
-
 		return v;
 	}
 
@@ -111,6 +104,15 @@ public class DozeFragment extends SetupFragment
 
 	@Override
 	public void onClick(View view) {
+		setNextClicked();
 		viewModel.dozeExceptionConfirmed();
 	}
+
+	@Override
+	void setNextClicked() {
+		super.setNextClicked();
+
+		next.setVisibility(INVISIBLE);
+		progressBar.setVisibility(VISIBLE);
+	}
 }

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

@@ -32,10 +32,8 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
 import static android.app.AlarmManager.ELAPSED_REALTIME;
-import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
 import static android.app.PendingIntent.getService;
 import static android.content.Context.ALARM_SERVICE;
-import static android.os.Process.myPid;
 import static android.os.SystemClock.elapsedRealtime;
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.logging.Level.WARNING;
@@ -77,25 +75,23 @@ public class LockManagerImpl implements LockManager, Service, EventListener {
 	LockManagerImpl(Application app, SettingsManager settingsManager,
 			AndroidNotificationManager notificationManager,
 			@DatabaseExecutor Executor dbExecutor) {
-		appContext = app.getApplicationContext();
+		this.appContext = app.getApplicationContext();
 		this.settingsManager = settingsManager;
 		this.notificationManager = notificationManager;
 		this.dbExecutor = dbExecutor;
-		alarmManager =
+		this.alarmManager =
 				(AlarmManager) appContext.getSystemService(ALARM_SERVICE);
 		Intent i =
 				new Intent(ACTION_LOCK, null, appContext, BriarService.class);
-		i.putExtra(EXTRA_PID, myPid());
-		// When not using FLAG_UPDATE_CURRENT, the intent might have no extras
-		lockIntent = getService(appContext, 0, i, FLAG_UPDATE_CURRENT);
-		timeoutNever = Integer.parseInt(
+		this.lockIntent = getService(appContext, 0, i, 0);
+		this.timeoutNever = Integer.valueOf(
 				appContext.getString(R.string.pref_lock_timeout_value_never));
-		timeoutDefault = Integer.parseInt(
+		this.timeoutDefault = Integer.valueOf(
 				appContext.getString(R.string.pref_lock_timeout_value_default));
-		timeoutMinutes = timeoutNever;
+		this.timeoutMinutes = timeoutNever;
 
 		// setting this in the constructor makes #getValue() @NonNull
-		lockable.setValue(false);
+		this.lockable.setValue(false);
 	}
 
 	@Override
@@ -152,7 +148,7 @@ public class LockManagerImpl implements LockManager, Service, EventListener {
 		boolean oldValue = lockable.getValue();
 		boolean newValue = hasScreenLock(appContext) && lockableSetting;
 		if (oldValue != newValue) {
-			lockable.setValue(newValue);
+			this.lockable.setValue(newValue);
 		}
 	}
 

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

@@ -38,6 +38,7 @@ public class SetPasswordFragment extends SetupFragment {
 	private TextInputEditText passwordConfirmation;
 	private StrengthMeter strengthMeter;
 	private Button nextButton;
+	private ProgressBar progressBar;
 
 	public static SetPasswordFragment newInstance() {
 		return new SetPasswordFragment();
@@ -63,7 +64,7 @@ public class SetPasswordFragment extends SetupFragment {
 				v.findViewById(R.id.password_confirm_wrapper);
 		passwordConfirmation = v.findViewById(R.id.password_confirm);
 		nextButton = v.findViewById(R.id.next);
-		ProgressBar progressBar = v.findViewById(R.id.progress);
+		progressBar = v.findViewById(R.id.progress);
 
 		passwordEntry.addTextChangedListener(this);
 		passwordConfirmation.addTextChangedListener(this);
@@ -74,17 +75,6 @@ public class SetPasswordFragment extends SetupFragment {
 			passwordConfirmation.setImeOptions(IME_ACTION_DONE);
 		}
 
-		viewModel.getIsCreatingAccount()
-				.observe(getViewLifecycleOwner(), isCreatingAccount -> {
-					if (isCreatingAccount) {
-						nextButton.setVisibility(INVISIBLE);
-						progressBar.setVisibility(VISIBLE);
-						// this also avoids the keyboard popping up
-						passwordEntry.setFocusable(false);
-						passwordConfirmation.setFocusable(false);
-					}
-				});
-
 		return v;
 	}
 
@@ -126,6 +116,20 @@ public class SetPasswordFragment extends SetupFragment {
 		IBinder token = passwordEntry.getWindowToken();
 		Object o = getContext().getSystemService(INPUT_METHOD_SERVICE);
 		((InputMethodManager) o).hideSoftInputFromWindow(token, 0);
+
+		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/SetupFragment.java

@@ -7,6 +7,7 @@ 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;
@@ -18,6 +19,8 @@ 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;
 
@@ -32,6 +35,7 @@ abstract class SetupFragment extends BaseFragment implements TextWatcher,
 		OnEditorActionListener, OnClickListener {
 
 	private final static String STATE_KEY_CLICKED = "setupFragmentClicked";
+	private boolean clicked = false;
 
 	@Inject
 	ViewModelProvider.Factory viewModelFactory;
@@ -44,6 +48,27 @@ abstract class SetupFragment extends BaseFragment implements TextWatcher,
 				.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) {
 		inflater.inflate(R.menu.help_action, menu);
@@ -89,4 +114,5 @@ abstract class SetupFragment extends BaseFragment implements TextWatcher,
 	public void afterTextChanged(Editable editable) {
 		// noop
 	}
+
 }

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

@@ -17,8 +17,6 @@ import javax.inject.Inject;
 
 import androidx.annotation.Nullable;
 import androidx.lifecycle.AndroidViewModel;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
 
 import static java.util.logging.Logger.getLogger;
 import static org.briarproject.briar.android.account.SetupViewModel.State.AUTHOR_NAME;
@@ -38,8 +36,6 @@ class SetupViewModel extends AndroidViewModel {
 	@Nullable
 	private String authorName, password;
 	private final MutableLiveEvent<State> state = new MutableLiveEvent<>();
-	private final MutableLiveData<Boolean> isCreatingAccount =
-			new MutableLiveData<>(false);
 
 	private final AccountManager accountManager;
 	private final Executor ioExecutor;
@@ -71,10 +67,6 @@ class SetupViewModel extends AndroidViewModel {
 		return state;
 	}
 
-	LiveData<Boolean> getIsCreatingAccount() {
-		return isCreatingAccount;
-	}
-
 	void setAuthorName(String authorName) {
 		this.authorName = authorName;
 		state.setEvent(SET_PASSWORD);
@@ -105,7 +97,6 @@ class SetupViewModel extends AndroidViewModel {
 	private void createAccount() {
 		if (authorName == null) throw new IllegalStateException();
 		if (password == null) throw new IllegalStateException();
-		isCreatingAccount.setValue(true);
 		ioExecutor.execute(() -> {
 			if (accountManager.createAccount(authorName, password)) {
 				LOG.info("Created account");

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

@@ -77,7 +77,7 @@ public class UnlockActivity extends BaseActivity {
 
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode,
-			@Nullable Intent data) {
+			Intent data) {
 		super.onActivityResult(requestCode, resultCode, data);
 		if (requestCode == REQUEST_KEYGUARD_UNLOCK) {
 			if (resultCode == RESULT_OK) unlock();

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

@@ -20,6 +20,10 @@ import org.briarproject.briar.android.blog.ReblogFragment;
 import org.briarproject.briar.android.blog.RssFeedImportActivity;
 import org.briarproject.briar.android.blog.RssFeedManageActivity;
 import org.briarproject.briar.android.blog.WriteBlogPostActivity;
+import org.briarproject.briar.android.bluetoothsetup.BluetoothSetupActivity;
+import org.briarproject.briar.android.bluetoothsetup.BluetoothSetupChooseFragment;
+import org.briarproject.briar.android.bluetoothsetup.BluetoothSetupPendingFragment;
+import org.briarproject.briar.android.bluetoothsetup.BluetoothSetupStartFragment;
 import org.briarproject.briar.android.contact.ContactListFragment;
 import org.briarproject.briar.android.contact.add.remote.AddContactActivity;
 import org.briarproject.briar.android.contact.add.remote.LinkExchangeFragment;
@@ -32,6 +36,7 @@ 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;
@@ -49,6 +54,7 @@ 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;
@@ -87,10 +93,12 @@ import dagger.Component;
 		ActivityModule.class,
 		BlogModule.class,
 		CreateGroupModule.class,
+		ForumModule.class,
 		GroupInvitationModule.class,
+		GroupConversationModule.class,
 		GroupMemberModule.class,
 		GroupRevealModule.class,
-		SharingModule.SharingLegacyModule.class
+		SharingModule.class
 }, dependencies = AndroidComponent.class)
 public interface ActivityComponent {
 
@@ -182,6 +190,8 @@ public interface ActivityComponent {
 
 	void inject(CrashReportActivity crashReportActivity);
 
+	void inject(BluetoothSetupActivity activity);
+
 	// Fragments
 
 	void inject(AuthorNameFragment fragment);
@@ -238,4 +248,10 @@ public interface ActivityComponent {
 
 	void inject(ConfirmAvatarDialogFragment fragment);
 
+	void inject(BluetoothSetupStartFragment fragment);
+
+	void inject(BluetoothSetupChooseFragment fragment);
+
+	void inject(BluetoothSetupPendingFragment fragment);
+
 }

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

@@ -14,6 +14,7 @@ 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;
@@ -86,6 +87,7 @@ public abstract class BaseActivity extends AppCompatActivity
 		activityComponent = DaggerActivityComponent.builder()
 				.androidComponent(applicationComponent)
 				.activityModule(getActivityModule())
+				.forumModule(getForumModule())
 				.build();
 		injectActivity(activityComponent);
 		super.onCreate(state);
@@ -109,7 +111,6 @@ public abstract class BaseActivity extends AppCompatActivity
 	protected void attachBaseContext(Context base) {
 		super.attachBaseContext(
 				Localizer.getInstance().setLocale(base));
-		Localizer.getInstance().setLocale(this);
 	}
 
 	public ActivityComponent getActivityComponent() {
@@ -121,6 +122,11 @@ 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,6 +160,7 @@ 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/bluetoothsetup/BluetoothSetupActivity.java

@@ -0,0 +1,60 @@
+package org.briarproject.briar.android.bluetoothsetup;
+
+import android.os.Bundle;
+import android.view.MenuItem;
+
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.activity.BriarActivity;
+import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+
+import androidx.appcompat.app.ActionBar;
+import androidx.lifecycle.ViewModelProvider;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+public class BluetoothSetupActivity extends BriarActivity implements
+		BaseFragmentListener {
+
+	@Inject
+	ViewModelProvider.Factory viewModelFactory;
+	private BluetoothSetupViewModel viewModel;
+
+	@Override
+	public void injectActivity(ActivityComponent component) {
+		component.inject(this);
+	}
+
+	@Override
+	public void onCreate(@Nullable Bundle state) {
+		super.onCreate(state);
+		setContentView(R.layout.activity_fragment_container);
+
+		ActionBar ab = getSupportActionBar();
+		if (ab != null) {
+			ab.setDisplayHomeAsUpEnabled(true);
+		}
+
+		viewModel = new ViewModelProvider(this, viewModelFactory)
+				.get(BluetoothSetupViewModel.class);
+
+		if (state == null) {
+			showInitialFragment(new BluetoothSetupStartFragment());
+		}
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		if (item.getItemId() == android.R.id.home) {
+			onBackPressed();
+			return true;
+		}
+		return super.onOptionsItemSelected(item);
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/bluetoothsetup/BluetoothSetupChooseFragment.java

@@ -0,0 +1,72 @@
+package org.briarproject.briar.android.bluetoothsetup;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.fragment.BaseFragment;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+
+import androidx.lifecycle.ViewModelProvider;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+public class BluetoothSetupChooseFragment extends BaseFragment {
+	private static final String TAG =
+			BluetoothSetupChooseFragment.class.getName();
+
+	@Inject
+	ViewModelProvider.Factory viewModelFactory;
+
+	private BluetoothSetupViewModel viewModel;
+
+	@Override
+	public String getUniqueTag() {
+		return TAG;
+	}
+
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+		if (getActivity() == null || getContext() == null) return null;
+
+		viewModel = new ViewModelProvider(requireActivity())
+				.get(BluetoothSetupViewModel.class);
+
+		View v =
+				inflater.inflate(R.layout.fragment_bluetooth_setup_choose,
+						container, false);
+
+		// TODO to enable when user picks a device from list
+
+		Button continueButton = v.findViewById(R.id.continueButton);
+		continueButton.setOnClickListener(view -> {
+			showNextFragment(new BluetoothSetupPendingFragment());
+		});
+		continueButton.setEnabled(true);
+
+//		RecyclerView devices = v.findViewById(R.id.devices);
+//		devices.setHasFixedSize(true);
+//		final LinearLayoutManager layoutManager =
+//				new LinearLayoutManager(getActivity(),
+//						LinearLayoutManager.VERTICAL, false);
+//		devices.setLayoutManager(layoutManager);
+
+		return v;
+	}
+}

briar-android/src/main/java/org/briarproject/briar/android/bluetoothsetup/BluetoothSetupModule.java

@@ -0,0 +1,18 @@
+package org.briarproject.briar.android.bluetoothsetup;
+
+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 BluetoothSetupModule {
+
+	@Binds
+	@IntoMap
+	@ViewModelKey(BluetoothSetupViewModel.class)
+	abstract ViewModel bindBluetoothSetupViewModel(
+			BluetoothSetupViewModel bluetoothSetupViewModel);
+}

briar-android/src/main/java/org/briarproject/briar/android/bluetoothsetup/BluetoothSetupPendingFragment.java

@@ -0,0 +1,59 @@
+package org.briarproject.briar.android.bluetoothsetup;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.fragment.BaseFragment;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+
+import androidx.lifecycle.ViewModelProvider;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+public class BluetoothSetupPendingFragment extends BaseFragment {
+	private static final String TAG =
+			BluetoothSetupPendingFragment.class.getName();
+
+	@Inject
+	ViewModelProvider.Factory viewModelFactory;
+
+	private BluetoothSetupViewModel viewModel;
+
+	@Override
+	public String getUniqueTag() {
+		return TAG;
+	}
+
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+		if (getActivity() == null || getContext() == null) return null;
+
+		viewModel = new ViewModelProvider(requireActivity())
+				.get(BluetoothSetupViewModel.class);
+
+		View v = inflater.inflate(R.layout.fragment_bluetooth_setup_pending,
+				container, false);
+
+		return v;
+	}
+
+	private void onContinueButtonClicked() {
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/bluetoothsetup/BluetoothSetupStartFragment.java

@@ -0,0 +1,65 @@
+package org.briarproject.briar.android.bluetoothsetup;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.fragment.BaseFragment;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+
+import androidx.lifecycle.ViewModelProvider;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+public class BluetoothSetupStartFragment extends BaseFragment {
+	private static final String TAG =
+			BluetoothSetupStartFragment.class.getName();
+
+	@Inject
+	ViewModelProvider.Factory viewModelFactory;
+
+	private BluetoothSetupViewModel viewModel;
+
+	@Override
+	public String getUniqueTag() {
+		return TAG;
+	}
+
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+	}
+
+	@Nullable
+	@Override
+	public View onCreateView(LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+		if (getActivity() == null || getContext() == null) return null;
+
+		viewModel = new ViewModelProvider(requireActivity())
+				.get(BluetoothSetupViewModel.class);
+
+		View v = inflater.inflate(R.layout.fragment_bluetooth_setup_start,
+				container, false);
+
+		// TODO device-BT and BT-plugin needs to be enabled at this point
+
+		Button startButton = v.findViewById(R.id.startButton);
+		startButton.setOnClickListener(view -> {
+			showNextFragment(new BluetoothSetupChooseFragment());
+		});
+		startButton.setEnabled(true);
+
+		return v;
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/bluetoothsetup/BluetoothSetupViewModel.java

@@ -0,0 +1,33 @@
+package org.briarproject.briar.android.bluetoothsetup;
+
+import android.app.Application;
+
+import org.briarproject.bramble.api.db.DatabaseExecutor;
+import org.briarproject.bramble.api.db.TransactionManager;
+import org.briarproject.bramble.api.lifecycle.LifecycleManager;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.system.AndroidExecutor;
+import org.briarproject.briar.android.viewmodel.DbViewModel;
+
+import java.util.concurrent.Executor;
+import java.util.logging.Logger;
+
+import javax.inject.Inject;
+
+import static java.util.logging.Logger.getLogger;
+
+@NotNullByDefault
+public class BluetoothSetupViewModel extends DbViewModel {
+
+	private final static Logger LOG =
+			getLogger(BluetoothSetupViewModel.class.getName());
+
+	@Inject
+	BluetoothSetupViewModel(Application application,
+			@DatabaseExecutor Executor dbExecutor,
+			LifecycleManager lifecycleManager,
+			TransactionManager db,
+			AndroidExecutor androidExecutor) {
+		super(application, dbExecutor, lifecycleManager, db, androidExecutor);
+	}
+}

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

@@ -15,6 +15,7 @@ import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.bluetoothsetup.BluetoothSetupActivity;
 import org.briarproject.briar.android.contact.BaseContactListAdapter.OnContactClickListener;
 import org.briarproject.briar.android.contact.add.remote.AddContactActivity;
 import org.briarproject.briar.android.contact.add.remote.PendingContactListActivity;
@@ -34,6 +35,7 @@ import io.github.kobakei.materialfabspeeddial.FabSpeedDial;
 import io.github.kobakei.materialfabspeeddial.FabSpeedDial.OnMenuItemClickListener;
 
 import static com.google.android.material.snackbar.BaseTransientBottomBar.LENGTH_INDEFINITE;
+import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
 import static org.briarproject.briar.android.conversation.ConversationActivity.CONTACT_ID;
 
 @MethodsNotNullByDefault
@@ -101,8 +103,7 @@ public class ContactListFragment extends BaseFragment
 				.observe(getViewLifecycleOwner(), result -> {
 					result.onError(this::handleException).onSuccess(items -> {
 						adapter.submitList(items);
-						// TODO remove when BriarRecyclerView was adapted
-						list.showData();
+						if (requireNonNull(items).size() == 0) list.showData();
 					});
 				});
 		viewModel.getHasPendingContacts()
@@ -134,6 +135,11 @@ public class ContactListFragment extends BaseFragment
 			case R.id.action_add_contact_remotely:
 				startActivity(
 						new Intent(getContext(), AddContactActivity.class));
+				return;
+			case R.id.action_bluetooth_setup:
+				startActivity(
+						new Intent(getContext(),
+								BluetoothSetupActivity.class));
 		}
 	}
 

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

@@ -124,7 +124,7 @@ public class AddContactViewModel extends DbViewModel {
 		return addContactResult;
 	}
 
-	void updatePendingContact(String name, PendingContact p) {
+	public void updatePendingContact(String name, PendingContact p) {
 		runOnDbThread(() -> {
 			try {
 				contactManager.removePendingContact(p.getId());

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

@@ -29,11 +29,11 @@ import org.briarproject.briar.android.fragment.BaseFragment;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog.Builder;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.ViewModelProvider;
+import androidx.lifecycle.ViewModelProviders;
 
 import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
@@ -48,7 +48,6 @@ import static org.briarproject.briar.android.util.UiUtils.getDialogIcon;
 public class NicknameFragment extends BaseFragment {
 
 	private static final String TAG = NicknameFragment.class.getName();
-	private static final String SAVED_LINK = "savedLink";
 
 	@Inject
 	ViewModelProvider.Factory viewModelFactory;
@@ -68,20 +67,6 @@ public class NicknameFragment extends BaseFragment {
 	@Override
 	public void injectFragment(ActivityComponent component) {
 		component.inject(this);
-		viewModel = new ViewModelProvider(requireActivity(), viewModelFactory)
-				.get(AddContactViewModel.class);
-	}
-
-	@Override
-	public void onCreate(@Nullable Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		if (savedInstanceState != null) {
-			// When the activity (and the ViewModel) get destroyed,
-			// the link will not be available anymore and needs to be restored.
-			// TODO migrate to SavedStateViewModelFactory (once we can use it)
-			String savedLink = savedInstanceState.getString(SAVED_LINK);
-			if (savedLink != null) viewModel.setRemoteHandshakeLink(savedLink);
-		}
 	}
 
 	@Nullable
@@ -89,9 +74,14 @@ public class NicknameFragment extends BaseFragment {
 	public View onCreateView(LayoutInflater inflater,
 			@Nullable ViewGroup container,
 			@Nullable Bundle savedInstanceState) {
+		if (getActivity() == null || getContext() == null) return null;
+
 		View v = inflater.inflate(R.layout.fragment_nickname,
 				container, false);
 
+		viewModel = ViewModelProviders.of(getActivity(), viewModelFactory)
+				.get(AddContactViewModel.class);
+
 		contactNameLayout = v.findViewById(R.id.contactNameLayout);
 		contactNameInput = v.findViewById(R.id.contactNameInput);
 
@@ -103,12 +93,6 @@ public class NicknameFragment extends BaseFragment {
 		return v;
 	}
 
-	@Override
-	public void onSaveInstanceState(@NonNull Bundle outState) {
-		super.onSaveInstanceState(outState);
-		outState.putString(SAVED_LINK, viewModel.getRemoteHandshakeLink());
-	}
-
 	@Nullable
 	private String getNicknameOrNull() {
 		Editable text = contactNameInput.getText();

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

@@ -7,7 +7,6 @@ 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,7 +18,6 @@ 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/ConversationActivity.java

@@ -3,7 +3,6 @@ package org.briarproject.briar.android.conversation;
 import android.annotation.SuppressLint;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.transition.Slide;
@@ -106,7 +105,6 @@ import androidx.recyclerview.selection.SelectionTracker.SelectionObserver;
 import androidx.recyclerview.selection.StorageStrategy;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
 import de.hdodenhof.circleimageview.CircleImageView;
 import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt;
 
@@ -481,10 +479,12 @@ public class ConversationActivity extends BriarActivity
 	@UiThread
 	private void displayContactOnlineStatus() {
 		if (connectionRegistry.isConnected(contactId)) {
-			toolbarStatus.setImageResource(R.drawable.contact_online);
+			toolbarStatus.setImageDrawable(ContextCompat.getDrawable(
+					ConversationActivity.this, R.drawable.contact_online));
 			toolbarStatus.setContentDescription(getString(R.string.online));
 		} else {
-			toolbarStatus.setImageResource(R.drawable.contact_offline);
+			toolbarStatus.setImageDrawable(ContextCompat.getDrawable(
+					ConversationActivity.this, R.drawable.contact_offline));
 			toolbarStatus.setContentDescription(getString(R.string.offline));
 		}
 	}
@@ -935,16 +935,13 @@ public class ConversationActivity extends BriarActivity
 			return;
 		}
 
-		int color =
-				ContextCompat.getColor(this, R.color.briar_primary);
-		Drawable drawable = VectorDrawableCompat
-				.create(getResources(), R.drawable.ic_more_vert_accent, null);
 		new MaterialTapTargetPrompt.Builder(ConversationActivity.this,
 				R.style.OnboardingDialogTheme).setTarget(target)
 				.setPrimaryText(R.string.introduction_onboarding_title)
 				.setSecondaryText(R.string.introduction_onboarding_text)
-				.setIconDrawable(drawable)
-				.setBackgroundColour(color)
+				.setIcon(R.drawable.ic_more_vert_accent)
+				.setBackgroundColour(
+						ContextCompat.getColor(this, R.color.briar_primary))
 				.show();
 	}
 

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

@@ -24,7 +24,10 @@ import org.briarproject.briar.android.attachment.AttachmentItem;
 import org.briarproject.briar.android.util.BriarSnackbarBuilder;
 import org.briarproject.briar.android.view.PullDownLayout;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 
 import javax.inject.Inject;
 
@@ -290,10 +293,13 @@ public class ImageActivity extends BriarActivity
 
 	@RequiresApi(api = 19)
 	private Intent getCreationIntent() {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss",
+				Locale.getDefault());
+		String fileName = sdf.format(new Date());
 		Intent intent = new Intent(ACTION_CREATE_DOCUMENT);
 		intent.addCategory(CATEGORY_OPENABLE);
 		intent.setType(getVisibleAttachment().getMimeType());
-		intent.putExtra(EXTRA_TITLE, viewModel.getFileName());
+		intent.putExtra(EXTRA_TITLE, fileName);
 		return intent;
 	}
 

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

@@ -225,8 +225,8 @@ public class ImageViewModel extends DbViewModel implements EventListener {
 		});
 	}
 
-	String getFileName() {
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd",
+	private String getFileName() {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss",
 				Locale.getDefault());
 		return sdf.format(new Date());
 	}

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

@@ -6,54 +6,52 @@ import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.widget.Toast;
 
+import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.controller.handler.UiResultExceptionHandler;
+import org.briarproject.briar.android.forum.ForumController.ForumListener;
 import org.briarproject.briar.android.sharing.ForumSharingStatusActivity;
 import org.briarproject.briar.android.sharing.ShareForumActivity;
 import org.briarproject.briar.android.threaded.ThreadItemAdapter;
 import org.briarproject.briar.android.threaded.ThreadListActivity;
-import org.briarproject.briar.android.threaded.ThreadListViewModel;
+import org.briarproject.briar.android.threaded.ThreadListController;
+import org.briarproject.briar.api.forum.Forum;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
-import androidx.lifecycle.ViewModelProvider;
+import androidx.recyclerview.widget.LinearLayoutManager;
 
 import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
+import static android.widget.Toast.LENGTH_SHORT;
 import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_SHARE_FORUM;
-import static org.briarproject.briar.android.util.UiUtils.observeOnce;
 import static org.briarproject.briar.api.forum.ForumConstants.MAX_FORUM_POST_TEXT_LENGTH;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
 public class ForumActivity extends
-		ThreadListActivity<ForumPostItem, ThreadItemAdapter<ForumPostItem>> {
+		ThreadListActivity<Forum, ForumPostItem, ThreadItemAdapter<ForumPostItem>>
+		implements ForumListener {
 
 	@Inject
-	ViewModelProvider.Factory viewModelFactory;
-
-	private ForumViewModel viewModel;
+	ForumController forumController;
 
 	@Override
 	public void injectActivity(ActivityComponent component) {
 		component.inject(this);
-		viewModel = new ViewModelProvider(this, viewModelFactory)
-				.get(ForumViewModel.class);
 	}
 
 	@Override
-	protected ThreadListViewModel<ForumPostItem> getViewModel() {
-		return viewModel;
-	}
-
-	@Override
-	protected ThreadItemAdapter<ForumPostItem> createAdapter() {
-		return new ThreadItemAdapter<>(this);
+	protected ThreadListController<Forum, ForumPostItem> getController() {
+		return forumController;
 	}
 
 	@Override
@@ -61,27 +59,36 @@ public class ForumActivity extends
 		super.onCreate(state);
 
 		Toolbar toolbar = setUpCustomToolbar(false);
-		// Open member list on Toolbar click
-		toolbar.setOnClickListener(v -> {
-			Intent i = new Intent(ForumActivity.this,
-					ForumSharingStatusActivity.class);
-			i.putExtra(GROUP_ID, groupId.getBytes());
-			startActivity(i);
-		});
 
-		String groupName = getIntent().getStringExtra(GROUP_NAME);
-		if (groupName != null) {
-			setTitle(groupName);
-		} else {
-			observeOnce(viewModel.loadForum(), this, forum ->
-					setTitle(forum.getName())
-			);
+		Intent i = getIntent();
+		String groupName = i.getStringExtra(GROUP_NAME);
+		if (groupName != null) setTitle(groupName);
+		else loadNamedGroup();
+
+		// Open member list on Toolbar click
+		if (toolbar != null) {
+			toolbar.setOnClickListener(v -> {
+				Intent i1 = new Intent(ForumActivity.this,
+						ForumSharingStatusActivity.class);
+				i1.putExtra(GROUP_ID, groupId.getBytes());
+				startActivity(i1);
+			});
 		}
 	}
 
 	@Override
-	protected void onActivityResult(int request, int result,
-			@Nullable Intent data) {
+	protected void onNamedGroupLoaded(Forum forum) {
+		setTitle(forum.getName());
+	}
+
+	@Override
+	protected ThreadItemAdapter<ForumPostItem> createAdapter(
+			LinearLayoutManager layoutManager) {
+		return new ThreadItemAdapter<>(this, layoutManager);
+	}
+
+	@Override
+	protected void onActivityResult(int request, int result, Intent data) {
 		super.onActivityResult(request, result, data);
 
 		if (request == REQUEST_SHARE_FORUM && result == RESULT_OK) {
@@ -94,31 +101,32 @@ public class ForumActivity extends
 		// Inflate the menu items for use in the action bar
 		MenuInflater inflater = getMenuInflater();
 		inflater.inflate(R.menu.forum_actions, menu);
-		super.onCreateOptionsMenu(menu);
-		return true;
+
+		return super.onCreateOptionsMenu(menu);
 	}
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		// Handle presses on the action bar items
-		int itemId = item.getItemId();
-		if (itemId == R.id.action_forum_share) {
-			Intent i = new Intent(this, ShareForumActivity.class);
-			i.setFlags(FLAG_ACTIVITY_CLEAR_TOP);
-			i.putExtra(GROUP_ID, groupId.getBytes());
-			startActivityForResult(i, REQUEST_SHARE_FORUM);
-			return true;
-		} else if (itemId == R.id.action_forum_sharing_status) {
-			Intent i = new Intent(this, ForumSharingStatusActivity.class);
-			i.setFlags(FLAG_ACTIVITY_CLEAR_TOP);
-			i.putExtra(GROUP_ID, groupId.getBytes());
-			startActivity(i);
-			return true;
-		} else if (itemId == R.id.action_forum_delete) {
-			showUnsubscribeDialog();
-			return true;
+		switch (item.getItemId()) {
+			case R.id.action_forum_share:
+				Intent i2 = new Intent(this, ShareForumActivity.class);
+				i2.setFlags(FLAG_ACTIVITY_CLEAR_TOP);
+				i2.putExtra(GROUP_ID, groupId.getBytes());
+				startActivityForResult(i2, REQUEST_SHARE_FORUM);
+				return true;
+			case R.id.action_forum_sharing_status:
+				Intent i3 = new Intent(this, ForumSharingStatusActivity.class);
+				i3.setFlags(FLAG_ACTIVITY_CLEAR_TOP);
+				i3.putExtra(GROUP_ID, groupId.getBytes());
+				startActivity(i3);
+				return true;
+			case R.id.action_forum_delete:
+				showUnsubscribeDialog();
+				return true;
+			default:
+				return super.onOptionsItemSelected(item);
 		}
-		return super.onOptionsItemSelected(item);
 	}
 
 	@Override
@@ -127,7 +135,7 @@ public class ForumActivity extends
 	}
 
 	private void showUnsubscribeDialog() {
-		OnClickListener okListener = (dialog, which) -> viewModel.deleteForum();
+		OnClickListener okListener = (dialog, which) -> deleteForum();
 		AlertDialog.Builder builder = new AlertDialog.Builder(this,
 				R.style.BriarDialogTheme);
 		builder.setTitle(getString(R.string.dialog_title_leave_forum));
@@ -137,4 +145,27 @@ public class ForumActivity extends
 		builder.show();
 	}
 
+	private void deleteForum() {
+		forumController.deleteNamedGroup(
+				new UiResultExceptionHandler<Void, DbException>(this) {
+					@Override
+					public void onResultUi(Void v) {
+						Toast.makeText(ForumActivity.this,
+								R.string.forum_left_toast, LENGTH_SHORT).show();
+					}
+
+					@Override
+					public void onExceptionUi(DbException exception) {
+						handleException(exception);
+					}
+				});
+	}
+
+	@Override
+	public void onForumLeft(ContactId c) {
+		sharingController.remove(c);
+		setToolbarSubTitle(sharingController.getTotalCount(),
+				sharingController.getOnlineCount());
+	}
+
 }

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

@@ -0,0 +1,18 @@
+package org.briarproject.briar.android.forum;
+
+import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.briar.android.threaded.ThreadListController;
+import org.briarproject.briar.api.forum.Forum;
+
+import androidx.annotation.UiThread;
+
+@NotNullByDefault
+interface ForumController extends ThreadListController<Forum, ForumPostItem> {
+
+	interface ForumListener extends ThreadListListener<ForumPostItem> {
+		@UiThread
+		void onForumLeft(ContactId c);
+	}
+
+}

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

@@ -0,0 +1,185 @@
+package org.briarproject.briar.android.forum;
+
+import org.briarproject.bramble.api.contact.Contact;
+import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.crypto.CryptoExecutor;
+import org.briarproject.bramble.api.db.DatabaseExecutor;
+import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.event.Event;
+import org.briarproject.bramble.api.event.EventBus;
+import org.briarproject.bramble.api.identity.IdentityManager;
+import org.briarproject.bramble.api.identity.LocalAuthor;
+import org.briarproject.bramble.api.lifecycle.LifecycleManager;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.sync.MessageId;
+import org.briarproject.bramble.api.system.Clock;
+import org.briarproject.briar.android.controller.handler.ResultExceptionHandler;
+import org.briarproject.briar.android.forum.ForumController.ForumListener;
+import org.briarproject.briar.android.threaded.ThreadListControllerImpl;
+import org.briarproject.briar.api.android.AndroidNotificationManager;
+import org.briarproject.briar.api.client.MessageTracker;
+import org.briarproject.briar.api.client.MessageTracker.GroupCount;
+import org.briarproject.briar.api.forum.Forum;
+import org.briarproject.briar.api.forum.ForumInvitationResponse;
+import org.briarproject.briar.api.forum.ForumManager;
+import org.briarproject.briar.api.forum.ForumPost;
+import org.briarproject.briar.api.forum.ForumPostHeader;
+import org.briarproject.briar.api.forum.ForumSharingManager;
+import org.briarproject.briar.api.forum.event.ForumInvitationResponseReceivedEvent;
+import org.briarproject.briar.api.forum.event.ForumPostReceivedEvent;
+import org.briarproject.briar.api.sharing.event.ContactLeftShareableEvent;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.concurrent.Executor;
+import java.util.logging.Logger;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+
+import static java.lang.Math.max;
+import static java.util.logging.Level.WARNING;
+import static org.briarproject.bramble.util.LogUtils.logException;
+
+@NotNullByDefault
+class ForumControllerImpl extends
+		ThreadListControllerImpl<Forum, ForumPostItem, ForumPostHeader, ForumPost, ForumListener>
+		implements ForumController {
+
+	private static final Logger LOG =
+			Logger.getLogger(ForumControllerImpl.class.getName());
+
+	private final ForumManager forumManager;
+	private final ForumSharingManager forumSharingManager;
+
+	@Inject
+	ForumControllerImpl(@DatabaseExecutor Executor dbExecutor,
+			LifecycleManager lifecycleManager, IdentityManager identityManager,
+			@CryptoExecutor Executor cryptoExecutor,
+			ForumManager forumManager, ForumSharingManager forumSharingManager,
+			EventBus eventBus, Clock clock, MessageTracker messageTracker,
+			AndroidNotificationManager notificationManager) {
+		super(dbExecutor, lifecycleManager, identityManager, cryptoExecutor,
+				eventBus, clock, notificationManager, messageTracker);
+		this.forumManager = forumManager;
+		this.forumSharingManager = forumSharingManager;
+	}
+
+	@Override
+	public void onActivityStart() {
+		super.onActivityStart();
+		notificationManager.clearForumPostNotification(getGroupId());
+	}
+
+	@Override
+	public void eventOccurred(Event e) {
+		super.eventOccurred(e);
+
+		if (e instanceof ForumPostReceivedEvent) {
+			ForumPostReceivedEvent f = (ForumPostReceivedEvent) e;
+			if (f.getGroupId().equals(getGroupId())) {
+				LOG.info("Forum post received, adding...");
+				listener.onItemReceived(buildItem(f.getHeader(), f.getText()));
+			}
+		} else if (e instanceof ForumInvitationResponseReceivedEvent) {
+			ForumInvitationResponseReceivedEvent f =
+					(ForumInvitationResponseReceivedEvent) e;
+			ForumInvitationResponse r = f.getMessageHeader();
+			if (r.getShareableId().equals(getGroupId()) && r.wasAccepted()) {
+				LOG.info("Forum invitation was accepted");
+				listener.onInvitationAccepted(f.getContactId());
+			}
+		} else if (e instanceof ContactLeftShareableEvent) {
+			ContactLeftShareableEvent c = (ContactLeftShareableEvent) e;
+			if (c.getGroupId().equals(getGroupId())) {
+				LOG.info("Forum left by contact");
+				listener.onForumLeft(c.getContactId());
+			}
+		}
+	}
+
+	@Override
+	protected Forum loadNamedGroup() throws DbException {
+		return forumManager.getForum(getGroupId());
+	}
+
+	@Override
+	protected Collection<ForumPostHeader> loadHeaders() throws DbException {
+		return forumManager.getPostHeaders(getGroupId());
+	}
+
+	@Override
+	protected String loadMessageText(ForumPostHeader h) throws DbException {
+		return forumManager.getPostText(h.getId());
+	}
+
+	@Override
+	protected void markRead(MessageId id) throws DbException {
+		forumManager.setReadFlag(getGroupId(), id, true);
+	}
+
+	@Override
+	public void loadSharingContacts(
+			ResultExceptionHandler<Collection<ContactId>, DbException> handler) {
+		runOnDbThread(() -> {
+			try {
+				Collection<Contact> contacts =
+						forumSharingManager.getSharedWith(getGroupId());
+				Collection<ContactId> contactIds =
+						new ArrayList<>(contacts.size());
+				for (Contact c : contacts) contactIds.add(c.getId());
+				handler.onResult(contactIds);
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+				handler.onException(e);
+			}
+		});
+	}
+
+	@Override
+	public void createAndStoreMessage(String text,
+			@Nullable ForumPostItem parentItem,
+			ResultExceptionHandler<ForumPostItem, DbException> handler) {
+		runOnDbThread(() -> {
+			try {
+				LocalAuthor author = identityManager.getLocalAuthor();
+				GroupCount count = forumManager.getGroupCount(getGroupId());
+				long timestamp = max(count.getLatestMsgTime() + 1,
+						clock.currentTimeMillis());
+				MessageId parentId = parentItem != null ?
+						parentItem.getId() : null;
+				createMessage(text, timestamp, parentId, author, handler);
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+				handler.onException(e);
+			}
+		});
+	}
+
+	private void createMessage(String text, long timestamp,
+			@Nullable MessageId parentId, LocalAuthor author,
+			ResultExceptionHandler<ForumPostItem, DbException> handler) {
+		cryptoExecutor.execute(() -> {
+			LOG.info("Creating forum post...");
+			ForumPost msg = forumManager.createLocalPost(getGroupId(), text,
+					timestamp, parentId, author);
+			storePost(msg, text, handler);
+		});
+	}
+
+	@Override
+	protected ForumPostHeader addLocalMessage(ForumPost p) throws DbException {
+		return forumManager.addLocalPost(p);
+	}
+
+	@Override
+	protected void deleteNamedGroup(Forum forum) throws DbException {
+		forumManager.removeForum(forum);
+	}
+
+	@Override
+	protected ForumPostItem buildItem(ForumPostHeader header, String text) {
+		return new ForumPostItem(header, text);
+	}
+
+}

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

@@ -1,23 +1,32 @@
 package org.briarproject.briar.android.forum;
 
+import org.briarproject.briar.android.activity.ActivityScope;
+import org.briarproject.briar.android.activity.BaseActivity;
 import org.briarproject.briar.android.viewmodel.ViewModelKey;
 
 import androidx.lifecycle.ViewModel;
 import dagger.Binds;
 import dagger.Module;
+import dagger.Provides;
 import dagger.multibindings.IntoMap;
 
 @Module
-public interface ForumModule {
+public class ForumModule {
 
-	@Binds
-	@IntoMap
-	@ViewModelKey(ForumListViewModel.class)
-	ViewModel bindForumListViewModel(ForumListViewModel forumListViewModel);
+	@Module
+	public interface BindsModule {
+		@Binds
+		@IntoMap
+		@ViewModelKey(ForumListViewModel.class)
+		ViewModel bindForumListViewModel(ForumListViewModel forumListViewModel);
+	}
 
-	@Binds
-	@IntoMap
-	@ViewModelKey(ForumViewModel.class)
-	ViewModel bindForumViewModel(ForumViewModel forumViewModel);
+	@ActivityScope
+	@Provides
+	ForumController provideForumController(BaseActivity activity,
+			ForumControllerImpl forumController) {
+		activity.addLifecycleController(forumController);
+		return forumController;
+	}
 
 }

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

@@ -6,6 +6,7 @@ import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.briar.android.threaded.ThreadItem;
 import org.briarproject.briar.api.forum.ForumPostHeader;
 
+import javax.annotation.Nullable;
 import javax.annotation.concurrent.NotThreadSafe;
 
 @NotThreadSafe
@@ -16,4 +17,9 @@ class ForumPostItem extends ThreadItem {
 				h.getAuthorInfo(), h.isRead());
 	}
 
+	ForumPostItem(MessageId messageId, @Nullable MessageId parentId,
+			String text, long timestamp, Author author, AuthorInfo authorInfo) {
+		super(messageId, parentId, text, timestamp, author, authorInfo, true);
+	}
+
 }

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

@@ -1,231 +0,0 @@
-package org.briarproject.briar.android.forum;
-
-import android.app.Application;
-import android.widget.Toast;
-
-import org.briarproject.bramble.api.contact.Contact;
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.crypto.CryptoExecutor;
-import org.briarproject.bramble.api.db.DatabaseExecutor;
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.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.identity.IdentityManager;
-import org.briarproject.bramble.api.identity.LocalAuthor;
-import org.briarproject.bramble.api.lifecycle.LifecycleManager;
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
-import org.briarproject.bramble.api.sync.MessageId;
-import org.briarproject.bramble.api.system.AndroidExecutor;
-import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.briar.R;
-import org.briarproject.briar.android.sharing.SharingController;
-import org.briarproject.briar.android.threaded.ThreadListViewModel;
-import org.briarproject.briar.api.android.AndroidNotificationManager;
-import org.briarproject.briar.api.client.MessageTracker;
-import org.briarproject.briar.api.client.MessageTracker.GroupCount;
-import org.briarproject.briar.api.forum.Forum;
-import org.briarproject.briar.api.forum.ForumInvitationResponse;
-import org.briarproject.briar.api.forum.ForumManager;
-import org.briarproject.briar.api.forum.ForumPost;
-import org.briarproject.briar.api.forum.ForumPostHeader;
-import org.briarproject.briar.api.forum.ForumSharingManager;
-import org.briarproject.briar.api.forum.event.ForumInvitationResponseReceivedEvent;
-import org.briarproject.briar.api.forum.event.ForumPostReceivedEvent;
-import org.briarproject.briar.api.sharing.event.ContactLeftShareableEvent;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.Executor;
-import java.util.logging.Logger;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-
-import static android.widget.Toast.LENGTH_SHORT;
-import static java.lang.Math.max;
-import static java.util.logging.Level.WARNING;
-import static java.util.logging.Logger.getLogger;
-import static org.briarproject.bramble.util.LogUtils.logDuration;
-import static org.briarproject.bramble.util.LogUtils.logException;
-import static org.briarproject.bramble.util.LogUtils.now;
-
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
-class ForumViewModel extends ThreadListViewModel<ForumPostItem> {
-
-	private static final Logger LOG = getLogger(ForumViewModel.class.getName());
-
-	private final ForumManager forumManager;
-	private final ForumSharingManager forumSharingManager;
-
-	@Inject
-	ForumViewModel(Application application,
-			@DatabaseExecutor Executor dbExecutor,
-			LifecycleManager lifecycleManager,
-			TransactionManager db,
-			AndroidExecutor androidExecutor,
-			IdentityManager identityManager,
-			AndroidNotificationManager notificationManager,
-			SharingController sharingController,
-			@CryptoExecutor Executor cryptoExecutor,
-			Clock clock,
-			MessageTracker messageTracker,
-			EventBus eventBus,
-			ForumManager forumManager,
-			ForumSharingManager forumSharingManager) {
-		super(application, dbExecutor, lifecycleManager, db, androidExecutor,
-				identityManager, notificationManager, sharingController,
-				cryptoExecutor, clock, messageTracker, eventBus);
-		this.forumManager = forumManager;
-		this.forumSharingManager = forumSharingManager;
-	}
-
-	@Override
-	public void eventOccurred(Event e) {
-		if (e instanceof ForumPostReceivedEvent) {
-			ForumPostReceivedEvent f = (ForumPostReceivedEvent) e;
-			if (f.getGroupId().equals(groupId)) {
-				LOG.info("Forum post received, adding...");
-				ForumPostItem item =
-						new ForumPostItem(f.getHeader(), f.getText());
-				addItem(item, false);
-			}
-		} else if (e instanceof ForumInvitationResponseReceivedEvent) {
-			ForumInvitationResponseReceivedEvent f =
-					(ForumInvitationResponseReceivedEvent) e;
-			ForumInvitationResponse r = f.getMessageHeader();
-			if (r.getShareableId().equals(groupId) && r.wasAccepted()) {
-				LOG.info("Forum invitation was accepted");
-				sharingController.add(f.getContactId());
-			}
-		} else if (e instanceof ContactLeftShareableEvent) {
-			ContactLeftShareableEvent c = (ContactLeftShareableEvent) e;
-			if (c.getGroupId().equals(groupId)) {
-				LOG.info("Forum left by contact");
-				sharingController.remove(c.getContactId());
-			}
-		} else {
-			super.eventOccurred(e);
-		}
-	}
-
-	protected void clearNotifications() {
-		notificationManager.clearForumPostNotification(groupId);
-	}
-
-	LiveData<Forum> loadForum() {
-		MutableLiveData<Forum> forum = new MutableLiveData<>();
-		runOnDbThread(() -> {
-			try {
-				Forum f = forumManager.getForum(groupId);
-				forum.postValue(f);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
-		return forum;
-	}
-
-	@Override
-	public void loadItems() {
-		loadList(txn -> {
-			long start = now();
-			List<ForumPostHeader> headers =
-					forumManager.getPostHeaders(txn, groupId);
-			logDuration(LOG, "Loading headers", start);
-			start = now();
-			List<ForumPostItem> items = new ArrayList<>();
-			for (ForumPostHeader header : headers) {
-				items.add(loadItem(txn, header));
-			}
-			logDuration(LOG, "Loading bodies and creating items", start);
-			return items;
-		}, this::setItems);
-	}
-
-	private ForumPostItem loadItem(Transaction txn, ForumPostHeader header)
-			throws DbException {
-		String text = forumManager.getPostText(txn, header.getId());
-		return new ForumPostItem(header, text);
-	}
-
-	@Override
-	public void createAndStoreMessage(String text,
-			@Nullable MessageId parentId) {
-		runOnDbThread(() -> {
-			try {
-				LocalAuthor author = identityManager.getLocalAuthor();
-				GroupCount count = forumManager.getGroupCount(groupId);
-				long timestamp = max(count.getLatestMsgTime() + 1,
-						clock.currentTimeMillis());
-				createMessage(text, timestamp, parentId, author);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
-	}
-
-	private void createMessage(String text, long timestamp,
-			@Nullable MessageId parentId, LocalAuthor author) {
-		cryptoExecutor.execute(() -> {
-			LOG.info("Creating forum post...");
-			ForumPost msg = forumManager.createLocalPost(groupId, text,
-					timestamp, parentId, author);
-			storePost(msg, text);
-		});
-	}
-
-	private void storePost(ForumPost msg, String text) {
-		runOnDbThread(false, txn -> {
-			long start = now();
-			ForumPostHeader header = forumManager.addLocalPost(txn, msg);
-			logDuration(LOG, "Storing forum post", start);
-			txn.attach(() -> {
-				ForumPostItem item = new ForumPostItem(header, text);
-				addItem(item, true);
-			});
-		}, e -> logException(LOG, WARNING, e));
-	}
-
-	@Override
-	protected void markItemRead(ForumPostItem item) {
-		runOnDbThread(() -> {
-			try {
-				forumManager.setReadFlag(groupId, item.getId(), true);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
-	}
-
-	public void loadSharingContacts() {
-		runOnDbThread(true, txn -> {
-			Collection<Contact> contacts =
-					forumSharingManager.getSharedWith(txn, groupId);
-			Collection<ContactId> contactIds = new ArrayList<>(contacts.size());
-			for (Contact c : contacts) contactIds.add(c.getId());
-			txn.attach(() -> sharingController.addAll(contactIds));
-		}, e -> logException(LOG, WARNING, e));
-	}
-
-	void deleteForum() {
-		runOnDbThread(() -> {
-			try {
-				Forum f = forumManager.getForum(groupId);
-				forumManager.removeForum(f);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
-		Toast.makeText(getApplication(), R.string.forum_left_toast,
-				LENGTH_SHORT).show();
-	}
-
-}

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

@@ -10,8 +10,9 @@ import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.android.DestroyableContext;
 import org.briarproject.briar.android.activity.ActivityComponent;
 
+import javax.annotation.Nullable;
+
 import androidx.annotation.CallSuper;
-import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
@@ -46,11 +47,13 @@ public abstract class BaseFragment extends Fragment
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
-		if (item.getItemId() == android.R.id.home) {
-			requireActivity().onBackPressed();
-			return true;
+		switch (item.getItemId()) {
+			case android.R.id.home:
+				listener.onBackPressed();
+				return true;
+			default:
+				return super.onOptionsItemSelected(item);
 		}
-		return super.onOptionsItemSelected(item);
 	}
 
 	@UiThread
@@ -76,7 +79,6 @@ public abstract class BaseFragment extends Fragment
 		void handleException(Exception e);
 	}
 
-	@Deprecated
 	@CallSuper
 	@Override
 	public void runOnUiThreadUnlessDestroyed(Runnable r) {

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

@@ -411,8 +411,6 @@ public abstract class KeyAgreementActivity extends BriarActivity implements
 	@UiThread
 	public void onRequestPermissionsResult(int requestCode,
 			String[] permissions, int[] grantResults) {
-		super.onRequestPermissionsResult(requestCode, permissions,
-				grantResults);
 		if (requestCode != REQUEST_PERMISSION_CAMERA_LOCATION)
 			throw new AssertionError();
 		if (gotPermission(CAMERA, permissions, grantResults)) {

briar-android/src/main/java/org/briarproject/briar/android/logging/BriefLogFormatter.java

@@ -4,7 +4,6 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.Collection;
 import java.util.Date;
 import java.util.TimeZone;
 import java.util.logging.Formatter;
@@ -18,16 +17,6 @@ import static java.util.Locale.US;
 @NotNullByDefault
 public class BriefLogFormatter extends Formatter {
 
-	public static String formatLog(Formatter formatter,
-			Collection<LogRecord> logRecords) {
-		StringBuilder sb = new StringBuilder();
-		for (LogRecord record : logRecords) {
-			String formatted = formatter.format(record);
-			sb.append(formatted).append('\n');
-		}
-		return sb.toString();
-	}
-
 	private final Object lock = new Object();
 	private final DateFormat dateFormat; // Locking: lock
 	private final Date date; // Locking: lock

briar-android/src/main/java/org/briarproject/briar/android/logging/CachingLogHandler.java

@@ -21,10 +21,6 @@ public class CachingLogHandler extends Handler {
 	// Locking: lock
 	private final Queue<LogRecord> recent = new LinkedList<>();
 
-	// package-private constructor
-	CachingLogHandler() {
-	}
-
 	@Override
 	public void publish(LogRecord record) {
 		synchronized (lock) {

briar-android/src/main/java/org/briarproject/briar/android/logging/LogDecrypter.java

@@ -1,16 +0,0 @@
-package org.briarproject.briar.android.logging;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.util.AndroidUtils;
-
-import androidx.annotation.Nullable;
-
-@NotNullByDefault
-public interface LogDecrypter {
-	/**
-	 * Returns decrypted log records from {@link AndroidUtils#getLogcatFile}
-	 * or null if there was an error reading the logs.
-	 */
-	@Nullable
-	String decryptLogs(@Nullable byte[] logKey);
-}

briar-android/src/main/java/org/briarproject/briar/android/logging/LogDecrypterImpl.java

@@ -1,61 +0,0 @@
-package org.briarproject.briar.android.logging;
-
-import org.briarproject.bramble.api.crypto.SecretKey;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.reporting.DevConfig;
-import org.briarproject.bramble.api.transport.StreamReaderFactory;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Scanner;
-import java.util.logging.Logger;
-
-import javax.inject.Inject;
-
-import androidx.annotation.Nullable;
-
-import static java.util.logging.Level.WARNING;
-import static java.util.logging.Logger.getLogger;
-import static org.briarproject.bramble.util.LogUtils.logException;
-
-@NotNullByDefault
-class LogDecrypterImpl implements LogDecrypter {
-
-	private static final Logger LOG =
-			getLogger(LogDecrypterImpl.class.getName());
-
-	private final DevConfig devConfig;
-	private final StreamReaderFactory streamReaderFactory;
-
-	@Inject
-	LogDecrypterImpl(DevConfig devConfig,
-			StreamReaderFactory streamReaderFactory) {
-		this.devConfig = devConfig;
-		this.streamReaderFactory = streamReaderFactory;
-	}
-
-	@Nullable
-	@Override
-	public String decryptLogs(@Nullable byte[] logKey) {
-		if (logKey == null) return null;
-		SecretKey key = new SecretKey(logKey);
-		File logFile = devConfig.getLogcatFile();
-		try (InputStream in = new FileInputStream(logFile)) {
-			InputStream reader =
-					streamReaderFactory.createLogStreamReader(in, key);
-			Scanner s = new Scanner(reader);
-			StringBuilder sb = new StringBuilder();
-			while (s.hasNextLine()) sb.append(s.nextLine()).append("\n");
-			s.close();
-			return sb.toString();
-		} catch (IOException e) {
-			logException(LOG, WARNING, e);
-			return null;
-		} finally {
-			//noinspection ResultOfMethodCallIgnored
-			logFile.delete();
-		}
-	}
-}

briar-android/src/main/java/org/briarproject/briar/android/logging/LogEncrypter.java

@@ -1,16 +0,0 @@
-package org.briarproject.briar.android.logging;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.util.AndroidUtils;
-
-import androidx.annotation.Nullable;
-
-@NotNullByDefault
-public interface LogEncrypter {
-	/**
-	 * Writes encrypted log records to {@link AndroidUtils#getLogcatFile}
-	 * and returns the encryption key if everything went fine.
-	 */
-	@Nullable
-	byte[] encryptLogs();
-}

briar-android/src/main/java/org/briarproject/briar/android/logging/LogEncrypterImpl.java

@@ -1,77 +0,0 @@
-package org.briarproject.briar.android.logging;
-
-import org.briarproject.bramble.api.crypto.CryptoComponent;
-import org.briarproject.bramble.api.crypto.SecretKey;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.reporting.DevConfig;
-import org.briarproject.bramble.api.transport.StreamWriter;
-import org.briarproject.bramble.api.transport.StreamWriterFactory;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.logging.Formatter;
-import java.util.logging.LogRecord;
-import java.util.logging.Logger;
-
-import javax.inject.Inject;
-
-import androidx.annotation.Nullable;
-
-import static java.util.logging.Level.WARNING;
-import static java.util.logging.Logger.getLogger;
-import static org.briarproject.bramble.util.LogUtils.logException;
-
-@NotNullByDefault
-class LogEncrypterImpl implements LogEncrypter {
-
-	private static final Logger LOG =
-			getLogger(LogEncrypterImpl.class.getName());
-
-	private final DevConfig devConfig;
-	private final CachingLogHandler logHandler;
-	private final CryptoComponent crypto;
-	private final StreamWriterFactory streamWriterFactory;
-
-	@Inject
-	LogEncrypterImpl(DevConfig devConfig,
-			CachingLogHandler logHandler,
-			CryptoComponent crypto,
-			StreamWriterFactory streamWriterFactory) {
-		this.devConfig = devConfig;
-		this.logHandler = logHandler;
-		this.crypto = crypto;
-		this.streamWriterFactory = streamWriterFactory;
-	}
-
-	@Nullable
-	@Override
-	public byte[] encryptLogs() {
-		SecretKey logKey = crypto.generateSecretKey();
-		File logFile = devConfig.getLogcatFile();
-		try (OutputStream out = new FileOutputStream(logFile)) {
-			StreamWriter streamWriter =
-					streamWriterFactory.createLogStreamWriter(out, logKey);
-			Writer writer =
-					new OutputStreamWriter(streamWriter.getOutputStream());
-			writeLogString(writer);
-			writer.close();
-			return logKey.getBytes();
-		} catch (IOException e) {
-			logException(LOG, WARNING, e);
-			return null;
-		}
-	}
-
-	private void writeLogString(Writer writer) throws IOException {
-		Formatter formatter = new BriefLogFormatter();
-		for (LogRecord record : logHandler.getRecentLogRecords()) {
-			String formatted = formatter.format(record);
-			writer.append(formatted).append('\n');
-		}
-	}
-
-}

briar-android/src/main/java/org/briarproject/briar/android/logging/LoggingModule.java

@@ -1,29 +0,0 @@
-package org.briarproject.briar.android.logging;
-
-import javax.inject.Singleton;
-
-import dagger.Module;
-import dagger.Provides;
-
-@Module
-public class LoggingModule {
-
-	@Provides
-	@Singleton
-	CachingLogHandler provideCachingLogHandler() {
-		return new CachingLogHandler();
-	}
-
-	@Provides
-	@Singleton
-	LogEncrypter provideLogEncrypter(LogEncrypterImpl logEncrypter) {
-		return logEncrypter;
-	}
-
-	@Provides
-	@Singleton
-	LogDecrypter provideLogDecrypter(LogDecrypterImpl logDecrypter) {
-		return logDecrypter;
-	}
-
-}

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

@@ -1,13 +1,17 @@
 package org.briarproject.briar.android.login;
 
 import android.content.Context;
+import android.graphics.drawable.Drawable;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.R;
 
 import androidx.appcompat.app.AlertDialog;
 
-import static org.briarproject.briar.android.util.UiUtils.getDialogIcon;
+import static androidx.core.content.ContextCompat.getColor;
+import static androidx.core.content.ContextCompat.getDrawable;
+import static androidx.core.graphics.drawable.DrawableCompat.setTint;
+import static java.util.Objects.requireNonNull;
 
 @NotNullByDefault
 class LoginUtils {
@@ -15,7 +19,9 @@ class LoginUtils {
 	static AlertDialog createKeyStrengthenerErrorDialog(Context ctx) {
 		AlertDialog.Builder builder =
 				new AlertDialog.Builder(ctx, R.style.BriarDialogTheme);
-		builder.setIcon(getDialogIcon(ctx, R.drawable.alerts_and_states_error));
+		Drawable icon = getDrawable(ctx, R.drawable.alerts_and_states_error);
+		setTint(requireNonNull(icon), getColor(ctx, R.color.color_primary));
+		builder.setIcon(icon);
 		builder.setTitle(R.string.dialog_title_cannot_check_password);
 		builder.setMessage(R.string.dialog_message_cannot_check_password);
 		builder.setPositiveButton(R.string.ok, null);

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

@@ -2,7 +2,6 @@ package org.briarproject.briar.android.navdrawer;
 
 import android.content.Intent;
 import android.content.res.Configuration;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -49,23 +48,25 @@ import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
+import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.lifecycle.ViewModelProviders;
-import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
 import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt;
 
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 import static androidx.core.view.GravityCompat.START;
 import static androidx.drawerlayout.widget.DrawerLayout.LOCK_MODE_LOCKED_CLOSED;
-import static androidx.lifecycle.Lifecycle.State.STARTED;
+import static androidx.fragment.app.FragmentManager.POP_BACK_STACK_INCLUSIVE;
+import static java.util.Objects.requireNonNull;
 import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState.RUNNING;
 import static org.briarproject.bramble.api.plugin.Plugin.State.ACTIVE;
@@ -142,7 +143,7 @@ public class NavDrawerActivity extends BriarActivity implements
 			if (ask) showDozeDialog(getString(R.string.setup_doze_intro));
 		});
 
-		Toolbar toolbar = setUpCustomToolbar(false);
+		Toolbar toolbar = findViewById(R.id.toolbar);
 		drawerLayout = findViewById(R.id.drawer_layout);
 		navigation = findViewById(R.id.navigation);
 		GridView transportsView = findViewById(R.id.transportsView);
@@ -152,6 +153,11 @@ public class NavDrawerActivity extends BriarActivity implements
 			startActivity(new Intent(this, TransportsActivity.class));
 		});
 
+		setSupportActionBar(toolbar);
+		ActionBar actionBar = requireNonNull(getSupportActionBar());
+		actionBar.setDisplayHomeAsUpEnabled(true);
+		actionBar.setHomeButtonEnabled(true);
+
 		drawerToggle = new ActionBarDrawerToggle(this, drawerLayout, toolbar,
 				R.string.nav_drawer_open_description,
 				R.string.nav_drawer_close_description) {
@@ -175,6 +181,9 @@ public class NavDrawerActivity extends BriarActivity implements
 
 		if (lifecycleManager.getLifecycleState().isAfter(RUNNING)) {
 			showSignOutFragment();
+		} else if (state == null) {
+			startFragment(ContactListFragment.newInstance(),
+					R.id.nav_btn_contacts);
 		}
 		if (state == null) {
 			// do not call this again when there's existing state
@@ -264,6 +273,7 @@ public class NavDrawerActivity extends BriarActivity implements
 	@Override
 	public boolean onNavigationItemSelected(@NonNull MenuItem item) {
 		drawerLayout.closeDrawer(START);
+		clearBackStack();
 		if (item.getItemId() == R.id.nav_btn_lock) {
 			lockManager.setLocked(true);
 			ActivityCompat.finishAfterTransition(this);
@@ -283,14 +293,8 @@ public class NavDrawerActivity extends BriarActivity implements
 			FragmentManager fm = getSupportFragmentManager();
 			if (fm.findFragmentByTag(SignOutFragment.TAG) != null) {
 				finish();
-			} else if (fm.getBackStackEntryCount() == 0 &&
-					fm.findFragmentByTag(ContactListFragment.TAG) == null) {
-				// don't start fragments in the wrong part of lifecycle (#1904)
-				if (!getLifecycle().getCurrentState().isAtLeast(STARTED)) {
-					LOG.warning("Tried to start contacts fragment in state " +
-							getLifecycle().getCurrentState().name());
-					return;
-				}
+			} else if (fm.getBackStackEntryCount() == 0
+					&& fm.findFragmentByTag(ContactListFragment.TAG) == null) {
 				/*
 				 * This makes sure that the first fragment (ContactListFragment) the
 				 * user sees is the same as the last fragment the user sees before
@@ -333,12 +337,30 @@ public class NavDrawerActivity extends BriarActivity implements
 		startFragment(fragment);
 	}
 
-	private void startFragment(BaseFragment f) {
-		getSupportFragmentManager().beginTransaction()
-				.setCustomAnimations(R.anim.fade_in, R.anim.fade_out,
-						R.anim.fade_in, R.anim.fade_out)
-				.replace(R.id.fragmentContainer, f, f.getUniqueTag())
-				.commit();
+	private void startFragment(BaseFragment fragment) {
+		if (getSupportFragmentManager().getBackStackEntryCount() == 0)
+			startFragment(fragment, false);
+		else startFragment(fragment, true);
+	}
+
+	private void startFragment(BaseFragment fragment,
+			boolean isAddedToBackStack) {
+		FragmentTransaction trans =
+				getSupportFragmentManager().beginTransaction()
+						.setCustomAnimations(R.anim.fade_in,
+								R.anim.fade_out, R.anim.fade_in,
+								R.anim.fade_out)
+						.replace(R.id.fragmentContainer, fragment,
+								fragment.getUniqueTag());
+		if (isAddedToBackStack) {
+			trans.addToBackStack(fragment.getUniqueTag());
+		}
+		trans.commit();
+	}
+
+	private void clearBackStack() {
+		getSupportFragmentManager().popBackStackImmediate(null,
+				POP_BACK_STACK_INCLUSIVE);
 	}
 
 	@Override
@@ -411,7 +433,8 @@ public class NavDrawerActivity extends BriarActivity implements
 				Transport t = getItem(position);
 
 				ImageView icon = view.findViewById(R.id.imageView);
-				icon.setImageResource(t.iconDrawable);
+				icon.setImageDrawable(ContextCompat.getDrawable(
+						NavDrawerActivity.this, t.iconDrawable));
 				icon.setColorFilter(ContextCompat.getColor(
 						NavDrawerActivity.this, t.iconColor));
 
@@ -453,13 +476,11 @@ public class NavDrawerActivity extends BriarActivity implements
 	private void showTransportsOnboarding(boolean show, ImageView imageView) {
 		if (show) {
 			int color = resolveColorAttribute(this, R.attr.colorControlNormal);
-			Drawable drawable = VectorDrawableCompat
-					.create(getResources(), R.drawable.transport_tor, null);
 			new MaterialTapTargetPrompt.Builder(NavDrawerActivity.this,
 					R.style.OnboardingDialogTheme).setTarget(imageView)
 					.setPrimaryText(R.string.network_settings_title)
 					.setSecondaryText(R.string.transports_onboarding_text)
-					.setIconDrawable(drawable)
+					.setIcon(R.drawable.transport_tor)
 					.setIconDrawableColourFilter(color)
 					.setBackgroundColour(
 							ContextCompat.getColor(this, R.color.briar_primary))

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

@@ -141,7 +141,8 @@ public class TransportsActivity extends BriarActivity {
 				Transport t = getItem(position);
 
 				ImageView icon = view.findViewById(R.id.icon);
-				icon.setImageResource(t.iconDrawable);
+				icon.setImageDrawable(ContextCompat.getDrawable(
+						TransportsActivity.this, t.iconDrawable));
 				icon.setColorFilter(ContextCompat.getColor(
 						TransportsActivity.this, t.iconColor));
 

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

@@ -1,60 +1,67 @@
 package org.briarproject.briar.android.privategroup.conversation;
 
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
+import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.identity.AuthorId;
+import org.briarproject.bramble.api.identity.LocalAuthor;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.controller.handler.UiExceptionHandler;
+import org.briarproject.briar.android.controller.handler.UiResultExceptionHandler;
+import org.briarproject.briar.android.privategroup.conversation.GroupController.GroupListener;
 import org.briarproject.briar.android.privategroup.creation.GroupInviteActivity;
 import org.briarproject.briar.android.privategroup.memberlist.GroupMemberListActivity;
 import org.briarproject.briar.android.privategroup.reveal.RevealContactsActivity;
 import org.briarproject.briar.android.threaded.ThreadListActivity;
-import org.briarproject.briar.android.threaded.ThreadListViewModel;
+import org.briarproject.briar.android.threaded.ThreadListController;
+import org.briarproject.briar.api.privategroup.PrivateGroup;
+import org.briarproject.briar.api.privategroup.Visibility;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
-import androidx.lifecycle.ViewModelProvider;
+import androidx.recyclerview.widget.LinearLayoutManager;
 
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
-import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
 import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_GROUP_INVITE;
-import static org.briarproject.briar.android.util.UiUtils.observeOnce;
 import static org.briarproject.briar.api.privategroup.PrivateGroupConstants.MAX_GROUP_POST_TEXT_LENGTH;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
 public class GroupActivity extends
-		ThreadListActivity<GroupMessageItem, GroupMessageAdapter> {
+		ThreadListActivity<PrivateGroup, GroupMessageItem, GroupMessageAdapter>
+		implements GroupListener, OnClickListener {
 
 	@Inject
-	ViewModelProvider.Factory viewModelFactory;
+	GroupController controller;
 
-	private GroupViewModel viewModel;
+	@Nullable
+	private Boolean isCreator = null;
+	private boolean isDissolved = false;
+	private MenuItem revealMenuItem, inviteMenuItem, leaveMenuItem,
+			dissolveMenuItem;
 
 	@Override
 	public void injectActivity(ActivityComponent component) {
 		component.inject(this);
-		viewModel = new ViewModelProvider(this, viewModelFactory)
-				.get(GroupViewModel.class);
 	}
 
 	@Override
-	protected ThreadListViewModel<GroupMessageItem> getViewModel() {
-		return viewModel;
-	}
-
-	@Override
-	protected GroupMessageAdapter createAdapter() {
-		return new GroupMessageAdapter(this);
+	protected ThreadListController<PrivateGroup, GroupMessageItem> getController() {
+		return controller;
 	}
 
 	@Override
@@ -62,28 +69,65 @@ public class GroupActivity extends
 		super.onCreate(state);
 
 		Toolbar toolbar = setUpCustomToolbar(false);
-		// Open member list on Toolbar click
-		toolbar.setOnClickListener(v -> {
-			Intent i = new Intent(GroupActivity.this,
-					GroupMemberListActivity.class);
-			i.putExtra(GROUP_ID, groupId.getBytes());
-			startActivity(i);
-		});
 
-		String groupName = getIntent().getStringExtra(GROUP_NAME);
+		Intent i = getIntent();
+		String groupName = i.getStringExtra(GROUP_NAME);
 		if (groupName != null) setTitle(groupName);
-		observeOnce(viewModel.getPrivateGroup(), this, privateGroup ->
-				setTitle(privateGroup.getName())
-		);
-		observeOnce(viewModel.isCreator(), this, adapter::setIsCreator);
+		loadNamedGroup();
+
+		// Open member list on Toolbar click
+		if (toolbar != null) {
+			toolbar.setOnClickListener(v -> {
+				Intent i1 = new Intent(GroupActivity.this,
+						GroupMemberListActivity.class);
+				i1.putExtra(GROUP_ID, groupId.getBytes());
+				startActivity(i1);
+			});
+		}
 
-		// start with group disabled and enable when not dissolved
 		setGroupEnabled(false);
-		viewModel.isDissolved().observe(this, dissolved -> {
-			setGroupEnabled(!dissolved);
-			// only show dialog when no prior state
-			if (dissolved && state == null) onGroupDissolved();
-		});
+	}
+
+	@Override
+	protected GroupMessageAdapter createAdapter(
+			LinearLayoutManager layoutManager) {
+		return new GroupMessageAdapter(this, layoutManager);
+	}
+
+	@Override
+	protected void loadItems() {
+		controller.isDissolved(
+				new UiResultExceptionHandler<Boolean, DbException>(this) {
+					@Override
+					public void onResultUi(Boolean isDissolved) {
+						setGroupEnabled(!isDissolved);
+						GroupActivity.super.loadItems();
+					}
+
+					@Override
+					public void onExceptionUi(DbException exception) {
+						handleException(exception);
+					}
+				});
+	}
+
+	@Override
+	protected void onNamedGroupLoaded(PrivateGroup group) {
+		setTitle(group.getName());
+		controller.loadLocalAuthor(
+				new UiResultExceptionHandler<LocalAuthor, DbException>(this) {
+					@Override
+					public void onResultUi(LocalAuthor author) {
+						isCreator = group.getCreator().equals(author);
+						adapter.setPerspective(isCreator);
+						showMenuItems();
+					}
+
+					@Override
+					public void onExceptionUi(DbException exception) {
+						handleException(exception);
+					}
+				});
 	}
 
 	@Override
@@ -92,61 +136,74 @@ public class GroupActivity extends
 		MenuInflater inflater = getMenuInflater();
 		inflater.inflate(R.menu.group_actions, menu);
 
-		// show items based on role (which will not change, so observe once)
-		observeOnce(viewModel.isCreator(), this, isCreator -> {
-			menu.findItem(R.id.action_group_reveal).setVisible(!isCreator);
-			menu.findItem(R.id.action_group_invite).setVisible(isCreator);
-			menu.findItem(R.id.action_group_leave).setVisible(!isCreator);
-			menu.findItem(R.id.action_group_dissolve).setVisible(isCreator);
-		});
-		super.onCreateOptionsMenu(menu);
-		return true;
+		revealMenuItem = menu.findItem(R.id.action_group_reveal);
+		inviteMenuItem = menu.findItem(R.id.action_group_invite);
+		leaveMenuItem = menu.findItem(R.id.action_group_leave);
+		dissolveMenuItem = menu.findItem(R.id.action_group_dissolve);
+
+		// all role-dependent items are invisible until we know our role
+		revealMenuItem.setVisible(false);
+		inviteMenuItem.setVisible(false);
+		leaveMenuItem.setVisible(false);
+		dissolveMenuItem.setVisible(false);
+
+		// show items based on role
+		showMenuItems();
+
+		return super.onCreateOptionsMenu(menu);
 	}
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
-		int itemId = item.getItemId();
-		if (itemId == R.id.action_group_member_list) {
-			Intent i = new Intent(this, GroupMemberListActivity.class);
-			i.putExtra(GROUP_ID, groupId.getBytes());
-			startActivity(i);
-			return true;
-		} else if (itemId == R.id.action_group_reveal) {
-			if (requireNonNull(viewModel.isCreator().getValue()))
-				throw new IllegalStateException();
-			Intent i = new Intent(this, RevealContactsActivity.class);
-			i.putExtra(GROUP_ID, groupId.getBytes());
-			startActivity(i);
-			return true;
-		} else if (itemId == R.id.action_group_invite) {
-			if (!requireNonNull(viewModel.isCreator().getValue()))
-				throw new IllegalStateException();
-			Intent i = new Intent(this, GroupInviteActivity.class);
-			i.putExtra(GROUP_ID, groupId.getBytes());
-			startActivityForResult(i, REQUEST_GROUP_INVITE);
-			return true;
-		} else if (itemId == R.id.action_group_leave) {
-			if (requireNonNull(viewModel.isCreator().getValue()))
-				throw new IllegalStateException();
-			showLeaveGroupDialog();
-			return true;
-		} else if (itemId == R.id.action_group_dissolve) {
-			if (!requireNonNull(viewModel.isCreator().getValue()))
-				throw new IllegalStateException();
-			showDissolveGroupDialog();
-			return true;
+		switch (item.getItemId()) {
+			case R.id.action_group_member_list:
+				Intent i1 = new Intent(this, GroupMemberListActivity.class);
+				i1.putExtra(GROUP_ID, groupId.getBytes());
+				startActivity(i1);
+				return true;
+			case R.id.action_group_reveal:
+				if (isCreator == null || isCreator)
+					throw new IllegalStateException();
+				Intent i2 = new Intent(this, RevealContactsActivity.class);
+				i2.putExtra(GROUP_ID, groupId.getBytes());
+				startActivity(i2);
+				return true;
+			case R.id.action_group_invite:
+				if (isCreator == null || !isCreator)
+					throw new IllegalStateException();
+				Intent i3 = new Intent(this, GroupInviteActivity.class);
+				i3.putExtra(GROUP_ID, groupId.getBytes());
+				startActivityForResult(i3, REQUEST_GROUP_INVITE);
+				return true;
+			case R.id.action_group_leave:
+				if (isCreator == null || isCreator)
+					throw new IllegalStateException();
+				showLeaveGroupDialog();
+				return true;
+			case R.id.action_group_dissolve:
+				if (isCreator == null || !isCreator)
+					throw new IllegalStateException();
+				showDissolveGroupDialog();
+			default:
+				return super.onOptionsItemSelected(item);
 		}
-		return super.onOptionsItemSelected(item);
 	}
 
 	@Override
-	protected void onActivityResult(int request, int result,
-			@Nullable Intent data) {
+	protected void onActivityResult(int request, int result, Intent data) {
 		if (request == REQUEST_GROUP_INVITE && result == RESULT_OK) {
 			displaySnackbar(R.string.groups_invitation_sent);
 		} else super.onActivityResult(request, result, data);
 	}
 
+	@Override
+	public void onItemReceived(GroupMessageItem item) {
+		super.onItemReceived(item);
+		if (item instanceof JoinMessageItem) {
+			if (((JoinMessageItem) item).isInitial()) loadSharingContacts();
+		}
+	}
+
 	@Override
 	protected int getMaxTextLength() {
 		return MAX_GROUP_POST_TEXT_LENGTH;
@@ -154,11 +211,11 @@ public class GroupActivity extends
 
 	@Override
 	public void onReplyClick(GroupMessageItem item) {
-		Boolean isDissolved = viewModel.isDissolved().getValue();
-		if (isDissolved != null && !isDissolved) super.onReplyClick(item);
+		if (!isDissolved) super.onReplyClick(item);
 	}
 
 	private void setGroupEnabled(boolean enabled) {
+		isDissolved = !enabled;
 		sendController.setReady(enabled);
 		list.getRecyclerView().setAlpha(enabled ? 1f : 0.5f);
 
@@ -170,13 +227,21 @@ public class GroupActivity extends
 		}
 	}
 
+	private void showMenuItems() {
+		// we need to have the menu items and know if we are the creator
+		if (leaveMenuItem == null || isCreator == null) return;
+		revealMenuItem.setVisible(!isCreator);
+		inviteMenuItem.setVisible(isCreator);
+		leaveMenuItem.setVisible(!isCreator);
+		dissolveMenuItem.setVisible(isCreator);
+	}
+
 	private void showLeaveGroupDialog() {
 		AlertDialog.Builder builder =
 				new AlertDialog.Builder(this, R.style.BriarDialogTheme);
 		builder.setTitle(getString(R.string.groups_leave_dialog_title));
 		builder.setMessage(getString(R.string.groups_leave_dialog_message));
-		builder.setNegativeButton(R.string.dialog_button_leave,
-				(d, w) -> deleteGroup());
+		builder.setNegativeButton(R.string.dialog_button_leave, this);
 		builder.setPositiveButton(R.string.cancel, null);
 		builder.show();
 	}
@@ -186,19 +251,37 @@ public class GroupActivity extends
 				new AlertDialog.Builder(this, R.style.BriarDialogTheme);
 		builder.setTitle(getString(R.string.groups_dissolve_dialog_title));
 		builder.setMessage(getString(R.string.groups_dissolve_dialog_message));
-		builder.setNegativeButton(R.string.groups_dissolve_button,
-				(d, w) -> deleteGroup());
+		builder.setNegativeButton(R.string.groups_dissolve_button, this);
 		builder.setPositiveButton(R.string.cancel, null);
 		builder.show();
 	}
 
-	private void deleteGroup() {
-		// The activity is going to be destroyed by the
-		// GroupRemovedEvent being fired
-		viewModel.deletePrivateGroup();
+	@Override
+	public void onClick(DialogInterface dialog, int which) {
+		controller.deleteNamedGroup(
+				new UiExceptionHandler<DbException>(this) {
+					// The activity is going to be destroyed by the
+					// GroupRemovedEvent being fired
+					@Override
+					public void onExceptionUi(DbException exception) {
+						handleException(exception);
+					}
+				});
 	}
 
-	private void onGroupDissolved() {
+	@Override
+	public void onContactRelationshipRevealed(AuthorId memberId, ContactId c,
+			Visibility v) {
+		adapter.updateVisibility(memberId, v);
+
+		sharingController.add(c);
+		setToolbarSubTitle(sharingController.getTotalCount(),
+				sharingController.getOnlineCount());
+	}
+
+	@Override
+	public void onGroupDissolved() {
+		setGroupEnabled(false);
 		AlertDialog.Builder builder =
 				new AlertDialog.Builder(this, R.style.BriarDialogTheme);
 		builder.setTitle(getString(R.string.groups_dissolved_dialog_title));

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

@@ -0,0 +1,33 @@
+package org.briarproject.briar.android.privategroup.conversation;
+
+import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.identity.AuthorId;
+import org.briarproject.bramble.api.identity.LocalAuthor;
+import org.briarproject.briar.android.controller.handler.ResultExceptionHandler;
+import org.briarproject.briar.android.threaded.ThreadListController;
+import org.briarproject.briar.api.privategroup.PrivateGroup;
+import org.briarproject.briar.api.privategroup.Visibility;
+
+import androidx.annotation.UiThread;
+
+public interface GroupController
+		extends ThreadListController<PrivateGroup, GroupMessageItem> {
+
+	void loadLocalAuthor(
+			ResultExceptionHandler<LocalAuthor, DbException> handler);
+
+	void isDissolved(
+			ResultExceptionHandler<Boolean, DbException> handler);
+
+	interface GroupListener extends ThreadListListener<GroupMessageItem> {
+
+		@UiThread
+		void onContactRelationshipRevealed(AuthorId memberId,
+				ContactId contactId, Visibility v);
+
+		@UiThread
+		void onGroupDissolved();
+	}
+
+}

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

@@ -0,0 +1,242 @@
+package org.briarproject.briar.android.privategroup.conversation;
+
+import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.crypto.CryptoExecutor;
+import org.briarproject.bramble.api.db.DatabaseExecutor;
+import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.event.Event;
+import org.briarproject.bramble.api.event.EventBus;
+import org.briarproject.bramble.api.identity.IdentityManager;
+import org.briarproject.bramble.api.identity.LocalAuthor;
+import org.briarproject.bramble.api.lifecycle.LifecycleManager;
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.bramble.api.sync.MessageId;
+import org.briarproject.bramble.api.system.Clock;
+import org.briarproject.briar.android.controller.handler.ResultExceptionHandler;
+import org.briarproject.briar.android.privategroup.conversation.GroupController.GroupListener;
+import org.briarproject.briar.android.threaded.ThreadListControllerImpl;
+import org.briarproject.briar.api.android.AndroidNotificationManager;
+import org.briarproject.briar.api.client.MessageTracker;
+import org.briarproject.briar.api.client.MessageTracker.GroupCount;
+import org.briarproject.briar.api.privategroup.GroupMember;
+import org.briarproject.briar.api.privategroup.GroupMessage;
+import org.briarproject.briar.api.privategroup.GroupMessageFactory;
+import org.briarproject.briar.api.privategroup.GroupMessageHeader;
+import org.briarproject.briar.api.privategroup.JoinMessageHeader;
+import org.briarproject.briar.api.privategroup.PrivateGroup;
+import org.briarproject.briar.api.privategroup.PrivateGroupManager;
+import org.briarproject.briar.api.privategroup.event.ContactRelationshipRevealedEvent;
+import org.briarproject.briar.api.privategroup.event.GroupDissolvedEvent;
+import org.briarproject.briar.api.privategroup.event.GroupInvitationResponseReceivedEvent;
+import org.briarproject.briar.api.privategroup.event.GroupMessageAddedEvent;
+import org.briarproject.briar.api.privategroup.invitation.GroupInvitationResponse;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.concurrent.Executor;
+import java.util.logging.Logger;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+
+import static java.lang.Math.max;
+import static java.util.logging.Level.WARNING;
+import static org.briarproject.bramble.util.LogUtils.logException;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+class GroupControllerImpl extends
+		ThreadListControllerImpl<PrivateGroup, GroupMessageItem, GroupMessageHeader, GroupMessage, GroupListener>
+		implements GroupController {
+
+	private static final Logger LOG =
+			Logger.getLogger(GroupControllerImpl.class.getName());
+
+	private final PrivateGroupManager privateGroupManager;
+	private final GroupMessageFactory groupMessageFactory;
+
+	@Inject
+	GroupControllerImpl(@DatabaseExecutor Executor dbExecutor,
+			LifecycleManager lifecycleManager, IdentityManager identityManager,
+			@CryptoExecutor Executor cryptoExecutor,
+			PrivateGroupManager privateGroupManager,
+			GroupMessageFactory groupMessageFactory, EventBus eventBus,
+			MessageTracker messageTracker, Clock clock,
+			AndroidNotificationManager notificationManager) {
+		super(dbExecutor, lifecycleManager, identityManager, cryptoExecutor,
+				eventBus, clock, notificationManager, messageTracker);
+		this.privateGroupManager = privateGroupManager;
+		this.groupMessageFactory = groupMessageFactory;
+	}
+
+	@Override
+	public void onActivityStart() {
+		super.onActivityStart();
+		notificationManager.clearGroupMessageNotification(getGroupId());
+	}
+
+	@Override
+	public void eventOccurred(Event e) {
+		super.eventOccurred(e);
+
+		if (e instanceof GroupMessageAddedEvent) {
+			GroupMessageAddedEvent g = (GroupMessageAddedEvent) e;
+			if (!g.isLocal() && g.getGroupId().equals(getGroupId())) {
+				LOG.info("Group message received, adding...");
+				listener.onItemReceived(buildItem(g.getHeader(), g.getText()));
+			}
+		} else if (e instanceof ContactRelationshipRevealedEvent) {
+			ContactRelationshipRevealedEvent c =
+					(ContactRelationshipRevealedEvent) e;
+			if (getGroupId().equals(c.getGroupId())) {
+				listener.onContactRelationshipRevealed(c.getMemberId(),
+						c.getContactId(), c.getVisibility());
+			}
+		} else if (e instanceof GroupInvitationResponseReceivedEvent) {
+			GroupInvitationResponseReceivedEvent g =
+					(GroupInvitationResponseReceivedEvent) e;
+			GroupInvitationResponse r = g.getMessageHeader();
+			if (getGroupId().equals(r.getShareableId()) && r.wasAccepted()) {
+				listener.onInvitationAccepted(g.getContactId());
+			}
+		} else if (e instanceof GroupDissolvedEvent) {
+			GroupDissolvedEvent g = (GroupDissolvedEvent) e;
+			if (getGroupId().equals(g.getGroupId())) {
+				listener.onGroupDissolved();
+			}
+		}
+	}
+
+	@Override
+	protected PrivateGroup loadNamedGroup() throws DbException {
+		return privateGroupManager.getPrivateGroup(getGroupId());
+	}
+
+	@Override
+	protected Collection<GroupMessageHeader> loadHeaders() throws DbException {
+		return privateGroupManager.getHeaders(getGroupId());
+	}
+
+	@Override
+	protected String loadMessageText(GroupMessageHeader header)
+			throws DbException {
+		if (header instanceof JoinMessageHeader) {
+			// will be looked up later
+			return "";
+		}
+		return privateGroupManager.getMessageText(header.getId());
+	}
+
+	@Override
+	protected void markRead(MessageId id) throws DbException {
+		privateGroupManager.setReadFlag(getGroupId(), id, true);
+	}
+
+	@Override
+	public void loadSharingContacts(
+			ResultExceptionHandler<Collection<ContactId>, DbException> handler) {
+		runOnDbThread(() -> {
+			try {
+				Collection<GroupMember> members =
+						privateGroupManager.getMembers(getGroupId());
+				Collection<ContactId> contactIds = new ArrayList<>();
+				for (GroupMember m : members) {
+					if (m.getContactId() != null)
+						contactIds.add(m.getContactId());
+				}
+				handler.onResult(contactIds);
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+				handler.onException(e);
+			}
+		});
+	}
+
+	@Override
+	public void createAndStoreMessage(String text,
+			@Nullable GroupMessageItem parentItem,
+			ResultExceptionHandler<GroupMessageItem, DbException> handler) {
+		runOnDbThread(() -> {
+			try {
+				LocalAuthor author = identityManager.getLocalAuthor();
+				MessageId parentId = null;
+				MessageId previousMsgId =
+						privateGroupManager.getPreviousMsgId(getGroupId());
+				GroupCount count =
+						privateGroupManager.getGroupCount(getGroupId());
+				long timestamp = count.getLatestMsgTime();
+				if (parentItem != null) parentId = parentItem.getId();
+				timestamp = max(clock.currentTimeMillis(), timestamp + 1);
+				createMessage(text, timestamp, parentId, author, previousMsgId,
+						handler);
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+				handler.onException(e);
+			}
+		});
+	}
+
+	private void createMessage(String text, long timestamp,
+			@Nullable MessageId parentId, LocalAuthor author,
+			MessageId previousMsgId,
+			ResultExceptionHandler<GroupMessageItem, DbException> handler) {
+		cryptoExecutor.execute(() -> {
+			LOG.info("Creating group message...");
+			GroupMessage msg = groupMessageFactory
+					.createGroupMessage(getGroupId(), timestamp,
+							parentId, author, text, previousMsgId);
+			storePost(msg, text, handler);
+		});
+	}
+
+	@Override
+	protected GroupMessageHeader addLocalMessage(GroupMessage message)
+			throws DbException {
+		return privateGroupManager.addLocalMessage(message);
+	}
+
+	@Override
+	protected void deleteNamedGroup(PrivateGroup group) throws DbException {
+		privateGroupManager.removePrivateGroup(group.getId());
+	}
+
+	@Override
+	protected GroupMessageItem buildItem(GroupMessageHeader header,
+			String text) {
+		if (header instanceof JoinMessageHeader) {
+			return new JoinMessageItem((JoinMessageHeader) header, text);
+		}
+		return new GroupMessageItem(header, text);
+	}
+
+	@Override
+	public void loadLocalAuthor(
+			ResultExceptionHandler<LocalAuthor, DbException> handler) {
+		runOnDbThread(() -> {
+			try {
+				LocalAuthor author = identityManager.getLocalAuthor();
+				handler.onResult(author);
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+				handler.onException(e);
+			}
+		});
+	}
+
+	@Override
+	public void isDissolved(
+			ResultExceptionHandler<Boolean, DbException> handler) {
+		runOnDbThread(() -> {
+			try {
+				boolean isDissolved =
+						privateGroupManager.isDissolved(getGroupId());
+				handler.onResult(isDissolved);
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+				handler.onException(e);
+			}
+		});
+	}
+
+}

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

@@ -1,18 +1,19 @@
 package org.briarproject.briar.android.privategroup.conversation;
 
-import org.briarproject.briar.android.viewmodel.ViewModelKey;
+import org.briarproject.briar.android.activity.ActivityScope;
+import org.briarproject.briar.android.activity.BaseActivity;
 
-import androidx.lifecycle.ViewModel;
-import dagger.Binds;
 import dagger.Module;
-import dagger.multibindings.IntoMap;
+import dagger.Provides;
 
 @Module
-public interface GroupConversationModule {
-
-	@Binds
-	@IntoMap
-	@ViewModelKey(GroupViewModel.class)
-	ViewModel bindGroupViewModel(GroupViewModel groupViewModel);
+public class GroupConversationModule {
 
+	@ActivityScope
+	@Provides
+	GroupController provideGroupController(BaseActivity activity,
+			GroupControllerImpl groupController) {
+		activity.addLifecycleController(groupController);
+		return groupController;
+	}
 }

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

@@ -4,14 +4,19 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import org.briarproject.bramble.api.identity.AuthorId;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.threaded.BaseThreadItemViewHolder;
 import org.briarproject.briar.android.threaded.ThreadItemAdapter;
 import org.briarproject.briar.android.threaded.ThreadPostViewHolder;
+import org.briarproject.briar.api.privategroup.Visibility;
 
 import androidx.annotation.LayoutRes;
 import androidx.annotation.UiThread;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
 
 @UiThread
 @NotNullByDefault
@@ -19,14 +24,15 @@ class GroupMessageAdapter extends ThreadItemAdapter<GroupMessageItem> {
 
 	private boolean isCreator = false;
 
-	GroupMessageAdapter(ThreadItemListener<GroupMessageItem> listener) {
-		super(listener);
+	GroupMessageAdapter(ThreadItemListener<GroupMessageItem> listener,
+			LinearLayoutManager layoutManager) {
+		super(listener, layoutManager);
 	}
 
 	@LayoutRes
 	@Override
 	public int getItemViewType(int position) {
-		GroupMessageItem item = getItem(position);
+		GroupMessageItem item = items.get(position);
 		return item.getLayout();
 	}
 
@@ -41,9 +47,30 @@ class GroupMessageAdapter extends ThreadItemAdapter<GroupMessageItem> {
 		return new ThreadPostViewHolder<>(v);
 	}
 
-	void setIsCreator(boolean isCreator) {
+	void setPerspective(boolean isCreator) {
 		this.isCreator = isCreator;
 		notifyDataSetChanged();
 	}
 
+	void updateVisibility(AuthorId memberId, Visibility v) {
+		int position = findItemPosition(memberId);
+		if (position != NO_POSITION) {
+			GroupMessageItem item = items.get(position);
+			if (item instanceof JoinMessageItem) {
+				((JoinMessageItem) item).setVisibility(v);
+				notifyItemChanged(findItemPosition(item), item);
+			}
+		}
+	}
+
+	private int findItemPosition(AuthorId a) {
+		int count = items.size();
+		for (int i = 0; i < count; i++) {
+			GroupMessageItem item = items.get(i);
+			if (item.getAuthor().getId().equals(a))
+				return i;
+		}
+		return NO_POSITION; // Not found
+	}
+
 }

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

@@ -1,287 +0,0 @@
-package org.briarproject.briar.android.privategroup.conversation;
-
-import android.app.Application;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.crypto.CryptoExecutor;
-import org.briarproject.bramble.api.db.DatabaseExecutor;
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.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.identity.Author;
-import org.briarproject.bramble.api.identity.IdentityManager;
-import org.briarproject.bramble.api.identity.LocalAuthor;
-import org.briarproject.bramble.api.lifecycle.LifecycleManager;
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
-import org.briarproject.bramble.api.sync.GroupId;
-import org.briarproject.bramble.api.sync.MessageId;
-import org.briarproject.bramble.api.system.AndroidExecutor;
-import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.briar.android.sharing.SharingController;
-import org.briarproject.briar.android.threaded.ThreadListViewModel;
-import org.briarproject.briar.api.android.AndroidNotificationManager;
-import org.briarproject.briar.api.client.MessageTracker;
-import org.briarproject.briar.api.client.MessageTracker.GroupCount;
-import org.briarproject.briar.api.privategroup.GroupMember;
-import org.briarproject.briar.api.privategroup.GroupMessage;
-import org.briarproject.briar.api.privategroup.GroupMessageFactory;
-import org.briarproject.briar.api.privategroup.GroupMessageHeader;
-import org.briarproject.briar.api.privategroup.JoinMessageHeader;
-import org.briarproject.briar.api.privategroup.PrivateGroup;
-import org.briarproject.briar.api.privategroup.PrivateGroupManager;
-import org.briarproject.briar.api.privategroup.event.ContactRelationshipRevealedEvent;
-import org.briarproject.briar.api.privategroup.event.GroupDissolvedEvent;
-import org.briarproject.briar.api.privategroup.event.GroupInvitationResponseReceivedEvent;
-import org.briarproject.briar.api.privategroup.event.GroupMessageAddedEvent;
-import org.briarproject.briar.api.privategroup.invitation.GroupInvitationResponse;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.Executor;
-import java.util.logging.Logger;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-
-import static java.lang.Math.max;
-import static java.util.logging.Level.WARNING;
-import static java.util.logging.Logger.getLogger;
-import static org.briarproject.bramble.util.LogUtils.logDuration;
-import static org.briarproject.bramble.util.LogUtils.logException;
-import static org.briarproject.bramble.util.LogUtils.now;
-
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
-class GroupViewModel extends ThreadListViewModel<GroupMessageItem> {
-
-	private static final Logger LOG = getLogger(GroupViewModel.class.getName());
-
-	private final PrivateGroupManager privateGroupManager;
-	private final GroupMessageFactory groupMessageFactory;
-
-	private final MutableLiveData<PrivateGroup> privateGroup =
-			new MutableLiveData<>();
-	private final MutableLiveData<Boolean> isCreator = new MutableLiveData<>();
-	private final MutableLiveData<Boolean> isDissolved =
-			new MutableLiveData<>();
-
-	@Inject
-	GroupViewModel(Application application,
-			@DatabaseExecutor Executor dbExecutor,
-			LifecycleManager lifecycleManager,
-			TransactionManager db,
-			AndroidExecutor androidExecutor,
-			EventBus eventBus,
-			IdentityManager identityManager,
-			AndroidNotificationManager notificationManager,
-			SharingController sharingController,
-			@CryptoExecutor Executor cryptoExecutor,
-			Clock clock,
-			MessageTracker messageTracker,
-			PrivateGroupManager privateGroupManager,
-			GroupMessageFactory groupMessageFactory) {
-		super(application, dbExecutor, lifecycleManager, db, androidExecutor,
-				identityManager, notificationManager, sharingController,
-				cryptoExecutor, clock, messageTracker, eventBus);
-		this.privateGroupManager = privateGroupManager;
-		this.groupMessageFactory = groupMessageFactory;
-	}
-
-	@Override
-	public void eventOccurred(Event e) {
-		if (e instanceof GroupMessageAddedEvent) {
-			GroupMessageAddedEvent g = (GroupMessageAddedEvent) e;
-			// only act on non-local messages in this group
-			if (!g.isLocal() && g.getGroupId().equals(groupId)) {
-				LOG.info("Group message received, adding...");
-				GroupMessageItem item = buildItem(g.getHeader(), g.getText());
-				addItem(item, false);
-				// In case the join message comes from the creator,
-				// we need to reload the sharing contacts
-				// in case it was delayed and the sharing count is wrong (#850).
-				if (item instanceof JoinMessageItem &&
-						(((JoinMessageItem) item).isInitial())) {
-					loadSharingContacts();
-				}
-			}
-		} else if (e instanceof GroupInvitationResponseReceivedEvent) {
-			GroupInvitationResponseReceivedEvent g =
-					(GroupInvitationResponseReceivedEvent) e;
-			GroupInvitationResponse r = g.getMessageHeader();
-			if (r.getShareableId().equals(groupId) && r.wasAccepted()) {
-				sharingController.add(g.getContactId());
-			}
-		} else if (e instanceof ContactRelationshipRevealedEvent) {
-			ContactRelationshipRevealedEvent c =
-					(ContactRelationshipRevealedEvent) e;
-			if (c.getGroupId().equals(groupId)) {
-				sharingController.add(c.getContactId());
-			}
-		} else if (e instanceof GroupDissolvedEvent) {
-			GroupDissolvedEvent g = (GroupDissolvedEvent) e;
-			if (g.getGroupId().equals(groupId)) {
-				isDissolved.setValue(true);
-			}
-		} else {
-			super.eventOccurred(e);
-		}
-	}
-
-	@Override
-	protected void performInitialLoad() {
-		super.performInitialLoad();
-		loadPrivateGroup(groupId);
-	}
-
-	protected void clearNotifications() {
-		notificationManager.clearGroupMessageNotification(groupId);
-	}
-
-	private void loadPrivateGroup(GroupId groupId) {
-		runOnDbThread(() -> {
-			try {
-				PrivateGroup g = privateGroupManager.getPrivateGroup(groupId);
-				privateGroup.postValue(g);
-				Author author = identityManager.getLocalAuthor();
-				isCreator.postValue(g.getCreator().equals(author));
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
-	}
-
-	@Override
-	public void loadItems() {
-		loadList(txn -> {
-			// check first if group is dissolved
-			isDissolved
-					.postValue(privateGroupManager.isDissolved(txn, groupId));
-			// now continue to load the items
-			long start = now();
-			List<GroupMessageHeader> headers =
-					privateGroupManager.getHeaders(txn, groupId);
-			logDuration(LOG, "Loading headers", start);
-			start = now();
-			List<GroupMessageItem> items = new ArrayList<>();
-			for (GroupMessageHeader header : headers) {
-				items.add(loadItem(txn, header));
-			}
-			logDuration(LOG, "Loading bodies and creating items", start);
-			return items;
-		}, this::setItems);
-	}
-
-	private GroupMessageItem loadItem(Transaction txn,
-			GroupMessageHeader header) throws DbException {
-		String text;
-		if (header instanceof JoinMessageHeader) {
-			// will be looked up later
-			text = "";
-		} else {
-			text = privateGroupManager.getMessageText(txn, header.getId());
-		}
-		return buildItem(header, text);
-	}
-
-	private GroupMessageItem buildItem(GroupMessageHeader header, String text) {
-		if (header instanceof JoinMessageHeader) {
-			return new JoinMessageItem((JoinMessageHeader) header, text);
-		}
-		return new GroupMessageItem(header, text);
-	}
-
-	@Override
-	public void createAndStoreMessage(String text,
-			@Nullable MessageId parentId) {
-		runOnDbThread(() -> {
-			try {
-				LocalAuthor author = identityManager.getLocalAuthor();
-				MessageId previousMsgId =
-						privateGroupManager.getPreviousMsgId(groupId);
-				GroupCount count = privateGroupManager.getGroupCount(groupId);
-				long timestamp = count.getLatestMsgTime();
-				timestamp = max(clock.currentTimeMillis(), timestamp + 1);
-				createMessage(text, timestamp, parentId, author, previousMsgId);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
-	}
-
-	private void createMessage(String text, long timestamp,
-			@Nullable MessageId parentId, LocalAuthor author,
-			MessageId previousMsgId) {
-		cryptoExecutor.execute(() -> {
-			LOG.info("Creating group message...");
-			GroupMessage msg = groupMessageFactory.createGroupMessage(groupId,
-					timestamp, parentId, author, text, previousMsgId);
-			storePost(msg, text);
-		});
-	}
-
-	private void storePost(GroupMessage msg, String text) {
-		runOnDbThread(false, txn -> {
-			long start = now();
-			GroupMessageHeader header =
-					privateGroupManager.addLocalMessage(txn, msg);
-			logDuration(LOG, "Storing group message", start);
-			txn.attach(() ->
-					addItem(buildItem(header, text), true)
-			);
-		}, e -> logException(LOG, WARNING, e));
-	}
-
-	@Override
-	protected void markItemRead(GroupMessageItem item) {
-		runOnDbThread(() -> {
-			try {
-				privateGroupManager.setReadFlag(groupId, item.getId(), true);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
-	}
-
-	public void loadSharingContacts() {
-		runOnDbThread(true, txn -> {
-			Collection<GroupMember> members =
-					privateGroupManager.getMembers(txn, groupId);
-			Collection<ContactId> contactIds = new ArrayList<>();
-			for (GroupMember m : members) {
-				if (m.getContactId() != null)
-					contactIds.add(m.getContactId());
-			}
-			txn.attach(() -> sharingController.addAll(contactIds));
-		}, e -> logException(LOG, WARNING, e));
-	}
-
-	void deletePrivateGroup() {
-		runOnDbThread(() -> {
-			try {
-				privateGroupManager.removePrivateGroup(groupId);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
-	}
-
-	LiveData<PrivateGroup> getPrivateGroup() {
-		return privateGroup;
-	}
-
-	LiveData<Boolean> isCreator() {
-		return isCreator;
-	}
-
-	LiveData<Boolean> isDissolved() {
-		return isDissolved;
-	}
-
-}

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

@@ -2,6 +2,7 @@ package org.briarproject.briar.android.privategroup.conversation;
 
 import org.briarproject.briar.R;
 import org.briarproject.briar.api.privategroup.JoinMessageHeader;
+import org.briarproject.briar.api.privategroup.Visibility;
 
 import javax.annotation.concurrent.NotThreadSafe;
 
@@ -12,11 +13,13 @@ import androidx.annotation.UiThread;
 @NotThreadSafe
 class JoinMessageItem extends GroupMessageItem {
 
+	private Visibility visibility;
 	private final boolean isInitial;
 
 	JoinMessageItem(JoinMessageHeader h, String text) {
 		super(h, text);
-		isInitial = h.isInitial();
+		this.visibility = h.getVisibility();
+		this.isInitial = h.isInitial();
 	}
 
 	@Override
@@ -30,6 +33,14 @@ class JoinMessageItem extends GroupMessageItem {
 		return R.layout.list_item_group_join_notice;
 	}
 
+	Visibility getVisibility() {
+		return visibility;
+	}
+
+	void setVisibility(Visibility visibility) {
+		this.visibility = visibility;
+	}
+
 	boolean isInitial() {
 		return isInitial;
 	}

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

@@ -1,40 +1,29 @@
 package org.briarproject.briar.android.reporting;
 
-import android.app.Application;
+import android.content.Context;
 import android.os.Process;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.briar.android.logging.LogEncrypter;
 
 import java.lang.Thread.UncaughtExceptionHandler;
 
-import javax.inject.Inject;
-
 import static org.briarproject.briar.android.util.UiUtils.startDevReportActivity;
 
 @NotNullByDefault
-class BriarExceptionHandler implements UncaughtExceptionHandler {
+public class BriarExceptionHandler implements UncaughtExceptionHandler {
 
-	private final Application app;
-	private final LogEncrypter logEncrypter;
+	private final Context ctx;
 	private final long appStartTime;
 
-	@Inject
-	BriarExceptionHandler(Application app, LogEncrypter logEncrypter) {
-		this.app = app;
-		this.logEncrypter = logEncrypter;
-		appStartTime = System.currentTimeMillis();
+	public BriarExceptionHandler(Context ctx) {
+		this.ctx = ctx;
+		this.appStartTime = System.currentTimeMillis();
 	}
 
 	@Override
 	public void uncaughtException(Thread t, Throwable e) {
-		// encrypt logs to disk before handing over to new process
-		// the intent has limited space, so we can't reliably store them there.
-		byte[] logKey = logEncrypter.encryptLogs();
-
 		// activity runs in its own process, so we can kill the old one
-		startDevReportActivity(app.getApplicationContext(),
-				CrashReportActivity.class, e, appStartTime, logKey);
+		startDevReportActivity(ctx, CrashReportActivity.class, e, appStartTime);
 		Process.killProcess(Process.myPid());
 		System.exit(10);
 	}

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

@@ -25,6 +25,8 @@ import org.briarproject.bramble.api.Pair;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.BuildConfig;
 import org.briarproject.briar.R;
+import org.briarproject.briar.android.BriarApplication;
+import org.briarproject.briar.android.logging.BriefLogFormatter;
 import org.briarproject.briar.android.reporting.ReportData.MultiReportInfo;
 import org.briarproject.briar.android.reporting.ReportData.ReportItem;
 import org.briarproject.briar.android.reporting.ReportData.SingleReportInfo;
@@ -39,6 +41,8 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.logging.Formatter;
+import java.util.logging.LogRecord;
 
 import javax.annotation.concurrent.Immutable;
 
@@ -70,8 +74,8 @@ class BriarReportCollector {
 		this.ctx = ctx;
 	}
 
-	ReportData collectReportData(@Nullable Throwable t, long appStartTime,
-			String logs) {
+	public ReportData collectReportData(@Nullable Throwable t,
+			long appStartTime) {
 		ReportData reportData = new ReportData()
 				.add(getBasicInfo(t))
 				.add(getDeviceInfo());
@@ -82,7 +86,7 @@ class BriarReportCollector {
 				.add(getStorage())
 				.add(getConnectivity())
 				.add(getBuildConfig())
-				.add(getLogcat(logs))
+				.add(getLogcat())
 				.add(getDeviceFeatures());
 	}
 
@@ -309,8 +313,15 @@ class BriarReportCollector {
 				buildConfig);
 	}
 
-	private ReportItem getLogcat(String logs) {
-		return new ReportItem("Logcat", R.string.dev_report_logcat, logs);
+	private ReportItem getLogcat() {
+		BriarApplication app = (BriarApplication) ctx.getApplicationContext();
+		StringBuilder sb = new StringBuilder();
+		Formatter formatter = new BriefLogFormatter();
+		for (LogRecord record : app.getRecentLogRecords()) {
+			sb.append(formatter.format(record)).append('\n');
+		}
+		return new ReportItem("Logcat", R.string.dev_report_logcat,
+				sb.toString());
 	}
 
 	private ReportItem getDeviceFeatures() {

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

@@ -35,7 +35,6 @@ public class CrashReportActivity extends BaseActivity
 
 	public static final String EXTRA_THROWABLE = "throwable";
 	public static final String EXTRA_APP_START_TIME = "appStartTime";
-	public static final String EXTRA_APP_LOGCAT = "logcat";
 
 	@Inject
 	ViewModelProvider.Factory viewModelFactory;
@@ -57,8 +56,7 @@ public class CrashReportActivity extends BaseActivity
 		Intent intent = getIntent();
 		Throwable t = (Throwable) intent.getSerializableExtra(EXTRA_THROWABLE);
 		long appStartTime = intent.getLongExtra(EXTRA_APP_START_TIME, -1);
-		byte[] logKey = intent.getByteArrayExtra(EXTRA_APP_LOGCAT);
-		viewModel.init(t, appStartTime, logKey);
+		viewModel.init(t, appStartTime);
 		viewModel.getShowReport().observeEvent(this, show -> {
 			if (show) displayFragment(true);
 		});

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

@@ -15,8 +15,4 @@ public abstract class DevReportModule {
 	@ViewModelKey(ReportViewModel.class)
 	abstract ViewModel bindReportViewModel(ReportViewModel reportViewModel);
 
-	@Binds
-	abstract Thread.UncaughtExceptionHandler bindUncaughtExceptionHandler(
-			BriarExceptionHandler handler);
-
 }

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

@@ -11,9 +11,6 @@ import org.briarproject.bramble.api.plugin.TorConstants;
 import org.briarproject.bramble.api.reporting.DevReporter;
 import org.briarproject.bramble.util.AndroidUtils;
 import org.briarproject.briar.R;
-import org.briarproject.briar.android.logging.BriefLogFormatter;
-import org.briarproject.briar.android.logging.CachingLogHandler;
-import org.briarproject.briar.android.logging.LogDecrypter;
 import org.briarproject.briar.android.reporting.ReportData.MultiReportInfo;
 import org.briarproject.briar.android.viewmodel.LiveEvent;
 import org.briarproject.briar.android.viewmodel.MutableLiveEvent;
@@ -22,7 +19,6 @@ import org.json.JSONException;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.UUID;
-import java.util.logging.Formatter;
 import java.util.logging.Logger;
 
 import javax.inject.Inject;
@@ -40,16 +36,13 @@ import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.api.plugin.Plugin.State.ACTIVE;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
-import static org.briarproject.briar.android.logging.BriefLogFormatter.formatLog;
 
 @NotNullByDefault
-class ReportViewModel extends AndroidViewModel {
+public class ReportViewModel extends AndroidViewModel {
 
 	private static final Logger LOG =
 			getLogger(ReportViewModel.class.getName());
 
-	private final CachingLogHandler logHandler;
-	private final LogDecrypter logDecrypter;
 	private final BriarReportCollector collector;
 	private final DevReporter reporter;
 	private final PluginManager pluginManager;
@@ -65,39 +58,18 @@ class ReportViewModel extends AndroidViewModel {
 	private boolean isFeedback;
 
 	@Inject
-	ReportViewModel(@NonNull Application application,
-			CachingLogHandler logHandler,
-			LogDecrypter logDecrypter,
-			DevReporter reporter,
-			PluginManager pluginManager) {
+	public ReportViewModel(@NonNull Application application,
+			DevReporter reporter, PluginManager pluginManager) {
 		super(application);
-		collector = new BriarReportCollector(application);
-		this.logHandler = logHandler;
-		this.logDecrypter = logDecrypter;
+		this.collector = new BriarReportCollector(application);
 		this.reporter = reporter;
 		this.pluginManager = pluginManager;
 	}
 
-	void init(@Nullable Throwable t, long appStartTime,
-			@Nullable byte[] logKey) {
+	void init(@Nullable Throwable t, long appStartTime) {
 		isFeedback = t == null;
 		if (reportData.getValue() == null) new SingleShotAndroidExecutor(() -> {
-			String decryptedLogs;
-			if (isFeedback) {
-				Formatter formatter = new BriefLogFormatter();
-				decryptedLogs =
-						formatLog(formatter, logHandler.getRecentLogRecords());
-			} else {
-				decryptedLogs = logDecrypter.decryptLogs(logKey);
-				if (decryptedLogs == null) {
-					// error decrypting logs, get logs from this process
-					Formatter formatter = new BriefLogFormatter();
-					decryptedLogs = formatLog(formatter,
-							logHandler.getRecentLogRecords());
-				}
-			}
-			ReportData data =
-					collector.collectReportData(t, appStartTime, decryptedLogs);
+			ReportData data = collector.collectReportData(t, appStartTime);
 			reportData.postValue(data);
 		}).start();
 	}
@@ -138,8 +110,8 @@ class ReportViewModel extends AndroidViewModel {
 	}
 
 	/**
-	 * The content of the report that will be loaded after
-	 * {@link #init(Throwable, long, byte[])} was called.
+	 * The content of the report
+	 * that will be loaded after {@link #init(Throwable, long)} was called.
 	 */
 	LiveData<ReportData> getReportData() {
 		return reportData;

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

@@ -9,13 +9,10 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.BaseActivity;
-import org.briarproject.briar.android.conversation.glide.GlideApp;
 
 import javax.inject.Inject;
 
@@ -35,7 +32,7 @@ public class ConfirmAvatarDialogFragment extends DialogFragment {
 
 	@Inject
 	ViewModelProvider.Factory viewModelFactory;
-	private SettingsViewModel viewModel;
+	private SettingsViewModel settingsViewModel;
 
 	private static final String ARG_URI = "uri";
 	private Uri uri;
@@ -54,9 +51,6 @@ public class ConfirmAvatarDialogFragment extends DialogFragment {
 	public void onAttach(Context ctx) {
 		super.onAttach(ctx);
 		((BaseActivity) requireActivity()).getActivityComponent().inject(this);
-		ViewModelProvider provider =
-				new ViewModelProvider(requireActivity(), viewModelFactory);
-		viewModel = provider.get(SettingsViewModel.class);
 	}
 
 	@Override
@@ -66,34 +60,32 @@ public class ConfirmAvatarDialogFragment extends DialogFragment {
 		uri = Uri.parse(argUri);
 
 		FragmentActivity activity = requireActivity();
-		LayoutInflater inflater = LayoutInflater.from(activity);
+
+		ViewModelProvider provider =
+				new ViewModelProvider(activity, viewModelFactory);
+		settingsViewModel = provider.get(SettingsViewModel.class);
+
+		AlertDialog.Builder builder =
+				new AlertDialog.Builder(activity, R.style.BriarDialogTheme);
+
+		LayoutInflater inflater = LayoutInflater.from(getContext());
 		final View view =
 				inflater.inflate(R.layout.fragment_confirm_avatar_dialog, null);
+		builder.setView(view);
+
+		builder.setTitle(R.string.dialog_confirm_profile_picture_title);
+		builder.setNegativeButton(R.string.cancel, null);
+		builder.setPositiveButton(R.string.change,
+				(dialog, id) -> settingsViewModel.setAvatar(uri));
+
 		ImageView imageView = view.findViewById(R.id.image);
+		imageView.setImageURI(uri);
+
 		TextView textViewUserName = view.findViewById(R.id.username);
+		settingsViewModel.getOwnIdentityInfo().observe(activity,
+				us -> textViewUserName.setText(us.getLocalAuthor().getName()));
 
-		GlideApp.with(imageView)
-				.load(uri)
-				.diskCacheStrategy(DiskCacheStrategy.NONE)
-				.error(R.drawable.ic_image_broken)
-				.into(imageView)
-				.waitForLayout();
-
-		// we can't use getViewLifecycleOwner() here
-		// as this fragment technically doesn't have a view
-		viewModel.getOwnIdentityInfo().observe(activity, us ->
-				textViewUserName.setText(us.getLocalAuthor().getName())
-		);
-
-		int theme = R.style.BriarDialogTheme;
-		return new AlertDialog.Builder(activity, theme)
-				.setView(view)
-				.setTitle(R.string.dialog_confirm_profile_picture_title)
-				.setNegativeButton(R.string.cancel, null)
-				.setPositiveButton(R.string.change, (d, id) ->
-						viewModel.setAvatar(uri)
-				)
-				.create();
+		return builder.create();
 	}
 
 }

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

@@ -79,7 +79,7 @@ class SettingsViewModel extends AndroidViewModel {
 		return ownIdentityInfo;
 	}
 
-	LiveEvent<Boolean> getSetAvatarFailed() {
+	public LiveEvent<Boolean> getSetAvatarFailed() {
 		return setAvatarFailed;
 	}
 

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

@@ -1,54 +0,0 @@
-package org.briarproject.briar.android.sharing;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.util.Collection;
-
-import androidx.annotation.UiThread;
-import androidx.lifecycle.LiveData;
-
-@NotNullByDefault
-public interface SharingController {
-
-	/**
-	 * Call this when the owning ViewModel gets cleared,
-	 * so the {@link EventBus} can get unregistered.
-	 */
-	void onCleared();
-
-	/**
-	 * Adds one contact to be tracked.
-	 */
-	@UiThread
-	void add(ContactId c);
-
-	/**
-	 * Adds a collection of contacts to be tracked.
-	 */
-	@UiThread
-	void addAll(Collection<ContactId> contacts);
-
-	/**
-	 * Call this when the contact identified by c is no longer sharing
-	 * the given group identified by GroupId g.
-	 */
-	@UiThread
-	void remove(ContactId c);
-
-	/**
-	 * Returns the total number of contacts that have been added.
-	 */
-	LiveData<SharingInfo> getSharingInfo();
-
-	class SharingInfo {
-		public final int total, online;
-
-		SharingInfo(int total, int online) {
-			this.total = total;
-			this.online = online;
-		}
-	}
-
-}

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

@@ -1,102 +0,0 @@
-package org.briarproject.briar.android.sharing;
-
-import org.briarproject.bramble.api.connection.ConnectionRegistry;
-import org.briarproject.bramble.api.contact.ContactId;
-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.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.event.ContactConnectedEvent;
-import org.briarproject.bramble.api.plugin.event.ContactDisconnectedEvent;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.inject.Inject;
-
-import androidx.annotation.UiThread;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-
-@NotNullByDefault
-public class SharingControllerImpl implements SharingController, EventListener {
-
-	private final EventBus eventBus;
-	private final ConnectionRegistry connectionRegistry;
-
-	// UI thread
-	private final Set<ContactId> contacts = new HashSet<>();
-	private final MutableLiveData<SharingInfo> sharingInfo =
-			new MutableLiveData<>();
-
-	@Inject
-	SharingControllerImpl(EventBus eventBus,
-			ConnectionRegistry connectionRegistry) {
-		this.eventBus = eventBus;
-		this.connectionRegistry = connectionRegistry;
-		eventBus.addListener(this);
-	}
-
-	@Override
-	public void onCleared() {
-		eventBus.removeListener(this);
-	}
-
-	@Override
-	public void eventOccurred(Event e) {
-		if (e instanceof ContactConnectedEvent) {
-			setConnected(((ContactConnectedEvent) e).getContactId());
-		} else if (e instanceof ContactDisconnectedEvent) {
-			setConnected(((ContactDisconnectedEvent) e).getContactId());
-		}
-	}
-
-	@UiThread
-	private void setConnected(ContactId c) {
-		if (contacts.contains(c)) {
-			updateLiveData();
-		}
-	}
-
-	@UiThread
-	private void updateLiveData() {
-		int online = getOnlineCount();
-		sharingInfo.setValue(new SharingInfo(contacts.size(), online));
-	}
-
-	private int getOnlineCount() {
-		int online = 0;
-		for (ContactId c : contacts) {
-			if (connectionRegistry.isConnected(c)) online++;
-		}
-		return online;
-	}
-
-	@UiThread
-	@Override
-	public void addAll(Collection<ContactId> c) {
-		contacts.addAll(c);
-		updateLiveData();
-	}
-
-	@UiThread
-	@Override
-	public void add(ContactId c) {
-		contacts.add(c);
-		updateLiveData();
-	}
-
-	@UiThread
-	@Override
-	public void remove(ContactId c) {
-		contacts.remove(c);
-		updateLiveData();
-	}
-
-	@Override
-	public LiveData<SharingInfo> getSharingInfo() {
-		return sharingInfo;
-	}
-
-}

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

@@ -9,47 +9,36 @@ import dagger.Provides;
 @Module
 public class SharingModule {
 
-	@Module
-	@Deprecated
-	public static class SharingLegacyModule {
-
-		@ActivityScope
-		@Provides
-		ShareForumController provideShareForumController(
-				ShareForumControllerImpl shareForumController) {
-			return shareForumController;
-		}
-
-		@ActivityScope
-		@Provides
-		BlogInvitationController provideInvitationBlogController(
-				BaseActivity activity,
-				BlogInvitationControllerImpl blogInvitationController) {
-			activity.addLifecycleController(blogInvitationController);
-			return blogInvitationController;
-		}
-
-		@ActivityScope
-		@Provides
-		ForumInvitationController provideInvitationForumController(
-				BaseActivity activity,
-				ForumInvitationControllerImpl forumInvitationController) {
-			activity.addLifecycleController(forumInvitationController);
-			return forumInvitationController;
-		}
-
-		@ActivityScope
-		@Provides
-		ShareBlogController provideShareBlogController(
-				ShareBlogControllerImpl shareBlogController) {
-			return shareBlogController;
-		}
+	@ActivityScope
+	@Provides
+	ShareForumController provideShareForumController(
+			ShareForumControllerImpl shareForumController) {
+		return shareForumController;
 	}
 
+	@ActivityScope
 	@Provides
-	SharingController provideSharingController(
-			SharingControllerImpl sharingController) {
-		return sharingController;
+	BlogInvitationController provideInvitationBlogController(
+			BaseActivity activity,
+			BlogInvitationControllerImpl blogInvitationController) {
+		activity.addLifecycleController(blogInvitationController);
+		return blogInvitationController;
+	}
+
+	@ActivityScope
+	@Provides
+	ForumInvitationController provideInvitationForumController(
+			BaseActivity activity,
+			ForumInvitationControllerImpl forumInvitationController) {
+		activity.addLifecycleController(forumInvitationController);
+		return forumInvitationController;
+	}
+
+	@ActivityScope
+	@Provides
+	ShareBlogController provideShareBlogController(
+			ShareBlogControllerImpl shareBlogController) {
+		return shareBlogController;
 	}
 
 }

briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredActivity.java

@@ -1,6 +1,5 @@
 package org.briarproject.briar.android.splash;
 
-import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -8,7 +7,6 @@ import android.view.View;
 import android.view.View.OnClickListener;
 
 import org.briarproject.briar.R;
-import org.briarproject.briar.android.Localizer;
 
 import androidx.appcompat.app.AppCompatActivity;
 
@@ -29,13 +27,6 @@ public class ExpiredActivity extends AppCompatActivity
 		findViewById(R.id.download_briar_button).setOnClickListener(this);
 	}
 
-	@Override
-	protected void attachBaseContext(Context base) {
-		super.attachBaseContext(
-				Localizer.getInstance().setLocale(base));
-		Localizer.getInstance().setLocale(this);
-	}
-
 	@Override
 	public void onClick(View v) {
 		Uri uri = Uri.parse("https://briarproject.org/download.html");

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

@@ -0,0 +1,54 @@
+package org.briarproject.briar.android.threaded;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.sync.MessageId;
+import org.briarproject.briar.api.client.MessageTree;
+import org.briarproject.briar.api.client.MessageTree.MessageNode;
+import org.briarproject.briar.client.MessageTreeImpl;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import androidx.annotation.UiThread;
+
+@UiThread
+@NotNullByDefault
+public class NestedTreeList<T extends MessageNode> implements Iterable<T> {
+
+	private final MessageTree<T> tree = new MessageTreeImpl<>();
+	private List<T> depthFirstCollection = new ArrayList<>();
+
+	public void addAll(Collection<T> collection) {
+		tree.add(collection);
+		depthFirstCollection = new ArrayList<>(tree.depthFirstOrder());
+	}
+
+	public void add(T elem) {
+		tree.add(elem);
+		depthFirstCollection = new ArrayList<>(tree.depthFirstOrder());
+	}
+
+	public void clear() {
+		tree.clear();
+		depthFirstCollection.clear();
+	}
+
+	public T get(int index) {
+		return depthFirstCollection.get(index);
+	}
+
+	public int size() {
+		return depthFirstCollection.size();
+	}
+
+	public boolean contains(MessageId m) {
+		return tree.contains(m);
+	}
+
+	@Override
+	public Iterator<T> iterator() {
+		return depthFirstCollection.iterator();
+	}
+}

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

@@ -99,14 +99,4 @@ public abstract class ThreadItem implements MessageNode {
 		return highlighted;
 	}
 
-	@Override
-	public int hashCode() {
-		return messageId.hashCode();
-	}
-
-	@Override
-	public boolean equals(@Nullable Object o) {
-		return o instanceof ThreadItem &&
-				messageId.equals(((ThreadItem) o).messageId);
-	}
 }

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

@@ -4,45 +4,39 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.util.ItemReturningAdapter;
+import org.briarproject.briar.android.util.VersionedAdapter;
+
+import java.util.Collection;
 
 import javax.annotation.Nullable;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.UiThread;
-import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.ListAdapter;
+import androidx.recyclerview.widget.RecyclerView;
 
 import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
 
 @UiThread
-@NotNullByDefault
 public class ThreadItemAdapter<I extends ThreadItem>
-		extends ListAdapter<I, BaseThreadItemViewHolder<I>>
-		implements ItemReturningAdapter<I> {
+		extends RecyclerView.Adapter<BaseThreadItemViewHolder<I>>
+		implements VersionedAdapter, ItemReturningAdapter<I> {
 
 	static final int UNDEFINED = -1;
 
+	protected final NestedTreeList<I> items = new NestedTreeList<>();
 	private final ThreadItemListener<I> listener;
+	private final LinearLayoutManager layoutManager;
 
-	public ThreadItemAdapter(ThreadItemListener<I> listener) {
-		super(new DiffUtil.ItemCallback<I>() {
-			@Override
-			public boolean areItemsTheSame(I a, I b) {
-				return a.equals(b);
-			}
+	private volatile int revision = 0;
 
-			@Override
-			public boolean areContentsTheSame(I a, I b) {
-				return a.isHighlighted() == b.isHighlighted() &&
-						a.isRead() == b.isRead();
-			}
-		});
+	public ThreadItemAdapter(ThreadItemListener<I> listener,
+			LinearLayoutManager layoutManager) {
 		this.listener = listener;
+		this.layoutManager = layoutManager;
 	}
 
 	@NonNull
@@ -57,27 +51,76 @@ public class ThreadItemAdapter<I extends ThreadItem>
 	@Override
 	public void onBindViewHolder(@NonNull BaseThreadItemViewHolder<I> ui,
 			int position) {
-		I item = getItem(position);
+		I item = items.get(position);
 		ui.bind(item, listener);
 	}
 
-	int findItemPosition(MessageId id) {
-		for (int i = 0; i < getItemCount(); i++) {
-			if (id.equals(getItem(i).getId())) return i;
+	@Override
+	public int getItemCount() {
+		return items.size();
+	}
+
+	@Override
+	public int getRevision() {
+		return revision;
+	}
+
+	@Override
+	public void incrementRevision() {
+		revision++;
+	}
+
+	void setItemWithIdVisible(MessageId messageId) {
+		int pos = 0;
+		for (I item : items) {
+			if (item.getId().equals(messageId)) {
+				layoutManager.scrollToPosition(pos);
+				break;
+			}
+			pos++;
+		}
+	}
+
+	public void setItems(Collection<I> items) {
+		this.items.clear();
+		this.items.addAll(items);
+		notifyDataSetChanged();
+	}
+
+	public void add(I item) {
+		items.add(item);
+		notifyItemInserted(findItemPosition(item));
+	}
+
+	@Nullable
+	public I getItemAt(int position) {
+		if (position == NO_POSITION || position >= items.size()) {
+			return null;
+		}
+		return items.get(position);
+	}
+
+	protected int findItemPosition(@Nullable I item) {
+		for (int i = 0; i < items.size(); i++) {
+			if (items.get(i).equals(item)) return i;
 		}
 		return NO_POSITION; // Not found
 	}
 
+	boolean contains(MessageId m) {
+		return items.contains(m);
+	}
+
 	/**
 	 * Highlights the item with the given {@link MessageId}
 	 * and disables the highlight for a previously highlighted item, if any.
-	 * <p>
+	 *
 	 * Only one item can be highlighted at a time.
 	 */
 	void setHighlightedItem(@Nullable MessageId id) {
-		for (int i = 0; i < getItemCount(); i++) {
-			I item = getItem(i);
-			if (item.getId().equals(id)) {
+		for (int i = 0; i < items.size(); i++) {
+			I item = items.get(i);
+			if (id != null && item.getId().equals(id)) {
 				item.setHighlighted(true);
 				notifyItemChanged(i, item);
 			} else if (item.isHighlighted()) {
@@ -89,27 +132,20 @@ public class ThreadItemAdapter<I extends ThreadItem>
 
 	@Nullable
 	I getHighlightedItem() {
-		for (I item : getCurrentList()) {
-			if (item.isHighlighted()) return item;
+		for (I i : items) {
+			if (i.isHighlighted()) return i;
 		}
 		return null;
 	}
 
-	@Nullable
-	MessageId getFirstVisibleMessageId(LinearLayoutManager layoutManager) {
-		int position = layoutManager.findFirstVisibleItemPosition();
-		if (position == NO_POSITION) return null;
-		return getItemAt(position).getId();
-	}
-
 	/**
 	 * Returns the position of the first unread item below the current viewport
 	 */
-	int getVisibleUnreadPosBottom(LinearLayoutManager layoutManager) {
+	int getVisibleUnreadPosBottom() {
 		int positionBottom = layoutManager.findLastVisibleItemPosition();
 		if (positionBottom == NO_POSITION) return NO_POSITION;
-		for (int i = positionBottom + 1; i < getItemCount(); i++) {
-			if (!getItem(i).isRead()) return i;
+		for (int i = positionBottom + 1; i < items.size(); i++) {
+			if (!items.get(i).isRead()) return i;
 		}
 		return NO_POSITION;
 	}
@@ -117,11 +153,11 @@ public class ThreadItemAdapter<I extends ThreadItem>
 	/**
 	 * Returns the position of the first unread item above the current viewport
 	 */
-	int getVisibleUnreadPosTop(LinearLayoutManager layoutManager) {
+	int getVisibleUnreadPosTop() {
 		int positionTop = layoutManager.findFirstVisibleItemPosition();
 		int position = NO_POSITION;
-		for (int i = 0; i < getItemCount(); i++) {
-			if (i < positionTop && !getItem(i).isRead()) {
+		for (int i = 0; i < items.size(); i++) {
+			if (i < positionTop && !items.get(i).isRead()) {
 				position = i;
 			} else if (i >= positionTop) {
 				return position;
@@ -130,11 +166,6 @@ public class ThreadItemAdapter<I extends ThreadItem>
 		return NO_POSITION;
 	}
 
-	@Override
-	public I getItemAt(int position) {
-		return getItem(position);
-	}
-
 	public interface ThreadItemListener<I> {
 		void onReplyClick(I item);
 	}

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

@@ -0,0 +1,15 @@
+package org.briarproject.briar.android.threaded;
+
+import org.briarproject.bramble.api.sync.MessageId;
+
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+public interface ThreadItemList<I extends ThreadItem> extends List<I> {
+
+	@Nullable
+	MessageId getFirstVisibleItemId();
+
+	void setFirstVisibleId(@Nullable MessageId bottomVisibleItemId);
+}

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

@@ -0,0 +1,23 @@
+package org.briarproject.briar.android.threaded;
+
+import org.briarproject.bramble.api.sync.MessageId;
+
+import java.util.ArrayList;
+
+import javax.annotation.Nullable;
+
+public class ThreadItemListImpl<I extends ThreadItem> extends ArrayList<I>
+		implements ThreadItemList<I> {
+
+	private MessageId bottomVisibleItemId;
+
+	@Override
+	public MessageId getFirstVisibleItemId() {
+		return bottomVisibleItemId;
+	}
+
+	@Override
+	public void setFirstVisibleId(@Nullable MessageId bottomVisibleItemId) {
+		this.bottomVisibleItemId = bottomVisibleItemId;
+	}
+}

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

@@ -2,18 +2,25 @@ package org.briarproject.briar.android.threaded;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.Parcelable;
 import android.view.MenuItem;
 
 import com.google.android.material.snackbar.Snackbar;
 
+import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.BriarActivity;
-import org.briarproject.briar.android.sharing.SharingController.SharingInfo;
+import org.briarproject.briar.android.controller.SharingController;
+import org.briarproject.briar.android.controller.SharingController.SharingListener;
+import org.briarproject.briar.android.controller.handler.UiResultExceptionHandler;
 import org.briarproject.briar.android.threaded.ThreadItemAdapter.ThreadItemListener;
+import org.briarproject.briar.android.threaded.ThreadListController.ThreadListDataSource;
+import org.briarproject.briar.android.threaded.ThreadListController.ThreadListListener;
 import org.briarproject.briar.android.util.BriarSnackbarBuilder;
 import org.briarproject.briar.android.view.BriarRecyclerView;
 import org.briarproject.briar.android.view.TextInputView;
@@ -21,13 +28,18 @@ import org.briarproject.briar.android.view.TextSendController;
 import org.briarproject.briar.android.view.TextSendController.SendListener;
 import org.briarproject.briar.android.view.UnreadMessageButton;
 import org.briarproject.briar.api.attachment.AttachmentHeader;
+import org.briarproject.briar.api.client.NamedGroup;
 
+import java.util.Collection;
 import java.util.List;
+import java.util.logging.Logger;
 
 import javax.annotation.Nullable;
+import javax.inject.Inject;
 
 import androidx.annotation.CallSuper;
 import androidx.annotation.StringRes;
+import androidx.annotation.UiThread;
 import androidx.appcompat.app.ActionBar;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
@@ -36,19 +48,32 @@ import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
-public abstract class ThreadListActivity<I extends ThreadItem, A extends ThreadItemAdapter<I>>
-		extends BriarActivity implements SendListener, ThreadItemListener<I> {
+public abstract class ThreadListActivity<G extends NamedGroup, I extends ThreadItem, A extends ThreadItemAdapter<I>>
+		extends BriarActivity
+		implements ThreadListListener<I>, SendListener, SharingListener,
+		ThreadItemListener<I>, ThreadListDataSource {
 
-	protected final A adapter = createAdapter();
-	protected abstract ThreadListViewModel<I> getViewModel();
-	protected abstract A createAdapter();
+	protected static final String KEY_REPLY_ID = "replyId";
+
+	private static final Logger LOG =
+			Logger.getLogger(ThreadListActivity.class.getName());
+
+	protected A adapter;
+	private ThreadScrollListener<I> scrollListener;
 	protected BriarRecyclerView list;
+	private LinearLayoutManager layoutManager;
 	protected TextInputView textInput;
 	protected TextSendController sendController;
 	protected GroupId groupId;
+	@Nullable
+	private Parcelable layoutManagerState;
+	@Nullable
+	private MessageId replyId;
 
-	private LinearLayoutManager layoutManager;
-	private ThreadScrollListener<I> scrollListener;
+	protected abstract ThreadListController<G, I> getController();
+
+	@Inject
+	protected SharingController sharingController;
 
 	@CallSuper
 	@Override
@@ -61,8 +86,7 @@ public abstract class ThreadListActivity<I extends ThreadItem, A extends ThreadI
 		byte[] b = i.getByteArrayExtra(GROUP_ID);
 		if (b == null) throw new IllegalStateException("No GroupId in intent.");
 		groupId = new GroupId(b);
-		ThreadListViewModel<I> viewModel = getViewModel();
-		viewModel.setGroupId(groupId);
+		getController().setGroupId(groupId);
 
 		textInput = findViewById(R.id.text_input_container);
 		sendController = new TextSendController(textInput, this, false);
@@ -76,41 +100,131 @@ public abstract class ThreadListActivity<I extends ThreadItem, A extends ThreadI
 		list = findViewById(R.id.list);
 		layoutManager = new LinearLayoutManager(this);
 		list.setLayoutManager(layoutManager);
+		adapter = createAdapter(layoutManager);
 		list.setAdapter(adapter);
-		scrollListener = new ThreadScrollListener<>(adapter, viewModel,
+		scrollListener = new ThreadScrollListener<>(adapter, getController(),
 				upButton, downButton);
 		list.getRecyclerView().addOnScrollListener(scrollListener);
 
 		upButton.setOnClickListener(v -> {
-			int position = adapter.getVisibleUnreadPosTop(layoutManager);
+			int position = adapter.getVisibleUnreadPosTop();
 			if (position != NO_POSITION) {
 				list.getRecyclerView().scrollToPosition(position);
 			}
 		});
 		downButton.setOnClickListener(v -> {
-			int position = adapter.getVisibleUnreadPosBottom(layoutManager);
+			int position = adapter.getVisibleUnreadPosBottom();
 			if (position != NO_POSITION) {
 				list.getRecyclerView().scrollToPosition(position);
 			}
 		});
 
-		viewModel.getItems().observe(this, result -> result
-				.onError(this::handleException)
-				.onSuccess(this::displayItems)
-		);
+		if (state != null) {
+			byte[] replyIdBytes = state.getByteArray(KEY_REPLY_ID);
+			if (replyIdBytes != null) replyId = new MessageId(replyIdBytes);
+		}
 
-		viewModel.getSharingInfo().observe(this, this::setToolbarSubTitle);
+		sharingController.setSharingListener(this);
+		loadSharingContacts();
+	}
 
-		viewModel.getGroupRemoved().observe(this, removed -> {
-			if (removed) supportFinishAfterTransition();
-		});
+	@Override
+	@Nullable
+	public MessageId getFirstVisibleMessageId() {
+		if (layoutManager != null && adapter != null) {
+			int position =
+					layoutManager.findFirstVisibleItemPosition();
+			I i = adapter.getItemAt(position);
+			return i == null ? null : i.getId();
+		}
+		return null;
+	}
+
+	protected abstract A createAdapter(LinearLayoutManager layoutManager);
+
+	protected void loadNamedGroup() {
+		getController().loadNamedGroup(
+				new UiResultExceptionHandler<G, DbException>(this) {
+					@Override
+					public void onResultUi(G groupItem) {
+						onNamedGroupLoaded(groupItem);
+					}
+
+					@Override
+					public void onExceptionUi(DbException exception) {
+						handleException(exception);
+					}
+				});
+	}
+
+	@UiThread
+	protected abstract void onNamedGroupLoaded(G groupItem);
+
+	protected void loadItems() {
+		int revision = adapter.getRevision();
+		getController().loadItems(
+				new UiResultExceptionHandler<ThreadItemList<I>, DbException>(
+						this) {
+					@Override
+					public void onResultUi(ThreadItemList<I> items) {
+						if (revision == adapter.getRevision()) {
+							adapter.incrementRevision();
+							if (items.isEmpty()) {
+								list.showData();
+							} else {
+								displayItems(items);
+								updateTextInput();
+							}
+						} else {
+							LOG.info("Concurrent update, reloading");
+							loadItems();
+						}
+					}
+
+					@Override
+					public void onExceptionUi(DbException exception) {
+						handleException(exception);
+					}
+				});
+	}
+
+	private void displayItems(ThreadItemList<I> items) {
+		adapter.setItems(items);
+		MessageId messageId = items.getFirstVisibleItemId();
+		if (messageId != null)
+			adapter.setItemWithIdVisible(messageId);
+		list.showData();
+		if (layoutManagerState == null) {
+			list.scrollToPosition(0);  // Scroll to the top
+		} else {
+			layoutManager.onRestoreInstanceState(layoutManagerState);
+		}
+	}
+
+	protected void loadSharingContacts() {
+		getController().loadSharingContacts(
+				new UiResultExceptionHandler<Collection<ContactId>, DbException>(
+						this) {
+					@Override
+					public void onResultUi(Collection<ContactId> contacts) {
+						sharingController.addAll(contacts);
+						int online = sharingController.getOnlineCount();
+						setToolbarSubTitle(contacts.size(), online);
+					}
+
+					@Override
+					public void onExceptionUi(DbException exception) {
+						handleException(exception);
+					}
+				});
 	}
 
 	@CallSuper
 	@Override
 	public void onStart() {
 		super.onStart();
-		getViewModel().blockAndClearNotifications();
+		sharingController.onStart();
+		loadItems();
 		list.startPeriodicUpdate();
 	}
 
@@ -118,98 +232,91 @@ public abstract class ThreadListActivity<I extends ThreadItem, A extends ThreadI
 	@Override
 	public void onStop() {
 		super.onStop();
-		getViewModel().unblockNotifications();
+		sharingController.onStop();
 		list.stopPeriodicUpdate();
 	}
 
 	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		if (item.getItemId() == android.R.id.home) {
-			supportFinishAfterTransition();
-			return true;
+	protected void onSaveInstanceState(Bundle outState) {
+		super.onSaveInstanceState(outState);
+		if (layoutManager != null) {
+			layoutManagerState = layoutManager.onSaveInstanceState();
+			outState.putParcelable("layoutManager", layoutManagerState);
+		}
+		if (replyId != null) {
+			outState.putByteArray(KEY_REPLY_ID, replyId.getBytes());
+		}
+	}
+
+	@Override
+	protected void onRestoreInstanceState(Bundle savedInstanceState) {
+		super.onRestoreInstanceState(savedInstanceState);
+		layoutManagerState = savedInstanceState.getParcelable("layoutManager");
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch (item.getItemId()) {
+			case android.R.id.home:
+				supportFinishAfterTransition();
+				return true;
+			default:
+				return super.onOptionsItemSelected(item);
 		}
-		return super.onOptionsItemSelected(item);
 	}
 
 	@Override
 	public void onBackPressed() {
 		if (adapter.getHighlightedItem() != null) {
 			textInput.clearText();
-			getViewModel().setReplyId(null);
+			replyId = null;
 			updateTextInput();
 		} else {
 			super.onBackPressed();
 		}
 	}
 
-	@Override
-	protected void onDestroy() {
-		super.onDestroy();
-		// store list position, so we can restore it when coming back here
-		if (layoutManager != null && adapter != null) {
-			MessageId id = adapter.getFirstVisibleMessageId(layoutManager);
-			getViewModel().storeMessageId(id);
-		}
-	}
-
-	protected void displayItems(List<I> items) {
-		if (items.isEmpty()) {
-			list.showData();
-		} else {
-			adapter.submitList(items, () -> {
-				// do stuff *after* list had been updated
-				scrollAfterListCommitted();
-				updateTextInput();
-			});
-		}
-	}
-
-	/**
-	 * Scrolls to the first visible item last time the activity was open,
-	 * if one exists and this is the first time, the list gets displayed.
-	 * Or scrolls to a locally added item that has just been added to the list.
-	 */
-	private void scrollAfterListCommitted() {
-		MessageId restoredFirstVisibleItemId =
-				getViewModel().getAndResetRestoredMessageId();
-		MessageId scrollToItem =
-				getViewModel().getAndResetScrollToItem();
-		if (restoredFirstVisibleItemId != null) {
-			scrollToItemAtTop(restoredFirstVisibleItemId);
-		} else if (scrollToItem != null) {
-			scrollToItemAtTop(scrollToItem);
-		}
-		scrollListener.updateUnreadButtons(layoutManager);
-	}
-
 	@Override
 	public void onReplyClick(I item) {
-		getViewModel().setReplyId(item.getId());
+		replyId = item.getId();
 		updateTextInput();
 		// FIXME This does not work for a hardware keyboard
 		if (textInput.isKeyboardOpen()) {
-			scrollToItemAtTop(item.getId());
+			scrollToItemAtTop(item);
 		} else {
 			// wait with scrolling until keyboard opened
 			textInput.setOnKeyboardShownListener(() -> {
-				scrollToItemAtTop(item.getId());
+				scrollToItemAtTop(item);
 				textInput.setOnKeyboardShownListener(null);
 			});
 		}
 	}
 
-	protected void setToolbarSubTitle(SharingInfo sharingInfo) {
+	@Override
+	public void onSharingInfoUpdated(int total, int online) {
+		setToolbarSubTitle(total, online);
+	}
+
+	@Override
+	public void onInvitationAccepted(ContactId c) {
+		sharingController.add(c);
+		setToolbarSubTitle(sharingController.getTotalCount(),
+				sharingController.getOnlineCount());
+	}
+
+	protected void setToolbarSubTitle(int total, int online) {
 		ActionBar actionBar = getSupportActionBar();
 		if (actionBar != null) {
-			actionBar.setSubtitle(getString(R.string.shared_with,
-					sharingInfo.total, sharingInfo.online));
+			actionBar.setSubtitle(
+					getString(R.string.shared_with, total, online));
 		}
 	}
 
-	private void scrollToItemAtTop(MessageId messageId) {
-		int position = adapter.findItemPosition(messageId);
+	private void scrollToItemAtTop(I item) {
+		int position = adapter.findItemPosition(item);
 		if (position != NO_POSITION) {
-			layoutManager.scrollToPositionWithOffset(position, 0);
+			layoutManager
+					.scrollToPositionWithOffset(position, 0);
 		}
 	}
 
@@ -220,7 +327,6 @@ public abstract class ThreadListActivity<I extends ThreadItem, A extends ThreadI
 	}
 
 	private void updateTextInput() {
-		MessageId replyId = getViewModel().getReplyId();
 		if (replyId != null) {
 			textInput.setHint(R.string.forum_message_reply_hint);
 			textInput.showSoftKeyboard();
@@ -235,14 +341,54 @@ public abstract class ThreadListActivity<I extends ThreadItem, A extends ThreadI
 			List<AttachmentHeader> headers) {
 		if (isNullOrEmpty(text)) throw new AssertionError();
 
-		MessageId replyId = getViewModel().getReplyId();
-		getViewModel().createAndStoreMessage(text, replyId);
+		I replyItem = adapter.getHighlightedItem();
+		UiResultExceptionHandler<I, DbException> handler =
+				new UiResultExceptionHandler<I, DbException>(this) {
+					@Override
+					public void onResultUi(I result) {
+						addItem(result, true);
+					}
+
+					@Override
+					public void onExceptionUi(DbException exception) {
+						handleException(exception);
+					}
+				};
+		getController().createAndStoreMessage(text, replyItem, handler);
 		textInput.hideSoftKeyboard();
 		textInput.clearText();
-		getViewModel().setReplyId(null);
+		replyId = null;
 		updateTextInput();
 	}
 
 	protected abstract int getMaxTextLength();
 
+	@Override
+	public void onItemReceived(I item) {
+		addItem(item, false);
+	}
+
+	@Override
+	public void onGroupRemoved() {
+		supportFinishAfterTransition();
+	}
+
+	private void addItem(I item, boolean isLocal) {
+		adapter.incrementRevision();
+		MessageId parent = item.getParentId();
+		if (parent != null && !adapter.contains(parent)) {
+			// We've incremented the adapter's revision, so the item will be
+			// loaded when its parent has been loaded
+			LOG.info("Ignoring item with missing parent");
+			return;
+		}
+		adapter.add(item);
+
+		if (isLocal) {
+			scrollToItemAtTop(item);
+		} else {
+			scrollListener.updateUnreadButtons(layoutManager);
+		}
+	}
+
 }

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

@@ -0,0 +1,60 @@
+package org.briarproject.briar.android.threaded;
+
+import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.db.DbException;
+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.android.controller.ActivityLifecycleController;
+import org.briarproject.briar.android.controller.handler.ExceptionHandler;
+import org.briarproject.briar.android.controller.handler.ResultExceptionHandler;
+import org.briarproject.briar.api.client.NamedGroup;
+
+import java.util.Collection;
+
+import javax.annotation.Nullable;
+
+import androidx.annotation.UiThread;
+
+@NotNullByDefault
+public interface ThreadListController<G extends NamedGroup, I extends ThreadItem>
+		extends ActivityLifecycleController {
+
+	void setGroupId(GroupId groupId);
+
+	void loadNamedGroup(ResultExceptionHandler<G, DbException> handler);
+
+	void loadSharingContacts(
+			ResultExceptionHandler<Collection<ContactId>, DbException> handler);
+
+	void loadItems(
+			ResultExceptionHandler<ThreadItemList<I>, DbException> handler);
+
+	void markItemRead(I item);
+
+	void markItemsRead(Collection<I> items);
+
+	void createAndStoreMessage(String text, @Nullable I parentItem,
+			ResultExceptionHandler<I, DbException> handler);
+
+	void deleteNamedGroup(ExceptionHandler<DbException> handler);
+
+	interface ThreadListListener<I> extends ThreadListDataSource {
+
+		@UiThread
+		void onItemReceived(I item);
+
+		@UiThread
+		void onGroupRemoved();
+
+		@UiThread
+		void onInvitationAccepted(ContactId c);
+	}
+
+	interface ThreadListDataSource {
+
+		@UiThread @Nullable
+		MessageId getFirstVisibleMessageId();
+	}
+
+}

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

@@ -0,0 +1,273 @@
+package org.briarproject.briar.android.threaded;
+
+import android.app.Activity;
+
+import org.briarproject.bramble.api.crypto.CryptoExecutor;
+import org.briarproject.bramble.api.db.DatabaseExecutor;
+import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.event.Event;
+import org.briarproject.bramble.api.event.EventBus;
+import org.briarproject.bramble.api.event.EventListener;
+import org.briarproject.bramble.api.identity.IdentityManager;
+import org.briarproject.bramble.api.lifecycle.LifecycleManager;
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.bramble.api.sync.GroupId;
+import org.briarproject.bramble.api.sync.MessageId;
+import org.briarproject.bramble.api.sync.event.GroupRemovedEvent;
+import org.briarproject.bramble.api.system.Clock;
+import org.briarproject.briar.android.controller.DbControllerImpl;
+import org.briarproject.briar.android.controller.handler.ExceptionHandler;
+import org.briarproject.briar.android.controller.handler.ResultExceptionHandler;
+import org.briarproject.briar.android.threaded.ThreadListController.ThreadListListener;
+import org.briarproject.briar.api.android.AndroidNotificationManager;
+import org.briarproject.briar.api.client.MessageTracker;
+import org.briarproject.briar.api.client.NamedGroup;
+import org.briarproject.briar.api.client.PostHeader;
+import org.briarproject.briar.api.client.ThreadedMessage;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executor;
+import java.util.logging.Logger;
+
+import androidx.annotation.CallSuper;
+
+import static java.util.logging.Level.INFO;
+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;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+public abstract class ThreadListControllerImpl<G extends NamedGroup, I extends ThreadItem, H extends PostHeader, M extends ThreadedMessage, L extends ThreadListListener<I>>
+		extends DbControllerImpl
+		implements ThreadListController<G, I>, EventListener {
+
+	private static final Logger LOG =
+			Logger.getLogger(ThreadListControllerImpl.class.getName());
+
+	private final EventBus eventBus;
+	private final MessageTracker messageTracker;
+	private final Map<MessageId, String> textCache = new ConcurrentHashMap<>();
+
+	private volatile GroupId groupId;
+
+	protected final IdentityManager identityManager;
+	protected final AndroidNotificationManager notificationManager;
+	protected final Executor cryptoExecutor;
+	protected final Clock clock;
+
+	// UI thread
+	protected L listener;
+
+	protected ThreadListControllerImpl(@DatabaseExecutor Executor dbExecutor,
+			LifecycleManager lifecycleManager, IdentityManager identityManager,
+			@CryptoExecutor Executor cryptoExecutor, EventBus eventBus,
+			Clock clock, AndroidNotificationManager notificationManager,
+			MessageTracker messageTracker) {
+		super(dbExecutor, lifecycleManager);
+		this.identityManager = identityManager;
+		this.cryptoExecutor = cryptoExecutor;
+		this.notificationManager = notificationManager;
+		this.clock = clock;
+		this.eventBus = eventBus;
+		this.messageTracker = messageTracker;
+	}
+
+	@Override
+	public void setGroupId(GroupId groupId) {
+		this.groupId = groupId;
+	}
+
+	@CallSuper
+	@SuppressWarnings("unchecked")
+	@Override
+	public void onActivityCreate(Activity activity) {
+		listener = (L) activity;
+	}
+
+	@CallSuper
+	@Override
+	public void onActivityStart() {
+		notificationManager.blockNotification(getGroupId());
+		eventBus.addListener(this);
+	}
+
+	@CallSuper
+	@Override
+	public void onActivityStop() {
+		notificationManager.unblockNotification(getGroupId());
+		eventBus.removeListener(this);
+	}
+
+	@Override
+	public void onActivityDestroy() {
+		MessageId messageId = listener.getFirstVisibleMessageId();
+		if (messageId != null) {
+			dbExecutor.execute(() -> {
+				try {
+					messageTracker.storeMessageId(groupId, messageId);
+				} catch (DbException e) {
+					logException(LOG, WARNING, e);
+				}
+			});
+		}
+	}
+
+	@CallSuper
+	@Override
+	public void eventOccurred(Event e) {
+		if (e instanceof GroupRemovedEvent) {
+			GroupRemovedEvent s = (GroupRemovedEvent) e;
+			if (s.getGroup().getId().equals(getGroupId())) {
+				LOG.info("Group removed");
+				listener.onGroupRemoved();
+			}
+		}
+	}
+
+	@Override
+	public void loadNamedGroup(
+			ResultExceptionHandler<G, DbException> handler) {
+		checkGroupId();
+		runOnDbThread(() -> {
+			try {
+				long start = now();
+				G groupItem = loadNamedGroup();
+				logDuration(LOG, "Loading group", start);
+				handler.onResult(groupItem);
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+				handler.onException(e);
+			}
+		});
+	}
+
+	@DatabaseExecutor
+	protected abstract G loadNamedGroup() throws DbException;
+
+	@Override
+	public void loadItems(
+			ResultExceptionHandler<ThreadItemList<I>, DbException> handler) {
+		checkGroupId();
+		runOnDbThread(() -> {
+			try {
+				// Load headers
+				long start = now();
+				Collection<H> headers = loadHeaders();
+				logDuration(LOG, "Loading headers", start);
+
+				// Load bodies into cache
+				start = now();
+				for (H header : headers) {
+					if (!textCache.containsKey(header.getId())) {
+						textCache.put(header.getId(),
+								loadMessageText(header));
+					}
+				}
+				logDuration(LOG, "Loading bodies", start);
+
+				// Build and hand over items
+				handler.onResult(buildItems(headers));
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+				handler.onException(e);
+			}
+		});
+	}
+
+	@DatabaseExecutor
+	protected abstract Collection<H> loadHeaders() throws DbException;
+
+	@DatabaseExecutor
+	protected abstract String loadMessageText(H header) throws DbException;
+
+	@Override
+	public void markItemRead(I item) {
+		markItemsRead(Collections.singletonList(item));
+	}
+
+	@Override
+	public void markItemsRead(Collection<I> items) {
+		runOnDbThread(() -> {
+			try {
+				long start = now();
+				for (I i : items) {
+					markRead(i.getId());
+				}
+				logDuration(LOG, "Marking read", start);
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+			}
+		});
+	}
+
+	@DatabaseExecutor
+	protected abstract void markRead(MessageId id) throws DbException;
+
+	protected void storePost(M msg, String text,
+			ResultExceptionHandler<I, DbException> resultHandler) {
+		runOnDbThread(() -> {
+			try {
+				long start = now();
+				H header = addLocalMessage(msg);
+				textCache.put(msg.getMessage().getId(), text);
+				logDuration(LOG, "Storing message", start);
+				resultHandler.onResult(buildItem(header, text));
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+				resultHandler.onException(e);
+			}
+		});
+	}
+
+	@DatabaseExecutor
+	protected abstract H addLocalMessage(M message) throws DbException;
+
+	@Override
+	public void deleteNamedGroup(ExceptionHandler<DbException> handler) {
+		runOnDbThread(() -> {
+			try {
+				long start = now();
+				G groupItem = loadNamedGroup();
+				deleteNamedGroup(groupItem);
+				logDuration(LOG, "Removing group", start);
+			} catch (DbException e) {
+				logException(LOG, WARNING, e);
+				handler.onException(e);
+			}
+		});
+	}
+
+	@DatabaseExecutor
+	protected abstract void deleteNamedGroup(G groupItem) throws DbException;
+
+	private ThreadItemList<I> buildItems(Collection<H> headers)
+			throws DbException {
+		ThreadItemList<I> items = new ThreadItemListImpl<>();
+		for (H h : headers) {
+			items.add(buildItem(h, textCache.get(h.getId())));
+		}
+		MessageId msgId = messageTracker.loadStoredMessageId(groupId);
+		if (LOG.isLoggable(INFO))
+			LOG.info("Loaded last top visible message id " + msgId);
+		items.setFirstVisibleId(msgId);
+		return items;
+	}
+
+	protected abstract I buildItem(H header, String text);
+
+	protected GroupId getGroupId() {
+		checkGroupId();
+		return groupId;
+	}
+
+	private void checkGroupId() {
+		if (groupId == null) throw new IllegalStateException();
+	}
+
+}

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

@@ -1,260 +0,0 @@
-package org.briarproject.briar.android.threaded;
-
-import android.app.Application;
-
-import org.briarproject.bramble.api.crypto.CryptoExecutor;
-import org.briarproject.bramble.api.db.DatabaseExecutor;
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.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.IdentityManager;
-import org.briarproject.bramble.api.lifecycle.LifecycleManager;
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
-import org.briarproject.bramble.api.sync.GroupId;
-import org.briarproject.bramble.api.sync.MessageId;
-import org.briarproject.bramble.api.sync.event.GroupRemovedEvent;
-import org.briarproject.bramble.api.system.AndroidExecutor;
-import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.briar.android.sharing.SharingController;
-import org.briarproject.briar.android.sharing.SharingController.SharingInfo;
-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.client.MessageTracker;
-import org.briarproject.briar.api.client.MessageTree;
-import org.briarproject.briar.client.MessageTreeImpl;
-
-import java.util.List;
-import java.util.concurrent.Executor;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.logging.Logger;
-
-import javax.annotation.Nullable;
-
-import androidx.annotation.CallSuper;
-import androidx.annotation.UiThread;
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-
-import static java.util.Objects.requireNonNull;
-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.LogUtils.logException;
-
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
-public abstract class ThreadListViewModel<I extends ThreadItem>
-		extends DbViewModel implements EventListener {
-
-	private static final Logger LOG =
-			getLogger(ThreadListViewModel.class.getName());
-
-	protected final IdentityManager identityManager;
-	protected final AndroidNotificationManager notificationManager;
-	protected final SharingController sharingController;
-	protected final Executor cryptoExecutor;
-	protected final Clock clock;
-	private final MessageTracker messageTracker;
-	private final EventBus eventBus;
-
-	// UIThread
-	private final MessageTree<I> messageTree = new MessageTreeImpl<>();
-	private final MutableLiveData<LiveResult<List<I>>> items =
-			new MutableLiveData<>();
-	private final MutableLiveData<Boolean> groupRemoved =
-			new MutableLiveData<>();
-	private final AtomicReference<MessageId> scrollToItem =
-			new AtomicReference<>();
-
-	protected volatile GroupId groupId;
-	@Nullable
-	private MessageId replyId;
-	/**
-	 * Stored list position. Needs to be loaded and set before the list itself.
-	 */
-	private final AtomicReference<MessageId> storedMessageId =
-			new AtomicReference<>();
-
-	public ThreadListViewModel(Application application,
-			@DatabaseExecutor Executor dbExecutor,
-			LifecycleManager lifecycleManager,
-			TransactionManager db,
-			AndroidExecutor androidExecutor,
-			IdentityManager identityManager,
-			AndroidNotificationManager notificationManager,
-			SharingController sharingController,
-			@CryptoExecutor Executor cryptoExecutor,
-			Clock clock,
-			MessageTracker messageTracker,
-			EventBus eventBus) {
-		super(application, dbExecutor, lifecycleManager, db, androidExecutor);
-		this.identityManager = identityManager;
-		this.notificationManager = notificationManager;
-		this.cryptoExecutor = cryptoExecutor;
-		this.clock = clock;
-		this.sharingController = sharingController;
-		this.messageTracker = messageTracker;
-		this.eventBus = eventBus;
-		this.eventBus.addListener(this);
-	}
-
-	@Override
-	protected void onCleared() {
-		super.onCleared();
-		eventBus.removeListener(this);
-		sharingController.onCleared();
-	}
-
-	/**
-	 * Needs to be called right after initialization,
-	 * before calling any other methods.
-	 */
-	public final void setGroupId(GroupId groupId) {
-		boolean needsInitialLoad = this.groupId == null;
-		this.groupId = groupId;
-		if (needsInitialLoad) performInitialLoad();
-	}
-
-	@CallSuper
-	protected void performInitialLoad() {
-		// load stored MessageId (last list position) before the list itself
-		loadStoredMessageId();
-		loadItems();
-		loadSharingContacts();
-	}
-
-	protected abstract void clearNotifications();
-
-	void blockAndClearNotifications() {
-		notificationManager.blockNotification(groupId);
-		clearNotifications();
-	}
-
-	void unblockNotifications() {
-		notificationManager.unblockNotification(groupId);
-	}
-
-	@Override
-	@CallSuper
-	public void eventOccurred(Event e) {
-		if (e instanceof GroupRemovedEvent) {
-			GroupRemovedEvent s = (GroupRemovedEvent) e;
-			if (s.getGroup().getId().equals(groupId)) {
-				LOG.info("Group removed");
-				groupRemoved.setValue(true);
-			}
-		}
-	}
-
-	private void loadStoredMessageId() {
-		runOnDbThread(() -> {
-			try {
-				storedMessageId
-						.set(messageTracker.loadStoredMessageId(groupId));
-				if (LOG.isLoggable(INFO)) {
-					LOG.info("Loaded last top visible message id " +
-							storedMessageId);
-				}
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
-	}
-
-	public abstract void loadItems();
-
-	public abstract void createAndStoreMessage(String text,
-			@Nullable MessageId parentMessageId);
-
-	/**
-	 * Loads the ContactIds of all contacts the group is shared with
-	 * and adds them to {@link SharingController}.
-	 */
-	protected abstract void loadSharingContacts();
-
-	@UiThread
-	protected void setItems(LiveResult<List<I>> items) {
-		if (items.hasError()) {
-			this.items.setValue(items);
-		} else {
-			messageTree.clear();
-			// not null, because hasError() is false
-			messageTree.add(requireNonNull(items.getResultOrNull()));
-			LiveResult<List<I>> result =
-					new LiveResult<>(messageTree.depthFirstOrder());
-			this.items.setValue(result);
-		}
-	}
-
-	/**
-	 * Add a remote item on the UI thread.
-	 *
-	 * @param scrollToItem whether the list will scroll to the newly added item
-	 */
-	@UiThread
-	protected void addItem(I item, boolean scrollToItem) {
-		// If items haven't loaded, we need to wait until they have.
-		// Since this was a R/W DB transaction, the load will pick up this item.
-		if (items.getValue() == null) return;
-
-		messageTree.add(item);
-		if (scrollToItem) this.scrollToItem.set(item.getId());
-		items.setValue(new LiveResult<>(messageTree.depthFirstOrder()));
-	}
-
-	@UiThread
-	void setReplyId(@Nullable MessageId id) {
-		replyId = id;
-	}
-
-	@UiThread
-	@Nullable
-	MessageId getReplyId() {
-		return replyId;
-	}
-
-	void storeMessageId(@Nullable MessageId messageId) {
-		if (messageId != null) {
-			runOnDbThread(() -> {
-				try {
-					messageTracker.storeMessageId(groupId, messageId);
-				} catch (DbException e) {
-					logException(LOG, WARNING, e);
-				}
-			});
-		}
-	}
-
-	protected abstract void markItemRead(I item);
-
-	/**
-	 * Returns the {@link MessageId} of the item that was at the top of the
-	 * list last time or null if there has been nothing stored, yet.
-	 */
-	@Nullable
-	MessageId getAndResetRestoredMessageId() {
-		return storedMessageId.getAndSet(null);
-	}
-
-	LiveData<LiveResult<List<I>>> getItems() {
-		return items;
-	}
-
-	LiveData<SharingInfo> getSharingInfo() {
-		return sharingController.getSharingInfo();
-	}
-
-	LiveData<Boolean> getGroupRemoved() {
-		return groupRemoved;
-	}
-
-	@Nullable
-	MessageId getAndResetScrollToItem() {
-		return scrollToItem.getAndSet(null);
-	}
-
-}

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

@@ -20,15 +20,15 @@ class ThreadScrollListener<I extends ThreadItem>
 	private static final Logger LOG =
 			getLogger(ThreadScrollListener.class.getName());
 
-	private final ThreadListViewModel<I> viewModel;
+	private final ThreadListController<?, I> controller;
 	private final UnreadMessageButton upButton, downButton;
 
 	ThreadScrollListener(ThreadItemAdapter<I> adapter,
-			ThreadListViewModel<I> viewModel,
+			ThreadListController<?, I> controller,
 			UnreadMessageButton upButton,
 			UnreadMessageButton downButton) {
 		super(adapter);
-		this.viewModel = viewModel;
+		this.controller = controller;
 		this.upButton = upButton;
 		this.downButton = downButton;
 	}
@@ -44,7 +44,7 @@ class ThreadScrollListener<I extends ThreadItem>
 	protected void onItemVisible(I item) {
 		if (!item.isRead()) {
 			item.setRead(true);
-			viewModel.markItemRead(item);
+			controller.markItemRead(item);
 		}
 	}
 

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

@@ -54,7 +54,6 @@ import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.Observer;
-import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
 
 import static android.content.Context.KEYGUARD_SERVICE;
 import static android.content.Context.POWER_SERVICE;
@@ -89,6 +88,7 @@ import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_NO;
 import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_YES;
 import static androidx.appcompat.app.AppCompatDelegate.setDefaultNightMode;
 import static androidx.core.content.ContextCompat.getColor;
+import static androidx.core.content.ContextCompat.getDrawable;
 import static androidx.core.content.ContextCompat.getSystemService;
 import static androidx.core.graphics.drawable.DrawableCompat.setTint;
 import static androidx.core.view.ViewCompat.LAYOUT_DIRECTION_RTL;
@@ -97,7 +97,6 @@ import static java.util.concurrent.TimeUnit.DAYS;
 import static org.briarproject.bramble.util.AndroidUtils.getSupportedImageContentTypes;
 import static org.briarproject.briar.BuildConfig.APPLICATION_ID;
 import static org.briarproject.briar.android.TestingConstants.EXPIRY_DATE;
-import static org.briarproject.briar.android.reporting.CrashReportActivity.EXTRA_APP_LOGCAT;
 import static org.briarproject.briar.android.reporting.CrashReportActivity.EXTRA_APP_START_TIME;
 import static org.briarproject.briar.android.reporting.CrashReportActivity.EXTRA_THROWABLE;
 
@@ -358,17 +357,16 @@ public class UiUtils {
 	}
 
 	public static void triggerFeedback(Context ctx) {
-		startDevReportActivity(ctx, FeedbackActivity.class, null, null, null);
+		startDevReportActivity(ctx, FeedbackActivity.class, null, null);
 	}
 
 	public static void startDevReportActivity(Context ctx,
 			Class<? extends FragmentActivity> activity, @Nullable Throwable t,
-			@Nullable Long appStartTime, @Nullable byte[] logKey) {
+			@Nullable Long appStartTime) {
 		final Intent dialogIntent = new Intent(ctx, activity);
 		dialogIntent.setFlags(FLAG_ACTIVITY_NEW_TASK);
 		dialogIntent.putExtra(EXTRA_THROWABLE, t);
 		dialogIntent.putExtra(EXTRA_APP_START_TIME, appStartTime);
-		dialogIntent.putExtra(EXTRA_APP_LOGCAT, logKey);
 		ctx.startActivity(dialogIntent);
 	}
 
@@ -438,8 +436,7 @@ public class UiUtils {
 	}
 
 	public static Drawable getDialogIcon(Context ctx, @DrawableRes int resId) {
-		Drawable icon =
-				VectorDrawableCompat.create(ctx.getResources(), resId, null);
+		Drawable icon = getDrawable(ctx, resId);
 		setTint(requireNonNull(icon), getColor(ctx, R.color.color_primary));
 		return icon;
 	}