Deliver test messages as though they arrived from contacts.

.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/All_tests.xml

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

.idea/runConfigurations/All_tests_in_briar_api.xml

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

.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

@@ -5,14 +5,14 @@ apply plugin: 'witness'
 apply from: 'witness.gradle'
 
 android {
-	compileSdkVersion 30
-	buildToolsVersion '30.0.2'
+	compileSdkVersion rootProject.ext.compileSdkVersion
+	buildToolsVersion rootProject.ext.buildToolsVersion
 
 	defaultConfig {
-		minSdkVersion 16
-		targetSdkVersion 29
-		versionCode 10215
-		versionName "1.2.15"
+		minSdkVersion rootProject.ext.minSdkVersion
+		targetSdkVersion rootProject.ext.targetSdkVersion
+		versionCode rootProject.ext.versionCode
+		versionName rootProject.ext.versionName
 		consumerProguardFiles 'proguard-rules.txt'
 
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -38,8 +38,8 @@ configurations {
 
 dependencies {
 	implementation project(path: ':bramble-core', configuration: 'default')
-	tor 'org.briarproject:tor-android:0.3.5.13@zip'
-	tor 'org.briarproject:obfs4proxy-android:0.0.12-dev-40245c4a@zip'
+	tor 'org.briarproject:tor-android:0.3.5.12@zip'
+	tor 'org.briarproject:obfs4proxy-android:0.0.11-2@zip'
 
 	annotationProcessor 'com.google.dagger:dagger-compiler:2.24'
 

bramble-android/src/main/java/org/briarproject/bramble/network/AndroidNetworkManager.java

@@ -1,15 +1,11 @@
 package org.briarproject.bramble.network;
 
-import android.annotation.TargetApi;
 import android.app.Application;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.ConnectivityManager;
-import android.net.LinkAddress;
-import android.net.LinkProperties;
-import android.net.Network;
 import android.net.NetworkInfo;
 
 import org.briarproject.bramble.api.event.EventBus;
@@ -23,11 +19,6 @@ import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.api.system.TaskScheduler;
 import org.briarproject.bramble.api.system.TaskScheduler.Cancellable;
 
-import java.net.Inet4Address;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.util.Enumeration;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -45,22 +36,16 @@ import static android.net.ConnectivityManager.TYPE_WIFI;
 import static android.net.wifi.p2p.WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION;
 import static android.os.Build.VERSION.SDK_INT;
 import static android.os.PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED;
-import static java.net.NetworkInterface.getNetworkInterfaces;
-import static java.util.Collections.list;
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.concurrent.TimeUnit.SECONDS;
 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.nullsafety.NullSafety.requireNonNull;
-import static org.briarproject.bramble.util.LogUtils.logException;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
 class AndroidNetworkManager implements NetworkManager, Service {
 
 	private static final Logger LOG =
-			getLogger(AndroidNetworkManager.class.getName());
+			Logger.getLogger(AndroidNetworkManager.class.getName());
 
 	// See android.net.wifi.WifiManager
 	private static final String WIFI_AP_STATE_CHANGED_ACTION =
@@ -69,8 +54,7 @@ class AndroidNetworkManager implements NetworkManager, Service {
 	private final TaskScheduler scheduler;
 	private final EventBus eventBus;
 	private final Executor eventExecutor;
-	private final Application app;
-	private final ConnectivityManager connectivityManager;
+	private final Context appContext;
 	private final AtomicReference<Cancellable> connectivityCheck =
 			new AtomicReference<>();
 	private final AtomicBoolean used = new AtomicBoolean(false);
@@ -83,9 +67,7 @@ class AndroidNetworkManager implements NetworkManager, Service {
 		this.scheduler = scheduler;
 		this.eventBus = eventBus;
 		this.eventExecutor = eventExecutor;
-		this.app = app;
-		connectivityManager = (ConnectivityManager)
-				requireNonNull(app.getSystemService(CONNECTIVITY_SERVICE));
+		this.appContext = app.getApplicationContext();
 	}
 
 	@Override
@@ -100,82 +82,24 @@ class AndroidNetworkManager implements NetworkManager, Service {
 		filter.addAction(WIFI_AP_STATE_CHANGED_ACTION);
 		filter.addAction(WIFI_P2P_THIS_DEVICE_CHANGED_ACTION);
 		if (SDK_INT >= 23) filter.addAction(ACTION_DEVICE_IDLE_MODE_CHANGED);
-		app.registerReceiver(networkStateReceiver, filter);
+		appContext.registerReceiver(networkStateReceiver, filter);
 	}
 
 	@Override
 	public void stopService() {
 		if (networkStateReceiver != null)
-			app.unregisterReceiver(networkStateReceiver);
+			appContext.unregisterReceiver(networkStateReceiver);
 	}
 
 	@Override
 	public NetworkStatus getNetworkStatus() {
-		NetworkInfo net = connectivityManager.getActiveNetworkInfo();
+		ConnectivityManager cm = (ConnectivityManager)
+				appContext.getSystemService(CONNECTIVITY_SERVICE);
+		if (cm == null) throw new AssertionError();
+		NetworkInfo net = cm.getActiveNetworkInfo();
 		boolean connected = net != null && net.isConnected();
-		boolean wifi = false, ipv6Only = false;
-		if (connected) {
-			wifi = net.getType() == TYPE_WIFI;
-			if (SDK_INT >= 23) ipv6Only = isActiveNetworkIpv6Only();
-			else ipv6Only = areAllAvailableNetworksIpv6Only();
-		}
-		return new NetworkStatus(connected, wifi, ipv6Only);
-	}
-
-	/**
-	 * Returns true if the
-	 * {@link ConnectivityManager#getActiveNetwork() active network} has an
-	 * IPv6 unicast address and no IPv4 addresses. The active network is
-	 * assumed not to be a loopback interface.
-	 */
-	@TargetApi(23)
-	private boolean isActiveNetworkIpv6Only() {
-		Network net = connectivityManager.getActiveNetwork();
-		if (net == null) {
-			LOG.info("No active network");
-			return false;
-		}
-		LinkProperties props = connectivityManager.getLinkProperties(net);
-		if (props == null) {
-			LOG.info("No link properties for active network");
-			return false;
-		}
-		boolean hasIpv6Unicast = false;
-		for (LinkAddress linkAddress : props.getLinkAddresses()) {
-			InetAddress addr = linkAddress.getAddress();
-			if (addr instanceof Inet4Address) return false;
-			if (!addr.isMulticastAddress()) hasIpv6Unicast = true;
-		}
-		return hasIpv6Unicast;
-	}
-
-	/**
-	 * Returns true if the device has at least one network interface with an
-	 * IPv6 unicast address and no interfaces with IPv4 addresses, excluding
-	 * loopback interfaces and interfaces that are
-	 * {@link NetworkInterface#isUp() down}. If this method returns true and
-	 * the device has internet access then it's via IPv6 only.
-	 */
-	private boolean areAllAvailableNetworksIpv6Only() {
-		try {
-			Enumeration<NetworkInterface> interfaces = getNetworkInterfaces();
-			if (interfaces == null) {
-				LOG.info("No network interfaces");
-				return false;
-			}
-			boolean hasIpv6Unicast = false;
-			for (NetworkInterface i : list(interfaces)) {
-				if (i.isLoopback() || !i.isUp()) continue;
-				for (InetAddress addr : list(i.getInetAddresses())) {
-					if (addr instanceof Inet4Address) return false;
-					if (!addr.isMulticastAddress()) hasIpv6Unicast = true;
-				}
-			}
-			return hasIpv6Unicast;
-		} catch (SocketException e) {
-			logException(LOG, WARNING, e);
-			return false;
-		}
+		boolean wifi = connected && net.getType() == TYPE_WIFI;
+		return new NetworkStatus(connected, wifi);
 	}
 
 	private void updateConnectionStatus() {

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

@@ -6,6 +6,8 @@ import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.content.ContentResolver;
 import android.content.Context;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.os.Parcel;
 import android.os.StrictMode;
@@ -15,10 +17,12 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
+import java.util.List;
 
 import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
 
+import static android.content.Context.WIFI_SERVICE;
 import static android.os.Build.VERSION.SDK_INT;
 import static android.provider.Settings.Secure.ANDROID_ID;
 
@@ -48,6 +52,15 @@ class AndroidSecureRandomProvider extends UnixSecureRandomProvider {
 		String id = Settings.Secure.getString(contentResolver, ANDROID_ID);
 		if (id != null) out.writeUTF(id);
 		Parcel parcel = Parcel.obtain();
+		WifiManager wm = (WifiManager) appContext.getApplicationContext()
+				.getSystemService(WIFI_SERVICE);
+		if (wm != null) {
+			List<WifiConfiguration> configs = wm.getConfiguredNetworks();
+			if (configs != null) {
+				for (WifiConfiguration config : configs)
+					parcel.writeParcelable(config, 0);
+			}
+		}
 		BluetoothAdapter bt = BluetoothAdapter.getDefaultAdapter();
 		if (bt != null) {
 			for (BluetoothDevice device : bt.getBondedDevices())

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

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

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

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

bramble-android/witness.gradle

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

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

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

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

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

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

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

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

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

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

@@ -1,8 +1,6 @@
-package org.briarproject.briar.api.identity;
+package org.briarproject.bramble.api.identity;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.NullSafety;
-import org.briarproject.briar.api.attachment.AttachmentHeader;
 
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
@@ -22,18 +20,14 @@ public class AuthorInfo {
 	private final Status status;
 	@Nullable
 	private final String alias;
-	@Nullable
-	private final AttachmentHeader avatarHeader;
 
-	public AuthorInfo(Status status, @Nullable String alias,
-			@Nullable AttachmentHeader avatarHeader) {
+	public AuthorInfo(Status status, @Nullable String alias) {
 		this.status = status;
 		this.alias = alias;
-		this.avatarHeader = avatarHeader;
 	}
 
 	public AuthorInfo(Status status) {
-		this(status, null, null);
+		this(status, null);
 	}
 
 	public Status getStatus() {
@@ -45,11 +39,6 @@ public class AuthorInfo {
 		return alias;
 	}
 
-	@Nullable
-	public AttachmentHeader getAvatarHeader() {
-		return avatarHeader;
-	}
-
 	@Override
 	public int hashCode() {
 		int hashCode = status.ordinal();
@@ -62,9 +51,6 @@ public class AuthorInfo {
 		if (!(o instanceof AuthorInfo)) return false;
 		AuthorInfo info = (AuthorInfo) o;
 		return status == info.status &&
-				// aliases are equal
-				NullSafety.equals(alias, info.alias) &&
-				// avatars are equal
-				NullSafety.equals(avatarHeader, info.avatarHeader);
+				(alias == null ? info.alias == null : alias.equals(info.alias));
 	}
 }

bramble-api/src/main/java/org/briarproject/bramble/api/network/NetworkStatus.java

@@ -8,12 +8,11 @@ import javax.annotation.concurrent.Immutable;
 @NotNullByDefault
 public class NetworkStatus {
 
-	private final boolean connected, wifi, ipv6Only;
+	private final boolean connected, wifi;
 
-	public NetworkStatus(boolean connected, boolean wifi, boolean ipv6Only) {
+	public NetworkStatus(boolean connected, boolean wifi) {
 		this.connected = connected;
 		this.wifi = wifi;
-		this.ipv6Only = ipv6Only;
 	}
 
 	public boolean isConnected() {
@@ -23,8 +22,4 @@ public class NetworkStatus {
 	public boolean isWifi() {
 		return wifi;
 	}
-
-	public boolean isIpv6Only() {
-		return ipv6Only;
-	}
 }

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

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

bramble-api/src/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/reporting/DevReporter.java

@@ -23,8 +23,6 @@ public interface DevReporter {
 
 	/**
 	 * Sends any reports previously stored on disk.
-	 *
-	 * @return The number of reports that were sent.
 	 */
-	int sendReports();
+	void sendReports();
 }

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-api/src/test/java/org/briarproject/bramble/api/identity/AuthorInfoTest.java

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

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

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

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

@@ -11,7 +11,6 @@ import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.util.Base32;
 
 import java.security.GeneralSecurityException;
-import java.util.Locale;
 import java.util.regex.Matcher;
 
 import javax.inject.Inject;
@@ -53,7 +52,7 @@ class PendingContactFactoryImpl implements PendingContactFactory {
 		byte[] raw = new byte[RAW_LINK_BYTES];
 		raw[0] = FORMAT_VERSION;
 		arraycopy(encoded, 0, raw, 1, encoded.length);
-		return "briar://" + Base32.encode(raw).toLowerCase(Locale.US);
+		return "briar://" + Base32.encode(raw).toLowerCase();
 	}
 
 	private PublicKey parseHandshakeLink(String link) throws FormatException {

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/plugin/tor/TorPlugin.java

@@ -863,7 +863,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			if (!state.isTorRunning()) return;
 			boolean online = status.isConnected();
 			boolean wifi = status.isWifi();
-			boolean ipv6Only = status.isIpv6Only();
 			String country = locationUtils.getCurrentCountry();
 			boolean blocked =
 					circumventionProvider.isTorProbablyBlocked(country);
@@ -880,8 +879,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			boolean automatic = network == PREF_TOR_NETWORK_AUTOMATIC;
 
 			if (LOG.isLoggable(INFO)) {
-				LOG.info("Online: " + online + ", wifi: " + wifi
-						+ ", IPv6 only: " + ipv6Only);
+				LOG.info("Online: " + online + ", wifi: " + wifi);
 				if (country.isEmpty()) LOG.info("Country code unknown");
 				else LOG.info("Country code: " + country);
 				LOG.info("Charging: " + charging);
@@ -918,8 +916,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 					enableNetwork = true;
 					if (network == PREF_TOR_NETWORK_WITH_BRIDGES ||
 							(automatic && bridgesWork)) {
-						if (ipv6Only ||
-								circumventionProvider.needsMeek(country)) {
+						if (circumventionProvider.needsMeek(country)) {
 							LOG.info("Using meek bridges");
 							enableBridges = true;
 							useMeek = true;
@@ -945,7 +942,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 				if (enableNetwork) {
 					enableBridges(enableBridges, useMeek);
 					enableConnectionPadding(enableConnectionPadding);
-					useIpv6(ipv6Only);
 				}
 				enableNetwork(enableNetwork);
 			} catch (IOException e) {
@@ -958,11 +954,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		controlConnection.setConf("ConnectionPadding", enable ? "1" : "0");
 	}
 
-	private void useIpv6(boolean ipv6Only) throws IOException {
-		controlConnection.setConf("ClientUseIPv4", ipv6Only ? "0" : "1");
-		controlConnection.setConf("ClientUseIPv6", ipv6Only ? "1" : "0");
-	}
-
 	@ThreadSafe
 	@NotNullByDefault
 	protected class PluginState {

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

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

bramble-core/src/main/java/org/briarproject/bramble/reporting/DevReporterImpl.java

@@ -29,7 +29,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.Level.WARNING;
 import static org.briarproject.bramble.util.IoUtils.tryToClose;
 
@@ -101,12 +100,11 @@ class DevReporterImpl implements DevReporter, EventListener {
 	}
 
 	@Override
-	public int sendReports() {
+	public void sendReports() {
 		File reportDir = devConfig.getReportDir();
 		File[] reports = reportDir.listFiles();
-		int reportsSent = 0;
 		if (reports == null || reports.length == 0)
-			return reportsSent; // No reports to send
+			return; // No reports to send
 
 		LOG.info("Sending reports to developers");
 		for (File f : reports) {
@@ -118,15 +116,13 @@ class DevReporterImpl implements DevReporter, EventListener {
 				in = new FileInputStream(f);
 				IoUtils.copyAndClose(in, out);
 				f.delete();
-				reportsSent++;
 			} catch (IOException e) {
 				LOG.log(WARNING, "Failed to send reports", e);
 				tryToClose(out, LOG, WARNING);
 				tryToClose(in, LOG, WARNING);
-				return reportsSent;
+				return;
 			}
 		}
-		if (LOG.isLoggable(INFO)) LOG.info(reportsSent + " report(s) sent");
-		return reportsSent;
+		LOG.info("Reports sent");
 	}
 }

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

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

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

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

bramble-core/src/main/resources/bridges

@@ -1,14 +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 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0
-Bridge obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0
-Bridge obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0
-Bridge obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0
-Bridge obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0
-Bridge obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0
-Bridge obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0
-Bridge obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0
 Bridge obfs4 78.46.188.239:37356 5A2D2F4158D0453E00C7C176978D3F41D69C45DB cert=3c0SwxpOisbohNxEc4tb875RVW8eOu1opRTVXJhafaKA/PNNtI7ElQIVOVZg1AdL5bxGCw iat-mode=0
-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-core/src/test/java/org/briarproject/bramble/contact/ContactManagerImplTest.java

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

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

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

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@zip'
-	tor 'org.briarproject:obfs4proxy:0.0.12-dev-40245c4a@zip'
+	tor 'org.briarproject:tor:0.3.5.12@zip'
+	tor 'org.briarproject:obfs4proxy:0.0.7@zip'
 
 	annotationProcessor 'com.google.dagger:dagger-compiler:2.24'
 

bramble-java/src/main/java/org/briarproject/bramble/network/JavaNetworkManager.java

@@ -5,8 +5,6 @@ import org.briarproject.bramble.api.network.NetworkStatus;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 
-import java.net.Inet4Address;
-import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.net.SocketException;
 import java.util.Enumeration;
@@ -16,8 +14,8 @@ import javax.inject.Inject;
 
 import static java.net.NetworkInterface.getNetworkInterfaces;
 import static java.util.Collections.list;
+import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
-import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.util.LogUtils.logException;
 
 @MethodsNotNullByDefault
@@ -25,7 +23,7 @@ import static org.briarproject.bramble.util.LogUtils.logException;
 class JavaNetworkManager implements NetworkManager {
 
 	private static final Logger LOG =
-			getLogger(JavaNetworkManager.class.getName());
+			Logger.getLogger(JavaNetworkManager.class.getName());
 
 	@Inject
 	JavaNetworkManager() {
@@ -33,28 +31,26 @@ class JavaNetworkManager implements NetworkManager {
 
 	@Override
 	public NetworkStatus getNetworkStatus() {
-		boolean connected = false, hasIpv4 = false, hasIpv6Unicast = false;
+		boolean connected = false;
 		try {
 			Enumeration<NetworkInterface> interfaces = getNetworkInterfaces();
-			if (interfaces == null) {
-				LOG.info("No network interfaces");
-			} else {
+			if (interfaces != null) {
 				for (NetworkInterface i : list(interfaces)) {
-					if (i.isLoopback() || !i.isUp()) continue;
-					for (InetAddress addr : list(i.getInetAddresses())) {
-						connected = true;
-						if (addr instanceof Inet4Address) {
-							hasIpv4 = true;
-						} else if (!addr.isMulticastAddress()) {
-							hasIpv6Unicast = true;
+					if (i.isLoopback()) continue;
+					if (i.isUp() && i.getInetAddresses().hasMoreElements()) {
+						if (LOG.isLoggable(INFO)) {
+							LOG.info("Interface " + i.getDisplayName() +
+									" is up with at least one address.");
 						}
+						connected = true;
+						break;
 					}
 				}
 			}
 		} catch (SocketException e) {
 			logException(LOG, WARNING, e);
 		}
-		return new NetworkStatus(connected, false, !hasIpv4 && hasIpv6Unicast);
+		return new NetworkStatus(connected, false);
 	}
 
 }

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

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

bramble-java/witness.gradle

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

briar-android/artwork/notification_signout.svg

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

briar-android/build.gradle

@@ -16,17 +16,15 @@ def getStdout = { command, defaultValue ->
 }
 
 android {
-	compileSdkVersion 30
-	buildToolsVersion '30.0.2'
+	compileSdkVersion rootProject.ext.compileSdkVersion
+	buildToolsVersion rootProject.ext.buildToolsVersion
 
 	defaultConfig {
-		minSdkVersion 16
-		targetSdkVersion 29
-		versionCode 10215
-		versionName "1.2.15"
+		minSdkVersion rootProject.ext.minSdkVersion
+		targetSdkVersion rootProject.ext.targetSdkVersion
+		versionCode rootProject.ext.versionCode
+		versionName rootProject.ext.versionName
 		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)
@@ -102,6 +100,7 @@ dependencies {
 	implementation 'com.google.android.material:material:1.2.1'
 	implementation 'androidx.recyclerview:recyclerview-selection:1.1.0-rc03'
 
+	implementation 'ch.acra:acra:4.11'
 	implementation 'info.guardianproject.panic:panic:1.0'
 	implementation 'info.guardianproject.trustedintents:trustedintents:0.2'
 	implementation 'de.hdodenhof:circleimageview:3.0.1'
@@ -110,7 +109,7 @@ dependencies {
 	implementation 'com.vanniktech:emoji-google:0.6.0' // newer versions need minSdk 21
 	implementation 'com.github.kobakei:MaterialFabSpeedDial:1.2.1'
 	implementation 'com.github.chrisbanes:PhotoView:2.3.0'
-	def glideVersion = '4.11.0'
+	def glideVersion = '4.10.0'
 	implementation("com.github.bumptech.glide:glide:$glideVersion") {
 		exclude group: 'com.android.support'
 		exclude module: 'disklrucache' // when there's no disk cache, we can't accidentally use it
@@ -128,15 +127,13 @@ dependencies {
 	testImplementation 'androidx.test:runner:1.3.0'
 	testImplementation 'androidx.test.ext:junit:1.1.2'
 	testImplementation 'androidx.fragment:fragment-testing:1.2.5'
-	testImplementation "androidx.arch.core:core-testing:2.1.0"
 	testImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
 	testImplementation 'org.robolectric:robolectric:4.3.1'
 	testImplementation 'org.mockito:mockito-core:3.1.0'
-	testImplementation 'junit:junit:4.13.1'
+	testImplementation 'junit:junit:4.12'
 	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'
@@ -145,9 +142,11 @@ dependencies {
 	androidTestImplementation "androidx.test.espresso:espresso-intents:$espressoVersion"
 	androidTestAnnotationProcessor "com.google.dagger:dagger-compiler:2.24"
 	androidTestCompileOnly 'javax.annotation:jsr250-api:1.0'
-	androidTestImplementation 'junit:junit:4.13.1'
-	androidTestScreenshotImplementation 'tools.fastlane:screengrab:2.0.0'
-	androidTestScreenshotImplementation 'com.jraska:falcon:2.1.1'
+	androidTestImplementation 'junit:junit:4.12'
+	androidTestScreenshotImplementation('tools.fastlane:screengrab:1.2.0') {
+		// workaround for jetifier issue https://issuetracker.google.com/issues/123060356
+		exclude group: 'com.android.support.test.uiautomator'
+	}
 	androidTestScreenshotImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
 }
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

briar-android/src/main/AndroidManifest.xml

@@ -65,43 +65,30 @@
 
 		<service
 			android:name="org.briarproject.briar.android.NotificationCleanupService"
-			android:exported="false" />
+			android:exported="false"></service>
 
 		<activity
-			android:name="org.briarproject.briar.android.reporting.CrashReportActivity"
+			android:name="org.briarproject.briar.android.reporting.DevReportActivity"
 			android:excludeFromRecents="true"
 			android:exported="false"
 			android:finishOnTaskLaunch="true"
 			android:label="@string/crash_report_title"
 			android:launchMode="singleInstance"
-			android:process=":briar_error_handler"
 			android:theme="@style/BriarTheme.NoActionBar"
-			android:windowSoftInputMode="adjustResize|stateHidden" />
-
-		<activity
-			android:name="org.briarproject.briar.android.reporting.FeedbackActivity"
-			android:exported="false"
-			android:label="@string/feedback_title"
-			android:parentActivityName="org.briarproject.briar.android.settings.SettingsActivity"
-			android:theme="@style/BriarTheme.NoActionBar"
-			android:windowSoftInputMode="adjustResize|stateHidden">
-			<meta-data
-				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.settings.SettingsActivity" />
-		</activity>
+			android:windowSoftInputMode="adjustResize|stateHidden"></activity>
 
 		<activity
 			android:name="org.briarproject.briar.android.splash.ExpiredActivity"
-			android:label="@string/app_name" />
+			android:label="@string/app_name"></activity>
 
 		<activity
 			android:name="org.briarproject.briar.android.login.StartupActivity"
-			android:label="@string/app_name" />
+			android:label="@string/app_name"></activity>
 
 		<activity
 			android:name="org.briarproject.briar.android.account.SetupActivity"
 			android:label="@string/setup_title"
-			android:windowSoftInputMode="adjustResize|stateAlwaysVisible" />
+			android:windowSoftInputMode="adjustResize|stateAlwaysVisible"></activity>
 
 		<activity
 			android:name="org.briarproject.briar.android.splash.SplashScreenActivity"
@@ -359,7 +346,7 @@
 
 		<activity
 			android:name="org.briarproject.briar.android.StartupFailureActivity"
-			android:label="@string/startup_failed_activity_title" />
+			android:label="@string/startup_failed_activity_title"></activity>
 
 		<activity
 			android:name="org.briarproject.briar.android.settings.SettingsActivity"
@@ -425,11 +412,11 @@
 
 		<activity
 			android:name="org.briarproject.briar.android.logout.ExitActivity"
-			android:theme="@android:style/Theme.NoDisplay" />
+			android:theme="@android:style/Theme.NoDisplay"></activity>
 
 		<activity
 			android:name=".android.logout.HideUiActivity"
-			android:theme="@android:style/Theme.NoDisplay" />
+			android:theme="@android:style/Theme.NoDisplay"></activity>
 
 		<activity
 			android:name=".android.account.UnlockActivity"
@@ -449,29 +436,4 @@
 			android:theme="@style/BriarTheme" />
 
 	</application>
-
-	<queries>
-		<package android:name="info.guardianproject.ripple" />
-		<package android:name="com.huawei.systemmanager" />
-		<package android:name="com.huawei.powergenie" />
-		<package android:name="com.evenwell.PowerMonitor" />
-
-		<intent>
-			<action android:name="android.intent.action.VIEW" />
-			<data android:scheme="https" />
-		</intent>
-		<intent>
-			<action android:name="android.intent.action.VIEW" />
-			<data android:scheme="http" />
-		</intent>
-		<!-- white-listing the intents below does not seem necessary,
-		but they are still included in case modified Android versions require it -->
-		<intent>
-			<action android:name="android.bluetooth.adapter.action.REQUEST_DISCOVERABLE" />
-		</intent>
-		<intent>
-			<action android:name="android.settings.CHANNEL_NOTIFICATION_SETTINGS" />
-		</intent>
-	</queries>
-
 </manifest>

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

@@ -14,7 +14,6 @@ import org.briarproject.bramble.api.contact.ContactManager;
 import org.briarproject.bramble.api.crypto.CryptoExecutor;
 import org.briarproject.bramble.api.crypto.PasswordStrengthEstimator;
 import org.briarproject.bramble.api.db.DatabaseExecutor;
-import org.briarproject.bramble.api.db.TransactionManager;
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.identity.IdentityManager;
 import org.briarproject.bramble.api.keyagreement.KeyAgreementTask;
@@ -32,16 +31,14 @@ import org.briarproject.bramble.plugin.tor.CircumventionProvider;
 import org.briarproject.briar.BriarCoreEagerSingletons;
 import org.briarproject.briar.BriarCoreModule;
 import org.briarproject.briar.android.attachment.AttachmentModule;
-import org.briarproject.briar.android.attachment.media.MediaModule;
 import org.briarproject.briar.android.conversation.glide.BriarModelLoader;
-import org.briarproject.briar.android.logging.CachingLogHandler;
 import org.briarproject.briar.android.login.SignInReminderReceiver;
+import org.briarproject.briar.android.reporting.BriarReportSender;
 import org.briarproject.briar.android.view.EmojiTextInputView;
 import org.briarproject.briar.api.android.AndroidNotificationManager;
 import org.briarproject.briar.api.android.DozeWatchdog;
 import org.briarproject.briar.api.android.LockManager;
 import org.briarproject.briar.api.android.ScreenFilterMonitor;
-import org.briarproject.briar.api.attachment.AttachmentReader;
 import org.briarproject.briar.api.blog.BlogManager;
 import org.briarproject.briar.api.blog.BlogPostFactory;
 import org.briarproject.briar.api.blog.BlogSharingManager;
@@ -50,7 +47,6 @@ import org.briarproject.briar.api.conversation.ConversationManager;
 import org.briarproject.briar.api.feed.FeedManager;
 import org.briarproject.briar.api.forum.ForumManager;
 import org.briarproject.briar.api.forum.ForumSharingManager;
-import org.briarproject.briar.api.identity.AuthorManager;
 import org.briarproject.briar.api.introduction.IntroductionManager;
 import org.briarproject.briar.api.messaging.MessagingManager;
 import org.briarproject.briar.api.messaging.PrivateMessageFactory;
@@ -75,8 +71,7 @@ import dagger.Component;
 		BrambleAndroidModule.class,
 		BriarAccountModule.class,
 		AppModule.class,
-		AttachmentModule.class,
-		MediaModule.class
+		AttachmentModule.class
 })
 public interface AndroidComponent
 		extends BrambleCoreEagerSingletons, BrambleAndroidEagerSingletons,
@@ -91,18 +86,12 @@ public interface AndroidComponent
 	@DatabaseExecutor
 	Executor databaseExecutor();
 
-	TransactionManager transactionManager();
-
 	MessageTracker messageTracker();
 
 	LifecycleManager lifecycleManager();
 
 	IdentityManager identityManager();
 
-	AttachmentReader attachmentReader();
-
-	AuthorManager authorManager();
-
 	PluginManager pluginManager();
 
 	EventBus eventBus();
@@ -180,14 +169,12 @@ public interface AndroidComponent
 
 	AndroidWakeLockManager wakeLockManager();
 
-	CachingLogHandler logHandler();
-
-	Thread.UncaughtExceptionHandler exceptionHandler();
-
 	void inject(SignInReminderReceiver briarService);
 
 	void inject(BriarService briarService);
 
+	void inject(BriarReportSender briarReportSender);
+
 	void inject(NotificationCleanupService notificationCleanupService);
 
 	void inject(EmojiTextInputView textInputView);

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

@@ -109,8 +109,7 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 	@Nullable
 	private GroupId blockedGroup = null;
 	private boolean blockSignInReminder = false;
-	private boolean blockForums = false, blockGroups = false,
-			blockBlogs = false;
+	private boolean blockBlogs = false;
 	private long lastSound = 0;
 
 	private volatile Settings settings = new Settings();
@@ -224,8 +223,8 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 			if (s.getNamespace().equals(SETTINGS_NAMESPACE))
 				settings = s.getSettings();
 		} else if (e instanceof ConversationMessageReceivedEvent) {
-			ConversationMessageReceivedEvent<?> p =
-					(ConversationMessageReceivedEvent<?>) e;
+			ConversationMessageReceivedEvent p =
+					(ConversationMessageReceivedEvent) e;
 			showContactNotification(p.getContactId());
 		} else if (e instanceof GroupMessageAddedEvent) {
 			GroupMessageAddedEvent g = (GroupMessageAddedEvent) e;
@@ -255,7 +254,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 =
@@ -386,7 +385,6 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 
 	@UiThread
 	private void showGroupMessageNotification(GroupId g) {
-		if (blockGroups) return;
 		if (g.equals(blockedGroup)) return;
 		groupCounts.add(g);
 		updateGroupMessageNotification(true);
@@ -454,7 +452,6 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 
 	@UiThread
 	private void showForumPostNotification(GroupId g) {
-		if (blockForums) return;
 		if (g.equals(blockedGroup)) return;
 		forumCounts.add(g);
 		updateForumPostNotification(true);
@@ -624,7 +621,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));
@@ -684,26 +681,6 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 		});
 	}
 
-	@Override
-	public void blockAllForumPostNotifications() {
-		androidExecutor.runOnUiThread((Runnable) () -> blockForums = true);
-	}
-
-	@Override
-	public void unblockAllForumPostNotifications() {
-		androidExecutor.runOnUiThread((Runnable) () -> blockForums = false);
-	}
-
-	@Override
-	public void blockAllGroupMessageNotifications() {
-		androidExecutor.runOnUiThread((Runnable) () -> blockGroups = true);
-	}
-
-	@Override
-	public void unblockAllGroupMessageNotifications() {
-		androidExecutor.runOnUiThread((Runnable) () -> blockGroups = false);
-	}
-
 	@Override
 	public void blockAllBlogPostNotifications() {
 		androidExecutor.runOnUiThread((Runnable) () -> blockBlogs = true);

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

@@ -27,27 +27,15 @@ import org.briarproject.bramble.plugin.tcp.AndroidLanTcpPluginFactory;
 import org.briarproject.bramble.plugin.tor.AndroidTorPluginFactory;
 import org.briarproject.bramble.util.AndroidUtils;
 import org.briarproject.bramble.util.StringUtils;
-import org.briarproject.briar.android.account.DozeHelperModule;
 import org.briarproject.briar.android.account.LockManagerImpl;
-import org.briarproject.briar.android.account.SetupModule;
-import org.briarproject.briar.android.contact.ContactListModule;
-import org.briarproject.briar.android.forum.ForumModule;
 import org.briarproject.briar.android.keyagreement.ContactExchangeModule;
-import org.briarproject.briar.android.logging.LoggingModule;
 import org.briarproject.briar.android.login.LoginModule;
 import org.briarproject.briar.android.navdrawer.NavDrawerModule;
-import org.briarproject.briar.android.privategroup.conversation.GroupConversationModule;
-import org.briarproject.briar.android.privategroup.list.GroupListModule;
-import org.briarproject.briar.android.reporting.DevReportModule;
-import org.briarproject.briar.android.settings.SettingsModule;
-import org.briarproject.briar.android.sharing.SharingModule;
-import org.briarproject.briar.android.test.TestAvatarCreatorImpl;
 import org.briarproject.briar.android.viewmodel.ViewModelModule;
 import org.briarproject.briar.api.android.AndroidNotificationManager;
 import org.briarproject.briar.api.android.DozeWatchdog;
 import org.briarproject.briar.api.android.LockManager;
 import org.briarproject.briar.api.android.ScreenFilterMonitor;
-import org.briarproject.briar.api.test.TestAvatarCreator;
 
 import java.io.File;
 import java.security.GeneralSecurityException;
@@ -72,21 +60,10 @@ import static org.briarproject.bramble.api.reporting.ReportingConstants.DEV_PUBL
 import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
 
 @Module(includes = {
-		SetupModule.class,
-		DozeHelperModule.class,
 		ContactExchangeModule.class,
-		LoggingModule.class,
 		LoginModule.class,
 		NavDrawerModule.class,
-		ViewModelModule.class,
-		SettingsModule.class,
-		DevReportModule.class,
-		ContactListModule.class,
-		// below need to be within same scope as ViewModelProvider.Factory
-		ForumModule.class,
-		GroupListModule.class,
-		GroupConversationModule.class,
-		SharingModule.class,
+		ViewModelModule.class
 })
 public class AppModule {
 
@@ -194,21 +171,10 @@ public class AppModule {
 			public File getReportDir() {
 				return AndroidUtils.getReportDir(app.getApplicationContext());
 			}
-
-			@Override
-			public File getLogcatFile() {
-				return AndroidUtils.getLogcatFile(app.getApplicationContext());
-			}
 		};
 		return devConfig;
 	}
 
-	@Provides
-	TestAvatarCreator provideTestAvatarCreator(
-			TestAvatarCreatorImpl testAvatarCreator) {
-		return testAvatarCreator;
-	}
-
 	@Provides
 	SharedPreferences provideSharedPreferences(Application app) {
 		// FIXME unify this with getDefaultSharedPreferences()
@@ -230,10 +196,7 @@ public class AppModule {
 	ScreenFilterMonitor provideScreenFilterMonitor(
 			LifecycleManager lifecycleManager,
 			ScreenFilterMonitorImpl screenFilterMonitor) {
-		if (SDK_INT <= 29) {
-			// this keeps track of installed apps and does not work on API 30+
-			lifecycleManager.registerService(screenFilterMonitor);
-		}
+		lifecycleManager.registerService(screenFilterMonitor);
 		return screenFilterMonitor;
 	}
 
@@ -272,17 +235,6 @@ public class AppModule {
 
 	@Provides
 	FeatureFlags provideFeatureFlags() {
-		return new FeatureFlags() {
-
-			@Override
-			public boolean shouldEnableImageAttachments() {
-				return IS_DEBUG_BUILD;
-			}
-
-			@Override
-			public boolean shouldEnableProfilePictures() {
-				return IS_DEBUG_BUILD;
-			}
-		};
+		return () -> IS_DEBUG_BUILD;
 	}
 }

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

@@ -14,32 +14,78 @@ import android.preference.PreferenceManager;
 import com.vanniktech.emoji.EmojiManager;
 import com.vanniktech.emoji.google.GoogleEmojiProvider;
 
+import org.acra.ACRA;
+import org.acra.ReportingInteractionMode;
+import org.acra.annotation.ReportsCrashes;
 import org.briarproject.bramble.BrambleAndroidEagerSingletons;
 import org.briarproject.bramble.BrambleAppComponent;
 import org.briarproject.bramble.BrambleCoreEagerSingletons;
 import org.briarproject.briar.BriarCoreEagerSingletons;
+import org.briarproject.briar.BuildConfig;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.logging.CachingLogHandler;
+import org.briarproject.briar.android.reporting.BriarReportPrimer;
+import org.briarproject.briar.android.reporting.BriarReportSenderFactory;
+import org.briarproject.briar.android.reporting.DevReportActivity;
 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;
-
 import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND;
 import static java.util.logging.Level.FINE;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Logger.getLogger;
+import static org.acra.ReportField.ANDROID_VERSION;
+import static org.acra.ReportField.APP_VERSION_CODE;
+import static org.acra.ReportField.APP_VERSION_NAME;
+import static org.acra.ReportField.BRAND;
+import static org.acra.ReportField.BUILD_CONFIG;
+import static org.acra.ReportField.CRASH_CONFIGURATION;
+import static org.acra.ReportField.CUSTOM_DATA;
+import static org.acra.ReportField.DEVICE_FEATURES;
+import static org.acra.ReportField.DISPLAY;
+import static org.acra.ReportField.INITIAL_CONFIGURATION;
+import static org.acra.ReportField.PACKAGE_NAME;
+import static org.acra.ReportField.PHONE_MODEL;
+import static org.acra.ReportField.PRODUCT;
+import static org.acra.ReportField.REPORT_ID;
+import static org.acra.ReportField.STACK_TRACE;
+import static org.acra.ReportField.USER_APP_START_DATE;
+import static org.acra.ReportField.USER_CRASH_DATE;
 import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
 
+@ReportsCrashes(
+		reportPrimerClass = BriarReportPrimer.class,
+		logcatArguments = {"-d", "-v", "time", "*:I"},
+		reportSenderFactoryClasses = {BriarReportSenderFactory.class},
+		mode = ReportingInteractionMode.DIALOG,
+		reportDialogClass = DevReportActivity.class,
+		resDialogOkToast = R.string.dev_report_saved,
+		deleteOldUnsentReportsOnApplicationStart = false,
+		buildConfigClass = BuildConfig.class,
+		customReportContent = {
+				REPORT_ID,
+				APP_VERSION_CODE, APP_VERSION_NAME, PACKAGE_NAME,
+				PHONE_MODEL, ANDROID_VERSION, BRAND, PRODUCT,
+				BUILD_CONFIG,
+				CUSTOM_DATA,
+				STACK_TRACE,
+				INITIAL_CONFIGURATION, CRASH_CONFIGURATION,
+				DISPLAY, DEVICE_FEATURES,
+				USER_APP_START_DATE, USER_CRASH_DATE
+		}
+)
 public class BriarApplicationImpl extends Application
 		implements BriarApplication {
 
 	private static final Logger LOG =
 			getLogger(BriarApplicationImpl.class.getName());
 
+	private final CachingLogHandler logHandler = new CachingLogHandler();
+
 	private AndroidComponent applicationComponent;
 	private volatile SharedPreferences prefs;
 
@@ -51,8 +97,8 @@ public class BriarApplicationImpl extends Application
 		Localizer.initialize(prefs);
 		super.attachBaseContext(
 				Localizer.getInstance().setLocale(base));
-		Localizer.getInstance().setLocale(this);
 		setTheme(base, prefs);
+		ACRA.init(this);
 	}
 
 	@Override
@@ -61,11 +107,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 +118,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());
 	}
 
@@ -103,7 +144,7 @@ public class BriarApplicationImpl extends Application
 	}
 
 	@Override
-	public void onConfigurationChanged(@NonNull Configuration newConfig) {
+	public void onConfigurationChanged(Configuration newConfig) {
 		super.onConfigurationChanged(newConfig);
 		Localizer.getInstance().setLocale(this);
 	}
@@ -135,6 +176,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

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

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

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

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

@@ -58,7 +58,7 @@ class ScreenFilterMonitorImpl implements ScreenFilterMonitor, Service {
 			Logger.getLogger(ScreenFilterMonitorImpl.class.getName());
 
 	/*
-	 * Ignore Play Services if it uses this package name and public key - it's
+ 	 * Ignore Play Services if it uses this package name and public key - it's
 	 * effectively a system app, but not flagged as such on older systems
 	 */
 	private static final String PLAY_SERVICES_PACKAGE =
@@ -108,7 +108,7 @@ class ScreenFilterMonitorImpl implements ScreenFilterMonitor, Service {
 		Set<String> allowed = prefs.getStringSet(PREF_KEY_ALLOWED,
 				Collections.emptySet());
 		List<AppDetails> apps = new ArrayList<>();
-		@SuppressLint("QueryPermissionsNeeded") List<PackageInfo> packageInfos =
+		List<PackageInfo> packageInfos =
 				pm.getInstalledPackages(GET_PERMISSIONS);
 		for (PackageInfo packageInfo : packageInfos) {
 			if (!allowed.contains(packageInfo.packageName)

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

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

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

@@ -104,15 +104,9 @@ 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);
+		setupController.createAccount();
 	}
+
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -21,6 +21,7 @@ import org.briarproject.briar.android.blog.RssFeedImportActivity;
 import org.briarproject.briar.android.blog.RssFeedManageActivity;
 import org.briarproject.briar.android.blog.WriteBlogPostActivity;
 import org.briarproject.briar.android.contact.ContactListFragment;
+import org.briarproject.briar.android.contact.ContactModule;
 import org.briarproject.briar.android.contact.add.remote.AddContactActivity;
 import org.briarproject.briar.android.contact.add.remote.LinkExchangeFragment;
 import org.briarproject.briar.android.contact.add.remote.NicknameFragment;
@@ -32,6 +33,7 @@ import org.briarproject.briar.android.conversation.ImageFragment;
 import org.briarproject.briar.android.forum.CreateForumActivity;
 import org.briarproject.briar.android.forum.ForumActivity;
 import org.briarproject.briar.android.forum.ForumListFragment;
+import org.briarproject.briar.android.forum.ForumModule;
 import org.briarproject.briar.android.fragment.ScreenFilterDialogFragment;
 import org.briarproject.briar.android.introduction.ContactChooserFragment;
 import org.briarproject.briar.android.introduction.IntroductionActivity;
@@ -49,6 +51,7 @@ import org.briarproject.briar.android.navdrawer.TransportsActivity;
 import org.briarproject.briar.android.panic.PanicPreferencesActivity;
 import org.briarproject.briar.android.panic.PanicResponderActivity;
 import org.briarproject.briar.android.privategroup.conversation.GroupActivity;
+import org.briarproject.briar.android.privategroup.conversation.GroupConversationModule;
 import org.briarproject.briar.android.privategroup.creation.CreateGroupActivity;
 import org.briarproject.briar.android.privategroup.creation.CreateGroupFragment;
 import org.briarproject.briar.android.privategroup.creation.CreateGroupModule;
@@ -57,15 +60,12 @@ import org.briarproject.briar.android.privategroup.creation.GroupInviteFragment;
 import org.briarproject.briar.android.privategroup.invitation.GroupInvitationActivity;
 import org.briarproject.briar.android.privategroup.invitation.GroupInvitationModule;
 import org.briarproject.briar.android.privategroup.list.GroupListFragment;
+import org.briarproject.briar.android.privategroup.list.GroupListModule;
 import org.briarproject.briar.android.privategroup.memberlist.GroupMemberListActivity;
 import org.briarproject.briar.android.privategroup.memberlist.GroupMemberModule;
 import org.briarproject.briar.android.privategroup.reveal.GroupRevealModule;
 import org.briarproject.briar.android.privategroup.reveal.RevealContactsActivity;
 import org.briarproject.briar.android.privategroup.reveal.RevealContactsFragment;
-import org.briarproject.briar.android.reporting.CrashFragment;
-import org.briarproject.briar.android.reporting.CrashReportActivity;
-import org.briarproject.briar.android.reporting.ReportFormFragment;
-import org.briarproject.briar.android.settings.ConfirmAvatarDialogFragment;
 import org.briarproject.briar.android.settings.SettingsActivity;
 import org.briarproject.briar.android.settings.SettingsFragment;
 import org.briarproject.briar.android.sharing.BlogInvitationActivity;
@@ -86,11 +86,15 @@ import dagger.Component;
 @Component(modules = {
 		ActivityModule.class,
 		BlogModule.class,
+		ContactModule.class,
 		CreateGroupModule.class,
+		ForumModule.class,
 		GroupInvitationModule.class,
+		GroupConversationModule.class,
+		GroupListModule.class,
 		GroupMemberModule.class,
 		GroupRevealModule.class,
-		SharingModule.SharingLegacyModule.class
+		SharingModule.class
 }, dependencies = AndroidComponent.class)
 public interface ActivityComponent {
 
@@ -180,8 +184,6 @@ public interface ActivityComponent {
 
 	void inject(PendingContactListActivity activity);
 
-	void inject(CrashReportActivity crashReportActivity);
-
 	// Fragments
 
 	void inject(AuthorNameFragment fragment);
@@ -232,10 +234,4 @@ public interface ActivityComponent {
 
 	void inject(ImageFragment imageFragment);
 
-	void inject(ReportFormFragment reportFormFragment);
-
-	void inject(CrashFragment crashFragment);
-
-	void inject(ConfirmAvatarDialogFragment fragment);
-
 }

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

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

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

@@ -6,6 +6,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
 
+import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
@@ -14,8 +15,10 @@ import org.briarproject.briar.android.BriarApplication;
 import org.briarproject.briar.android.DestroyableContext;
 import org.briarproject.briar.android.Localizer;
 import org.briarproject.briar.android.controller.ActivityLifecycleController;
+import org.briarproject.briar.android.forum.ForumModule;
 import org.briarproject.briar.android.fragment.BaseFragment;
 import org.briarproject.briar.android.fragment.ScreenFilterDialogFragment;
+import org.briarproject.briar.android.reporting.DevReportActivity;
 import org.briarproject.briar.android.util.UiUtils;
 import org.briarproject.briar.android.widget.TapSafeFrameLayout;
 import org.briarproject.briar.android.widget.TapSafeFrameLayout.OnTapFilteredListener;
@@ -37,11 +40,9 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
-import static android.os.Build.VERSION.SDK_INT;
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
 import static androidx.lifecycle.Lifecycle.State.STARTED;
-import static java.util.Collections.emptyList;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Logger.getLogger;
 import static org.briarproject.briar.android.TestingConstants.PREVENT_SCREENSHOTS;
@@ -49,6 +50,7 @@ import static org.briarproject.briar.android.util.UiUtils.hideSoftKeyboard;
 
 /**
  * Warning: Some activities don't extend {@link BaseActivity}.
+ *          E.g. {@link DevReportActivity}
  */
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
@@ -86,6 +88,7 @@ public abstract class BaseActivity extends AppCompatActivity
 		activityComponent = DaggerActivityComponent.builder()
 				.androidComponent(applicationComponent)
 				.activityModule(getActivityModule())
+				.forumModule(getForumModule())
 				.build();
 		injectActivity(activityComponent);
 		super.onCreate(state);
@@ -109,7 +112,6 @@ public abstract class BaseActivity extends AppCompatActivity
 	protected void attachBaseContext(Context base) {
 		super.attachBaseContext(
 				Localizer.getInstance().setLocale(base));
-		Localizer.getInstance().setLocale(this);
 	}
 
 	public ActivityComponent getActivityComponent() {
@@ -121,6 +123,10 @@ public abstract class BaseActivity extends AppCompatActivity
 		return new ActivityModule(this);
 	}
 
+	protected ForumModule getForumModule() {
+		return new ForumModule();
+	}
+
 	@Override
 	protected void onStart() {
 		super.onStart();
@@ -196,15 +202,9 @@ public abstract class BaseActivity extends AppCompatActivity
 		// If the dialog is already visible, filter the tap
 		ScreenFilterDialogFragment f = findDialogFragment();
 		if (f != null && f.isVisible()) return false;
-		Collection<AppDetails> apps;
-		// querying all apps is only possible at API 29 and below
-		if (SDK_INT <= 29) {
-			apps = screenFilterMonitor.getApps();
-			// If all overlay apps have been allowed, allow the tap
-			if (apps.isEmpty()) return true;
-		} else {
-			apps = emptyList();
-		}
+		Collection<AppDetails> apps = screenFilterMonitor.getApps();
+		// If all overlay apps have been allowed, allow the tap
+		if (apps.isEmpty()) return true;
 		// Show dialog unless onSaveInstanceState() has been called, see #1112
 		FragmentManager fm = getSupportFragmentManager();
 		if (!fm.isStateSaved()) {
@@ -241,7 +241,7 @@ public abstract class BaseActivity extends AppCompatActivity
 	}
 
 	@UiThread
-	public void handleException(Exception e) {
+	public void handleDbException(DbException e) {
 		supportFinishAfterTransition();
 	}
 
@@ -266,12 +266,7 @@ public abstract class BaseActivity extends AppCompatActivity
 	private void protectToolbar() {
 		findToolbar();
 		if (toolbar != null) {
-			boolean filter;
-			if (SDK_INT <= 29) {
-				filter = !screenFilterMonitor.getApps().isEmpty();
-			} else {
-				filter = true;
-			}
+			boolean filter = !screenFilterMonitor.getApps().isEmpty();
 			UiUtils.setFilterTouchesWhenObscured(toolbar, filter);
 		}
 	}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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