Factor out code for skipping onboarding.

bramble-android/build.gradle

@@ -13,8 +13,8 @@ android {
 	defaultConfig {
 		minSdkVersion 21
 		targetSdkVersion 33
-		versionCode 10513
-		versionName "1.5.13"
+		versionCode 10508
+		versionName "1.5.8"
 		consumerProguardFiles 'proguard-rules.txt'
 
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -40,7 +40,7 @@ configurations {
 }
 
 dependencies {
-	api 'org.briarproject:dont-kill-me-lib:0.2.8'
+	api 'org.briarproject:dont-kill-me-lib:0.2.7'
 
 	// In theory this dependency shouldn't be needed, but without it Android Studio's linter will
 	// complain about unresolved symbols for bramble-api test classes in bramble-android tests,

bramble-android/src/main/AndroidManifest.xml

@@ -8,8 +8,10 @@
 
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-	<!-- The BLUETOOTH permission was supposed to be removed in API 31 but is still needed on some Xiaomi/Redmi/POCO devices running API 31 and Nubia devices running API 32/33 -->
-	<uses-permission android:name="android.permission.BLUETOOTH" />
+	<!-- The BLUETOOTH permission was supposed to be removed in API 31 but is still needed on some Xiaomi/Redmi/POCO devices running API 31 and Nubia devices running API 32 -->
+	<uses-permission
+		android:name="android.permission.BLUETOOTH"
+		android:maxSdkVersion="32" />
 	<uses-permission
 		android:name="android.permission.BLUETOOTH_ADMIN"
 		android:maxSdkVersion="30" />

bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPluginFactory.java

@@ -31,6 +31,7 @@ import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
 import javax.net.SocketFactory;
 
+import static android.os.Build.VERSION.SDK_INT;
 import static org.briarproject.bramble.util.AndroidUtils.getSupportedArchitectures;
 
 @Immutable
@@ -85,10 +86,15 @@ public class AndroidTorPluginFactory extends TorPluginFactory {
 		TorWrapper tor = new AndroidTorWrapper(app, wakeLockManager,
 				ioExecutor, eventExecutor, architecture, torDirectory,
 				torSocksPort, torControlPort);
+		// Android versions 7.1 and newer can verify Let's Encrypt TLS certs
+		// signed with the IdentTrust DST Root X3 certificate. Older versions
+		// of Android consider the certificate to have expired at the end of
+		// September 2021.
+		boolean canVerifyLetsEncryptCerts = SDK_INT >= 25;
 		return new TorPlugin(ioExecutor, wakefulIoExecutor,
 				networkManager, locationUtils, torSocketFactory,
 				circumventionProvider, batteryManager, backoff,
 				torRendezvousCrypto, tor, callback, MAX_LATENCY,
-				MAX_IDLE_TIME);
+				MAX_IDLE_TIME, canVerifyLetsEncryptCerts);
 	}
 }

bramble-android/witness.gradle

@@ -4,16 +4,18 @@ dependencyVerification {
 		'cglib:cglib:3.2.8:cglib-3.2.8.jar:3f64de999ecc5595dc84ca8ff0879d8a34c8623f9ef3c517a53ed59023fcb9db',
 		'com.google.code.findbugs:annotations:3.0.1:annotations-3.0.1.jar:6b47ff0a6de0ce17cbedc3abb0828ca5bce3009d53ea47b3723ff023c4742f79',
 		'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
-		'com.google.dagger:dagger-compiler:2.51.1:dagger-compiler-2.51.1.jar:14cf2def1c4c8cd3b977840e297b463191d537cd1c8330992ca5c0b341a641ad',
-		'com.google.dagger:dagger-spi:2.51.1:dagger-spi-2.51.1.jar:deb52030b92b27c5dcd76b2c0747f1cf105b60939f6073b43eb06cfe7c9ba601',
-		'com.google.dagger:dagger:2.51.1:dagger-2.51.1.jar:c3891a4c4a4e48682888ca321eaf8497004b286e1d9a2936867373219f7dd86d',
-		'com.google.devtools.ksp:symbol-processing-api:1.9.20-1.0.14:symbol-processing-api-1.9.20-1.0.14.jar:d0339396f40dc9eb3b3f7bc86257f93869ee23448fa31ec4a1de900c6b7ae6d7',
-		'com.google.errorprone:error_prone_annotations:2.23.0:error_prone_annotations-2.23.0.jar:ec6f39f068b6ff9ac323c68e28b9299f8c0a80ca512dccb1d4a70f40ac3ec054',
+		'com.google.dagger:dagger-compiler:2.45:dagger-compiler-2.45.jar:5617dfb994537dba5b41f3744a6dd13ec3cd99789c065e0d5c6fa9f21cf7ca25',
+		'com.google.dagger:dagger-producers:2.45:dagger-producers-2.45.jar:a05abb4c3ccf6bb0f056bdcb5ef973898ecf172952ab5948a824aeea6c86ecaa',
+		'com.google.dagger:dagger-spi:2.45:dagger-spi-2.45.jar:7cd6f0b09d88e64a9c97bc80e544ab8ac8fdee9301754413585a74cf64222b27',
+		'com.google.dagger:dagger:2.45:dagger-2.45.jar:f011cae7d2c0fb7ea17c34e05bc10e768b1081a5892ad019cf1fdb0e125c49c1',
+		'com.google.devtools.ksp:symbol-processing-api:1.7.0-1.0.6:symbol-processing-api-1.7.0-1.0.6.jar:adc29417be5ca9ff42118105fea4e36d9ef44987abfc41432309371a60198941',
+		'com.google.errorprone:error_prone_annotations:2.7.1:error_prone_annotations-2.7.1.jar:cd5257c08a246cf8628817ae71cb822be192ef91f6881ca4a3fcff4f1de1cff3',
 		'com.google.errorprone:javac-shaded:9-dev-r4023-3:javac-shaded-9-dev-r4023-3.jar:65bfccf60986c47fbc17c9ebab0be626afc41741e0a6ec7109e0768817a36f30',
 		'com.google.googlejavaformat:google-java-format:1.5:google-java-format-1.5.jar:aa19ad7850fb85178aa22f2fddb163b84d6ce4d0035872f30d4408195ca1144e',
-		'com.google.guava:failureaccess:1.0.2:failureaccess-1.0.2.jar:8a8f81cf9b359e3f6dfa691a1e776985c061ef2f223c9b2c80753e1b458e8064',
-		'com.google.guava:guava:33.0.0-jre:guava-33.0.0-jre.jar:f4d85c3e4d411694337cb873abea09b242b664bb013320be6105327c45991537',
+		'com.google.guava:failureaccess:1.0.1:failureaccess-1.0.1.jar:a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26',
+		'com.google.guava:guava:31.0.1-jre:guava-31.0.1-jre.jar:d5be94d65e87bd219fb3193ad1517baa55a3b88fc91d21cf735826ab5af087b9',
 		'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava:listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar:b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99',
+		'com.google.j2objc:j2objc-annotations:1.3:j2objc-annotations-1.3.jar:21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b',
 		'com.squareup:javapoet:1.13.0:javapoet-1.13.0.jar:4c7517e848a71b36d069d12bb3bf46a70fd4cda3105d822b0ed2e19c00b69291',
 		'com.squareup:kotlinpoet:1.11.0:kotlinpoet-1.11.0.jar:2887ada1ca03dd83baa2758640d87e840d1907564db0ef88d2289c868a980492',
 		'javax.annotation:jsr250-api:1.0:jsr250-api-1.0.jar:a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f',
@@ -23,16 +25,16 @@ dependencyVerification {
 		'net.jcip:jcip-annotations:1.0:jcip-annotations-1.0.jar:be5805392060c71474bf6c9a67a099471274d30b83eef84bfc4e0889a4f1dcc0',
 		'net.ltgt.gradle.incap:incap:0.2:incap-0.2.jar:b625b9806b0f1e4bc7a2e3457119488de3cd57ea20feedd513db070a573a4ffd',
 		'org.apache-extras.beanshell:bsh:2.0b6:bsh-2.0b6.jar:a17955976070c0573235ee662f2794a78082758b61accffce8d3f8aedcd91047',
-		'org.briarproject:dont-kill-me-lib:0.2.8:dont-kill-me-lib-0.2.8.aar:e21173e480ee3f2364c142cc14db8dc6447be91bde9e62e4985c485ea0af9126',
+		'org.briarproject:dont-kill-me-lib:0.2.7:dont-kill-me-lib-0.2.7.aar:8a9540941fd927e1c127096a7a9b4aa61ce2f2965d2e24f849be92f9e57213c4',
 		'org.briarproject:jtorctl:0.5:jtorctl-0.5.jar:43f8c7d390169772b9a2c82ab806c8414c136a2a8636c555e22754bb7260793b',
 		'org.briarproject:null-safety:0.1:null-safety-0.1.jar:161760de5e838cb982bafa973df820675d4397098e9a91637a36a306d43ba011',
 		'org.briarproject:obfs4proxy-android:0.0.14-tor2:obfs4proxy-android-0.0.14-tor2.jar:a0a93770d6760ce57d9dbd31cc7177687374e00c3361dac22ab75e3b6e0f289e',
-		'org.briarproject:onionwrapper-android:0.1.1:onionwrapper-android-0.1.1.aar:d761854dac454616b3e0ca099b2cd17060365ce4316afe495cc7ae86b6c81d15',
-		'org.briarproject:onionwrapper-core:0.1.1:onionwrapper-core-0.1.1.jar:176b7c159a45f6397810a1f93f040b3e17fdbc6645b0d189204777920719464b',
-		'org.briarproject:snowflake-android:2.9.1:snowflake-android-2.9.1.jar:8d6195637edbe3717d205c2e524e9d3cb742b90fc67b10565d16262af134e489',
-		'org.briarproject:tor-android:0.4.8.9-1:tor-android-0.4.8.9-1.jar:8fbaaf0cb1663abd12852b7fc51a804534b7e7d865b4dec3fc4e9ec0e79f3ad5',
+		'org.briarproject:onionwrapper-android:0.0.6:onionwrapper-android-0.0.6.aar:d761854dac454616b3e0ca099b2cd17060365ce4316afe495cc7ae86b6c81d15',
+		'org.briarproject:onionwrapper-core:0.0.6:onionwrapper-core-0.0.6.jar:ed316fa600b9efa21f5643447f2e21b4db607889a41d526c03d61dec8d059c16',
+		'org.briarproject:snowflake-android:2.5.1:snowflake-android-2.5.1.jar:88ec81c17b1b6fa884d06839dec0330e328b45c89f88c970a213ce91ca8eac87',
+		'org.briarproject:tor-android:0.4.7.15:tor-android-0.4.7.15.jar:992877b28c1181cc10569cad5f84257218f510a4dbea99a455c476b29932dd68',
 		'org.checkerframework:checker-compat-qual:2.5.5:checker-compat-qual-2.5.5.jar:11d134b245e9cacc474514d2d66b5b8618f8039a1465cdc55bbc0b34e0008b7a',
-		'org.checkerframework:checker-qual:3.41.0:checker-qual-3.41.0.jar:2f9f245bf68e4259d610894f2406dc1f6363dc639302bd566e8272e4f4541172',
+		'org.checkerframework:checker-qual:3.12.0:checker-qual-3.12.0.jar:ff10785ac2a357ec5de9c293cb982a2cbb605c0309ea4cc1cb9b9bc6dbe7f3cb',
 		'org.hamcrest:hamcrest-core:2.1:hamcrest-core-2.1.jar:e09109e54a289d88506b9bfec987ddd199f4217c9464132668351b9a4f00bee9',
 		'org.hamcrest:hamcrest-library:2.1:hamcrest-library-2.1.jar:b7e2b6895b3b679f0e47b6380fda391b225e9b78505db9d8bdde8d3cc8d52a21',
 		'org.hamcrest:hamcrest:2.1:hamcrest-2.1.jar:ba93b2e3a562322ba432f0a1b53addcc55cb188253319a020ed77f824e692050',
@@ -41,12 +43,14 @@ dependencyVerification {
 		'org.jacoco:org.jacoco.core:0.8.7:org.jacoco.core-0.8.7.jar:ad7739b5fb5969aa1a8aead3d74ed54dc82ed012f1f10f336bd1b96e71c1a13c',
 		'org.jacoco:org.jacoco.report:0.8.7:org.jacoco.report-0.8.7.jar:cc89258623700a6c932592153cb528785876b6da183d5431f97efbba6f020e5b',
 		'org.jetbrains.kotlin:kotlin-reflect:1.6.10:kotlin-reflect-1.6.10.jar:3277ac102ae17aad10a55abec75ff5696c8d109790396434b496e75087854203',
-		'org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10:kotlin-stdlib-common-1.9.10.jar:cde3341ba18a2ba262b0b7cf6c55b20c90e8d434e42c9a13e6a3f770db965a88',
-		'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0:kotlin-stdlib-jdk7-1.9.0.jar:b7979a7aac94055f0d9f1fd3b47ce5ffe1cb6032a842ba9fbe7186f085289178',
-		'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10:kotlin-stdlib-jdk7-1.9.10.jar:ac6361bf9ad1ed382c2103d9712c47cdec166232b4903ed596e8876b0681c9b7',
-		'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0:kotlin-stdlib-jdk8-1.9.0.jar:a59fa24fdf1ffb594baecdbf0fd10010f977cea10236d487fe3464977a7377fa',
-		'org.jetbrains.kotlin:kotlin-stdlib:1.9.10:kotlin-stdlib-1.9.10.jar:55e989c512b80907799f854309f3bc7782c5b3d13932442d0379d5c472711504',
-		'org.jetbrains.kotlin:kotlin-stdlib:1.9.20:kotlin-stdlib-1.9.20.jar:28a35bcdff46d864f80f346a617e486284b208d17378c41900dfb1de95a90e6c',
+		'org.jetbrains.kotlin:kotlin-stdlib-common:1.7.0:kotlin-stdlib-common-1.7.0.jar:59c6ff64fe9a6604afce03e8aaa75f83586c6030ac71fb0b34ee7cdefed3618f',
+		'org.jetbrains.kotlin:kotlin-stdlib-common:1.8.0:kotlin-stdlib-common-1.8.0.jar:78ef93b59e603cc0fe51def9bd4c037b07cbace3b3b7806d1a490a42bc1f4cb2',
+		'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.0:kotlin-stdlib-jdk7-1.7.0.jar:07e91be9b2ca20672d2bdb7e181b766e73453a2da13492b5ddaee8fa47aea239',
+		'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0:kotlin-stdlib-jdk7-1.8.0.jar:4c889d1d9803f5f2eb6c1592a6b7e62369ac7660c9eee15aba16fec059163666',
+		'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.0:kotlin-stdlib-jdk8-1.7.0.jar:cf058e11db1dfc9944680c8c61b95ac689aaaa8a3eb30bced028100f038f030b',
+		'org.jetbrains.kotlin:kotlin-stdlib:1.7.0:kotlin-stdlib-1.7.0.jar:aa88e9625577957f3249a46cb6e166ee09b369e600f7a11d148d16b0a6d87f05',
+		'org.jetbrains.kotlin:kotlin-stdlib:1.8.0:kotlin-stdlib-1.8.0.jar:c77bef8774640b9fb9d6e217459ff220dae59878beb7d2e4b430506feffc654e',
+		'org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.5.0:kotlinx-metadata-jvm-0.5.0.jar:ca063a96639b08b9eaa0de4d65e899480740a6efbe28ab9a8681a2ced03055a4',
 		'org.jetbrains:annotations:13.0:annotations-13.0.jar:ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478',
 		'org.jmock:jmock-imposters:2.12.0:jmock-imposters-2.12.0.jar:3b836269745a137c9b2347e8d7c2104845b126ef04f012d6bfd94f1a7dea7b09',
 		'org.jmock:jmock-junit4:2.12.0:jmock-junit4-2.12.0.jar:3233062fc889637c151a24f1ee086bad04321ab7d8264fef279daff0fa27205b',

bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TorConstants.java

@@ -46,7 +46,6 @@ public interface TorConstants {
 
 	/**
 	 * Reason flag returned by {@link Plugin#getReasonsDisabled()}.
-	 * Currently unused, but may be worth keeping for future use.
 	 */
 	int REASON_COUNTRY_BLOCKED = 8;
 }

bramble-api/witness.gradle

@@ -4,7 +4,7 @@ dependencyVerification {
 		'com.fasterxml.jackson.core:jackson-annotations:2.13.4:jackson-annotations-2.13.4.jar:ac5b27a634942391ca113850ee7db01df1499a240174021263501c05fc653b44',
 		'com.google.code.findbugs:annotations:3.0.1:annotations-3.0.1.jar:6b47ff0a6de0ce17cbedc3abb0828ca5bce3009d53ea47b3723ff023c4742f79',
 		'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
-		'com.google.dagger:dagger:2.51.1:dagger-2.51.1.jar:c3891a4c4a4e48682888ca321eaf8497004b286e1d9a2936867373219f7dd86d',
+		'com.google.dagger:dagger:2.45:dagger-2.45.jar:f011cae7d2c0fb7ea17c34e05bc10e768b1081a5892ad019cf1fdb0e125c49c1',
 		'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
 		'junit:junit:4.13.2:junit-4.13.2.jar:8e495b634469d64fb8acfa3495a065cbacc8a0fff55ce1e31007be4c16dc57d3',
 		'net.bytebuddy:byte-buddy:1.9.12:byte-buddy-1.9.12.jar:3688c3d434bebc3edc5516296a2ed0f47b65e451071b4afecad84f902f0efc11',

bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java

@@ -75,6 +75,7 @@ import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_ONLY_WHE
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_PORT;
 import static org.briarproject.bramble.api.plugin.TorConstants.PROP_ONION_V3;
 import static org.briarproject.bramble.api.plugin.TorConstants.REASON_BATTERY;
+import static org.briarproject.bramble.api.plugin.TorConstants.REASON_COUNTRY_BLOCKED;
 import static org.briarproject.bramble.api.plugin.TorConstants.REASON_MOBILE_DATA;
 import static org.briarproject.bramble.plugin.tor.TorRendezvousCrypto.SEED_BYTES;
 import static org.briarproject.bramble.util.IoUtils.tryToClose;
@@ -105,6 +106,7 @@ class TorPlugin implements DuplexPlugin, EventListener {
 	private final PluginCallback callback;
 	private final long maxLatency;
 	private final int maxIdleTime;
+	private final boolean canVerifyLetsEncryptCerts;
 	private final int socketTimeout;
 	private final AtomicBoolean used = new AtomicBoolean(false);
 
@@ -124,7 +126,8 @@ class TorPlugin implements DuplexPlugin, EventListener {
 			TorWrapper tor,
 			PluginCallback callback,
 			long maxLatency,
-			int maxIdleTime) {
+			int maxIdleTime,
+			boolean canVerifyLetsEncryptCerts) {
 		this.ioExecutor = ioExecutor;
 		this.wakefulIoExecutor = wakefulIoExecutor;
 		this.networkManager = networkManager;
@@ -138,6 +141,7 @@ class TorPlugin implements DuplexPlugin, EventListener {
 		this.callback = callback;
 		this.maxLatency = maxLatency;
 		this.maxIdleTime = maxIdleTime;
+		this.canVerifyLetsEncryptCerts = canVerifyLetsEncryptCerts;
 		if (maxIdleTime > Integer.MAX_VALUE / 2) {
 			socketTimeout = Integer.MAX_VALUE;
 		} else {
@@ -293,7 +297,7 @@ class TorPlugin implements DuplexPlugin, EventListener {
 			List<String> bridges = new ArrayList<>();
 			for (BridgeType bridgeType : bridgeTypes) {
 				bridges.addAll(circumventionProvider.getBridges(bridgeType,
-						countryCode));
+						countryCode, canVerifyLetsEncryptCerts));
 			}
 			tor.enableBridges(bridges);
 		}
@@ -487,8 +491,8 @@ class TorPlugin implements DuplexPlugin, EventListener {
 			boolean wifi = status.isWifi();
 			boolean ipv6Only = status.isIpv6Only();
 			String country = locationUtils.getCurrentCountry();
-			boolean bridgesByDefault =
-					circumventionProvider.shouldUseBridges(country);
+			boolean blocked =
+					circumventionProvider.isTorProbablyBlocked(country);
 			boolean enabledByUser = settings.getBoolean(PREF_PLUGIN_ENABLE,
 					DEFAULT_PREF_PLUGIN_ENABLE);
 			int network = settings.getInt(PREF_TOR_NETWORK,
@@ -498,6 +502,7 @@ class TorPlugin implements DuplexPlugin, EventListener {
 			boolean onlyWhenCharging =
 					settings.getBoolean(PREF_TOR_ONLY_WHEN_CHARGING,
 							DEFAULT_PREF_TOR_ONLY_WHEN_CHARGING);
+			boolean bridgesWork = circumventionProvider.doBridgesWork(country);
 			boolean automatic = network == PREF_TOR_NETWORK_AUTOMATIC;
 
 			if (LOG.isLoggable(INFO)) {
@@ -527,6 +532,10 @@ class TorPlugin implements DuplexPlugin, EventListener {
 					LOG.info("Configured not to use mobile data");
 					reasonsDisabled |= REASON_MOBILE_DATA;
 				}
+				if (automatic && blocked && !bridgesWork) {
+					LOG.info("Country is blocked");
+					reasonsDisabled |= REASON_COUNTRY_BLOCKED;
+				}
 
 				if (reasonsDisabled != 0) {
 					LOG.info("Disabling network due to settings");
@@ -534,7 +543,7 @@ class TorPlugin implements DuplexPlugin, EventListener {
 					LOG.info("Enabling network");
 					enableNetwork = true;
 					if (network == PREF_TOR_NETWORK_WITH_BRIDGES ||
-							(automatic && bridgesByDefault)) {
+							(automatic && bridgesWork)) {
 						if (ipv6Only) {
 							bridgeTypes = asList(MEEK, SNOWFLAKE);
 						} else {

bramble-core/witness.gradle

@@ -6,20 +6,22 @@ dependencyVerification {
 		'com.fasterxml.jackson.core:jackson-databind:2.13.4:jackson-databind-2.13.4.jar:c9faff420d9e2c7e1e4711dbeebec2506a32c9942027211c5c293d8d87807eb6',
 		'com.google.code.findbugs:annotations:3.0.1:annotations-3.0.1.jar:6b47ff0a6de0ce17cbedc3abb0828ca5bce3009d53ea47b3723ff023c4742f79',
 		'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
-		'com.google.dagger:dagger-compiler:2.51.1:dagger-compiler-2.51.1.jar:14cf2def1c4c8cd3b977840e297b463191d537cd1c8330992ca5c0b341a641ad',
-		'com.google.dagger:dagger-spi:2.51.1:dagger-spi-2.51.1.jar:deb52030b92b27c5dcd76b2c0747f1cf105b60939f6073b43eb06cfe7c9ba601',
-		'com.google.dagger:dagger:2.51.1:dagger-2.51.1.jar:c3891a4c4a4e48682888ca321eaf8497004b286e1d9a2936867373219f7dd86d',
-		'com.google.devtools.ksp:symbol-processing-api:1.9.20-1.0.14:symbol-processing-api-1.9.20-1.0.14.jar:d0339396f40dc9eb3b3f7bc86257f93869ee23448fa31ec4a1de900c6b7ae6d7',
-		'com.google.errorprone:error_prone_annotations:2.23.0:error_prone_annotations-2.23.0.jar:ec6f39f068b6ff9ac323c68e28b9299f8c0a80ca512dccb1d4a70f40ac3ec054',
+		'com.google.dagger:dagger-compiler:2.45:dagger-compiler-2.45.jar:5617dfb994537dba5b41f3744a6dd13ec3cd99789c065e0d5c6fa9f21cf7ca25',
+		'com.google.dagger:dagger-producers:2.45:dagger-producers-2.45.jar:a05abb4c3ccf6bb0f056bdcb5ef973898ecf172952ab5948a824aeea6c86ecaa',
+		'com.google.dagger:dagger-spi:2.45:dagger-spi-2.45.jar:7cd6f0b09d88e64a9c97bc80e544ab8ac8fdee9301754413585a74cf64222b27',
+		'com.google.dagger:dagger:2.45:dagger-2.45.jar:f011cae7d2c0fb7ea17c34e05bc10e768b1081a5892ad019cf1fdb0e125c49c1',
+		'com.google.devtools.ksp:symbol-processing-api:1.7.0-1.0.6:symbol-processing-api-1.7.0-1.0.6.jar:adc29417be5ca9ff42118105fea4e36d9ef44987abfc41432309371a60198941',
+		'com.google.errorprone:error_prone_annotations:2.7.1:error_prone_annotations-2.7.1.jar:cd5257c08a246cf8628817ae71cb822be192ef91f6881ca4a3fcff4f1de1cff3',
 		'com.google.errorprone:javac-shaded:9-dev-r4023-3:javac-shaded-9-dev-r4023-3.jar:65bfccf60986c47fbc17c9ebab0be626afc41741e0a6ec7109e0768817a36f30',
 		'com.google.googlejavaformat:google-java-format:1.5:google-java-format-1.5.jar:aa19ad7850fb85178aa22f2fddb163b84d6ce4d0035872f30d4408195ca1144e',
-		'com.google.guava:failureaccess:1.0.2:failureaccess-1.0.2.jar:8a8f81cf9b359e3f6dfa691a1e776985c061ef2f223c9b2c80753e1b458e8064',
-		'com.google.guava:guava:33.0.0-jre:guava-33.0.0-jre.jar:f4d85c3e4d411694337cb873abea09b242b664bb013320be6105327c45991537',
+		'com.google.guava:failureaccess:1.0.1:failureaccess-1.0.1.jar:a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26',
+		'com.google.guava:guava:31.0.1-jre:guava-31.0.1-jre.jar:d5be94d65e87bd219fb3193ad1517baa55a3b88fc91d21cf735826ab5af087b9',
 		'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava:listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar:b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99',
+		'com.google.j2objc:j2objc-annotations:1.3:j2objc-annotations-1.3.jar:21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b',
 		'com.h2database:h2:1.4.192:h2-1.4.192.jar:225b22e9857235c46c93861410b60b8c81c10dc8985f4faf188985ba5445126c',
 		'com.squareup.okhttp3:mockwebserver:4.10.0:mockwebserver-4.10.0.jar:af29da234e63159d6e0dea43bf8288eea97d71cdf1651a5ee2d6c0d0d4adbf8f',
-		'com.squareup.okhttp3:okhttp:4.12.0:okhttp-4.12.0.jar:b1050081b14bb7a3a7e55a4d3ef01b5dcfabc453b4573a4fc019767191d5f4e0',
-		'com.squareup.okio:okio-jvm:3.6.0:okio-jvm-3.6.0.jar:67543f0736fc422ae927ed0e504b98bc5e269fda0d3500579337cb713da28412',
+		'com.squareup.okhttp3:okhttp:4.10.0:okhttp-4.10.0.jar:7580f14fa1691206e37081ad3f92063b1603b328da0bb316f2fef02e0562e7ec',
+		'com.squareup.okio:okio-jvm:3.0.0:okio-jvm-3.0.0.jar:be64a0cc1f28ea9cd5c970dd7e7557af72c808d738c495b397bf897c9921e907',
 		'com.squareup:javapoet:1.13.0:javapoet-1.13.0.jar:4c7517e848a71b36d069d12bb3bf46a70fd4cda3105d822b0ed2e19c00b69291',
 		'com.squareup:kotlinpoet:1.11.0:kotlinpoet-1.11.0.jar:2887ada1ca03dd83baa2758640d87e840d1907564db0ef88d2289c868a980492',
 		'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
@@ -34,10 +36,10 @@ dependencyVerification {
 		'org.bouncycastle:bcprov-jdk15to18:1.71:bcprov-jdk15to18-1.71.jar:143aaa4a40edd5fc2a18db7900059f6c16f4d931b94b94b20f7e2238e6662886',
 		'org.briarproject:jtorctl:0.5:jtorctl-0.5.jar:43f8c7d390169772b9a2c82ab806c8414c136a2a8636c555e22754bb7260793b',
 		'org.briarproject:null-safety:0.1:null-safety-0.1.jar:161760de5e838cb982bafa973df820675d4397098e9a91637a36a306d43ba011',
-		'org.briarproject:onionwrapper-core:0.1.1:onionwrapper-core-0.1.1.jar:176b7c159a45f6397810a1f93f040b3e17fdbc6645b0d189204777920719464b',
+		'org.briarproject:onionwrapper-core:0.0.6:onionwrapper-core-0.0.6.jar:ed316fa600b9efa21f5643447f2e21b4db607889a41d526c03d61dec8d059c16',
 		'org.briarproject:socks-socket:0.1:socks-socket-0.1.jar:e5898822d10f5390363c5dddb945891648c92cf93ba50709e07f0d173ec0eb4b',
 		'org.checkerframework:checker-compat-qual:2.5.5:checker-compat-qual-2.5.5.jar:11d134b245e9cacc474514d2d66b5b8618f8039a1465cdc55bbc0b34e0008b7a',
-		'org.checkerframework:checker-qual:3.41.0:checker-qual-3.41.0.jar:2f9f245bf68e4259d610894f2406dc1f6363dc639302bd566e8272e4f4541172',
+		'org.checkerframework:checker-qual:3.12.0:checker-qual-3.12.0.jar:ff10785ac2a357ec5de9c293cb982a2cbb605c0309ea4cc1cb9b9bc6dbe7f3cb',
 		'org.codehaus.mojo.signature:java16:1.1:java16-1.1.signature:53799223a2c98dba2d0add810bed76315460df285c69e4f397ae6098f87dd619',
 		'org.codehaus.mojo:animal-sniffer-ant-tasks:1.22:animal-sniffer-ant-tasks-1.22.jar:3f6afeb3e09301d2d7179ed1db21e3ad8846c1e38415ad832a395138ae3f4218',
 		'org.codehaus.mojo:animal-sniffer:1.22:animal-sniffer-1.22.jar:f18c11a25bdd8b520b9c6a28cbb6f33007c812ab0051b6be3f0778e660aa501c',
@@ -46,13 +48,17 @@ dependencyVerification {
 		'org.hamcrest:hamcrest:2.1:hamcrest-2.1.jar:ba93b2e3a562322ba432f0a1b53addcc55cb188253319a020ed77f824e692050',
 		'org.hsqldb:hsqldb:2.3.5:hsqldb-2.3.5.jar:6676a6977ac98997a80f827ddbd3fe8ca1e0853dad1492512135fd1a222ccfad',
 		'org.jetbrains.kotlin:kotlin-reflect:1.6.10:kotlin-reflect-1.6.10.jar:3277ac102ae17aad10a55abec75ff5696c8d109790396434b496e75087854203',
-		'org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10:kotlin-stdlib-common-1.9.10.jar:cde3341ba18a2ba262b0b7cf6c55b20c90e8d434e42c9a13e6a3f770db965a88',
-		'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0:kotlin-stdlib-jdk7-1.9.0.jar:b7979a7aac94055f0d9f1fd3b47ce5ffe1cb6032a842ba9fbe7186f085289178',
-		'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10:kotlin-stdlib-jdk7-1.9.10.jar:ac6361bf9ad1ed382c2103d9712c47cdec166232b4903ed596e8876b0681c9b7',
-		'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0:kotlin-stdlib-jdk8-1.9.0.jar:a59fa24fdf1ffb594baecdbf0fd10010f977cea10236d487fe3464977a7377fa',
-		'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10:kotlin-stdlib-jdk8-1.9.10.jar:a4c74d94d64ce1abe53760fe0389dd941f6fc558d0dab35e47c085a11ec80f28',
-		'org.jetbrains.kotlin:kotlin-stdlib:1.9.10:kotlin-stdlib-1.9.10.jar:55e989c512b80907799f854309f3bc7782c5b3d13932442d0379d5c472711504',
-		'org.jetbrains.kotlin:kotlin-stdlib:1.9.20:kotlin-stdlib-1.9.20.jar:28a35bcdff46d864f80f346a617e486284b208d17378c41900dfb1de95a90e6c',
+		'org.jetbrains.kotlin:kotlin-stdlib-common:1.6.20:kotlin-stdlib-common-1.6.20.jar:8da40a2520d30dcb1012176fe93d24e82d08a3e346c37e0343b0fb6f64f6be01',
+		'org.jetbrains.kotlin:kotlin-stdlib-common:1.7.0:kotlin-stdlib-common-1.7.0.jar:59c6ff64fe9a6604afce03e8aaa75f83586c6030ac71fb0b34ee7cdefed3618f',
+		'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31:kotlin-stdlib-jdk7-1.5.31.jar:a25bf47353ce899d843cbddee516d621a73473e7fba97f8d0301e7b4aed7c15f',
+		'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10:kotlin-stdlib-jdk7-1.6.10.jar:2aedcdc6b69b33bdf5cc235bcea88e7cf6601146bb6bcdffdb312bbacd7be261',
+		'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.0:kotlin-stdlib-jdk7-1.7.0.jar:07e91be9b2ca20672d2bdb7e181b766e73453a2da13492b5ddaee8fa47aea239',
+		'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31:kotlin-stdlib-jdk8-1.5.31.jar:b548f7767aacf029d2417e47440742bd6d3ebede19b60386e23554ce5c4c5fdc',
+		'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10:kotlin-stdlib-jdk8-1.6.10.jar:1456d82d039ea30d8485b032901f52bbf07e7cdbe8bb1f8708ad32a8574c41ce',
+		'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.0:kotlin-stdlib-jdk8-1.7.0.jar:cf058e11db1dfc9944680c8c61b95ac689aaaa8a3eb30bced028100f038f030b',
+		'org.jetbrains.kotlin:kotlin-stdlib:1.6.20:kotlin-stdlib-1.6.20.jar:eeb51c2b67b26233fd81d0bc4f8044ec849718890905763ceffd84a31e2cb799',
+		'org.jetbrains.kotlin:kotlin-stdlib:1.7.0:kotlin-stdlib-1.7.0.jar:aa88e9625577957f3249a46cb6e166ee09b369e600f7a11d148d16b0a6d87f05',
+		'org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.5.0:kotlinx-metadata-jvm-0.5.0.jar:ca063a96639b08b9eaa0de4d65e899480740a6efbe28ab9a8681a2ced03055a4',
 		'org.jetbrains:annotations:13.0:annotations-13.0.jar:ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478',
 		'org.jmock:jmock-imposters:2.12.0:jmock-imposters-2.12.0.jar:3b836269745a137c9b2347e8d7c2104845b126ef04f012d6bfd94f1a7dea7b09',
 		'org.jmock:jmock-junit4:2.12.0:jmock-junit4-2.12.0.jar:3233062fc889637c151a24f1ee086bad04321ab7d8264fef279daff0fa27205b',

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

@@ -19,6 +19,7 @@ import org.briarproject.onionwrapper.CircumventionProvider;
 import org.briarproject.onionwrapper.LocationUtils;
 import org.briarproject.onionwrapper.MacTorWrapper;
 import org.briarproject.onionwrapper.TorWrapper;
+import org.briarproject.onionwrapper.UnixTorWrapper;
 
 import java.io.File;
 import java.util.concurrent.Executor;
@@ -79,6 +80,6 @@ public class MacTorPluginFactory extends TorPluginFactory {
 		return new TorPlugin(ioExecutor, wakefulIoExecutor, networkManager,
 				locationUtils, torSocketFactory, circumventionProvider,
 				batteryManager, backoff, torRendezvousCrypto, tor, callback,
-				MAX_LATENCY, MAX_IDLE_TIME);
+				MAX_LATENCY, MAX_IDLE_TIME, true);
 	}
 }

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

@@ -81,6 +81,6 @@ public class UnixTorPluginFactory extends TorPluginFactory {
 		return new TorPlugin(ioExecutor, wakefulIoExecutor, networkManager,
 				locationUtils, torSocketFactory, circumventionProvider,
 				batteryManager, backoff, torRendezvousCrypto, tor, callback,
-				MAX_LATENCY, MAX_IDLE_TIME);
+				MAX_LATENCY, MAX_IDLE_TIME, true);
 	}
 }

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

@@ -78,6 +78,6 @@ public class WindowsTorPluginFactory extends TorPluginFactory {
 		return new TorPlugin(ioExecutor, wakefulIoExecutor, networkManager,
 				locationUtils, torSocketFactory, circumventionProvider,
 				batteryManager, backoff, torRendezvousCrypto, tor, callback,
-				MAX_LATENCY, MAX_IDLE_TIME);
+				MAX_LATENCY, MAX_IDLE_TIME, true);
 	}
 }

bramble-java/witness.gradle

@@ -3,16 +3,18 @@ dependencyVerification {
 		'cglib:cglib:3.2.8:cglib-3.2.8.jar:3f64de999ecc5595dc84ca8ff0879d8a34c8623f9ef3c517a53ed59023fcb9db',
 		'com.google.code.findbugs:annotations:3.0.1:annotations-3.0.1.jar:6b47ff0a6de0ce17cbedc3abb0828ca5bce3009d53ea47b3723ff023c4742f79',
 		'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
-		'com.google.dagger:dagger-compiler:2.51.1:dagger-compiler-2.51.1.jar:14cf2def1c4c8cd3b977840e297b463191d537cd1c8330992ca5c0b341a641ad',
-		'com.google.dagger:dagger-spi:2.51.1:dagger-spi-2.51.1.jar:deb52030b92b27c5dcd76b2c0747f1cf105b60939f6073b43eb06cfe7c9ba601',
-		'com.google.dagger:dagger:2.51.1:dagger-2.51.1.jar:c3891a4c4a4e48682888ca321eaf8497004b286e1d9a2936867373219f7dd86d',
-		'com.google.devtools.ksp:symbol-processing-api:1.9.20-1.0.14:symbol-processing-api-1.9.20-1.0.14.jar:d0339396f40dc9eb3b3f7bc86257f93869ee23448fa31ec4a1de900c6b7ae6d7',
-		'com.google.errorprone:error_prone_annotations:2.23.0:error_prone_annotations-2.23.0.jar:ec6f39f068b6ff9ac323c68e28b9299f8c0a80ca512dccb1d4a70f40ac3ec054',
+		'com.google.dagger:dagger-compiler:2.45:dagger-compiler-2.45.jar:5617dfb994537dba5b41f3744a6dd13ec3cd99789c065e0d5c6fa9f21cf7ca25',
+		'com.google.dagger:dagger-producers:2.45:dagger-producers-2.45.jar:a05abb4c3ccf6bb0f056bdcb5ef973898ecf172952ab5948a824aeea6c86ecaa',
+		'com.google.dagger:dagger-spi:2.45:dagger-spi-2.45.jar:7cd6f0b09d88e64a9c97bc80e544ab8ac8fdee9301754413585a74cf64222b27',
+		'com.google.dagger:dagger:2.45:dagger-2.45.jar:f011cae7d2c0fb7ea17c34e05bc10e768b1081a5892ad019cf1fdb0e125c49c1',
+		'com.google.devtools.ksp:symbol-processing-api:1.7.0-1.0.6:symbol-processing-api-1.7.0-1.0.6.jar:adc29417be5ca9ff42118105fea4e36d9ef44987abfc41432309371a60198941',
+		'com.google.errorprone:error_prone_annotations:2.7.1:error_prone_annotations-2.7.1.jar:cd5257c08a246cf8628817ae71cb822be192ef91f6881ca4a3fcff4f1de1cff3',
 		'com.google.errorprone:javac-shaded:9-dev-r4023-3:javac-shaded-9-dev-r4023-3.jar:65bfccf60986c47fbc17c9ebab0be626afc41741e0a6ec7109e0768817a36f30',
 		'com.google.googlejavaformat:google-java-format:1.5:google-java-format-1.5.jar:aa19ad7850fb85178aa22f2fddb163b84d6ce4d0035872f30d4408195ca1144e',
-		'com.google.guava:failureaccess:1.0.2:failureaccess-1.0.2.jar:8a8f81cf9b359e3f6dfa691a1e776985c061ef2f223c9b2c80753e1b458e8064',
-		'com.google.guava:guava:33.0.0-jre:guava-33.0.0-jre.jar:f4d85c3e4d411694337cb873abea09b242b664bb013320be6105327c45991537',
+		'com.google.guava:failureaccess:1.0.1:failureaccess-1.0.1.jar:a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26',
+		'com.google.guava:guava:31.0.1-jre:guava-31.0.1-jre.jar:d5be94d65e87bd219fb3193ad1517baa55a3b88fc91d21cf735826ab5af087b9',
 		'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava:listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar:b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99',
+		'com.google.j2objc:j2objc-annotations:1.3:j2objc-annotations-1.3.jar:21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b',
 		'com.squareup:javapoet:1.13.0:javapoet-1.13.0.jar:4c7517e848a71b36d069d12bb3bf46a70fd4cda3105d822b0ed2e19c00b69291',
 		'com.squareup:kotlinpoet:1.11.0:kotlinpoet-1.11.0.jar:2887ada1ca03dd83baa2758640d87e840d1907564db0ef88d2289c868a980492',
 		'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
@@ -25,17 +27,19 @@ dependencyVerification {
 		'org.apache-extras.beanshell:bsh:2.0b6:bsh-2.0b6.jar:a17955976070c0573235ee662f2794a78082758b61accffce8d3f8aedcd91047',
 		'org.briarproject:jtorctl:0.5:jtorctl-0.5.jar:43f8c7d390169772b9a2c82ab806c8414c136a2a8636c555e22754bb7260793b',
 		'org.briarproject:null-safety:0.1:null-safety-0.1.jar:161760de5e838cb982bafa973df820675d4397098e9a91637a36a306d43ba011',
-		'org.briarproject:onionwrapper-core:0.1.1:onionwrapper-core-0.1.1.jar:176b7c159a45f6397810a1f93f040b3e17fdbc6645b0d189204777920719464b',
-		'org.briarproject:onionwrapper-java:0.1.1:onionwrapper-java-0.1.1.jar:96dbf1f5c72381b7c124d2d43748fcbe18db9cc8e3c950160954e10a6042f83d',
+		'org.briarproject:onionwrapper-core:0.0.6:onionwrapper-core-0.0.6.jar:ed316fa600b9efa21f5643447f2e21b4db607889a41d526c03d61dec8d059c16',
+		'org.briarproject:onionwrapper-java:0.0.6:onionwrapper-java-0.0.6.jar:e76e043b8c72d39e48508da79c9e2db2279b3c824f9c26cb0622d56a4a43a822',
 		'org.checkerframework:checker-compat-qual:2.5.5:checker-compat-qual-2.5.5.jar:11d134b245e9cacc474514d2d66b5b8618f8039a1465cdc55bbc0b34e0008b7a',
-		'org.checkerframework:checker-qual:3.41.0:checker-qual-3.41.0.jar:2f9f245bf68e4259d610894f2406dc1f6363dc639302bd566e8272e4f4541172',
+		'org.checkerframework:checker-qual:3.12.0:checker-qual-3.12.0.jar:ff10785ac2a357ec5de9c293cb982a2cbb605c0309ea4cc1cb9b9bc6dbe7f3cb',
 		'org.hamcrest:hamcrest-core:2.1:hamcrest-core-2.1.jar:e09109e54a289d88506b9bfec987ddd199f4217c9464132668351b9a4f00bee9',
 		'org.hamcrest:hamcrest-library:2.1:hamcrest-library-2.1.jar:b7e2b6895b3b679f0e47b6380fda391b225e9b78505db9d8bdde8d3cc8d52a21',
 		'org.hamcrest:hamcrest:2.1:hamcrest-2.1.jar:ba93b2e3a562322ba432f0a1b53addcc55cb188253319a020ed77f824e692050',
 		'org.jetbrains.kotlin:kotlin-reflect:1.6.10:kotlin-reflect-1.6.10.jar:3277ac102ae17aad10a55abec75ff5696c8d109790396434b496e75087854203',
-		'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0:kotlin-stdlib-jdk7-1.9.0.jar:b7979a7aac94055f0d9f1fd3b47ce5ffe1cb6032a842ba9fbe7186f085289178',
-		'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0:kotlin-stdlib-jdk8-1.9.0.jar:a59fa24fdf1ffb594baecdbf0fd10010f977cea10236d487fe3464977a7377fa',
-		'org.jetbrains.kotlin:kotlin-stdlib:1.9.20:kotlin-stdlib-1.9.20.jar:28a35bcdff46d864f80f346a617e486284b208d17378c41900dfb1de95a90e6c',
+		'org.jetbrains.kotlin:kotlin-stdlib-common:1.7.0:kotlin-stdlib-common-1.7.0.jar:59c6ff64fe9a6604afce03e8aaa75f83586c6030ac71fb0b34ee7cdefed3618f',
+		'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.0:kotlin-stdlib-jdk7-1.7.0.jar:07e91be9b2ca20672d2bdb7e181b766e73453a2da13492b5ddaee8fa47aea239',
+		'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.0:kotlin-stdlib-jdk8-1.7.0.jar:cf058e11db1dfc9944680c8c61b95ac689aaaa8a3eb30bced028100f038f030b',
+		'org.jetbrains.kotlin:kotlin-stdlib:1.7.0:kotlin-stdlib-1.7.0.jar:aa88e9625577957f3249a46cb6e166ee09b369e600f7a11d148d16b0a6d87f05',
+		'org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.5.0:kotlinx-metadata-jvm-0.5.0.jar:ca063a96639b08b9eaa0de4d65e899480740a6efbe28ab9a8681a2ced03055a4',
 		'org.jetbrains:annotations:13.0:annotations-13.0.jar:ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478',
 		'org.jmock:jmock-imposters:2.12.0:jmock-imposters-2.12.0.jar:3b836269745a137c9b2347e8d7c2104845b126ef04f012d6bfd94f1a7dea7b09',
 		'org.jmock:jmock-junit4:2.12.0:jmock-junit4-2.12.0.jar:3233062fc889637c151a24f1ee086bad04321ab7d8264fef279daff0fa27205b',

briar-android/.tx/config

@@ -1,6 +1,6 @@
 [main]
 host     = https://www.transifex.com
-lang_map = es_CU: es-rCU, pt_BR: pt-rBR, pt_PT: pt-rPT, nb_NO: nb, zh-Hans: zh-rCN, zh-Hant: zh-rTW
+lang_map = pt_BR: pt-rBR, nb_NO: nb, zh-Hans: zh-rCN, zh-Hant: zh-rTW
 
 [o:otf:p:briar:r:google-play-full-description]
 file_filter  = fastlane/metadata/android/<lang>/full_description.txt

briar-android/build.gradle

@@ -16,7 +16,7 @@ def getStdout = { command, defaultValue ->
 }
 
 android {
-	compileSdk 33
+	compileSdkVersion 33
 	buildToolsVersion '33.0.0'
 
 	packagingOptions {
@@ -26,8 +26,8 @@ android {
 	defaultConfig {
 		minSdkVersion 21
 		targetSdkVersion 33
-		versionCode 10513
-		versionName "1.5.13"
+		versionCode 10508
+		versionName "1.5.8"
 		applicationId "org.briarproject.briar.android"
 		buildConfigField "String", "TorVersion", "\"$tor_version\""
 
@@ -108,15 +108,16 @@ dependencies {
 	implementation project(':bramble-android')
 	implementation project(':briar-core')
 
-	// newer versions of the libraries below require compileSdk 34
-	implementation 'androidx.fragment:fragment:1.6.2'
-	implementation 'androidx.preference:preference:1.2.1'
-	implementation 'androidx.exifinterface:exifinterface:1.3.7'
-	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
-	implementation 'androidx.lifecycle:lifecycle-livedata:2.6.2'
+	implementation 'androidx.fragment:fragment:1.5.5'
+	implementation 'androidx.preference:preference:1.2.0'
+	implementation 'androidx.exifinterface:exifinterface:1.3.6'
+	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
+	implementation 'androidx.lifecycle:lifecycle-livedata:2.5.1'
 
 	implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-	implementation 'com.google.android.material:material:1.9.0'
+	// check https://github.com/material-components/material-components-android/issues/3191
+	// before upgrading material library
+	implementation 'com.google.android.material:material:1.7.0'
 	implementation 'androidx.recyclerview:recyclerview-selection:1.1.0'
 
 	// force kotlin standard lib to latest version to prevent jetifier issues
@@ -130,7 +131,7 @@ dependencies {
 	implementation 'com.vanniktech:emoji-google:0.9.0' // newer versions are more work to adapt
 	implementation 'com.github.kobakei:MaterialFabSpeedDial:1.2.1'
 	implementation 'com.github.chrisbanes:PhotoView:2.3.0'
-	def glideVersion = '4.16.0'
+	def glideVersion = '4.14.2'
 	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

briar-android/proguard-test.txt

@@ -15,4 +15,7 @@
 -keep class junit.** { *; }
 -dontwarn junit.**
 
+-keep class org.jmock.** { *; }
+-dontwarn org.jmock.**
+
 -dontwarn org.briarproject.briar.android.**

briar-android/src/androidTest/java/org/briarproject/briar/android/UiTest.java

@@ -4,7 +4,9 @@ import android.app.Activity;
 import android.content.Intent;
 
 import org.briarproject.bramble.api.account.AccountManager;
+import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
+import org.briarproject.bramble.api.settings.Settings;
 import org.briarproject.bramble.api.settings.SettingsManager;
 import org.briarproject.briar.R;
 import org.briarproject.nullsafety.NotNullByDefault;
@@ -16,6 +18,11 @@ import androidx.test.espresso.intent.rule.IntentsTestRule;
 
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+import static org.briarproject.briar.api.android.SettingsConstants.SETTINGS_NAMESPACE;
+import static org.briarproject.briar.api.android.SettingsConstants.SHOW_ONBOARDING_IMAGE;
+import static org.briarproject.briar.api.android.SettingsConstants.SHOW_ONBOARDING_INTRODUCTION;
+import static org.briarproject.briar.api.android.SettingsConstants.SHOW_ONBOARDING_REVEAL_CONTACTS;
+import static org.briarproject.briar.api.android.SettingsConstants.SHOW_ONBOARDING_TRANSPORTS;
 
 
 @SuppressWarnings("WeakerAccess")
@@ -49,6 +56,19 @@ public abstract class UiTest {
 		getApplicationContext().startActivity(i);
 	}
 
+	protected void disableOnboarding() {
+		try {
+			Settings settings = new Settings();
+			settings.putBoolean(SHOW_ONBOARDING_TRANSPORTS, false);
+			settings.putBoolean(SHOW_ONBOARDING_IMAGE, false);
+			settings.putBoolean(SHOW_ONBOARDING_INTRODUCTION, false);
+			settings.putBoolean(SHOW_ONBOARDING_REVEAL_CONTACTS, false);
+			settingsManager.mergeSettings(settings, SETTINGS_NAMESPACE);
+		} catch (DbException e) {
+			throw new AssertionError(e);
+		}
+	}
+
 	@NotNullByDefault
 	protected class CleanAccountTestRule<A extends Activity>
 			extends IntentsTestRule<A> {
@@ -70,7 +90,7 @@ public abstract class UiTest {
 			} catch (InterruptedException e) {
 				throw new AssertionError(e);
 			}
+			disableOnboarding();
 		}
 	}
-
 }

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

@@ -30,7 +30,6 @@ import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.action.ViewActions.click;
 import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard;
 import static androidx.test.espresso.action.ViewActions.replaceText;
-import static androidx.test.espresso.action.ViewActions.scrollTo;
 import static androidx.test.espresso.assertion.ViewAssertions.matches;
 import static androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition;
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
@@ -63,7 +62,7 @@ public class PromoVideoTest extends ScreenshotTest {
 			new ActivityScenarioRule<>(SplashScreenActivity.class);
 
 	@Inject
-	protected ContactManager contactManager;
+	ContactManager contactManager;
 
 	private OverlayView overlayView;
 
@@ -181,7 +180,6 @@ public class PromoVideoTest extends ScreenshotTest {
 		sleep(DELAY_SMALL);
 
 		// add pending contact
-		onView(withId(R.id.addButton)).perform(scrollTo());
 		doClick(withId(R.id.addButton));
 		sleep(DELAY_LONG);
 
@@ -214,7 +212,7 @@ public class PromoVideoTest extends ScreenshotTest {
 		}
 
 		// click on new contact
-		doItemClick(withId(R.id.recyclerView), 0);
+		doItemClick(withId(R.id.recyclerView));
 
 		sleep(DELAY_MEDIUM);
 
@@ -265,15 +263,14 @@ public class PromoVideoTest extends ScreenshotTest {
 				.perform(click());
 	}
 
-	private void doItemClick(final Matcher<View> viewMatcher, int pos)
+	private void doItemClick(final Matcher<View> viewMatcher)
 			throws InterruptedException {
 		if (isFilming) {
 			onView(viewMatcher).perform(
-					actionOnItemAtPosition(pos, visualClick(overlayView)));
+					actionOnItemAtPosition(0, visualClick(overlayView)));
 			sleep(500);
 		}
-		onView(viewMatcher).perform(
-				actionOnItemAtPosition(pos, click()));
+		onView(viewMatcher).perform(actionOnItemAtPosition(0, click()));
 	}
 
 	private void closeKeyboard(final Matcher<View> viewMatcher)

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

@@ -23,13 +23,13 @@ public abstract class ScreenshotTest extends UiTest {
 	public static final LocaleTestRule localeTestRule = new LocaleTestRule();
 
 	@Inject
-	protected TestDataCreator testDataCreator;
+	TestDataCreator testDataCreator;
 	@Inject
-	protected ConnectionRegistry connectionRegistry;
+	ConnectionRegistry connectionRegistry;
 	@Inject
-	protected Clock clock;
+	Clock clock;
 
-	protected void screenshot(String name, ActivityScenarioRule<?> rule) {
+	void screenshot(String name, ActivityScenarioRule<?> rule) {
 		rule.getScenario().onActivity(activity -> screenshot(name, activity));
 	}
 
@@ -47,9 +47,4 @@ public abstract class ScreenshotTest extends UiTest {
 			Log.w("Screengrab", "Permission to write screenshot is missing.");
 		}
 	}
-
-	protected long getMinutesAgo(int minutes) {
-		return clock.currentTimeMillis() - minutes * 60 * 1000;
-	}
-
 }

briar-android/src/androidTestScreenshot/java/org/briarproject/briar/android/settings/SettingsActivityScreenshotTest.java

@@ -1,6 +1,5 @@
 package org.briarproject.briar.android.settings;
 
-import android.content.Intent;
 import android.view.Gravity;
 
 import org.briarproject.briar.R;
@@ -16,6 +15,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
 import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.Espresso.pressBack;
 import static androidx.test.espresso.action.ViewActions.click;
 import static androidx.test.espresso.assertion.ViewAssertions.matches;
 import static androidx.test.espresso.contrib.DrawerMatchers.isClosed;
@@ -31,9 +31,11 @@ import static org.junit.Assume.assumeTrue;
 @RunWith(AndroidJUnit4.class)
 public class SettingsActivityScreenshotTest extends ScreenshotTest {
 
+	// Start from the nav drawer activity so we can go back to it and take
+	// screenshots showing the effects of changing settings
 	@Rule
-	public CleanAccountTestRule<SettingsActivity> testRule =
-			new CleanAccountTestRule<>(SettingsActivity.class);
+	public CleanAccountTestRule<NavDrawerActivity> testRule =
+			new CleanAccountTestRule<>(NavDrawerActivity.class);
 
 	@Override
 	protected void inject(BriarUiTestComponent component) {
@@ -42,8 +44,10 @@ public class SettingsActivityScreenshotTest extends ScreenshotTest {
 
 	@Test
 	public void changeTheme() {
+		openNavDrawer();
 		onView(withText(R.string.settings_button))
-				.check(matches(isDisplayed()));
+				.check(matches(isDisplayed()))
+				.perform(click());
 
 		onView(withText(R.string.display_settings_title))
 				.perform(waitUntilMatches(isDisplayed()))
@@ -59,6 +63,8 @@ public class SettingsActivityScreenshotTest extends ScreenshotTest {
 				.check(matches(isDisplayed()))
 				.perform(click());
 
+		pressBack();
+		pressBack();
 		openNavDrawer();
 
 		screenshot("manual_dark_theme_nav_drawer", testRule.getActivity());
@@ -68,8 +74,8 @@ public class SettingsActivityScreenshotTest extends ScreenshotTest {
 				.check(matches(isDisplayed()))
 				.perform(click());
 		onView(withText(R.string.display_settings_title))
-				.check(matches(isDisplayed()))
-				.perform(click());
+				.perform(waitUntilMatches(isDisplayed()))
+				.perform(click(), click());
 		onView(withText(R.string.pref_theme_title))
 				.check(matches(isDisplayed()))
 				.perform(click());
@@ -83,6 +89,11 @@ public class SettingsActivityScreenshotTest extends ScreenshotTest {
 		assumeTrue("device has no screen lock",
 				hasScreenLock(getApplicationContext()));
 
+		openNavDrawer();
+		onView(withText(R.string.settings_button))
+				.check(matches(isDisplayed()))
+				.perform(click());
+
 		onView(withText(R.string.security_settings_title))
 				.perform(waitUntilMatches(isDisplayed()))
 				.perform(click(), click());
@@ -98,6 +109,8 @@ public class SettingsActivityScreenshotTest extends ScreenshotTest {
 
 		screenshot("manual_app_lock", testRule.getActivity());
 
+		pressBack();
+		pressBack();
 		openNavDrawer();
 
 		screenshot("manual_app_lock_nav_drawer", testRule.getActivity());
@@ -105,6 +118,11 @@ public class SettingsActivityScreenshotTest extends ScreenshotTest {
 
 	@Test
 	public void torSettings() {
+		openNavDrawer();
+		onView(withText(R.string.settings_button))
+				.check(matches(isDisplayed()))
+				.perform(click());
+
 		// click network/connections settings
 		onView(withText(R.string.network_settings_title))
 				.perform(waitUntilMatches(isDisplayed()))
@@ -119,15 +137,8 @@ public class SettingsActivityScreenshotTest extends ScreenshotTest {
 	}
 
 	private void openNavDrawer() {
-		// start main activity
-		Intent i =
-				new Intent(testRule.getActivity(), NavDrawerActivity.class);
-		testRule.getActivity().startActivity(i);
-
-		// open navigation drawer
 		onView(withId(R.id.drawer_layout))
 				.check(matches(isClosed(Gravity.START)))
 				.perform(DrawerActions.open());
 	}
-
 }

briar-android/src/main/AndroidManifest.xml

@@ -33,17 +33,12 @@
 		tools:ignore="ScopedStorage" />
 	<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
-	<uses-permission-sdk-23
-		android:name="android.permission.ACCESS_FINE_LOCATION"
+	<uses-permission-sdk-23 android:name="android.permission.ACCESS_FINE_LOCATION"
 		android:maxSdkVersion="32" />
 	<uses-permission-sdk-23 android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
 	<uses-permission-sdk-23 android:name="android.permission.USE_BIOMETRIC" />
 	<uses-permission-sdk-23 android:name="android.permission.FOREGROUND_SERVICE" />
 
-	<uses-permission
-		android:name="android.permission.HIDE_OVERLAY_WINDOWS"
-		tools:targetApi="31" />
-
 	<application
 		android:name="org.briarproject.briar.android.BriarApplicationImpl"
 		android:allowBackup="false"
@@ -109,12 +104,12 @@
 		<activity
 			android:name="org.briarproject.briar.android.login.StartupActivity"
 			android:exported="false"
-			android:theme="@style/BriarTheme.NoActionBar" />
+			android:label="@string/app_name" />
 
 		<activity
 			android:name="org.briarproject.briar.android.account.SetupActivity"
 			android:exported="false"
-			android:theme="@style/BriarTheme.NoActionBar" />
+			android:label="@string/setup_title" />
 
 		<activity
 			android:name="org.briarproject.briar.android.splash.SplashScreenActivity"

briar-android/src/main/java/org/briarproject/bramble/account/BriarAccountManager.java

@@ -27,7 +27,7 @@ class BriarAccountManager extends AndroidAccountManager {
 			super.deleteAccount();
 			Localizer.reinitialize();
 			UiUtils.setTheme(appContext,
-					appContext.getString(R.string.pref_theme_system_value));
+					appContext.getString(R.string.pref_theme_light_value));
 		}
 	}
 }

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

@@ -92,7 +92,14 @@ import static org.briarproject.briar.android.navdrawer.NavDrawerActivity.CONTACT
 import static org.briarproject.briar.android.navdrawer.NavDrawerActivity.CONTACT_URI;
 import static org.briarproject.briar.android.navdrawer.NavDrawerActivity.FORUM_URI;
 import static org.briarproject.briar.android.navdrawer.NavDrawerActivity.GROUP_URI;
-import static org.briarproject.briar.android.settings.SettingsFragment.SETTINGS_NAMESPACE;
+import static org.briarproject.briar.api.android.SettingsConstants.PREF_NOTIFY_BLOG;
+import static org.briarproject.briar.api.android.SettingsConstants.PREF_NOTIFY_FORUM;
+import static org.briarproject.briar.api.android.SettingsConstants.PREF_NOTIFY_GROUP;
+import static org.briarproject.briar.api.android.SettingsConstants.PREF_NOTIFY_PRIVATE;
+import static org.briarproject.briar.api.android.SettingsConstants.PREF_NOTIFY_RINGTONE_URI;
+import static org.briarproject.briar.api.android.SettingsConstants.PREF_NOTIFY_SOUND;
+import static org.briarproject.briar.api.android.SettingsConstants.PREF_NOTIFY_VIBRATION;
+import static org.briarproject.briar.api.android.SettingsConstants.SETTINGS_NAMESPACE;
 
 @ThreadSafe
 @MethodsNotNullByDefault

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

@@ -33,7 +33,6 @@ import static java.util.logging.Level.FINE;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Logger.getLogger;
 import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
-import static org.briarproject.briar.android.settings.DisplayFragment.PREF_THEME;
 
 public class BriarApplicationImpl extends Application
 		implements BriarApplication {
@@ -110,11 +109,11 @@ public class BriarApplicationImpl extends Application
 	}
 
 	private void setTheme(Context ctx, SharedPreferences prefs) {
-		String theme = prefs.getString(PREF_THEME, null);
+		String theme = prefs.getString("pref_key_theme", null);
 		if (theme == null) {
 			// set default value
-			theme = getString(R.string.pref_theme_system_value);
-			prefs.edit().putString(PREF_THEME, theme).apply();
+			theme = getString(R.string.pref_theme_light_value);
+			prefs.edit().putString("pref_key_theme", theme).apply();
 		}
 		// set theme
 		UiUtils.setTheme(ctx, theme);

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

@@ -26,7 +26,8 @@ import javax.inject.Inject;
 
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.util.LogUtils.logException;
-import static org.briarproject.briar.android.settings.SettingsFragment.SETTINGS_NAMESPACE;
+import static org.briarproject.briar.api.android.SettingsConstants.EMOJI_LRU_PREFERENCE;
+import static org.briarproject.briar.api.android.SettingsConstants.SETTINGS_NAMESPACE;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
@@ -35,7 +36,6 @@ class RecentEmojiImpl implements RecentEmoji, OpenDatabaseHook {
 	private static final Logger LOG =
 			Logger.getLogger(RecentEmojiImpl.class.getName());
 
-	private static final String EMOJI_LRU_PREFERENCE = "pref_emoji_recent2";
 	private static final int EMOJI_LRU_SIZE = 50;
 
 	// UI thread

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

@@ -18,9 +18,7 @@ import javax.annotation.Nullable;
 
 import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
 import static org.briarproject.bramble.util.StringUtils.toUtf8;
-import static org.briarproject.briar.android.util.UiUtils.hideViewOnSmallScreen;
 import static org.briarproject.briar.android.util.UiUtils.setError;
-import static org.briarproject.briar.android.util.UiUtils.showOnboardingDialog;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
@@ -40,27 +38,19 @@ public class AuthorNameFragment extends SetupFragment {
 	public View onCreateView(LayoutInflater inflater,
 			@Nullable ViewGroup container,
 			@Nullable Bundle savedInstanceState) {
+		requireActivity().setTitle(getString(R.string.setup_title));
 		View v = inflater.inflate(R.layout.fragment_setup_author_name,
 				container, false);
 		authorNameWrapper = v.findViewById(R.id.nickname_entry_wrapper);
 		authorNameInput = v.findViewById(R.id.nickname_entry);
-		Button infoButton = v.findViewById(R.id.info_button);
 		nextButton = v.findViewById(R.id.next);
 
 		authorNameInput.addTextChangedListener(this);
-		infoButton.setOnClickListener(view ->
-				showOnboardingDialog(requireContext(), getHelpText()));
 		nextButton.setOnClickListener(this);
 
 		return v;
 	}
 
-	@Override
-	public void onStart() {
-		super.onStart();
-		hideViewOnSmallScreen(requireView().findViewById(R.id.logo));
-	}
-
 	@Override
 	public String getUniqueTag() {
 		return TAG;

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

@@ -23,7 +23,6 @@ import static android.view.View.VISIBLE;
 import static android.widget.Toast.LENGTH_LONG;
 import static org.briarproject.android.dontkillmelib.DozeUtils.getDozeWhitelistingIntent;
 import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_DOZE_WHITELISTING;
-import static org.briarproject.briar.android.util.UiUtils.hideViewOnSmallScreen;
 import static org.briarproject.briar.android.util.UiUtils.showOnboardingDialog;
 
 @MethodsNotNullByDefault
@@ -80,12 +79,6 @@ public class DozeFragment extends SetupFragment
 		return v;
 	}
 
-	@Override
-	public void onStart() {
-		super.onStart();
-		hideViewOnSmallScreen(requireView().findViewById(R.id.logo));
-	}
-
 	@Override
 	public String getUniqueTag() {
 		return TAG;

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

@@ -41,10 +41,10 @@ import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.util.AndroidUtils.getImmutableFlags;
 import static org.briarproject.bramble.util.LogUtils.logException;
-import static org.briarproject.briar.android.settings.SecurityFragment.PREF_SCREEN_LOCK;
-import static org.briarproject.briar.android.settings.SecurityFragment.PREF_SCREEN_LOCK_TIMEOUT;
-import static org.briarproject.briar.android.settings.SettingsFragment.SETTINGS_NAMESPACE;
 import static org.briarproject.briar.android.util.UiUtils.hasScreenLock;
+import static org.briarproject.briar.api.android.SettingsConstants.PREF_SCREEN_LOCK;
+import static org.briarproject.briar.api.android.SettingsConstants.PREF_SCREEN_LOCK_TIMEOUT;
+import static org.briarproject.briar.api.android.SettingsConstants.SETTINGS_NAMESPACE;
 
 @ThreadSafe
 @MethodsNotNullByDefault

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

@@ -28,12 +28,10 @@ import static android.content.pm.PackageManager.PERMISSION_GRANTED;
 import static android.os.Build.VERSION.SDK_INT;
 import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
+import static android.view.inputmethod.EditorInfo.IME_ACTION_DONE;
 import static androidx.core.content.ContextCompat.checkSelfPermission;
 import static org.briarproject.bramble.api.crypto.PasswordStrengthEstimator.QUITE_WEAK;
-import static org.briarproject.bramble.api.crypto.PasswordStrengthEstimator.STRONG;
-import static org.briarproject.briar.android.util.UiUtils.hideViewOnSmallScreen;
 import static org.briarproject.briar.android.util.UiUtils.setError;
-import static org.briarproject.briar.android.util.UiUtils.showOnboardingDialog;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
@@ -59,6 +57,7 @@ public class SetPasswordFragment extends SetupFragment {
 	public View onCreateView(LayoutInflater inflater,
 			@Nullable ViewGroup container,
 			@Nullable Bundle savedInstanceState) {
+		requireActivity().setTitle(getString(R.string.setup_password_intro));
 		View v = inflater.inflate(R.layout.fragment_setup_password, container,
 				false);
 
@@ -68,18 +67,17 @@ public class SetPasswordFragment extends SetupFragment {
 		passwordConfirmationWrapper =
 				v.findViewById(R.id.password_confirm_wrapper);
 		passwordConfirmation = v.findViewById(R.id.password_confirm);
-		Button infoButton = v.findViewById(R.id.info_button);
 		nextButton = v.findViewById(R.id.next);
 		ProgressBar progressBar = v.findViewById(R.id.progress);
 
 		passwordEntry.addTextChangedListener(this);
 		passwordConfirmation.addTextChangedListener(this);
-		infoButton.setOnClickListener(view ->
-				showOnboardingDialog(requireContext(), getHelpText()));
 		nextButton.setOnClickListener(this);
 
 		if (!viewModel.needToShowDozeFragment()) {
 			nextButton.setText(R.string.create_account_button);
+			int options = passwordConfirmation.getImeOptions();
+			passwordConfirmation.setImeOptions(options | IME_ACTION_DONE);
 		}
 
 		viewModel.getIsCreatingAccount()
@@ -96,12 +94,6 @@ public class SetPasswordFragment extends SetupFragment {
 		return v;
 	}
 
-	@Override
-	public void onStart() {
-		super.onStart();
-		hideViewOnSmallScreen(requireView().findViewById(R.id.logo));
-	}
-
 	@Override
 	public String getUniqueTag() {
 		return TAG;
@@ -118,27 +110,17 @@ public class SetPasswordFragment extends SetupFragment {
 		String password2 = passwordConfirmation.getText().toString();
 		boolean passwordsMatch = password1.equals(password2);
 
-		strengthMeter.setVisibility(!password1.isEmpty() ? VISIBLE : INVISIBLE);
+		strengthMeter
+				.setVisibility(password1.length() > 0 ? VISIBLE : INVISIBLE);
 		float strength = viewModel.estimatePasswordStrength(password1);
 		strengthMeter.setStrength(strength);
 		boolean strongEnough = strength >= QUITE_WEAK;
 
-		if (!password1.isEmpty()) {
-			if (strength >= STRONG) {
-				passwordEntryWrapper.setHelperText(
-						getString(R.string.password_strong));
-			} else if (strength >= QUITE_WEAK) {
-				passwordEntryWrapper.setHelperText(
-						getString(R.string.password_quite_strong));
-			} else {
-				passwordEntryWrapper.setHelperTextEnabled(false);
-			}
-		}
 		setError(passwordEntryWrapper, getString(R.string.password_too_weak),
-				!password1.isEmpty() && !strongEnough);
+				password1.length() > 0 && !strongEnough);
 		setError(passwordConfirmationWrapper,
 				getString(R.string.passwords_do_not_match),
-				!password2.isEmpty() && !passwordsMatch);
+				password2.length() > 0 && !passwordsMatch);
 
 		boolean enabled = passwordsMatch && strongEnough;
 		nextButton.setEnabled(enabled);

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

@@ -1,6 +1,5 @@
 package org.briarproject.briar.android.account;
 
-import android.annotation.SuppressLint;
 import android.app.KeyguardManager;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
@@ -114,7 +113,6 @@ public class UnlockActivity extends BaseActivity {
 	}
 
 	@Override
-	@SuppressLint("MissingSuperCall")
 	public void onBackPressed() {
 		moveTaskToBack(true);
 	}

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

@@ -101,8 +101,6 @@ public abstract class BaseActivity extends AppCompatActivity
 		//          unlock screen is shown.
 		if (PREVENT_SCREENSHOTS) getWindow().addFlags(FLAG_SECURE);
 
-		if (SDK_INT >= 31) getWindow().setHideOverlayWindows(true);
-
 		for (ActivityLifecycleController alc : lifecycleControllers) {
 			alc.onActivityCreate(this);
 		}

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

@@ -7,8 +7,6 @@ import android.view.Window;
 import android.widget.CheckBox;
 import android.widget.Toast;
 
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
 import org.briarproject.android.dontkillmelib.wakelock.AndroidWakeLockManager;
 import org.briarproject.bramble.api.system.Wakeful;
 import org.briarproject.briar.R;
@@ -179,8 +177,8 @@ public abstract class BriarActivity extends BaseActivity {
 	}
 
 	protected void showDozeDialog(@StringRes int message) {
-		MaterialAlertDialogBuilder b =
-				new MaterialAlertDialogBuilder(this, R.style.BriarDialogTheme);
+		AlertDialog.Builder b =
+				new AlertDialog.Builder(this, R.style.BriarDialogTheme);
 		b.setMessage(message);
 		b.setView(R.layout.checkbox);
 		b.setPositiveButton(R.string.fix,

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

@@ -10,8 +10,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toast;
 
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
@@ -29,6 +27,7 @@ import javax.inject.Inject;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
+import androidx.appcompat.app.AlertDialog;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView.LayoutManager;
@@ -221,8 +220,8 @@ public class BlogFragment extends BaseFragment
 	}
 
 	private void showDeleteDialog() {
-		MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(
-				requireContext(), R.style.BriarDialogTheme);
+		AlertDialog.Builder builder = new AlertDialog.Builder(requireContext(),
+				R.style.BriarDialogTheme);
 		builder.setTitle(getString(R.string.blogs_remove_blog));
 		builder.setMessage(
 				getString(R.string.blogs_remove_blog_dialog_message));

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

@@ -4,8 +4,6 @@ import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
 
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.BaseActivity;
@@ -15,6 +13,7 @@ import org.briarproject.nullsafety.ParametersNotNullByDefault;
 import javax.inject.Inject;
 
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import androidx.lifecycle.ViewModelProvider;
 
@@ -52,8 +51,8 @@ public class RssFeedDeleteFeedDialogFragment extends DialogFragment {
 	public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
 		GroupId groupId = new GroupId(
 				requireNonNull(requireArguments().getByteArray(GROUP_ID)));
-		MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(
-				requireActivity(), R.style.BriarDialogTheme);
+		AlertDialog.Builder builder = new AlertDialog.Builder(requireActivity(),
+				R.style.BriarDialogTheme);
 		builder.setTitle(getString(R.string.blogs_rss_remove_feed));
 		builder.setMessage(
 				getString(R.string.blogs_rss_remove_feed_dialog_message));

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

@@ -4,8 +4,6 @@ import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
 
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.BaseActivity;
 import org.briarproject.nullsafety.MethodsNotNullByDefault;
@@ -14,6 +12,7 @@ import org.briarproject.nullsafety.ParametersNotNullByDefault;
 import javax.inject.Inject;
 
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import androidx.lifecycle.ViewModelProvider;
 
@@ -48,8 +47,8 @@ public class RssFeedImportFailedDialogFragment extends DialogFragment {
 
 	@Override
 	public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
-		MaterialAlertDialogBuilder builder =
-				new MaterialAlertDialogBuilder(requireActivity(),
+		AlertDialog.Builder builder =
+				new AlertDialog.Builder(requireActivity(),
 						R.style.BriarDialogTheme);
 		builder.setMessage(R.string.blogs_rss_feeds_import_error);
 		builder.setNegativeButton(R.string.cancel, null);

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

@@ -55,7 +55,6 @@ public class NicknameFragment extends BaseFragment {
 
 	private TextInputLayout contactNameLayout;
 	private TextInputEditText contactNameInput;
-	private BriarButton addButton;
 
 	@Override
 	public String getUniqueTag() {
@@ -92,7 +91,7 @@ public class NicknameFragment extends BaseFragment {
 		contactNameLayout = v.findViewById(R.id.contactNameLayout);
 		contactNameInput = v.findViewById(R.id.contactNameInput);
 
-		addButton = v.findViewById(R.id.addButton);
+		BriarButton addButton = v.findViewById(R.id.addButton);
 		addButton.setOnClickListener(view -> onAddButtonClicked());
 
 		return v;
@@ -113,7 +112,7 @@ public class NicknameFragment extends BaseFragment {
 	@Nullable
 	private String getNicknameOrNull() {
 		Editable text = contactNameInput.getText();
-		if (text == null || text.toString().trim().isEmpty()) {
+		if (text == null || text.toString().trim().length() == 0) {
 			contactNameLayout.setError(getString(R.string.nickname_missing));
 			contactNameInput.requestFocus();
 			return null;
@@ -130,10 +129,7 @@ public class NicknameFragment extends BaseFragment {
 
 	private void onAddButtonClicked() {
 		String name = getNicknameOrNull();
-		if (name == null) { // invalid nickname
-			addButton.reset();
-			return;
-		}
+		if (name == null) return;  // invalid nickname
 
 		LifecycleOwner owner = getViewLifecycleOwner();
 		viewModel.getAddContactResult().observe(owner, result -> {

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

@@ -4,7 +4,6 @@ import android.content.DialogInterface.OnClickListener;
 import android.os.Bundle;
 import android.view.MenuItem;
 
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.snackbar.Snackbar;
 
 import org.briarproject.bramble.api.contact.PendingContactId;
@@ -22,6 +21,7 @@ import javax.annotation.Nullable;
 import javax.inject.Inject;
 
 import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
@@ -110,7 +110,7 @@ public class PendingContactListActivity extends BriarActivity
 		// show warning dialog
 		OnClickListener removeListener = (dialog, which) ->
 				removePendingContact(item.getPendingContact().getId());
-		MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(
+		AlertDialog.Builder builder = new AlertDialog.Builder(
 				PendingContactListActivity.this, R.style.BriarDialogTheme);
 		builder.setTitle(
 				getString(R.string.dialog_title_remove_pending_contact));

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

@@ -30,7 +30,8 @@ import static java.util.logging.Logger.getLogger;
 import static org.briarproject.android.dontkillmelib.DozeUtils.needsDozeWhitelisting;
 import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState.STARTING_SERVICES;
 import static org.briarproject.bramble.util.LogUtils.logException;
-import static org.briarproject.briar.android.settings.SettingsFragment.SETTINGS_NAMESPACE;
+import static org.briarproject.briar.api.android.SettingsConstants.DOZE_ASK_AGAIN;
+import static org.briarproject.briar.api.android.SettingsConstants.SETTINGS_NAMESPACE;
 
 @NotNullByDefault
 public class BriarControllerImpl implements BriarController {
@@ -38,8 +39,6 @@ public class BriarControllerImpl implements BriarController {
 	private static final Logger LOG =
 			getLogger(BriarControllerImpl.class.getName());
 
-	public static final String DOZE_ASK_AGAIN = "dozeAskAgain";
-
 	private final BriarServiceConnection serviceConnection;
 	private final AccountManager accountManager;
 	private final LifecycleManager lifecycleManager;

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

@@ -19,7 +19,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.snackbar.Snackbar;
 
 import org.briarproject.bramble.api.FeatureFlags;
@@ -102,6 +101,7 @@ import javax.inject.Inject;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
+import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.ActionMenuView;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.ActivityCompat;
@@ -812,8 +812,8 @@ public class ConversationActivity extends BriarActivity
 	}
 
 	private void askToDeleteAllMessages() {
-		MaterialAlertDialogBuilder builder =
-				new MaterialAlertDialogBuilder(this, R.style.BriarDialogTheme);
+		AlertDialog.Builder builder =
+				new AlertDialog.Builder(this, R.style.BriarDialogTheme);
 		builder.setTitle(getString(R.string.dialog_title_delete_all_messages));
 		builder.setMessage(
 				getString(R.string.dialog_message_delete_all_messages));
@@ -892,8 +892,8 @@ public class ConversationActivity extends BriarActivity
 		}
 		String msg = join(fails, "\n\n");
 		// show dialog
-		MaterialAlertDialogBuilder builder =
-				new MaterialAlertDialogBuilder(this, R.style.BriarDialogTheme);
+		AlertDialog.Builder builder =
+				new AlertDialog.Builder(this, R.style.BriarDialogTheme);
 		builder.setTitle(
 				getString(R.string.dialog_title_not_all_messages_deleted));
 		builder.setMessage(msg);
@@ -904,8 +904,8 @@ public class ConversationActivity extends BriarActivity
 	private void askToRemoveContact() {
 		DialogInterface.OnClickListener okListener =
 				(dialog, which) -> removeContact();
-		MaterialAlertDialogBuilder builder =
-				new MaterialAlertDialogBuilder(ConversationActivity.this,
+		AlertDialog.Builder builder =
+				new AlertDialog.Builder(ConversationActivity.this,
 						R.style.BriarDialogTheme);
 		builder.setTitle(getString(R.string.dialog_title_delete_contact));
 		builder.setMessage(

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

@@ -68,11 +68,13 @@ import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.util.LogUtils.logDuration;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.bramble.util.LogUtils.now;
-import static org.briarproject.briar.android.settings.SettingsFragment.SETTINGS_NAMESPACE;
 import static org.briarproject.briar.android.util.UiUtils.observeForeverOnce;
 import static org.briarproject.briar.android.view.TextSendController.SendState.ERROR;
 import static org.briarproject.briar.android.view.TextSendController.SendState.SENT;
 import static org.briarproject.briar.android.view.TextSendController.SendState.UNEXPECTED_TIMER;
+import static org.briarproject.briar.api.android.SettingsConstants.SETTINGS_NAMESPACE;
+import static org.briarproject.briar.api.android.SettingsConstants.SHOW_ONBOARDING_IMAGE;
+import static org.briarproject.briar.api.android.SettingsConstants.SHOW_ONBOARDING_INTRODUCTION;
 import static org.briarproject.briar.api.autodelete.AutoDeleteConstants.NO_AUTO_DELETE_TIMER;
 import static org.briarproject.briar.api.autodelete.AutoDeleteManager.DEFAULT_TIMER_DURATION;
 import static org.briarproject.briar.api.messaging.PrivateMessageFormat.TEXT_IMAGES;
@@ -85,11 +87,6 @@ public class ConversationViewModel extends DbViewModel
 	private static final Logger LOG =
 			getLogger(ConversationViewModel.class.getName());
 
-	private static final String SHOW_ONBOARDING_IMAGE =
-			"showOnboardingImage";
-	private static final String SHOW_ONBOARDING_INTRODUCTION =
-			"showOnboardingIntroduction";
-
 	private final TransactionManager db;
 	private final EventBus eventBus;
 	private final MessagingManager messagingManager;

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

@@ -7,8 +7,6 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.sharing.ForumSharingStatusActivity;
@@ -22,6 +20,7 @@ import org.briarproject.nullsafety.ParametersNotNullByDefault;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
+import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
 import androidx.lifecycle.ViewModelProvider;
 
@@ -129,7 +128,7 @@ public class ForumActivity extends
 
 	private void showUnsubscribeDialog() {
 		OnClickListener okListener = (dialog, which) -> viewModel.deleteForum();
-		MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this,
+		AlertDialog.Builder builder = new AlertDialog.Builder(this,
 				R.style.BriarDialogTheme);
 		builder.setTitle(getString(R.string.dialog_title_leave_forum));
 		builder.setMessage(getString(R.string.dialog_message_leave_forum));

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

@@ -13,8 +13,6 @@ import android.view.View;
 import android.widget.CheckBox;
 import android.widget.TextView;
 
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.BaseActivity;
 import org.briarproject.briar.api.android.ScreenFilterMonitor;
@@ -29,6 +27,7 @@ import java.util.Collection;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 
 import static android.os.Build.VERSION.SDK_INT;
@@ -76,8 +75,8 @@ public class ScreenFilterDialogFragment extends DialogFragment {
 	public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
 		Activity activity = getActivity();
 		if (activity == null) throw new IllegalStateException();
-		MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(
-				activity, R.style.BriarDialogThemeNoFilter);
+		AlertDialog.Builder builder = new AlertDialog.Builder(activity,
+				R.style.BriarDialogThemeNoFilter);
 		builder.setTitle(R.string.screen_filter_title);
 		Bundle args = getArguments();
 		if (args == null) throw new IllegalStateException();

briar-android/src/main/java/org/briarproject/briar/android/hotspot/AbstractConditionManager.java

@@ -6,13 +6,12 @@ import android.content.Intent;
 import android.net.wifi.WifiManager;
 import android.widget.Toast;
 
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
 import org.briarproject.briar.R;
 
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.StringRes;
+import androidx.appcompat.app.AlertDialog;
 import androidx.core.util.Consumer;
 import androidx.fragment.app.FragmentActivity;
 
@@ -74,8 +73,7 @@ abstract class AbstractConditionManager {
 	void showRationale(Context ctx, @StringRes int title,
 			@StringRes int body, Runnable onContinueClicked,
 			Runnable onDismiss) {
-		MaterialAlertDialogBuilder builder =
-				new MaterialAlertDialogBuilder(ctx);
+		AlertDialog.Builder builder = new AlertDialog.Builder(ctx);
 		builder.setTitle(title);
 		builder.setMessage(body);
 		builder.setNeutralButton(R.string.continue_button,

briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotIntroFragment.java

@@ -61,7 +61,6 @@ public class HotspotIntroFragment extends Fragment {
 		getAndroidComponent(activity).inject(this);
 		viewModel = new ViewModelProvider(activity, viewModelFactory)
 				.get(HotspotViewModel.class);
-		conditionManager.init(requireActivity());
 	}
 
 	@Override
@@ -77,6 +76,8 @@ public class HotspotIntroFragment extends Fragment {
 
 		startButton.setOnClickListener(this::onButtonClick);
 
+		conditionManager.init(requireActivity());
+
 		return v;
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotManager.java

@@ -432,8 +432,7 @@ class HotspotManager {
 
 	@RequiresApi(29)
 	private String getPassword() {
-		return getRandomString(4) + "-" + getRandomString(4) + "-" +
-				getRandomString(4) + "-" + getRandomString(4);
+		return getRandomString(8);
 	}
 
 	private static String createWifiLoginString(String ssid, String password) {

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

@@ -32,7 +32,6 @@ import static android.widget.Toast.LENGTH_LONG;
 import static org.briarproject.bramble.api.crypto.DecryptionResult.KEY_STRENGTHENER_ERROR;
 import static org.briarproject.bramble.api.crypto.DecryptionResult.SUCCESS;
 import static org.briarproject.bramble.api.crypto.PasswordStrengthEstimator.QUITE_WEAK;
-import static org.briarproject.bramble.api.crypto.PasswordStrengthEstimator.STRONG;
 import static org.briarproject.briar.android.login.LoginUtils.createKeyStrengthenerErrorDialog;
 import static org.briarproject.briar.android.util.UiUtils.hideSoftKeyboard;
 import static org.briarproject.briar.android.util.UiUtils.setError;
@@ -124,25 +123,12 @@ public class ChangePasswordActivity extends BriarActivity
 		boolean passwordsMatch = firstPassword.equals(secondPassword);
 		float strength = viewModel.estimatePasswordStrength(firstPassword);
 		strengthMeter.setStrength(strength);
-
-		if (!firstPassword.isEmpty()) {
-			if (strength >= STRONG) {
-				newPasswordEntryWrapper.setHelperText(
-						getString(R.string.password_strong));
-			} else if (strength >= QUITE_WEAK) {
-				newPasswordEntryWrapper.setHelperText(
-						getString(R.string.password_quite_strong));
-			} else {
-				newPasswordEntryWrapper.setHelperTextEnabled(false);
-			}
-		}
-
 		setError(newPasswordEntryWrapper,
 				getString(R.string.password_too_weak),
-				!firstPassword.isEmpty() && strength < QUITE_WEAK);
+				firstPassword.length() > 0 && strength < QUITE_WEAK);
 		setError(newPasswordConfirmationWrapper,
 				getString(R.string.passwords_do_not_match),
-				!secondPassword.isEmpty() && !passwordsMatch);
+				secondPassword.length() > 0 && !passwordsMatch);
 		changePasswordButton.setEnabled(
 				!currentPassword.getText().toString().isEmpty() &&
 						passwordsMatch && strength >= QUITE_WEAK);

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

@@ -2,8 +2,6 @@ package org.briarproject.briar.android.login;
 
 import android.content.Context;
 
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
 import org.briarproject.briar.R;
 import org.briarproject.nullsafety.NotNullByDefault;
 
@@ -15,8 +13,8 @@ import static org.briarproject.briar.android.util.UiUtils.getDialogIcon;
 class LoginUtils {
 
 	static AlertDialog createKeyStrengthenerErrorDialog(Context ctx) {
-		MaterialAlertDialogBuilder builder =
-				new MaterialAlertDialogBuilder(ctx, R.style.BriarDialogTheme);
+		AlertDialog.Builder builder =
+				new AlertDialog.Builder(ctx, R.style.BriarDialogTheme);
 		builder.setIcon(getDialogIcon(ctx, R.drawable.alerts_and_states_error));
 		builder.setTitle(R.string.dialog_title_cannot_check_password);
 		builder.setMessage(R.string.dialog_message_cannot_check_password);

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

@@ -9,7 +9,6 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.ProgressBar;
 
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textfield.TextInputLayout;
 
@@ -41,7 +40,6 @@ import static org.briarproject.bramble.api.crypto.DecryptionResult.SUCCESS;
 import static org.briarproject.briar.android.login.LoginUtils.createKeyStrengthenerErrorDialog;
 import static org.briarproject.briar.android.util.UiUtils.enterPressed;
 import static org.briarproject.briar.android.util.UiUtils.hideSoftKeyboard;
-import static org.briarproject.briar.android.util.UiUtils.hideViewOnSmallScreen;
 import static org.briarproject.briar.android.util.UiUtils.setError;
 import static org.briarproject.briar.android.util.UiUtils.showSoftKeyboard;
 
@@ -102,12 +100,6 @@ public class PasswordFragment extends BaseFragment implements TextWatcher {
 		return v;
 	}
 
-	@Override
-	public void onStart() {
-		super.onStart();
-		hideViewOnSmallScreen(requireView().findViewById(R.id.logo));
-	}
-
 	@Override
 	public void beforeTextChanged(CharSequence s, int start, int count,
 			int after) {
@@ -155,11 +147,9 @@ public class PasswordFragment extends BaseFragment implements TextWatcher {
 	}
 
 	private void onForgottenPasswordClick() {
-		MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(
-				requireContext(), R.style.BriarDialogTheme);
+		AlertDialog.Builder builder = new AlertDialog.Builder(requireContext(),
+				R.style.BriarDialogTheme);
 		builder.setTitle(R.string.dialog_title_lost_password);
-		builder.setBackgroundInsetStart(25);
-		builder.setBackgroundInsetEnd(25);
 		builder.setMessage(R.string.dialog_message_lost_password);
 		builder.setPositiveButton(R.string.cancel, null);
 		builder.setNegativeButton(R.string.delete,

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

@@ -1,6 +1,5 @@
 package org.briarproject.briar.android.login;
 
-import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.os.Bundle;
 
@@ -75,7 +74,6 @@ public class StartupActivity extends BaseActivity implements
 	}
 
 	@Override
-	@SuppressLint("MissingSuperCall")
 	public void onBackPressed() {
 		// Move task and activity to the background instead of showing another
 		// password prompt.

briar-android/src/main/java/org/briarproject/briar/android/mailbox/ErrorWizardFragment.java

@@ -11,7 +11,6 @@ import android.widget.RadioGroup;
 import android.widget.ScrollView;
 
 import com.google.android.material.animation.ArgbEvaluatorCompat;
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.view.BriarButton;
@@ -25,6 +24,7 @@ import javax.inject.Inject;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.ViewModelProvider;
@@ -148,8 +148,8 @@ public class ErrorWizardFragment extends Fragment {
 	}
 
 	private void onUnlinkButtonClicked(View v) {
-		MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(
-				requireContext(), R.style.BriarDialogTheme);
+		AlertDialog.Builder builder = new AlertDialog.Builder(requireContext(),
+				R.style.BriarDialogTheme);
 		builder.setTitle(R.string.mailbox_status_unlink_dialog_title);
 		builder.setMessage(R.string.mailbox_status_unlink_dialog_question);
 		builder.setPositiveButton(R.string.cancel,

briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxActivity.java

@@ -5,8 +5,6 @@ import android.view.MenuItem;
 import android.widget.ProgressBar;
 import android.widget.Toast;
 
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
 import org.briarproject.bramble.api.mailbox.MailboxPairingState;
 import org.briarproject.bramble.api.mailbox.MailboxPairingState.ConnectionError;
 import org.briarproject.bramble.api.mailbox.MailboxPairingState.InvalidQrCode;
@@ -33,6 +31,7 @@ import org.briarproject.nullsafety.ParametersNotNullByDefault;
 import javax.inject.Inject;
 
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.ViewModelProvider;
@@ -250,8 +249,8 @@ public class MailboxActivity extends BriarActivity {
 		if (tellUserToWipeMailbox) {
 			showFragment(getSupportFragmentManager(), new BlankFragment(),
 					BlankFragment.TAG);
-			MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(
-					this, R.style.BriarDialogTheme);
+			AlertDialog.Builder builder =
+					new AlertDialog.Builder(this, R.style.BriarDialogTheme);
 			builder.setTitle(R.string.mailbox_status_unlink_no_wipe_title);
 			builder.setMessage(R.string.mailbox_status_unlink_no_wipe_message);
 			builder.setNeutralButton(R.string.got_it,

briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxStatusFragment.java

@@ -13,8 +13,6 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
 import org.briarproject.bramble.api.mailbox.MailboxStatus;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.view.BriarButton;
@@ -216,8 +214,8 @@ public class MailboxStatusFragment extends Fragment {
 	}
 
 	private void onUnlinkButtonClicked(boolean showWarning) {
-		MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(
-				requireContext(), R.style.BriarDialogTheme);
+		AlertDialog.Builder builder = new AlertDialog.Builder(requireContext(),
+				R.style.BriarDialogTheme);
 		builder.setTitle(R.string.mailbox_status_unlink_dialog_title);
 		String msg = getString(R.string.mailbox_status_unlink_dialog_question);
 		if (showWarning) {

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

@@ -28,8 +28,10 @@ import static java.util.logging.Logger.getLogger;
 import static org.briarproject.android.dontkillmelib.DozeUtils.needsDozeWhitelisting;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.briar.android.TestingConstants.EXPIRY_DATE;
-import static org.briarproject.briar.android.controller.BriarControllerImpl.DOZE_ASK_AGAIN;
-import static org.briarproject.briar.android.settings.SettingsFragment.SETTINGS_NAMESPACE;
+import static org.briarproject.briar.api.android.SettingsConstants.DOZE_ASK_AGAIN;
+import static org.briarproject.briar.api.android.SettingsConstants.EXPIRY_DATE_WARNING;
+import static org.briarproject.briar.api.android.SettingsConstants.SETTINGS_NAMESPACE;
+import static org.briarproject.briar.api.android.SettingsConstants.SHOW_ONBOARDING_TRANSPORTS;
 
 @NotNullByDefault
 public class NavDrawerViewModel extends DbViewModel {
@@ -37,10 +39,6 @@ public class NavDrawerViewModel extends DbViewModel {
 	private static final Logger LOG =
 			getLogger(NavDrawerViewModel.class.getName());
 
-	private static final String EXPIRY_DATE_WARNING = "expiryDateWarning";
-	private static final String SHOW_TRANSPORTS_ONBOARDING =
-			"showTransportsOnboarding";
-
 	private final SettingsManager settingsManager;
 
 	private final MutableLiveData<Boolean> showExpiryWarning =
@@ -153,7 +151,7 @@ public class NavDrawerViewModel extends DbViewModel {
 				Settings settings =
 						settingsManager.getSettings(SETTINGS_NAMESPACE);
 				boolean show =
-						settings.getBoolean(SHOW_TRANSPORTS_ONBOARDING, true);
+						settings.getBoolean(SHOW_ONBOARDING_TRANSPORTS, true);
 				showTransportsOnboarding.postValue(show);
 			} catch (DbException e) {
 				handleException(e);
@@ -167,7 +165,7 @@ public class NavDrawerViewModel extends DbViewModel {
 		runOnDbThread(() -> {
 			try {
 				Settings settings = new Settings();
-				settings.putBoolean(SHOW_TRANSPORTS_ONBOARDING, false);
+				settings.putBoolean(SHOW_ONBOARDING_TRANSPORTS, false);
 				settingsManager.mergeSettings(settings, SETTINGS_NAMESPACE);
 			} catch (DbException e) {
 				handleException(e);

briar-android/src/main/java/org/briarproject/briar/android/panic/PanicPreferencesFragment.java

@@ -10,8 +10,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
 
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
 import org.briarproject.briar.R;
 
 import java.util.ArrayList;
@@ -19,6 +17,7 @@ import java.util.logging.Logger;
 
 import javax.annotation.Nullable;
 
+import androidx.appcompat.app.AlertDialog;
 import androidx.preference.ListPreference;
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.SwitchPreferenceCompat;
@@ -202,8 +201,8 @@ public class PanicPreferencesFragment extends PreferenceFragmentCompat
 			getActivity().finish();
 		};
 
-		MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(
-				requireContext(), R.style.BriarDialogTheme);
+		AlertDialog.Builder builder = new AlertDialog.Builder(getContext(),
+				R.style.BriarDialogTheme);
 		builder.setTitle(getString(R.string.dialog_title_connect_panic_app));
 
 		CharSequence app = getString(R.string.unknown_app);

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

@@ -6,8 +6,6 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.privategroup.creation.GroupInviteActivity;
@@ -22,6 +20,7 @@ import org.briarproject.nullsafety.ParametersNotNullByDefault;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
+import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
 import androidx.lifecycle.ViewModelProvider;
 
@@ -179,8 +178,8 @@ public class GroupActivity extends
 	}
 
 	private void showLeaveGroupDialog() {
-		MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(
-				this, R.style.BriarDialogTheme);
+		AlertDialog.Builder builder =
+				new AlertDialog.Builder(this, R.style.BriarDialogTheme);
 		builder.setTitle(getString(R.string.groups_leave_dialog_title));
 		builder.setMessage(getString(R.string.groups_leave_dialog_message));
 		builder.setNegativeButton(R.string.dialog_button_leave,
@@ -190,8 +189,8 @@ public class GroupActivity extends
 	}
 
 	private void showDissolveGroupDialog() {
-		MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(
-				this, R.style.BriarDialogTheme);
+		AlertDialog.Builder builder =
+				new AlertDialog.Builder(this, R.style.BriarDialogTheme);
 		builder.setTitle(getString(R.string.groups_dissolve_dialog_title));
 		builder.setMessage(getString(R.string.groups_dissolve_dialog_message));
 		builder.setNegativeButton(R.string.groups_dissolve_button,
@@ -207,8 +206,8 @@ public class GroupActivity extends
 	}
 
 	private void onGroupDissolved() {
-		MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(
-				this, R.style.BriarDialogTheme);
+		AlertDialog.Builder builder =
+				new AlertDialog.Builder(this, R.style.BriarDialogTheme);
 		builder.setTitle(getString(R.string.groups_dissolved_dialog_title));
 		builder.setMessage(getString(R.string.groups_dissolved_dialog_message));
 		builder.setNeutralButton(R.string.ok, null);

briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsActivity.java

@@ -9,8 +9,6 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.sync.GroupId;
@@ -28,6 +26,7 @@ import javax.annotation.Nullable;
 import javax.inject.Inject;
 
 import androidx.annotation.LayoutRes;
+import androidx.appcompat.app.AlertDialog;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
@@ -106,8 +105,7 @@ public class RevealContactsActivity extends ContactSelectorActivity
 	}
 
 	private void showOnboardingDialog() {
-		new MaterialAlertDialogBuilder(this,
-				R.style.OnboardingDialogTheme)
+		new AlertDialog.Builder(this, R.style.OnboardingDialogTheme)
 				.setMessage(getString(R.string.groups_reveal_dialog_message))
 				.setNeutralButton(R.string.got_it,
 						(dialog, which) -> dialog.cancel())

briar-android/src/main/java/org/briarproject/briar/android/privategroup/reveal/RevealContactsControllerImpl.java

@@ -31,7 +31,8 @@ import javax.inject.Inject;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.util.LogUtils.logException;
-import static org.briarproject.briar.android.settings.SettingsFragment.SETTINGS_NAMESPACE;
+import static org.briarproject.briar.api.android.SettingsConstants.SETTINGS_NAMESPACE;
+import static org.briarproject.briar.api.android.SettingsConstants.SHOW_ONBOARDING_REVEAL_CONTACTS;
 import static org.briarproject.briar.api.privategroup.Visibility.INVISIBLE;
 
 @Immutable
@@ -41,8 +42,6 @@ class RevealContactsControllerImpl extends DbControllerImpl
 
 	private static final Logger LOG =
 			Logger.getLogger(RevealContactsControllerImpl.class.getName());
-	private static final String SHOW_ONBOARDING_REVEAL_CONTACTS =
-			"showOnboardingRevealContacts";
 
 	private final PrivateGroupManager groupManager;
 	private final GroupInvitationManager groupInvitationManager;

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

@@ -1,6 +1,5 @@
 package org.briarproject.briar.android.reporting;
 
-import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
@@ -88,7 +87,6 @@ public class CrashReportActivity extends BaseActivity
 	}
 
 	@Override
-	@SuppressLint("MissingSuperCall")
 	public void onBackPressed() {
 		exit();
 	}

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

@@ -10,7 +10,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.BaseActivity;
@@ -21,6 +20,7 @@ import org.briarproject.nullsafety.ParametersNotNullByDefault;
 import javax.inject.Inject;
 
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.ViewModelProvider;
@@ -86,7 +86,7 @@ public class ConfirmAvatarDialogFragment extends DialogFragment {
 		);
 
 		int theme = R.style.BriarDialogTheme;
-		return new MaterialAlertDialogBuilder(activity, theme)
+		return new AlertDialog.Builder(activity, theme)
 				.setView(view)
 				.setTitle(R.string.dialog_confirm_profile_picture_title)
 				.setNegativeButton(R.string.cancel, null)

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

@@ -1,19 +1,21 @@
 package org.briarproject.briar.android.settings;
 
+import android.app.AlertDialog;
 import android.content.Intent;
 import android.os.Bundle;
 
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.Localizer;
 import org.briarproject.briar.android.util.UiUtils;
 import org.briarproject.nullsafety.NotNullByDefault;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
+import java.util.logging.Logger;
 
+import androidx.core.text.TextUtilsCompat;
 import androidx.fragment.app.FragmentActivity;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
@@ -22,7 +24,10 @@ import androidx.preference.PreferenceFragmentCompat;
 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.os.Build.VERSION.SDK_INT;
+import static androidx.core.view.ViewCompat.LAYOUT_DIRECTION_LTR;
 import static java.util.Objects.requireNonNull;
+import static java.util.logging.Logger.getLogger;
 import static org.briarproject.briar.android.BriarApplication.ENTRY_ACTIVITY;
 import static org.briarproject.briar.android.navdrawer.NavDrawerActivity.SIGN_OUT_URI;
 import static org.briarproject.briar.android.settings.SettingsActivity.EXTRA_THEME_CHANGE;
@@ -31,7 +36,10 @@ import static org.briarproject.briar.android.settings.SettingsActivity.EXTRA_THE
 public class DisplayFragment extends PreferenceFragmentCompat {
 
 	public static final String PREF_LANGUAGE = "pref_key_language";
-	public static final String PREF_THEME = "pref_key_theme";
+	private static final String PREF_THEME = "pref_key_theme";
+
+	private static final Logger LOG =
+			getLogger(DisplayFragment.class.getName());
 
 	@Override
 	public void onCreatePreferences(Bundle bundle, String s) {
@@ -42,6 +50,7 @@ public class DisplayFragment extends PreferenceFragmentCompat {
 		language.setOnPreferenceChangeListener(this::onLanguageChanged);
 
 		ListPreference theme = requireNonNull(findPreference(PREF_THEME));
+		setThemeEntries(theme);
 		theme.setOnPreferenceChangeListener(this::onThemeChanged);
 	}
 
@@ -82,6 +91,30 @@ public class DisplayFragment extends PreferenceFragmentCompat {
 		language.setEntryValues(entryValues.toArray(new CharSequence[0]));
 	}
 
+	private boolean isLeftToRight(Locale locale) {
+		// TextUtilsCompat returns the wrong direction for Hebrew on some phones
+		String language = locale.getLanguage();
+		if (language.equals("iw") || language.equals("he")) return false;
+		int direction = TextUtilsCompat.getLayoutDirectionFromLocale(locale);
+		return direction == LAYOUT_DIRECTION_LTR;
+	}
+
+	private void setThemeEntries(ListPreference theme) {
+		if (SDK_INT < 27) {
+			// remove System Default Theme option from preference entries
+			// as it is not functional on this API anyway
+			List<CharSequence> entries =
+					new ArrayList<>(Arrays.asList(theme.getEntries()));
+			entries.remove(getString(R.string.pref_theme_system));
+			theme.setEntries(entries.toArray(new CharSequence[0]));
+			// also remove corresponding value
+			List<CharSequence> values =
+					new ArrayList<>(Arrays.asList(theme.getEntryValues()));
+			values.remove(getString(R.string.pref_theme_system_value));
+			theme.setEntryValues(values.toArray(new CharSequence[0]));
+		}
+	}
+
 	private boolean onThemeChanged(Preference preference, Object newValue) {
 		// activate new theme
 		FragmentActivity activity = requireActivity();
@@ -102,8 +135,8 @@ public class DisplayFragment extends PreferenceFragmentCompat {
 	private boolean onLanguageChanged(Preference preference, Object newValue) {
 		ListPreference language = (ListPreference) preference;
 		if (!language.getValue().equals(newValue)) {
-			MaterialAlertDialogBuilder builder =
-					new MaterialAlertDialogBuilder(requireContext());
+			AlertDialog.Builder builder =
+					new AlertDialog.Builder(getActivity());
 			builder.setTitle(R.string.pref_language_title);
 			builder.setMessage(R.string.pref_language_changed);
 			builder.setPositiveButton(R.string.sign_out_button, (d, i) -> {

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

@@ -47,12 +47,12 @@ import static org.briarproject.briar.api.android.AndroidNotificationManager.BLOG
 import static org.briarproject.briar.api.android.AndroidNotificationManager.CONTACT_CHANNEL_ID;
 import static org.briarproject.briar.api.android.AndroidNotificationManager.FORUM_CHANNEL_ID;
 import static org.briarproject.briar.api.android.AndroidNotificationManager.GROUP_CHANNEL_ID;
-import static org.briarproject.briar.api.android.AndroidNotificationManager.PREF_NOTIFY_BLOG;
-import static org.briarproject.briar.api.android.AndroidNotificationManager.PREF_NOTIFY_FORUM;
-import static org.briarproject.briar.api.android.AndroidNotificationManager.PREF_NOTIFY_GROUP;
-import static org.briarproject.briar.api.android.AndroidNotificationManager.PREF_NOTIFY_PRIVATE;
-import static org.briarproject.briar.api.android.AndroidNotificationManager.PREF_NOTIFY_SOUND;
-import static org.briarproject.briar.api.android.AndroidNotificationManager.PREF_NOTIFY_VIBRATION;
+import static org.briarproject.briar.api.android.SettingsConstants.PREF_NOTIFY_BLOG;
+import static org.briarproject.briar.api.android.SettingsConstants.PREF_NOTIFY_FORUM;
+import static org.briarproject.briar.api.android.SettingsConstants.PREF_NOTIFY_GROUP;
+import static org.briarproject.briar.api.android.SettingsConstants.PREF_NOTIFY_PRIVATE;
+import static org.briarproject.briar.api.android.SettingsConstants.PREF_NOTIFY_SOUND;
+import static org.briarproject.briar.api.android.SettingsConstants.PREF_NOTIFY_VIBRATION;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault

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

@@ -27,15 +27,15 @@ import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.util.LogUtils.logDuration;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.bramble.util.LogUtils.now;
-import static org.briarproject.briar.android.settings.SettingsFragment.SETTINGS_NAMESPACE;
-import static org.briarproject.briar.api.android.AndroidNotificationManager.PREF_NOTIFY_BLOG;
-import static org.briarproject.briar.api.android.AndroidNotificationManager.PREF_NOTIFY_FORUM;
-import static org.briarproject.briar.api.android.AndroidNotificationManager.PREF_NOTIFY_GROUP;
-import static org.briarproject.briar.api.android.AndroidNotificationManager.PREF_NOTIFY_PRIVATE;
-import static org.briarproject.briar.api.android.AndroidNotificationManager.PREF_NOTIFY_RINGTONE_NAME;
-import static org.briarproject.briar.api.android.AndroidNotificationManager.PREF_NOTIFY_RINGTONE_URI;
-import static org.briarproject.briar.api.android.AndroidNotificationManager.PREF_NOTIFY_SOUND;
-import static org.briarproject.briar.api.android.AndroidNotificationManager.PREF_NOTIFY_VIBRATION;
+import static org.briarproject.briar.api.android.SettingsConstants.PREF_NOTIFY_BLOG;
+import static org.briarproject.briar.api.android.SettingsConstants.PREF_NOTIFY_FORUM;
+import static org.briarproject.briar.api.android.SettingsConstants.PREF_NOTIFY_GROUP;
+import static org.briarproject.briar.api.android.SettingsConstants.PREF_NOTIFY_PRIVATE;
+import static org.briarproject.briar.api.android.SettingsConstants.PREF_NOTIFY_RINGTONE_NAME;
+import static org.briarproject.briar.api.android.SettingsConstants.PREF_NOTIFY_RINGTONE_URI;
+import static org.briarproject.briar.api.android.SettingsConstants.PREF_NOTIFY_SOUND;
+import static org.briarproject.briar.api.android.SettingsConstants.PREF_NOTIFY_VIBRATION;
+import static org.briarproject.briar.api.android.SettingsConstants.SETTINGS_NAMESPACE;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault

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

@@ -22,15 +22,13 @@ import static java.util.Objects.requireNonNull;
 import static org.briarproject.briar.android.AppModule.getAndroidComponent;
 import static org.briarproject.briar.android.settings.SettingsActivity.enableAndPersist;
 import static org.briarproject.briar.android.util.UiUtils.hasScreenLock;
+import static org.briarproject.briar.api.android.SettingsConstants.PREF_SCREEN_LOCK;
+import static org.briarproject.briar.api.android.SettingsConstants.PREF_SCREEN_LOCK_TIMEOUT;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
 public class SecurityFragment extends PreferenceFragmentCompat {
 
-	public static final String PREF_SCREEN_LOCK = "pref_key_lock";
-	public static final String PREF_SCREEN_LOCK_TIMEOUT =
-			"pref_key_lock_timeout";
-
 	@Inject
 	ViewModelProvider.Factory viewModelFactory;
 

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

@@ -37,8 +37,6 @@ import static org.briarproject.briar.android.util.UiUtils.tryToStartActivity;
 @ParametersNotNullByDefault
 public class SettingsFragment extends PreferenceFragmentCompat {
 
-	public static final String SETTINGS_NAMESPACE = "android-ui";
-
 	private static final String PREF_KEY_AVATAR = "pref_key_avatar";
 	private static final String PREF_KEY_SHARE_LINK = "pref_key_share_app_link";
 	private static final String PREF_KEY_FEEDBACK = "pref_key_send_feedback";

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

@@ -54,9 +54,9 @@ import static org.briarproject.bramble.util.AndroidUtils.getSupportedImageConten
 import static org.briarproject.bramble.util.LogUtils.logDuration;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.bramble.util.LogUtils.now;
-import static org.briarproject.briar.android.settings.SecurityFragment.PREF_SCREEN_LOCK;
-import static org.briarproject.briar.android.settings.SecurityFragment.PREF_SCREEN_LOCK_TIMEOUT;
-import static org.briarproject.briar.android.settings.SettingsFragment.SETTINGS_NAMESPACE;
+import static org.briarproject.briar.api.android.SettingsConstants.PREF_SCREEN_LOCK;
+import static org.briarproject.briar.api.android.SettingsConstants.PREF_SCREEN_LOCK_TIMEOUT;
+import static org.briarproject.briar.api.android.SettingsConstants.SETTINGS_NAMESPACE;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault

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

@@ -40,12 +40,15 @@ class TorSummaryProvider implements SummaryProvider<ListPreference> {
 		String country = locationUtils.getCurrentCountry();
 		String countryName = getCountryDisplayName(country);
 
-		boolean useBridgesByDefault =
-				circumventionProvider.shouldUseBridges(country);
+		boolean blocked =
+				circumventionProvider.isTorProbablyBlocked(country);
+		boolean useBridges = circumventionProvider.doBridgesWork(country);
 		String setting =
 				ctx.getString(R.string.tor_network_setting_without_bridges);
-		if (useBridgesByDefault) {
+		if (blocked && useBridges) {
 			setting = ctx.getString(R.string.tor_network_setting_with_bridges);
+		} else if (blocked) {
+			setting = ctx.getString(R.string.tor_network_setting_never);
 		}
 		return ctx.getString(R.string.tor_network_setting_summary, setting,
 				countryName);

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

@@ -13,7 +13,6 @@ import org.briarproject.briar.android.Localizer;
 import androidx.appcompat.app.AppCompatActivity;
 
 import static android.content.Intent.ACTION_VIEW;
-import static android.os.Build.VERSION.SDK_INT;
 import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
 import static org.briarproject.briar.android.TestingConstants.PREVENT_SCREENSHOTS;
 
@@ -26,8 +25,6 @@ public class ExpiredActivity extends AppCompatActivity
 
 		if (PREVENT_SCREENSHOTS) getWindow().addFlags(FLAG_SECURE);
 
-		if (SDK_INT >= 31) getWindow().setHideOverlayWindows(true);
-
 		setContentView(R.layout.activity_expired);
 		findViewById(R.id.download_briar_button).setOnClickListener(this);
 	}
@@ -41,7 +38,7 @@ public class ExpiredActivity extends AppCompatActivity
 
 	@Override
 	public void onClick(View v) {
-		Uri uri = Uri.parse("https://briarproject.org/download-briar");
+		Uri uri = Uri.parse("https://briarproject.org/download.html");
 		startActivity(new Intent(ACTION_VIEW, uri));
 		finish();
 	}

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

@@ -18,8 +18,7 @@ import static androidx.core.content.ContextCompat.getColor;
 public class BriarSnackbarBuilder {
 
 	@ColorRes
-	@Nullable
-	private Integer backgroundResId = null;
+	private int backgroundResId = R.color.briar_primary;
 	@StringRes
 	private int actionResId;
 	@Nullable
@@ -27,11 +26,7 @@ public class BriarSnackbarBuilder {
 
 	public Snackbar make(View view, CharSequence text, int duration) {
 		Snackbar s = Snackbar.make(view, text, duration);
-		if (backgroundResId != null) {
-			s.setBackgroundTint(getColor(view.getContext(), backgroundResId));
-			s.setTextColor(
-					getColor(view.getContext(), R.color.md_theme_onSecondary));
-		}
+		s.getView().setBackgroundResource(backgroundResId);
 		if (onClickListener != null) {
 			s.setActionTextColor(getColor(view.getContext(),
 					R.color.briar_button_text_positive));

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

@@ -6,8 +6,6 @@ import android.content.Intent;
 import android.location.LocationManager;
 import android.net.Uri;
 
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
 import org.briarproject.briar.R;
 import org.briarproject.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.nullsafety.ParametersNotNullByDefault;
@@ -18,6 +16,7 @@ import androidx.activity.result.ActivityResultLauncher;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.StringRes;
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.FragmentActivity;
 
 import static android.Manifest.permission.BLUETOOTH_ADVERTISE;
@@ -109,8 +108,8 @@ public class PermissionUtils {
 	}
 
 	public static void showLocationDialog(Context ctx, boolean forBluetooth) {
-		MaterialAlertDialogBuilder builder =
-				new MaterialAlertDialogBuilder(ctx, R.style.BriarDialogTheme);
+		AlertDialog.Builder builder =
+				new AlertDialog.Builder(ctx, R.style.BriarDialogTheme);
 		builder.setTitle(R.string.permission_location_setting_title);
 		if (forBluetooth) {
 			builder.setMessage(R.string.permission_location_setting_body);
@@ -137,8 +136,8 @@ public class PermissionUtils {
 
 	public static void showDenialDialog(FragmentActivity ctx,
 			@StringRes int title, @StringRes int body, Runnable onDenied) {
-		MaterialAlertDialogBuilder builder =
-				new MaterialAlertDialogBuilder(ctx, R.style.BriarDialogTheme);
+		AlertDialog.Builder builder =
+				new AlertDialog.Builder(ctx, R.style.BriarDialogTheme);
 		builder.setTitle(title);
 		builder.setMessage(body);
 		builder.setPositiveButton(R.string.ok, getGoToSettingsListener(ctx));
@@ -149,8 +148,8 @@ public class PermissionUtils {
 
 	public static void showRationale(FragmentActivity ctx, @StringRes int title,
 			@StringRes int body, @Nullable Runnable onOk) {
-		MaterialAlertDialogBuilder builder =
-				new MaterialAlertDialogBuilder(ctx, R.style.BriarDialogTheme);
+		AlertDialog.Builder builder =
+				new AlertDialog.Builder(ctx, R.style.BriarDialogTheme);
 		builder.setTitle(title);
 		builder.setMessage(body);
 		builder.setNeutralButton(R.string.continue_button, (dialog, which) -> {

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

@@ -28,7 +28,6 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.textfield.TextInputLayout;
 
 import org.briarproject.bramble.api.contact.Contact;
@@ -53,6 +52,7 @@ import androidx.annotation.ColorRes;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
+import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
 import androidx.core.hardware.fingerprint.FingerprintManagerCompat;
 import androidx.core.text.HtmlCompat;
@@ -92,6 +92,7 @@ import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN;
 import static android.view.inputmethod.EditorInfo.IME_NULL;
 import static android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT;
 import static android.widget.Toast.LENGTH_LONG;
+import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_AUTO_TIME;
 import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
 import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_NO;
 import static androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_YES;
@@ -322,7 +323,7 @@ public class UiUtils {
 	}
 
 	public static void showOnboardingDialog(Context ctx, String text) {
-		new MaterialAlertDialogBuilder(ctx, R.style.OnboardingDialogTheme)
+		new AlertDialog.Builder(ctx, R.style.OnboardingDialogTheme)
 				.setMessage(text)
 				.setNeutralButton(R.string.got_it,
 						(dialog, which) -> dialog.cancel())
@@ -348,7 +349,12 @@ public class UiUtils {
 		} else if (theme
 				.equals(ctx.getString(R.string.pref_theme_dark_value))) {
 			setDefaultNightMode(MODE_NIGHT_YES);
-		} else {
+		} else if (theme
+				.equals(ctx.getString(R.string.pref_theme_auto_value))) {
+			// TODO remove AUTO-setting as it is deprecated
+			setDefaultNightMode(MODE_NIGHT_AUTO_TIME);
+		} else if (theme
+				.equals(ctx.getString(R.string.pref_theme_system_value))) {
 			setDefaultNightMode(MODE_NIGHT_FOLLOW_SYSTEM);
 		}
 	}

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

@@ -8,13 +8,12 @@ import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.ProgressBar;
 
-import com.google.android.material.button.MaterialButton;
-
 import org.briarproject.briar.R;
 import org.briarproject.nullsafety.NotNullByDefault;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.view.ContextThemeWrapper;
+import androidx.appcompat.widget.AppCompatButton;
 
 import static android.content.Context.LAYOUT_INFLATER_SERVICE;
 import static androidx.transition.TransitionManager.beginDelayedTransition;
@@ -48,7 +47,8 @@ public class BriarButton extends FrameLayout {
 		attributes.recycle();
 
 		ContextThemeWrapper wrapper = new ContextThemeWrapper(context, style);
-		button = new MaterialButton(wrapper, null, style);
+		button = isInEditMode() ? new AppCompatButton(context) :
+				new AppCompatButton(wrapper, null, style);
 		button.setText(text);
 		addView(button);
 		progressBar = findViewById(R.id.briar_button_progress_bar);

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

@@ -11,17 +11,6 @@ import org.briarproject.bramble.api.sync.GroupId;
  */
 public interface AndroidNotificationManager {
 
-	// Keys for notification preferences
-	String PREF_NOTIFY_PRIVATE = "notifyPrivateMessages";
-	String PREF_NOTIFY_GROUP = "notifyGroupMessages";
-	String PREF_NOTIFY_FORUM = "notifyForumPosts";
-	String PREF_NOTIFY_BLOG = "notifyBlogPosts";
-
-	String PREF_NOTIFY_SOUND = "notifySound";
-	String PREF_NOTIFY_RINGTONE_NAME = "notifyRingtoneName";
-	String PREF_NOTIFY_RINGTONE_URI = "notifyRingtoneUri";
-	String PREF_NOTIFY_VIBRATION = "notifyVibration";
-
 	// Notification IDs
 	int ONGOING_NOTIFICATION_ID = 1;
 	int REMINDER_NOTIFICATION_ID = 3;

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

@@ -0,0 +1,39 @@
+package org.briarproject.briar.api.android;
+
+import org.briarproject.nullsafety.NotNullByDefault;
+
+@NotNullByDefault
+public interface SettingsConstants {
+
+	// Namespace for Android-specific settings
+	String SETTINGS_NAMESPACE = "android-ui";
+
+	// Key for time when expiry warning was last shown
+	String EXPIRY_DATE_WARNING = "expiryDateWarning";
+
+	// Key for doze mode exemption warning
+	String DOZE_ASK_AGAIN = "dozeAskAgain";
+
+	// Keys for onboarding
+	String SHOW_ONBOARDING_TRANSPORTS = "showTransportsOnboarding";
+	String SHOW_ONBOARDING_IMAGE = "showOnboardingImage";
+	String SHOW_ONBOARDING_INTRODUCTION = "showOnboardingIntroduction";
+	String SHOW_ONBOARDING_REVEAL_CONTACTS = "showOnboardingRevealContacts";
+
+	// Keys for notification preferences
+	String PREF_NOTIFY_PRIVATE = "notifyPrivateMessages";
+	String PREF_NOTIFY_GROUP = "notifyGroupMessages";
+	String PREF_NOTIFY_FORUM = "notifyForumPosts";
+	String PREF_NOTIFY_BLOG = "notifyBlogPosts";
+	String PREF_NOTIFY_SOUND = "notifySound";
+	String PREF_NOTIFY_RINGTONE_NAME = "notifyRingtoneName";
+	String PREF_NOTIFY_RINGTONE_URI = "notifyRingtoneUri";
+	String PREF_NOTIFY_VIBRATION = "notifyVibration";
+
+	// Key for recently used emoji
+	String EMOJI_LRU_PREFERENCE = "pref_emoji_recent2";
+
+	// Keys for screen lock
+	String PREF_SCREEN_LOCK = "pref_key_lock";
+	String PREF_SCREEN_LOCK_TIMEOUT = "pref_key_lock_timeout";
+}

briar-android/src/main/res/color/button_text.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+	xmlns:android="http://schemas.android.com/apk/res/android">
+	<item
+		android:color="@color/briar_button_text_disabled"
+		android:state_enabled="false"/>
+	<item
+		android:color="#ffffffff"/>
+</selector>

briar-android/src/main/res/drawable-v21/button_outline.xml

@@ -0,0 +1,7 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+	android:color="?attr/colorControlHighlight">
+	<item
+		android:id="@android:id/mask"
+		android:drawable="@drawable/button_outline_mask" />
+	<item android:drawable="@drawable/button_outline_background" />
+</ripple>

briar-android/src/main/res/drawable-v21/button_outline_background.xml

@@ -0,0 +1,19 @@
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+	android:insetLeft="4dp"
+	android:insetTop="6dp"
+	android:insetRight="4dp"
+	android:insetBottom="6dp">
+	<shape
+		android:shape="rectangle">
+		<corners android:radius="2dp" />
+		<solid android:color="@android:color/transparent" />
+		<stroke
+			android:width="1dp"
+			android:color="@color/briar_button_outline" />
+		<padding
+			android:bottom="4dp"
+			android:left="8dp"
+			android:right="8dp"
+			android:top="4dp" />
+	</shape>
+</inset>

briar-android/src/main/res/drawable-v21/button_outline_mask.xml

@@ -0,0 +1,19 @@
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+	android:insetLeft="4dp"
+	android:insetTop="6dp"
+	android:insetRight="4dp"
+	android:insetBottom="6dp">
+	<shape
+		android:shape="rectangle">
+		<corners android:radius="2dp" />
+		<solid android:color="@android:color/white" />
+		<stroke
+			android:width="1dp"
+			android:color="@android:color/white" />
+		<padding
+			android:bottom="4dp"
+			android:left="8dp"
+			android:right="8dp"
+			android:top="4dp" />
+	</shape>
+</inset>

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

@@ -7,7 +7,7 @@
 		android:radius="32dp"/>
 
 	<solid
-		android:color="?colorTertiary"/>
+		android:color="@color/briar_accent"/>
 
 </shape>
 

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

@@ -7,7 +7,7 @@
 		android:radius="32dp"/>
 
 	<solid
-		android:color="?colorTertiaryContainer"/>
+		android:color="@color/briar_lime_600"/>
 
 </shape>
 

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

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="rectangle">
-
-	<corners
-		android:radius="32dp"/>
-
-	<solid
-		android:color="?colorSurfaceDim"/>
-
-</shape>
-

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item
+		android:bottom="6dp"
+		android:left="4dp"
+		android:right="4dp"
+		android:top="6dp">
+		<shape android:shape="rectangle">
+			<corners android:radius="2dp" />
+			<solid android:color="@android:color/transparent" />
+			<stroke
+				android:width="1dp"
+				android:color="@color/briar_button_outline" />
+		</shape>
+	</item>
+</layer-list>

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

@@ -4,7 +4,6 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:fillViewport="true"
 	tools:context=".android.login.ChangePasswordActivity">
 
 	<androidx.constraintlayout.widget.ConstraintLayout
@@ -65,27 +64,15 @@
 				android:maxLines="1" />
 		</com.google.android.material.textfield.TextInputLayout>
 
-		<org.briarproject.briar.android.login.StrengthMeter
-			android:id="@+id/strength_meter"
-			android:layout_width="match_parent"
-			android:layout_height="10dp"
-			android:layout_marginTop="8dp"
-			android:visibility="invisible"
-			app:layout_constraintLeft_toLeftOf="parent"
-			app:layout_constraintRight_toRightOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/new_password_entry_wrapper"
-			tools:visibility="visible" />
-
 		<com.google.android.material.textfield.TextInputLayout
 			android:id="@+id/new_password_confirm_wrapper"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginTop="8dp"
 			app:errorEnabled="true"
 			app:hintEnabled="false"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/strength_meter"
+			app:layout_constraintTop_toBottomOf="@id/new_password_entry_wrapper"
 			app:passwordToggleEnabled="true">
 
 			<com.google.android.material.textfield.TextInputEditText
@@ -99,6 +86,15 @@
 				android:maxLines="1" />
 		</com.google.android.material.textfield.TextInputLayout>
 
+		<org.briarproject.briar.android.login.StrengthMeter
+			android:id="@+id/strength_meter"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:visibility="invisible"
+			app:layout_constraintLeft_toLeftOf="parent"
+			app:layout_constraintRight_toRightOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/new_password_confirm_wrapper" />
+
 		<Button
 			android:id="@+id/change_password"
 			style="@style/BriarButton"
@@ -107,20 +103,16 @@
 			android:layout_marginTop="@dimen/margin_medium"
 			android:enabled="false"
 			android:text="@string/change_password"
-			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/new_password_confirm_wrapper"
-			app:layout_constraintVertical_bias="1.0"
+			app:layout_constraintTop_toBottomOf="@id/strength_meter"
 			tools:enabled="true" />
 
-		<com.google.android.material.progressindicator.CircularProgressIndicator
+		<ProgressBar
 			android:id="@+id/progress_wheel"
-			style="@style/CircularProgress"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:visibility="invisible"
-			app:layout_constraintBottom_toBottomOf="@+id/change_password"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="parent"
 			app:layout_constraintTop_toTopOf="@id/change_password" />

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

@@ -12,7 +12,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content">
 
-		<com.google.android.material.appbar.MaterialToolbar
+		<androidx.appcompat.widget.Toolbar
 			android:id="@+id/toolbar"
 			style="@style/BriarToolbar"
 			android:layout_width="match_parent"
@@ -40,7 +40,7 @@
 
 			</LinearLayout>
 
-		</com.google.android.material.appbar.MaterialToolbar>
+		</androidx.appcompat.widget.Toolbar>
 
 	</com.google.android.material.appbar.AppBarLayout>
 

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

@@ -35,9 +35,8 @@
 		android:text="@string/create_forum_button"
 		tools:enabled="true" />
 
-	<com.google.android.material.progressindicator.CircularProgressIndicator
+	<ProgressBar
 		android:id="@+id/createForumProgressBar"
-		style="@style/CircularProgress"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center"

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

@@ -18,7 +18,7 @@
 		android:layout_height="wrap_content"
 		android:background="@color/msg_status_bubble_background">
 
-		<com.google.android.material.appbar.MaterialToolbar
+		<androidx.appcompat.widget.Toolbar
 			android:id="@+id/toolbar"
 			style="@style/BriarToolbar"
 			android:layout_width="match_parent"
@@ -50,7 +50,7 @@
 
 			</LinearLayout>
 
-		</com.google.android.material.appbar.MaterialToolbar>
+		</androidx.appcompat.widget.Toolbar>
 
 	</com.google.android.material.appbar.AppBarLayout>
 

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

@@ -5,9 +5,9 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<com.google.android.material.progressindicator.CircularProgressIndicator
+	<ProgressBar
 		android:id="@+id/progressBar"
-		style="@style/CircularProgress.Large"
+		style="?android:progressBarStyleLarge"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center"

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

@@ -19,9 +19,9 @@
 
 	</org.briarproject.briar.android.view.LargeTextInputView>
 
-	<com.google.android.material.progressindicator.CircularProgressIndicator
+	<ProgressBar
 		android:id="@+id/progressBar"
-		style="@style/CircularProgress.Large"
+		style="?android:attr/progressBarStyleLarge"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center"

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

@@ -6,14 +6,12 @@
 
 	<!-- Button gets added programmatically so we can pass on the styles -->
 
-	<com.google.android.material.progressindicator.CircularProgressIndicator
+	<ProgressBar
 		android:id="@+id/briar_button_progress_bar"
-		style="@style/CircularProgress"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center"
 		android:visibility="invisible"
-		tools:progress="50"
 		tools:visibility="visible" />
 
 </merge>

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

@@ -15,9 +15,9 @@
 		tools:listitem="@layout/list_item_contact"
 		tools:visibility="visible" />
 
-	<com.google.android.material.progressindicator.CircularProgressIndicator
+	<ProgressBar
 		android:id="@+id/progressBar"
-		style="@style/CircularProgress.Large"
+		style="?android:attr/progressBarStyleLarge"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		app:layout_constraintBottom_toBottomOf="parent"

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

@@ -21,7 +21,6 @@
 		android:id="@+id/aliasEditLayout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginTop="16dp"
 		app:errorEnabled="true"
 		app:hintEnabled="false">
 
@@ -29,6 +28,7 @@
 			android:id="@+id/aliasEditText"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
+			android:layout_marginTop="16dp"
 			android:hint="@string/set_contact_alias_hint"
 			android:imeOptions="flagNoPersonalizedLearning"
 			android:inputType="text|textCapWords"
@@ -41,7 +41,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginStart="@dimen/margin_xxlarge"
-		android:layout_marginBottom="8dp"
+		android:layout_marginLeft="@dimen/margin_xxlarge"
 		android:gravity="end"
 		android:orientation="horizontal">
 

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

@@ -19,9 +19,9 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content" />
 
-		<com.google.android.material.progressindicator.CircularProgressIndicator
+		<ProgressBar
 			android:id="@+id/progressBar"
-			style="@style/CircularProgress.Large"
+			style="?android:attr/progressBarStyleLarge"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center" />

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

@@ -34,6 +34,7 @@
 				android:text="@string/connect_via_bluetooth_intro"
 				app:layout_constraintBottom_toBottomOf="parent"
 				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintHorizontal_bias="0.5"
 				app:layout_constraintStart_toStartOf="parent"
 				app:layout_constraintTop_toBottomOf="@+id/introImageView" />
 

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

@@ -17,12 +17,12 @@
 		app:layout_constraintVertical_chainStyle="packed"
 		app:srcCompat="@drawable/il_bluetooth_connect" />
 
-	<com.google.android.material.progressindicator.LinearProgressIndicator
+	<ProgressBar
 		android:id="@+id/progressBar"
+		style="?android:attr/progressBarStyleHorizontal"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:indeterminate="true"
-		app:indicatorColor="@color/briar_accent"
 		app:layout_constraintBottom_toTopOf="@+id/textView"
 		app:layout_constraintEnd_toEndOf="@+id/introImageView"
 		app:layout_constraintStart_toStartOf="@+id/introImageView"

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

@@ -18,7 +18,8 @@
 		app:fab_fabDrawable="@drawable/ic_action_add"
 		app:fab_fabRippleColor="@android:color/transparent"
 		app:fab_menu="@menu/contact_list_actions"
-		app:fab_miniFabTextBackground="?attr/colorPrimary"
+		app:fab_miniFabTextBackground="@color/briar_accent"
+		app:fab_miniFabTextColor="@android:color/white"
 		app:layout_anchorGravity="bottom|right|end"
 		app:layout_behavior="org.briarproject.briar.android.view.SnackbarAwareBehavior" />
 

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

@@ -5,7 +5,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<com.google.android.material.appbar.MaterialToolbar
+	<androidx.appcompat.widget.Toolbar
 		android:id="@+id/toolbar"
 		style="@style/BriarToolbar"
 		android:layout_width="match_parent"
@@ -40,7 +40,7 @@
 				app:tint="?attr/colorControlNormal"
 				tools:ignore="ContentDescription" />
 
-			<com.google.android.material.materialswitch.MaterialSwitch
+			<androidx.appcompat.widget.SwitchCompat
 				android:id="@+id/switchDisappearingMessages"
 				android:layout_width="0dp"
 				android:layout_height="wrap_content"
@@ -50,7 +50,6 @@
 				app:layout_constraintEnd_toEndOf="parent"
 				app:layout_constraintStart_toStartOf="parent"
 				app:layout_constraintTop_toBottomOf="@+id/imageViewBomb"
-				tools:checked="true"
 				tools:enabled="true" />
 
 			<Button

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

@@ -35,9 +35,8 @@
 		android:text="@string/groups_create_group_button"
 		tools:enabled="true" />
 
-	<com.google.android.material.progressindicator.CircularProgressIndicator
+	<ProgressBar
 		android:id="@+id/progressBar"
-		style="@style/CircularProgress"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center"

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

@@ -37,9 +37,9 @@
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@+id/fallbackIntro" />
 
-	<com.google.android.material.progressindicator.CircularProgressIndicator
+	<ProgressBar
 		android:id="@+id/progressBar"
-		style="@style/CircularProgress"
+		style="?android:progressBarStyle"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:visibility="invisible"

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

@@ -59,17 +59,19 @@
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:layout_marginHorizontal="@dimen/margin_large"
+			android:drawablePadding="8dp"
 			android:text="@string/hotspot_button_start_sharing"
-			app:icon="@drawable/ic_wifi_tethering"
-			app:iconTint="?attr/colorOnPrimary"
+			app:drawableLeftCompat="@drawable/ic_wifi_tethering"
+			app:drawableStartCompat="@drawable/ic_wifi_tethering"
+			app:drawableTint="@color/button_text"
 			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
 			tools:visibility="visible" />
 
-		<com.google.android.material.progressindicator.CircularProgressIndicator
+		<ProgressBar
 			android:id="@+id/progressBar"
-			style="@style/CircularProgress"
+			style="?android:attr/progressBarStyle"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:visibility="invisible"

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

@@ -76,9 +76,11 @@
 		android:layout_height="wrap_content"
 		android:layout_marginHorizontal="16dp"
 		android:layout_marginTop="6dp"
+		android:drawablePadding="8dp"
 		android:text="@string/hotspot_button_connected"
-		app:icon="@drawable/ic_check_white"
-		app:iconTint="?attr/colorOnPrimary"
+		app:drawableLeftCompat="@drawable/ic_check_white"
+		app:drawableStartCompat="@drawable/ic_check_white"
+		app:drawableTint="@color/button_text"
 		app:layout_constraintBottom_toTopOf="@+id/stopButton"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
@@ -92,9 +94,11 @@
 		android:layout_height="wrap_content"
 		android:layout_marginHorizontal="16dp"
 		android:layout_marginTop="6dp"
+		android:drawablePadding="8dp"
 		android:text="@string/hotspot_button_stop_sharing"
-		app:icon="@drawable/ic_portable_wifi_off"
-		app:iconTint="@color/briar_red_500"
+		app:drawableLeftCompat="@drawable/ic_portable_wifi_off"
+		app:drawableStartCompat="@drawable/ic_portable_wifi_off"
+		app:drawableTint="@color/briar_red_500"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"

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

@@ -27,9 +27,9 @@
 			android:visibility="invisible"
 			tools:visibility="visible">
 
-			<com.google.android.material.progressindicator.CircularProgressIndicator
+			<ProgressBar
 				android:id="@+id/connect_progress"
-				style="@style/CircularProgress.Large"
+				style="?android:attr/progressBarStyleLarge"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				app:layout_constraintBottom_toTopOf="@+id/connect_status"

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

@@ -49,7 +49,7 @@
 				android:layout_height="1dp"
 				android:layout_margin="16dp"
 				android:alpha="0.5"
-				android:background="?colorTertiary"
+				android:background="@color/briar_accent"
 				app:layout_constraintBottom_toBottomOf="@+id/stepOne"
 				app:layout_constraintEnd_toStartOf="@+id/stepTwo"
 				app:layout_constraintStart_toEndOf="@+id/stepOne"
@@ -94,12 +94,12 @@
 				android:layout_width="38dp"
 				android:layout_height="38dp"
 				android:layout_marginTop="8dp"
-				android:background="@drawable/bubble_current"
+				android:background="@drawable/bubble_accent"
 				android:scaleType="center"
 				app:layout_constraintStart_toStartOf="parent"
 				app:layout_constraintTop_toBottomOf="@+id/imageView"
 				app:srcCompat="@drawable/ic_call_made"
-				app:tint="?colorOnTertiary" />
+				app:tint="@android:color/white" />
 
 			<TextView
 				android:id="@+id/yourLink"
@@ -137,10 +137,11 @@
 				style="@style/BriarButtonFlat.Positive.Tiny"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
+				android:drawablePadding="8dp"
 				android:enabled="false"
 				android:text="@string/copy_button"
-				app:icon="@drawable/ic_content_copy"
-				app:iconPadding="8dp"
+				app:drawableLeftCompat="@drawable/ic_content_copy"
+				app:drawableStartCompat="@drawable/ic_content_copy"
 				app:layout_constraintEnd_toStartOf="@id/shareButton"
 				app:layout_constraintHorizontal_bias="1.0"
 				app:layout_constraintHorizontal_chainStyle="packed"
@@ -152,10 +153,11 @@
 				style="@style/BriarButtonFlat.Positive.Tiny"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
+				android:drawablePadding="8dp"
 				android:enabled="false"
 				android:text="@string/share_button"
-				app:icon="@drawable/social_share_blue"
-				app:iconPadding="8dp"
+				app:drawableLeftCompat="@drawable/social_share_blue"
+				app:drawableStartCompat="@drawable/social_share_blue"
 				app:layout_constraintBottom_toBottomOf="@id/copyButton"
 				app:layout_constraintEnd_toEndOf="parent"
 				app:layout_constraintStart_toEndOf="@id/copyButton"
@@ -166,12 +168,12 @@
 				android:layout_width="38dp"
 				android:layout_height="38dp"
 				android:layout_marginTop="16dp"
-				android:background="@drawable/bubble_current"
+				android:background="@drawable/bubble_accent"
 				android:scaleType="center"
 				app:layout_constraintStart_toStartOf="parent"
 				app:layout_constraintTop_toBottomOf="@+id/copyButton"
 				app:srcCompat="@drawable/ic_call_received"
-				app:tint="?colorOnTertiary" />
+				app:tint="@android:color/white" />
 
 			<TextView
 				android:id="@+id/inputLink"
@@ -214,14 +216,15 @@
 				style="@style/BriarButtonFlat.Positive.Tiny"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
+				android:drawablePadding="8dp"
 				android:text="@string/paste_button"
-				app:icon="@drawable/ic_content_paste"
-				app:iconPadding="8dp"
-				app:layout_constraintBottom_toTopOf="@+id/infoView"
+				app:drawableLeftCompat="@drawable/ic_content_paste"
+				app:drawableStartCompat="@drawable/ic_content_paste"
 				app:layout_constraintEnd_toEndOf="parent"
 				app:layout_constraintHorizontal_bias="1.0"
 				app:layout_constraintStart_toStartOf="parent"
 				app:layout_constraintTop_toBottomOf="@+id/linkInputLayout"
+				app:layout_constraintBottom_toTopOf="@+id/infoView"
 				app:layout_constraintVertical_bias="0.0" />
 
 			<org.briarproject.briar.android.view.InfoView