Add transactional helper methods to DbViewModel.

.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>

.idea/runConfigurations/BridgeTest.xml

@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="BridgeTest" type="AndroidJUnit" factoryName="Android JUnit" nameIsGenerated="true">
-    <module name="briar.bramble-java" />
-    <useClassPathOnly />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.briarproject.bramble.plugin.tor.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <option name="PACKAGE_NAME" value="org.briarproject.bramble.plugin.tor" />
-    <option name="MAIN_CLASS_NAME" value="org.briarproject.bramble.plugin.tor.BridgeTest" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-    <envs>
-      <env name="OPTIONAL_TESTS" value="org.briarproject.bramble.plugin.tor.BridgeTest" />
-    </envs>
-    <method v="2">
-      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
-    </method>
-  </configuration>
-</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
+		versionCode 10213
-		versionName "1.2.18"
+		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:tor-android:0.3.5.12@zip'
-	tor 'org.briarproject:obfs4proxy-android:0.0.12-dev-40245c4a@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:obfs4proxy-android:0.0.11-2:obfs4proxy-android-0.0.11-2.zip:57e55cbe87aa2aac210fdbb6cd8cdeafe15f825406a08ebf77a8b787aa2c6a8a',
-        'org.briarproject:tor-android:0.3.5.13:tor-android-0.3.5.13.zip:e0978db136731dae07774b722970cdae1e462fb5adc82845dd80a7e2d87f356c',
+        '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/ThrowingRunnable.java

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

bramble-api/src/main/java/org/briarproject/bramble/api/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,
+	StreamEncrypter createContactExchangeStreamDecrypter(OutputStream out,
-			SecretKey headerKey);
-
-	/**
-	 * Creates a {@link StreamEncrypter} for encrypting a log stream.
-	 */
-	StreamEncrypter createLogStreamEncrypter(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/sync/DuplexOutgoingSession.java

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

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

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

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

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

bramble-core/src/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
+		return new StreamReaderImpl(
-				.createStreamDecrypter(in, ctx));
+				streamDecrypterFactory.createStreamDecrypter(in, ctx));
 	}
 
 	@Override
 	public InputStream createContactExchangeStreamReader(InputStream in,
 			SecretKey headerKey) {
-		return new StreamReaderImpl(streamDecrypterFactory
+		return new StreamReaderImpl(
-				.createContactExchangeStreamDecrypter(in, headerKey));
+				streamDecrypterFactory.createContactExchangeStreamDecrypter(in,
-	}
+						headerKey));
-
-	@Override
-	public InputStream createLogStreamReader(InputStream in,
-			SecretKey headerKey) {
-		return new StreamReaderImpl(streamDecrypterFactory
-				.createLogStreamDecrypter(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
+		return new StreamWriterImpl(
-				.createStreamEncrypter(out, ctx));
+				streamEncrypterFactory.createStreamEncrypter(out, ctx));
 	}
 
 	@Override
 	public StreamWriter createContactExchangeStreamWriter(OutputStream out,
 			SecretKey headerKey) {
-		return new StreamWriterImpl(streamEncrypterFactory
+		return new StreamWriterImpl(
-				.createContactExchangeStreamEncrypter(out, headerKey));
+				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

@@ -1,13 +1,5 @@
-Bridge obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1
-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 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 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
-Bridge meek_lite 192.0.2.2:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com
+Bridge obfs4 52.15.78.72:9443 02069A3C5362476936B62BA6F5ACC41ABD573A9B cert=ijYG/OKc7kqu2YzKNFfeXN7/BG2BOgfEP2KyYEiGDQthnHbsOiTWHeIG0WJVW+BckzDgKw iat-mode=0
+Bridge obfs4 13.58.29.242:9443 0C58939A77DA6B6B29D4B5236A75865659607AE0 cert=OylWIEHb/ezpq1zWxW0sgKRn+9ARH2eOcQOZ8/Gew+4l+oKOhQ2jUX/Y+FSl61JorXZUWA iat-mode=0
+Bridge obfs4 45.33.37.112:9443 60A609BB4ABE8D46E634AE81ED29ADAB7776B399 cert=t5v19WmNv5Sc2YPNr8RQids365W7MY8zJwQVkOxBjUMFomMWARDzsbYpcWLLcw0J9Gm+BQ iat-mode=0
+Bridge meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com

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:tor:0.3.5.12@zip'
-	tor 'org.briarproject:obfs4proxy:0.0.12-dev-40245c4a@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:obfs4proxy:0.0.7:obfs4proxy-0.0.7.zip:5b2f693262ce43a7e130f7cc7d5d1617925330640a2eb6d71085e95df8ee0642',
-        'org.briarproject:tor:0.3.5.13-1:tor-0.3.5.13-1.zip:ef35c16bf8dc1f4c75ed71d9f55e4514f383d124ec96b859aca647c990927c99',
+        '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
+		versionCode 10213
-		versionName "1.2.18"
+		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/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

@@ -33,13 +33,12 @@ import org.briarproject.briar.android.account.SetupModule;
 import org.briarproject.briar.android.contact.ContactListModule;
 import org.briarproject.briar.android.forum.ForumModule;
 import org.briarproject.briar.android.keyagreement.ContactExchangeModule;
-import org.briarproject.briar.android.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.settings.SettingsModule;
 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;
@@ -75,7 +74,6 @@ import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
 		SetupModule.class,
 		DozeHelperModule.class,
 		ContactExchangeModule.class,
-		LoggingModule.class,
 		LoginModule.class,
 		NavDrawerModule.class,
 		ViewModelModule.class,
@@ -194,11 +192,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);
+			lockManager.setLocked(true);
-			if (pid == myPid()) lockManager.setLocked(true);
-			else if (LOG.isLoggable(WARNING)) {
-				LOG.warning("Tried to lock process " + pid + " but this is " +
-						myPid());
-			}
 		}
 		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);
 	}
 
-	/*
+	// Returns the localized version of context
-	 * 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.
-	 */
 	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());
+		this.lockIntent = getService(appContext, 0, i, 0);
-		// When not using FLAG_UPDATE_CURRENT, the intent might have no extras
+		this.timeoutNever = Integer.valueOf(
-		lockIntent = getService(appContext, 0, i, FLAG_UPDATE_CURRENT);
-		timeoutNever = Integer.parseInt(
 				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/BaseActivity.java

@@ -109,7 +109,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() {

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

@@ -34,6 +34,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 +102,7 @@ public class ContactListFragment extends BaseFragment
 				.observe(getViewLifecycleOwner(), result -> {
 					result.onError(this::handleException).onSuccess(items -> {
 						adapter.submitList(items);
-						// TODO remove when BriarRecyclerView was adapted
+						if (requireNonNull(items).size() == 0) list.showData();
-						list.showData();
 					});
 				});
 		viewModel.getHasPendingContacts()

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

@@ -45,10 +45,8 @@ import androidx.arch.core.util.Function;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
-import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.util.LogUtils.logDuration;
-import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.bramble.util.LogUtils.now;
 
 @NotNullByDefault
@@ -173,14 +171,9 @@ class ContactListViewModel extends DbViewModel implements EventListener {
 	}
 
 	void checkForPendingContacts() {
-		runOnDbThread(() -> {
+		runOnDbThreadOrLogException(() -> {
-			try {
+			boolean hasPending = !contactManager.getPendingContacts().isEmpty();
-				boolean hasPending =
+			hasPendingContacts.postValue(hasPending);
-						!contactManager.getPendingContacts().isEmpty();
-				hasPendingContacts.postValue(hasPending);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
 		});
 	}
 

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

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

briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/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/contact/add/remote/PendingContactListViewModel.java

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

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)
+				.setIcon(R.drawable.ic_more_vert_accent)
-				.setBackgroundColour(color)
+				.setBackgroundColour(
+						ContextCompat.getColor(this, R.color.briar_primary))
 				.show();
 	}
 

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

@@ -149,7 +149,7 @@ public class ConversationViewModel extends DbViewModel
 			AttachmentReceivedEvent a = (AttachmentReceivedEvent) e;
 			if (a.getContactId().equals(contactId)) {
 				LOG.info("Attachment received");
-				runOnDbThread(() -> attachmentRetriever
+				runOnDbThreadOrLogException(() -> attachmentRetriever
 						.loadAttachmentItem(a.getMessageId()));
 			}
 		} else if (e instanceof AvatarUpdatedEvent) {
@@ -194,44 +194,36 @@ public class ConversationViewModel extends DbViewModel
 
 	private void loadContact(ContactId contactId) {
 		runOnDbThread(() -> {
-			try {
+			long start = now();
-				long start = now();
+			Contact c = contactManager.getContact(contactId);
-				Contact c = contactManager.getContact(contactId);
+			AuthorInfo authorInfo = authorManager.getAuthorInfo(c);
-				AuthorInfo authorInfo = authorManager.getAuthorInfo(c);
+			contactItem.postValue(new ContactItem(c, authorInfo));
-				contactItem.postValue(new ContactItem(c, authorInfo));
+			logDuration(LOG, "Loading contact", start);
-				logDuration(LOG, "Loading contact", start);
+			start = now();
-				start = now();
+			checkFeaturesAndOnboarding(contactId);
-				checkFeaturesAndOnboarding(contactId);
+			logDuration(LOG, "Checking for image support", start);
-				logDuration(LOG, "Checking for image support", start);
+		}, e -> {
-			} catch (NoSuchContactException e) {
+			if (e instanceof NoSuchContactException) {
 				contactDeleted.postValue(true);
-			} catch (DbException e) {
+			} else {
 				logException(LOG, WARNING, e);
 			}
 		});
 	}
 
 	void markMessageRead(GroupId g, MessageId m) {
-		runOnDbThread(() -> {
+		runOnDbThreadOrLogException(() -> {
-			try {
+			long start = now();
-				long start = now();
+			messagingManager.setReadFlag(g, m, true);
-				messagingManager.setReadFlag(g, m, true);
+			logDuration(LOG, "Marking read", start);
-				logDuration(LOG, "Marking read", start);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
 		});
 	}
 
 	void setContactAlias(String alias) {
-		runOnDbThread(() -> {
+		runOnDbThreadOrLogException(() -> {
-			try {
+			contactManager.setContactAlias(requireNonNull(contactId),
-				contactManager.setContactAlias(requireNonNull(contactId),
+					alias.isEmpty() ? null : alias);
-						alias.isEmpty() ? null : alias);
+			loadContact(contactId);
-				loadContact(contactId);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
 		});
 	}
 
@@ -327,21 +319,17 @@ public class ConversationViewModel extends DbViewModel
 	@UiThread
 	private void storeMessage(PrivateMessage m) {
 		attachmentCreator.onAttachmentsSent(m.getMessage().getId());
-		runOnDbThread(() -> {
+		runOnDbThreadOrLogException(() -> {
-			try {
+			long start = now();
-				long start = now();
+			messagingManager.addLocalMessage(m);
-				messagingManager.addLocalMessage(m);
+			logDuration(LOG, "Storing message", start);
-				logDuration(LOG, "Storing message", start);
+			Message message = m.getMessage();
-				Message message = m.getMessage();
+			PrivateMessageHeader h = new PrivateMessageHeader(
-				PrivateMessageHeader h = new PrivateMessageHeader(
+					message.getId(), message.getGroupId(),
-						message.getId(), message.getGroupId(),
+					message.getTimestamp(), true, true, false, false,
-						message.getTimestamp(), true, true, false, false,
+					m.hasText(), m.getAttachmentHeaders());
-						m.hasText(), m.getAttachmentHeaders());
+			// TODO add text to cache when available here
-				// TODO add text to cache when available here
+			addedHeader.postEvent(h);
-				addedHeader.postEvent(h);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
 		});
 	}
 
@@ -383,12 +371,7 @@ public class ConversationViewModel extends DbViewModel
 
 	@UiThread
 	void recheckFeaturesAndOnboarding(ContactId contactId) {
-		runOnDbThread(() -> {
+		runOnDbThreadOrLogException(() ->
-			try {
+				checkFeaturesAndOnboarding(contactId));
-				checkFeaturesAndOnboarding(contactId);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
 	}
 }

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

@@ -6,7 +6,6 @@ import android.net.Uri;
 import android.view.View;
 
 import org.briarproject.bramble.api.db.DatabaseExecutor;
-import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.TransactionManager;
 import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.event.EventBus;
@@ -198,14 +197,12 @@ public class ImageViewModel extends DbViewModel implements EventListener {
 	private void saveImage(AttachmentItem attachment, OutputStreamProvider osp,
 			@Nullable Runnable afterCopy) {
 		runOnDbThread(() -> {
-			try {
+			Attachment a =
-				Attachment a =
+					attachmentReader.getAttachment(attachment.getHeader());
-						attachmentReader.getAttachment(attachment.getHeader());
+			copyImageFromDb(a, osp, afterCopy);
-				copyImageFromDb(a, osp, afterCopy);
+		}, e -> {
-			} catch (DbException e) {
+			logException(LOG, WARNING, e);
-				logException(LOG, WARNING, e);
+			saveState.postEvent(true);
-				saveState.postEvent(true);
-			}
 		});
 	}
 
@@ -225,8 +222,8 @@ public class ImageViewModel extends DbViewModel implements EventListener {
 		});
 	}
 
-	String getFileName() {
+	private String getFileName() {
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd",
+		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

@@ -79,6 +79,12 @@ public class ForumActivity extends
 		}
 	}
 
+	@Override
+	public void onStart() {
+		super.onStart();
+		viewModel.clearForumPostNotification();
+	}
+
 	@Override
 	protected void onActivityResult(int request, int result,
 			@Nullable Intent data) {
@@ -103,16 +109,16 @@ public class ForumActivity extends
 		// 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);
+			Intent i2 = new Intent(this, ShareForumActivity.class);
-			i.setFlags(FLAG_ACTIVITY_CLEAR_TOP);
+			i2.setFlags(FLAG_ACTIVITY_CLEAR_TOP);
-			i.putExtra(GROUP_ID, groupId.getBytes());
+			i2.putExtra(GROUP_ID, groupId.getBytes());
-			startActivityForResult(i, REQUEST_SHARE_FORUM);
+			startActivityForResult(i2, REQUEST_SHARE_FORUM);
 			return true;
 		} else if (itemId == R.id.action_forum_sharing_status) {
-			Intent i = new Intent(this, ForumSharingStatusActivity.class);
+			Intent i3 = new Intent(this, ForumSharingStatusActivity.class);
-			i.setFlags(FLAG_ACTIVITY_CLEAR_TOP);
+			i3.setFlags(FLAG_ACTIVITY_CLEAR_TOP);
-			i.putExtra(GROUP_ID, groupId.getBytes());
+			i3.putExtra(GROUP_ID, groupId.getBytes());
-			startActivity(i);
+			startActivity(i3);
 			return true;
 		} else if (itemId == R.id.action_forum_delete) {
 			showUnsubscribeDialog();

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

@@ -40,10 +40,8 @@ import androidx.annotation.UiThread;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
-import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.util.LogUtils.logDuration;
-import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.bramble.util.LogUtils.now;
 import static org.briarproject.briar.api.forum.ForumManager.CLIENT_ID;
 
@@ -164,15 +162,11 @@ class ForumListViewModel extends DbViewModel implements EventListener {
 	}
 
 	void loadForumInvitations() {
-		runOnDbThread(() -> {
+		runOnDbThreadOrLogException(() -> {
-			try {
+			long start = now();
-				long start = now();
+			int available = forumSharingManager.getInvitations().size();
-				int available = forumSharingManager.getInvitations().size();
+			logDuration(LOG, "Loading available", start);
-				logDuration(LOG, "Loading available", start);
+			numInvitations.postValue(available);
-				numInvitations.postValue(available);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
 		});
 	}
 

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

@@ -26,6 +26,7 @@ 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.client.PostHeader;
 import org.briarproject.briar.api.forum.Forum;
 import org.briarproject.briar.api.forum.ForumInvitationResponse;
 import org.briarproject.briar.api.forum.ForumManager;
@@ -50,10 +51,8 @@ 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
@@ -93,9 +92,8 @@ class ForumViewModel extends ThreadListViewModel<ForumPostItem> {
 			ForumPostReceivedEvent f = (ForumPostReceivedEvent) e;
 			if (f.getGroupId().equals(groupId)) {
 				LOG.info("Forum post received, adding...");
-				ForumPostItem item =
+				ForumPostItem item = buildItem(f.getHeader(), f.getText());
-						new ForumPostItem(f.getHeader(), f.getText());
+				addItem(item);
-				addItem(item, false);
 			}
 		} else if (e instanceof ForumInvitationResponseReceivedEvent) {
 			ForumInvitationResponseReceivedEvent f =
@@ -116,20 +114,14 @@ class ForumViewModel extends ThreadListViewModel<ForumPostItem> {
 		}
 	}
 
-	protected void clearNotifications() {
+	void clearForumPostNotification() {
 		notificationManager.clearForumPostNotification(groupId);
 	}
 
 	LiveData<Forum> loadForum() {
 		MutableLiveData<Forum> forum = new MutableLiveData<>();
-		runOnDbThread(() -> {
+		runOnDbThreadOrLogException(() ->
-			try {
+				forum.postValue(forumManager.getForum(groupId)));
-				Forum f = forumManager.getForum(groupId);
-				forum.postValue(f);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
 		return forum;
 	}
 
@@ -140,35 +132,19 @@ class ForumViewModel extends ThreadListViewModel<ForumPostItem> {
 			List<ForumPostHeader> headers =
 					forumManager.getPostHeaders(txn, groupId);
 			logDuration(LOG, "Loading headers", start);
-			start = now();
+			return createItems(txn, headers, this::buildItem);
-			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(() -> {
+		runOnDbThreadOrLogException(() -> {
-			try {
+			LocalAuthor author = identityManager.getLocalAuthor();
-				LocalAuthor author = identityManager.getLocalAuthor();
+			GroupCount count = forumManager.getGroupCount(groupId);
-				GroupCount count = forumManager.getGroupCount(groupId);
+			long timestamp = max(count.getLatestMsgTime() + 1,
-				long timestamp = max(count.getLatestMsgTime() + 1,
+					clock.currentTimeMillis());
-						clock.currentTimeMillis());
+			createMessage(text, timestamp, parentId, author);
-				createMessage(text, timestamp, parentId, author);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
 		});
 	}
 
@@ -183,47 +159,43 @@ class ForumViewModel extends ThreadListViewModel<ForumPostItem> {
 	}
 
 	private void storePost(ForumPost msg, String text) {
-		runOnDbThread(false, txn -> {
+		runOnDbThreadOrLogException(() -> {
 			long start = now();
-			ForumPostHeader header = forumManager.addLocalPost(txn, msg);
+			ForumPostHeader header = forumManager.addLocalPost(msg);
+			addItemAsync(buildItem(header, text));
 			logDuration(LOG, "Storing forum post", start);
-			txn.attach(() -> {
+		});
-				ForumPostItem item = new ForumPostItem(header, text);
+	}
-				addItem(item, true);
+
-			});
+	private ForumPostItem buildItem(ForumPostHeader header, String text) {
-		}, e -> logException(LOG, WARNING, e));
+		return new ForumPostItem(header, text);
+	}
+
+	@Override
+	protected String loadMessageText(Transaction txn, PostHeader header)
+			throws DbException {
+		return forumManager.getPostText(txn, header.getId());
 	}
 
 	@Override
 	protected void markItemRead(ForumPostItem item) {
-		runOnDbThread(() -> {
+		runOnDbThreadOrLogException(() ->
-			try {
+				forumManager.setReadFlag(groupId, item.getId(), true));
-				forumManager.setReadFlag(groupId, item.getId(), true);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
 	}
 
 	public void loadSharingContacts() {
-		runOnDbThread(true, txn -> {
+		runOnDbThreadOrLogException(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(() -> {
+		runOnDbThreadOrLogException(() ->
-			try {
+				forumManager.removeForum(forumManager.getForum(groupId)));
-				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) {
+		switch (item.getItemId()) {
-			requireActivity().onBackPressed();
+			case android.R.id.home:
-			return true;
+				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 &&
+			} else if (fm.getBackStackEntryCount() == 0
-					fm.findFragmentByTag(ContactListFragment.TAG) == null) {
+					&& 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;
-				}
 				/*
 				 * 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) {
+	private void startFragment(BaseFragment fragment) {
-		getSupportFragmentManager().beginTransaction()
+		if (getSupportFragmentManager().getBackStackEntryCount() == 0)
-				.setCustomAnimations(R.anim.fade_in, R.anim.fade_out,
+			startFragment(fragment, false);
-						R.anim.fade_in, R.anim.fade_out)
+		else startFragment(fragment, true);
-				.replace(R.id.fragmentContainer, f, f.getUniqueTag())
+	}
-				.commit();
+
+	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/NavDrawerViewModel.java

@@ -3,7 +3,6 @@ package org.briarproject.briar.android.navdrawer;
 import android.app.Application;
 
 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.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@@ -66,34 +65,27 @@ public class NavDrawerViewModel extends DbViewModel {
 
 	@UiThread
 	void checkExpiryWarning() {
-		runOnDbThread(() -> {
+		runOnDbThreadOrLogException(() -> {
-			try {
+			Settings settings = settingsManager.getSettings(SETTINGS_NAMESPACE);
-				Settings settings =
+			int warningInt = settings.getInt(EXPIRY_DATE_WARNING, 0);
-						settingsManager.getSettings(SETTINGS_NAMESPACE);
-				int warningInt = settings.getInt(EXPIRY_DATE_WARNING, 0);
 
-				if (warningInt == 0) {
+			if (warningInt == 0) {
-					// we have not warned before
+				// we have not warned before
+				showExpiryWarning.postValue(true);
+			} else {
+				long warningLong = warningInt * 1000L;
+				long now = System.currentTimeMillis();
+				long daysSinceLastWarning =
+						(now - warningLong) / DAYS.toMillis(1);
+				long daysBeforeExpiry = (EXPIRY_DATE - now) / DAYS.toMillis(1);
+
+				if (daysSinceLastWarning >= 30) {
+					showExpiryWarning.postValue(true);
+				} else if (daysBeforeExpiry <= 3 && daysSinceLastWarning > 0) {
 					showExpiryWarning.postValue(true);
 				} else {
-					long warningLong = warningInt * 1000L;
+					showExpiryWarning.postValue(false);
-					long now = System.currentTimeMillis();
-					long daysSinceLastWarning =
-							(now - warningLong) / DAYS.toMillis(1);
-					long daysBeforeExpiry =
-							(EXPIRY_DATE - now) / DAYS.toMillis(1);
-
-					if (daysSinceLastWarning >= 30) {
-						showExpiryWarning.postValue(true);
-					} else if (daysBeforeExpiry <= 3 &&
-							daysSinceLastWarning > 0) {
-						showExpiryWarning.postValue(true);
-					} else {
-						showExpiryWarning.postValue(false);
-					}
 				}
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
 			}
 		});
 	}
@@ -101,15 +93,11 @@ public class NavDrawerViewModel extends DbViewModel {
 	@UiThread
 	void expiryWarningDismissed() {
 		showExpiryWarning.setValue(false);
-		runOnDbThread(() -> {
+		runOnDbThreadOrLogException(() -> {
-			try {
+			Settings settings = new Settings();
-				Settings settings = new Settings();
+			int date = (int) (System.currentTimeMillis() / 1000L);
-				int date = (int) (System.currentTimeMillis() / 1000L);
+			settings.putInt(EXPIRY_DATE_WARNING, date);
-				settings.putInt(EXPIRY_DATE_WARNING, date);
+			settingsManager.mergeSettings(settings, SETTINGS_NAMESPACE);
-				settingsManager.mergeSettings(settings, SETTINGS_NAMESPACE);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
 		});
 	}
 
@@ -125,15 +113,12 @@ public class NavDrawerViewModel extends DbViewModel {
 			return;
 		}
 		runOnDbThread(() -> {
-			try {
+			Settings settings = settingsManager.getSettings(SETTINGS_NAMESPACE);
-				Settings settings =
+			boolean ask = settings.getBoolean(DOZE_ASK_AGAIN, true);
-						settingsManager.getSettings(SETTINGS_NAMESPACE);
+			shouldAskForDozeWhitelisting.postValue(ask);
-				boolean ask = settings.getBoolean(DOZE_ASK_AGAIN, true);
+		}, e -> {
-				shouldAskForDozeWhitelisting.postValue(ask);
+			logException(LOG, WARNING, e);
-			} catch (DbException e) {
+			shouldAskForDozeWhitelisting.postValue(true);
-				logException(LOG, WARNING, e);
-				shouldAskForDozeWhitelisting.postValue(true);
-			}
 		});
 	}
 
@@ -145,30 +130,21 @@ public class NavDrawerViewModel extends DbViewModel {
 	@UiThread
 	void checkTransportsOnboarding() {
 		if (showTransportsOnboarding.getValue() != null) return;
-		runOnDbThread(() -> {
+		runOnDbThreadOrLogException(() -> {
-			try {
+			Settings settings = settingsManager.getSettings(SETTINGS_NAMESPACE);
-				Settings settings =
+			boolean show =
-						settingsManager.getSettings(SETTINGS_NAMESPACE);
+					settings.getBoolean(SHOW_TRANSPORTS_ONBOARDING, true);
-				boolean show =
+			showTransportsOnboarding.postValue(show);
-						settings.getBoolean(SHOW_TRANSPORTS_ONBOARDING, true);
-				showTransportsOnboarding.postValue(show);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
 		});
 	}
 
 	@UiThread
 	void transportsOnboardingShown() {
 		showTransportsOnboarding.setValue(false);
-		runOnDbThread(() -> {
+		runOnDbThreadOrLogException(() -> {
-			try {
+			Settings settings = new Settings();
-				Settings settings = new Settings();
+			settings.putBoolean(SHOW_TRANSPORTS_ONBOARDING, false);
-				settings.putBoolean(SHOW_TRANSPORTS_ONBOARDING, false);
+			settingsManager.mergeSettings(settings, SETTINGS_NAMESPACE);
-				settingsManager.mergeSettings(settings, SETTINGS_NAMESPACE);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
 		});
 	}
 }

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

@@ -45,12 +45,10 @@ import static android.bluetooth.BluetoothAdapter.ACTION_STATE_CHANGED;
 import static android.bluetooth.BluetoothAdapter.EXTRA_STATE;
 import static android.bluetooth.BluetoothAdapter.STATE_ON;
 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.api.plugin.Plugin.PREF_PLUGIN_ENABLE;
 import static org.briarproject.bramble.api.plugin.Plugin.State.STARTING_STOPPING;
 import static org.briarproject.bramble.util.LogUtils.logDuration;
-import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.bramble.util.LogUtils.now;
 
 @NotNullByDefault
@@ -185,20 +183,16 @@ public class PluginViewModel extends DbViewModel implements EventListener {
 	}
 
 	private void loadSettings() {
-		runOnDbThread(() -> {
+		runOnDbThreadOrLogException(() -> {
-			try {
+			boolean tor = isPluginEnabled(TorConstants.ID,
-				boolean tor = isPluginEnabled(TorConstants.ID,
+					TorConstants.DEFAULT_PREF_PLUGIN_ENABLE);
-						TorConstants.DEFAULT_PREF_PLUGIN_ENABLE);
+			torEnabledSetting.postValue(tor);
-				torEnabledSetting.postValue(tor);
+			boolean wifi = isPluginEnabled(LanTcpConstants.ID,
-				boolean wifi = isPluginEnabled(LanTcpConstants.ID,
+					LanTcpConstants.DEFAULT_PREF_PLUGIN_ENABLE);
-						LanTcpConstants.DEFAULT_PREF_PLUGIN_ENABLE);
+			wifiEnabledSetting.postValue(wifi);
-				wifiEnabledSetting.postValue(wifi);
+			boolean bt = isPluginEnabled(BluetoothConstants.ID,
-				boolean bt = isPluginEnabled(BluetoothConstants.ID,
+					BluetoothConstants.DEFAULT_PREF_PLUGIN_ENABLE);
-						BluetoothConstants.DEFAULT_PREF_PLUGIN_ENABLE);
+			btEnabledSetting.postValue(bt);
-				btEnabledSetting.postValue(bt);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
 		});
 	}
 
@@ -222,14 +216,10 @@ public class PluginViewModel extends DbViewModel implements EventListener {
 	}
 
 	private void mergeSettings(Settings s, String namespace) {
-		runOnDbThread(() -> {
+		runOnDbThreadOrLogException(() -> {
-			try {
+			long start = now();
-				long start = now();
+			settingsManager.mergeSettings(s, namespace);
-				settingsManager.mergeSettings(s, namespace);
+			logDuration(LOG, "Merging settings", start);
-				logDuration(LOG, "Merging settings", start);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
 		});
 	}
 

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

@@ -25,7 +25,6 @@ import androidx.lifecycle.ViewModelProvider;
 
 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;
@@ -81,11 +80,16 @@ public class GroupActivity extends
 		setGroupEnabled(false);
 		viewModel.isDissolved().observe(this, dissolved -> {
 			setGroupEnabled(!dissolved);
-			// only show dialog when no prior state
+			if (dissolved) onGroupDissolved();
-			if (dissolved && state == null) onGroupDissolved();
 		});
 	}
 
+	@Override
+	public void onStart() {
+		super.onStart();
+		viewModel.clearGroupMessageNotifications();
+	}
+
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		// Inflate the menu items for use in the action bar
@@ -112,26 +116,26 @@ public class GroupActivity extends
 			startActivity(i);
 			return true;
 		} else if (itemId == R.id.action_group_reveal) {
-			if (requireNonNull(viewModel.isCreator().getValue()))
+			if (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()))
+			if (!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()))
+			if (viewModel.isCreator().getValue())
 				throw new IllegalStateException();
 			showLeaveGroupDialog();
 			return true;
 		} else if (itemId == R.id.action_group_dissolve) {
-			if (!requireNonNull(viewModel.isCreator().getValue()))
+			if (!viewModel.isCreator().getValue())
 				throw new IllegalStateException();
 			showDissolveGroupDialog();
 			return true;
@@ -154,8 +158,7 @@ public class GroupActivity extends
 
 	@Override
 	public void onReplyClick(GroupMessageItem item) {
-		Boolean isDissolved = viewModel.isDissolved().getValue();
+		if (!viewModel.isDissolved().getValue()) super.onReplyClick(item);
-		if (isDissolved != null && !isDissolved) super.onReplyClick(item);
 	}
 
 	private void setGroupEnabled(boolean enabled) {
@@ -198,7 +201,7 @@ public class GroupActivity extends
 		viewModel.deletePrivateGroup();
 	}
 
-	private void onGroupDissolved() {
+	public void onGroupDissolved() {
 		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/GroupViewModel.java

@@ -25,6 +25,7 @@ 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.client.PostHeader;
 import org.briarproject.briar.api.privategroup.GroupMember;
 import org.briarproject.briar.api.privategroup.GroupMessage;
 import org.briarproject.briar.api.privategroup.GroupMessageFactory;
@@ -51,10 +52,8 @@ 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
@@ -102,10 +101,7 @@ class GroupViewModel extends ThreadListViewModel<GroupMessageItem> {
 			if (!g.isLocal() && g.getGroupId().equals(groupId)) {
 				LOG.info("Group message received, adding...");
 				GroupMessageItem item = buildItem(g.getHeader(), g.getText());
-				addItem(item, false);
+				addItem(item);
-				// 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();
@@ -135,25 +131,21 @@ class GroupViewModel extends ThreadListViewModel<GroupMessageItem> {
 	}
 
 	@Override
-	protected void performInitialLoad() {
+	public void setGroupId(GroupId groupId) {
-		super.performInitialLoad();
+		super.setGroupId(groupId);
 		loadPrivateGroup(groupId);
 	}
 
-	protected void clearNotifications() {
+	public void clearGroupMessageNotifications() {
 		notificationManager.clearGroupMessageNotification(groupId);
 	}
 
 	private void loadPrivateGroup(GroupId groupId) {
-		runOnDbThread(() -> {
+		runOnDbThreadOrLogException(() -> {
-			try {
+			PrivateGroup g = privateGroupManager.getPrivateGroup(groupId);
-				PrivateGroup g = privateGroupManager.getPrivateGroup(groupId);
+			privateGroup.postValue(g);
-				privateGroup.postValue(g);
+			Author author = identityManager.getLocalAuthor();
-				Author author = identityManager.getLocalAuthor();
+			isCreator.postValue(g.getCreator().equals(author));
-				isCreator.postValue(g.getCreator().equals(author));
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
 		});
 	}
 
@@ -168,28 +160,10 @@ class GroupViewModel extends ThreadListViewModel<GroupMessageItem> {
 			List<GroupMessageHeader> headers =
 					privateGroupManager.getHeaders(txn, groupId);
 			logDuration(LOG, "Loading headers", start);
-			start = now();
+			return createItems(txn, headers, this::buildItem);
-			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);
@@ -197,21 +171,27 @@ class GroupViewModel extends ThreadListViewModel<GroupMessageItem> {
 		return new GroupMessageItem(header, text);
 	}
 
+	@Override
+	protected String loadMessageText(
+			Transaction txn, PostHeader header) throws DbException {
+		if (header instanceof JoinMessageHeader) {
+			// will be looked up later
+			return "";
+		}
+		return privateGroupManager.getMessageText(txn, header.getId());
+	}
+
 	@Override
 	public void createAndStoreMessage(String text,
 			@Nullable MessageId parentId) {
-		runOnDbThread(() -> {
+		runOnDbThreadOrLogException(() -> {
-			try {
+			LocalAuthor author = identityManager.getLocalAuthor();
-				LocalAuthor author = identityManager.getLocalAuthor();
+			MessageId previousMsgId =
-				MessageId previousMsgId =
+					privateGroupManager.getPreviousMsgId(groupId);
-						privateGroupManager.getPreviousMsgId(groupId);
+			GroupCount count = privateGroupManager.getGroupCount(groupId);
-				GroupCount count = privateGroupManager.getGroupCount(groupId);
+			long timestamp = count.getLatestMsgTime();
-				long timestamp = count.getLatestMsgTime();
+			timestamp = max(clock.currentTimeMillis(), timestamp + 1);
-				timestamp = max(clock.currentTimeMillis(), timestamp + 1);
+			createMessage(text, timestamp, parentId, author, previousMsgId);
-				createMessage(text, timestamp, parentId, author, previousMsgId);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
 		});
 	}
 
@@ -227,49 +207,36 @@ class GroupViewModel extends ThreadListViewModel<GroupMessageItem> {
 	}
 
 	private void storePost(GroupMessage msg, String text) {
-		runOnDbThread(false, txn -> {
+		runOnDbThreadOrLogException(() -> {
 			long start = now();
 			GroupMessageHeader header =
-					privateGroupManager.addLocalMessage(txn, msg);
+					privateGroupManager.addLocalMessage(msg);
+			addItemAsync(buildItem(header, text));
 			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(() -> {
+		runOnDbThreadOrLogException(() ->
-			try {
+				privateGroupManager.setReadFlag(groupId, item.getId(), true));
-				privateGroupManager.setReadFlag(groupId, item.getId(), true);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
 	}
 
 	public void loadSharingContacts() {
-		runOnDbThread(true, txn -> {
+		runOnDbThreadOrLogException(true, txn -> {
 			Collection<GroupMember> members =
 					privateGroupManager.getMembers(txn, groupId);
 			Collection<ContactId> contactIds = new ArrayList<>();
 			for (GroupMember m : members) {
-				if (m.getContactId() != null)
+				if (m.getContactId() != null) contactIds.add(m.getContactId());
-					contactIds.add(m.getContactId());
 			}
 			txn.attach(() -> sharingController.addAll(contactIds));
-		}, e -> logException(LOG, WARNING, e));
+		});
 	}
 
 	void deletePrivateGroup() {
-		runOnDbThread(() -> {
+		runOnDbThreadOrLogException(() ->
-			try {
+				privateGroupManager.removePrivateGroup(groupId));
-				privateGroupManager.removePrivateGroup(groupId);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
-		});
 	}
 
 	LiveData<PrivateGroup> getPrivateGroup() {

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

@@ -16,7 +16,7 @@ class JoinMessageItem extends GroupMessageItem {
 
 	JoinMessageItem(JoinMessageHeader h, String text) {
 		super(h, text);
-		isInitial = h.isInitial();
+		this.isInitial = h.isInitial();
 	}
 
 	@Override

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

@@ -2,7 +2,6 @@ package org.briarproject.briar.android.privategroup.list;
 
 import android.app.Application;
 
-import org.briarproject.bramble.api.contact.ContactManager;
 import org.briarproject.bramble.api.db.DatabaseExecutor;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
@@ -49,10 +48,8 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
 import static java.util.Objects.requireNonNull;
-import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.util.LogUtils.logDuration;
-import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.bramble.util.LogUtils.now;
 import static org.briarproject.briar.api.privategroup.PrivateGroupManager.CLIENT_ID;
 
@@ -200,25 +197,17 @@ class GroupListViewModel extends DbViewModel implements EventListener {
 	}
 
 	void removeGroup(GroupId g) {
-		runOnDbThread(() -> {
+		runOnDbThreadOrLogException(() -> {
-			try {
+			long start = now();
-				long start = now();
+			groupManager.removePrivateGroup(g);
-				groupManager.removePrivateGroup(g);
+			logDuration(LOG, "Removing group", start);
-				logDuration(LOG, "Removing group", start);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
 		});
 	}
 
 	void loadNumInvitations() {
-		runOnDbThread(() -> {
+		runOnDbThreadOrLogException(() -> {
-			try {
+			int i = groupInvitationManager.getInvitations().size();
-				int i = groupInvitationManager.getInvitations().size();
+			numInvitations.postValue(i);
-				numInvitations.postValue(i);
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
-			}
 		});
 	}
 

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 Context ctx;
-	private final LogEncrypter logEncrypter;
 	private final long appStartTime;
 
-	@Inject
+	public BriarExceptionHandler(Context ctx) {
-	BriarExceptionHandler(Application app, LogEncrypter logEncrypter) {
+		this.ctx = ctx;
-		this.app = app;
+		this.appStartTime = System.currentTimeMillis();
-		this.logEncrypter = logEncrypter;
-		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(),
+		startDevReportActivity(ctx, CrashReportActivity.class, e, appStartTime);
-				CrashReportActivity.class, e, appStartTime, logKey);
 		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,
+	public ReportData collectReportData(@Nullable Throwable t,
-			String logs) {
+			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) {
+	private ReportItem getLogcat() {
-		return new ReportItem("Logcat", R.string.dev_report_logcat, logs);
+		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);
-		viewModel.init(t, appStartTime, logKey);
 		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,
+	public ReportViewModel(@NonNull Application application,
-			CachingLogHandler logHandler,
+			DevReporter reporter, PluginManager pluginManager) {
-			LogDecrypter logDecrypter,
-			DevReporter reporter,
-			PluginManager pluginManager) {
 		super(application);
-		collector = new BriarReportCollector(application);
+		this.collector = new BriarReportCollector(application);
-		this.logHandler = logHandler;
-		this.logDecrypter = logDecrypter;
 		this.reporter = reporter;
 		this.pluginManager = pluginManager;
 	}
 
-	void init(@Nullable Throwable t, long appStartTime,
+	void init(@Nullable Throwable t, long appStartTime) {
-			@Nullable byte[] logKey) {
 		isFeedback = t == null;
 		if (reportData.getValue() == null) new SingleShotAndroidExecutor(() -> {
-			String decryptedLogs;
+			ReportData data = collector.collectReportData(t, appStartTime);
-			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.postValue(data);
 		}).start();
 	}
@@ -138,8 +110,8 @@ class ReportViewModel extends AndroidViewModel {
 	}
 
 	/**
-	 * The content of the report that will be loaded after
+	 * The content of the report
-	 * {@link #init(Throwable, long, byte[])} was called.
+	 * 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)
+		return builder.create();
-				.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();
 	}
 
 }

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/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/ThreadItemAdapter.java

@@ -4,7 +4,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.util.ItemReturningAdapter;
@@ -20,7 +21,8 @@ import androidx.recyclerview.widget.ListAdapter;
 import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
 
 @UiThread
-@NotNullByDefault
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
 public class ThreadItemAdapter<I extends ThreadItem>
 		extends ListAdapter<I, BaseThreadItemViewHolder<I>>
 		implements ItemReturningAdapter<I> {
@@ -39,7 +41,7 @@ public class ThreadItemAdapter<I extends ThreadItem>
 			@Override
 			public boolean areContentsTheSame(I a, I b) {
 				return a.isHighlighted() == b.isHighlighted() &&
-						a.isRead() == b.isRead();
+						a.isRead() && b.isRead();
 			}
 		});
 		this.listener = listener;
@@ -61,7 +63,7 @@ public class ThreadItemAdapter<I extends ThreadItem>
 		ui.bind(item, listener);
 	}
 
-	int findItemPosition(MessageId id) {
+	public int findItemPosition(MessageId id) {
 		for (int i = 0; i < getItemCount(); i++) {
 			if (id.equals(getItem(i).getId())) return i;
 		}
@@ -89,7 +91,8 @@ public class ThreadItemAdapter<I extends ThreadItem>
 
 	@Nullable
 	I getHighlightedItem() {
-		for (I item : getCurrentList()) {
+		for (int i = 0; i < getItemCount(); i++) {
+			I item = getItem(i);
 			if (item.isHighlighted()) return item;
 		}
 		return null;

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

@@ -110,7 +110,7 @@ public abstract class ThreadListActivity<I extends ThreadItem, A extends ThreadI
 	@Override
 	public void onStart() {
 		super.onStart();
-		getViewModel().blockAndClearNotifications();
+		getViewModel().blockNotifications();
 		list.startPeriodicUpdate();
 	}
 

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

@@ -5,6 +5,7 @@ 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.Transaction;
 import org.briarproject.bramble.api.db.TransactionManager;
 import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.event.EventBus;
@@ -25,8 +26,11 @@ 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.api.client.PostHeader;
 import org.briarproject.briar.client.MessageTreeImpl;
 
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicReference;
@@ -39,16 +43,16 @@ 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;
+import static org.briarproject.bramble.util.LogUtils.logDuration;
+import static org.briarproject.bramble.util.LogUtils.now;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
 public abstract class ThreadListViewModel<I extends ThreadItem>
-		extends DbViewModel implements EventListener {
+		extends DbViewModel
+		implements EventListener {
 
 	private static final Logger LOG =
 			getLogger(ThreadListViewModel.class.getName());
@@ -61,7 +65,7 @@ public abstract class ThreadListViewModel<I extends ThreadItem>
 	private final MessageTracker messageTracker;
 	private final EventBus eventBus;
 
-	// UIThread
+	@DatabaseExecutor
 	private final MessageTree<I> messageTree = new MessageTreeImpl<>();
 	private final MutableLiveData<LiveResult<List<I>>> items =
 			new MutableLiveData<>();
@@ -73,9 +77,6 @@ public abstract class ThreadListViewModel<I extends ThreadItem>
 	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<>();
 
@@ -113,28 +114,19 @@ public abstract class ThreadListViewModel<I extends ThreadItem>
 	 * 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() {
+	public void setGroupId(GroupId groupId) {
-		// load stored MessageId (last list position) before the list itself
+		this.groupId = groupId;
 		loadStoredMessageId();
 		loadItems();
 		loadSharingContacts();
 	}
 
-	protected abstract void clearNotifications();
+	public void blockNotifications() {
-
-	void blockAndClearNotifications() {
 		notificationManager.blockNotification(groupId);
-		clearNotifications();
 	}
 
-	void unblockNotifications() {
+	public void unblockNotifications() {
 		notificationManager.unblockNotification(groupId);
 	}
 
@@ -151,16 +143,11 @@ public abstract class ThreadListViewModel<I extends ThreadItem>
 	}
 
 	private void loadStoredMessageId() {
-		runOnDbThread(() -> {
+		runOnDbThreadOrLogException(() -> {
-			try {
+			storedMessageId.set(messageTracker.loadStoredMessageId(groupId));
-				storedMessageId
+			if (LOG.isLoggable(INFO)) {
-						.set(messageTracker.loadStoredMessageId(groupId));
+				LOG.info("Loaded last top visible message id " +
-				if (LOG.isLoggable(INFO)) {
+						storedMessageId);
-					LOG.info("Loaded last top visible message id " +
-							storedMessageId);
-				}
-			} catch (DbException e) {
-				logException(LOG, WARNING, e);
 			}
 		});
 	}
@@ -174,67 +161,75 @@ public abstract class ThreadListViewModel<I extends ThreadItem>
 	 * Loads the ContactIds of all contacts the group is shared with
 	 * and adds them to {@link SharingController}.
 	 */
-	protected abstract void loadSharingContacts();
+	public abstract void loadSharingContacts();
 
 	@UiThread
 	protected void setItems(LiveResult<List<I>> items) {
-		if (items.hasError()) {
+		this.items.setValue(items);
-			this.items.setValue(items);
+	}
-		} else {
+
-			messageTree.clear();
+	@DatabaseExecutor
-			// not null, because hasError() is false
+	protected <H extends PostHeader> List<I> createItems(
-			messageTree.add(requireNonNull(items.getResultOrNull()));
+			Transaction txn, Collection<H> headers, ItemGetter<H, I> itemGetter)
-			LiveResult<List<I>> result =
+			throws DbException {
-					new LiveResult<>(messageTree.depthFirstOrder());
+		long start = now();
-			this.items.setValue(result);
+		List<I> items = new ArrayList<>();
+		for (H header : headers) {
+			String text = loadMessageText(txn, header);
+			items.add(itemGetter.getItem(header, text));
 		}
+		logDuration(LOG, "Loading bodies and creating items", start);
+
+		messageTree.clear();
+		messageTree.add(items);
+		return messageTree.depthFirstOrder();
 	}
 
 	/**
 	 * Add a remote item on the UI thread.
-	 *
+	 * The list will not scroll, but show an unread indicator.
-	 * @param scrollToItem whether the list will scroll to the newly added item
 	 */
 	@UiThread
-	protected void addItem(I item, boolean scrollToItem) {
+	protected void addItem(I item) {
-		// 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()));
 	}
 
+	/**
+	 * Add a local item from the DB thread.
+	 * The list will scroll to the new item.
+	 */
+	@DatabaseExecutor
+	protected void addItemAsync(I item) {
+		messageTree.add(item);
+		scrollToItem.set(item.getId());
+		items.postValue(new LiveResult<>(messageTree.depthFirstOrder()));
+	}
+
+	@DatabaseExecutor
+	protected abstract String loadMessageText(Transaction txn,
+			PostHeader header) throws DbException;
+
 	@UiThread
-	void setReplyId(@Nullable MessageId id) {
+	public void setReplyId(@Nullable MessageId id) {
 		replyId = id;
 	}
 
 	@UiThread
 	@Nullable
-	MessageId getReplyId() {
+	public MessageId getReplyId() {
 		return replyId;
 	}
 
 	void storeMessageId(@Nullable MessageId messageId) {
 		if (messageId != null) {
-			runOnDbThread(() -> {
+			runOnDbThreadOrLogException(() ->
-				try {
+					messageTracker.storeMessageId(groupId, messageId));
-					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);
@@ -257,4 +252,8 @@ public abstract class ThreadListViewModel<I extends ThreadItem>
 		return scrollToItem.getAndSet(null);
 	}
 
+	public interface ItemGetter<H extends PostHeader, I> {
+		I getItem(H header, String text);
+	}
+
 }

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 =
+		Drawable icon = getDrawable(ctx, resId);
-				VectorDrawableCompat.create(ctx.getResources(), resId, null);
 		setTint(requireNonNull(icon), getColor(ctx, R.color.color_primary));
 		return icon;
 	}

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

@@ -2,6 +2,7 @@ package org.briarproject.briar.android.view;
 
 import android.content.Context;
 import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.os.Looper;
 import android.util.AttributeSet;
@@ -52,8 +53,9 @@ public class BriarRecyclerView extends FrameLayout {
 				R.styleable.BriarRecyclerView);
 		isScrollingToEnd = attributes
 				.getBoolean(R.styleable.BriarRecyclerView_scrollToEnd, true);
-		int drawableRes = attributes.getResourceId(R.styleable.BriarRecyclerView_emptyImage, -1);
+		Drawable drawable = attributes
-		if (drawableRes != -1) setEmptyImage(drawableRes);
+				.getDrawable(R.styleable.BriarRecyclerView_emptyImage);
+		if (drawable != null) setEmptyImage(drawable);
 		String emtpyText =
 				attributes.getString(R.styleable.BriarRecyclerView_emptyText);
 		if (emtpyText != null) setEmptyText(emtpyText);
@@ -137,6 +139,11 @@ public class BriarRecyclerView extends FrameLayout {
 		}
 	}
 
+	public void setEmptyImage(Drawable drawable) {
+		if (recyclerView == null) initViews();
+		emptyImage.setImageDrawable(drawable);
+	}
+
 	public void setEmptyImage(@DrawableRes int res) {
 		if (recyclerView == null) initViews();
 		emptyImage.setImageResource(res);

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

@@ -4,7 +4,6 @@ import android.app.Activity;
 import android.content.ClipData;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -29,7 +28,6 @@ import androidx.customview.view.AbsSavedState;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.Observer;
-import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
 import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt;
 
 import static android.os.Build.VERSION.SDK_INT;
@@ -255,14 +253,12 @@ public class TextAttachmentController extends TextSendController
 
 	public void showImageOnboarding(Activity activity) {
 		int color = resolveColorAttribute(activity, R.attr.colorControlNormal);
-		Drawable drawable = VectorDrawableCompat
-				.create(activity.getResources(), R.drawable.ic_image, null);
 		new MaterialTapTargetPrompt.Builder(activity,
 				R.style.OnboardingDialogTheme).setTarget(sendButton)
 				.setPrimaryText(R.string.dialog_title_image_support)
 				.setSecondaryText(R.string.dialog_message_image_support)
 				.setBackgroundColour(getColor(activity, R.color.briar_primary))
-				.setIconDrawable(drawable)
+				.setIcon(R.drawable.ic_image)
 				.setIconDrawableColourFilter(color)
 				.show();
 	}

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

@@ -8,6 +8,7 @@ import org.briarproject.briar.R;
 
 import androidx.annotation.UiThread;
 import androidx.appcompat.widget.AppCompatImageView;
+import androidx.core.content.ContextCompat;
 
 @UiThread
 public class TrustIndicatorView extends AppCompatImageView {
@@ -43,7 +44,7 @@ public class TrustIndicatorView extends AppCompatImageView {
 			default:
 				res = R.drawable.trust_indicator_unknown;
 		}
-		setImageResource(res);
+		setImageDrawable(ContextCompat.getDrawable(getContext(), res));
 		setVisibility(VISIBLE);
 
 		invalidate();

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

@@ -2,6 +2,7 @@ package org.briarproject.briar.android.viewmodel;
 
 import android.app.Application;
 
+import org.briarproject.bramble.api.ThrowingRunnable;
 import org.briarproject.bramble.api.db.DatabaseExecutor;
 import org.briarproject.bramble.api.db.DbCallable;
 import org.briarproject.bramble.api.db.DbException;
@@ -66,7 +67,8 @@ public abstract class DbViewModel extends AndroidViewModel {
 	 * {@link RecyclerView.Adapter},
 	 * use {@link #loadList(DbCallable, UiConsumer)} instead.
 	 */
-	protected void runOnDbThread(Runnable task) {
+	protected void runOnDbThread(ThrowingRunnable<Exception> task,
+			Consumer<Exception> err) {
 		dbExecutor.execute(() -> {
 			try {
 				lifecycleManager.waitForDatabase();
@@ -74,6 +76,8 @@ public abstract class DbViewModel extends AndroidViewModel {
 			} catch (InterruptedException e) {
 				LOG.warning("Interrupted while waiting for database");
 				Thread.currentThread().interrupt();
+			} catch (Exception e) {
+				err.accept(e);
 			}
 		});
 	}
@@ -101,6 +105,34 @@ public abstract class DbViewModel extends AndroidViewModel {
 		});
 	}
 
+	/**
+	 * Waits for the DB to open and runs the given task on the
+	 * {@link DatabaseExecutor}. If the task throws a {@link DbException}
+	 * it's caught and logged.
+	 * <p>
+	 * If you need a list of items to be displayed in a
+	 * {@link RecyclerView.Adapter},
+	 * use {@link #loadList(DbCallable, UiConsumer)} instead.
+	 */
+	protected void runOnDbThreadOrLogException(boolean readOnly,
+			DbRunnable<Exception> task) {
+		runOnDbThread(readOnly, task, e -> logException(LOG, WARNING, e));
+	}
+
+	/**
+	 * Waits for the DB to open and runs the given task on the
+	 * {@link DatabaseExecutor}. If the task throws a {@link DbException}
+	 * it's caught and logged.
+	 * <p>
+	 * If you need a list of items to be displayed in a
+	 * {@link RecyclerView.Adapter},
+	 * use {@link #loadList(DbCallable, UiConsumer)} instead.
+	 */
+	protected void runOnDbThreadOrLogException(
+			ThrowingRunnable<Exception> task) {
+		runOnDbThread(task, e -> logException(LOG, WARNING, e));
+	}
+
 	/**
 	 * Loads a list of items on the {@link DatabaseExecutor} within a single
 	 * {@link Transaction} and publishes it as a {@link LiveResult}

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

@@ -39,17 +39,6 @@ public class LiveEvent<T> extends LiveData<LiveEvent.ConsumableEvent<T>> {
 		super.observeForever(observer);
 	}
 
-	/**
-	 * Returns the last value of the event (even if already consumed)
-	 * or null if there hasn't been any value so far.
-	 */
-	@Nullable
-	public T getLastValue() {
-		ConsumableEvent<T> event = getValue();
-		if (event == null) return null;
-		return event.content;
-	}
-
 	static class ConsumableEvent<T> {
 
 		private final T content;

briar-android/src/main/java/org/briarproject/briar/api/android/AndroidNotificationManager.java

@@ -39,8 +39,7 @@ public interface AndroidNotificationManager {
 	String BLOG_CHANNEL_ID = "blogs";
 	// Channels are sorted by channel ID in the Settings app, so use IDs
 	// that will sort below the main channels such as contacts
-	String ONGOING_CHANNEL_OLD_ID = "zForegroundService";
+	String ONGOING_CHANNEL_ID = "zForegroundService";
-	String ONGOING_CHANNEL_ID = "zForegroundService2";
 	String FAILURE_CHANNEL_ID = "zStartupFailure";
 	String REMINDER_CHANNEL_ID = "zSignInReminder";
 

briar-android/src/main/java/org/briarproject/briar/api/android/LockManager.java

@@ -8,7 +8,6 @@ import androidx.lifecycle.LiveData;
 public interface LockManager {
 
 	String ACTION_LOCK = "lock";
-	String EXTRA_PID = "PID";
 
 	/**
 	 * Stops the inactivity timer when the user interacts with the app.

briar-android/src/main/res/drawable-anydpi-v24/notification_lock.xml

@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#FFFFFF">
-  <group android:scaleX="0.92"
-      android:scaleY="0.92"
-      android:translateX="0.96"
-      android:translateY="0.96">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
-  </group>
-</vector>

briar-android/src/main/res/drawable-anydpi-v24/notification_signout.xml

@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#FFFFFF">
-  <group android:scaleX="0.92"
-      android:scaleY="0.92"
-      android:translateX="0.96"
-      android:translateY="0.96">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="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"/>
-  </group>
-</vector>