Bump version numbers for 1.5.13 release.

Fix outline buttons to not have green background

Closes #2466

See merge request briar/briar!1830

bramble-android/build.gradle

@@ -13,8 +13,8 @@ android {
 	defaultConfig {
 		minSdkVersion 21
 		targetSdkVersion 33
-		versionCode 10509
-		versionName "1.5.9"
+		versionCode 10513
+		versionName "1.5.13"
 		consumerProguardFiles 'proguard-rules.txt'
 
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -40,7 +40,7 @@ configurations {
 }
 
 dependencies {
-	api 'org.briarproject:dont-kill-me-lib:0.2.7'
+	api 'org.briarproject:dont-kill-me-lib:0.2.8'
 
 	// 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,10 +8,8 @@
 
 	<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 -->
-	<uses-permission
-		android:name="android.permission.BLUETOOTH"
-		android:maxSdkVersion="32" />
+	<!-- 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" />
 	<uses-permission
 		android:name="android.permission.BLUETOOTH_ADMIN"
 		android:maxSdkVersion="30" />

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

@@ -31,7 +31,6 @@ 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
@@ -86,15 +85,10 @@ 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, canVerifyLetsEncryptCerts);
+				MAX_IDLE_TIME);
 	}
 }

bramble-android/witness.gradle

@@ -4,18 +4,16 @@ 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.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.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.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.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: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: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',
@@ -25,16 +23,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.7:dont-kill-me-lib-0.2.7.aar:8a9540941fd927e1c127096a7a9b4aa61ce2f2965d2e24f849be92f9e57213c4',
+		'org.briarproject:dont-kill-me-lib:0.2.8:dont-kill-me-lib-0.2.8.aar:e21173e480ee3f2364c142cc14db8dc6447be91bde9e62e4985c485ea0af9126',
 		'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.0.7:onionwrapper-android-0.0.7.aar:d761854dac454616b3e0ca099b2cd17060365ce4316afe495cc7ae86b6c81d15',
-		'org.briarproject:onionwrapper-core:0.0.7:onionwrapper-core-0.0.7.jar:918b5851f4a05a3bc0835bc7c81d70e598a178c79856fe5c506c261889f4b3fd',
-		'org.briarproject:snowflake-android:2.5.1:snowflake-android-2.5.1.jar:88ec81c17b1b6fa884d06839dec0330e328b45c89f88c970a213ce91ca8eac87',
+		'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.checkerframework:checker-compat-qual:2.5.5:checker-compat-qual-2.5.5.jar:11d134b245e9cacc474514d2d66b5b8618f8039a1465cdc55bbc0b34e0008b7a',
-		'org.checkerframework:checker-qual:3.12.0:checker-qual-3.12.0.jar:ff10785ac2a357ec5de9c293cb982a2cbb605c0309ea4cc1cb9b9bc6dbe7f3cb',
+		'org.checkerframework:checker-qual:3.41.0:checker-qual-3.41.0.jar:2f9f245bf68e4259d610894f2406dc1f6363dc639302bd566e8272e4f4541172',
 		'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',
@@ -43,14 +41,12 @@ 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.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.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: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,6 +46,7 @@ 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.45:dagger-2.45.jar:f011cae7d2c0fb7ea17c34e05bc10e768b1081a5892ad019cf1fdb0e125c49c1',
+		'com.google.dagger:dagger:2.51.1:dagger-2.51.1.jar:c3891a4c4a4e48682888ca321eaf8497004b286e1d9a2936867373219f7dd86d',
 		'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,7 +75,6 @@ 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;
@@ -106,7 +105,6 @@ 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);
 
@@ -126,8 +124,7 @@ class TorPlugin implements DuplexPlugin, EventListener {
 			TorWrapper tor,
 			PluginCallback callback,
 			long maxLatency,
-			int maxIdleTime,
-			boolean canVerifyLetsEncryptCerts) {
+			int maxIdleTime) {
 		this.ioExecutor = ioExecutor;
 		this.wakefulIoExecutor = wakefulIoExecutor;
 		this.networkManager = networkManager;
@@ -141,7 +138,6 @@ 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 {
@@ -297,7 +293,7 @@ class TorPlugin implements DuplexPlugin, EventListener {
 			List<String> bridges = new ArrayList<>();
 			for (BridgeType bridgeType : bridgeTypes) {
 				bridges.addAll(circumventionProvider.getBridges(bridgeType,
-						countryCode, canVerifyLetsEncryptCerts));
+						countryCode));
 			}
 			tor.enableBridges(bridges);
 		}
@@ -491,8 +487,8 @@ class TorPlugin implements DuplexPlugin, EventListener {
 			boolean wifi = status.isWifi();
 			boolean ipv6Only = status.isIpv6Only();
 			String country = locationUtils.getCurrentCountry();
-			boolean blocked =
-					circumventionProvider.isTorProbablyBlocked(country);
+			boolean bridgesByDefault =
+					circumventionProvider.shouldUseBridges(country);
 			boolean enabledByUser = settings.getBoolean(PREF_PLUGIN_ENABLE,
 					DEFAULT_PREF_PLUGIN_ENABLE);
 			int network = settings.getInt(PREF_TOR_NETWORK,
@@ -502,7 +498,6 @@ 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)) {
@@ -532,10 +527,6 @@ 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");
@@ -543,7 +534,7 @@ class TorPlugin implements DuplexPlugin, EventListener {
 					LOG.info("Enabling network");
 					enableNetwork = true;
 					if (network == PREF_TOR_NETWORK_WITH_BRIDGES ||
-							(automatic && bridgesWork)) {
+							(automatic && bridgesByDefault)) {
 						if (ipv6Only) {
 							bridgeTypes = asList(MEEK, SNOWFLAKE);
 						} else {

bramble-core/witness.gradle

@@ -6,22 +6,20 @@ 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.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.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.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.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: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: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.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.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: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',
@@ -36,10 +34,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.0.7:onionwrapper-core-0.0.7.jar:918b5851f4a05a3bc0835bc7c81d70e598a178c79856fe5c506c261889f4b3fd',
+		'org.briarproject:onionwrapper-core:0.1.1:onionwrapper-core-0.1.1.jar:176b7c159a45f6397810a1f93f040b3e17fdbc6645b0d189204777920719464b',
 		'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.12.0:checker-qual-3.12.0.jar:ff10785ac2a357ec5de9c293cb982a2cbb605c0309ea4cc1cb9b9bc6dbe7f3cb',
+		'org.checkerframework:checker-qual:3.41.0:checker-qual-3.41.0.jar:2f9f245bf68e4259d610894f2406dc1f6363dc639302bd566e8272e4f4541172',
 		'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',
@@ -48,17 +46,13 @@ 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.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.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: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,7 +19,6 @@ 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;
@@ -80,6 +79,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, true);
+				MAX_LATENCY, MAX_IDLE_TIME);
 	}
 }

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, true);
+				MAX_LATENCY, MAX_IDLE_TIME);
 	}
 }

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, true);
+				MAX_LATENCY, MAX_IDLE_TIME);
 	}
 }

bramble-java/witness.gradle

@@ -3,18 +3,16 @@ 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.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.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.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.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: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: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',
@@ -27,19 +25,17 @@ 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.0.7:onionwrapper-core-0.0.7.jar:918b5851f4a05a3bc0835bc7c81d70e598a178c79856fe5c506c261889f4b3fd',
-		'org.briarproject:onionwrapper-java:0.0.7:onionwrapper-java-0.0.7.jar:48115772d4348eab6f35e562ae648dd9d7398adb99e5429afb64a62c82f3d27c',
+		'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.checkerframework:checker-compat-qual:2.5.5:checker-compat-qual-2.5.5.jar:11d134b245e9cacc474514d2d66b5b8618f8039a1465cdc55bbc0b34e0008b7a',
-		'org.checkerframework:checker-qual:3.12.0:checker-qual-3.12.0.jar:ff10785ac2a357ec5de9c293cb982a2cbb605c0309ea4cc1cb9b9bc6dbe7f3cb',
+		'org.checkerframework:checker-qual:3.41.0:checker-qual-3.41.0.jar:2f9f245bf68e4259d610894f2406dc1f6363dc639302bd566e8272e4f4541172',
 		'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-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.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: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 = pt_BR: pt-rBR, nb_NO: nb, zh-Hans: zh-rCN, zh-Hant: zh-rTW
+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
 
 [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 {
-	compileSdkVersion 33
+	compileSdk 33
 	buildToolsVersion '33.0.0'
 
 	packagingOptions {
@@ -26,8 +26,8 @@ android {
 	defaultConfig {
 		minSdkVersion 21
 		targetSdkVersion 33
-		versionCode 10509
-		versionName "1.5.9"
+		versionCode 10513
+		versionName "1.5.13"
 		applicationId "org.briarproject.briar.android"
 		buildConfigField "String", "TorVersion", "\"$tor_version\""
 
@@ -108,16 +108,15 @@ dependencies {
 	implementation project(':bramble-android')
 	implementation project(':briar-core')
 
-	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'
+	// 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.constraintlayout:constraintlayout:2.1.4'
-	// 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 'com.google.android.material:material:1.9.0'
 	implementation 'androidx.recyclerview:recyclerview-selection:1.1.0'
 
 	// force kotlin standard lib to latest version to prevent jetifier issues
@@ -131,7 +130,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.14.2'
+	def glideVersion = '4.16.0'
 	implementation("com.github.bumptech.glide:glide:$glideVersion") {
 		exclude group: 'com.android.support'
 		exclude module: 'disklrucache' // when there's no disk cache, we can't accidentally use it

briar-android/src/main/AndroidManifest.xml

@@ -109,12 +109,12 @@
 		<activity
 			android:name="org.briarproject.briar.android.login.StartupActivity"
 			android:exported="false"
-			android:label="@string/app_name" />
+			android:theme="@style/BriarTheme.NoActionBar" />
 
 		<activity
 			android:name="org.briarproject.briar.android.account.SetupActivity"
 			android:exported="false"
-			android:label="@string/setup_title" />
+			android:theme="@style/BriarTheme.NoActionBar" />
 
 		<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_light_value));
+					appContext.getString(R.string.pref_theme_system_value));
 		}
 	}
 }

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

@@ -33,6 +33,7 @@ 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 {
@@ -109,11 +110,11 @@ public class BriarApplicationImpl extends Application
 	}
 
 	private void setTheme(Context ctx, SharedPreferences prefs) {
-		String theme = prefs.getString("pref_key_theme", null);
+		String theme = prefs.getString(PREF_THEME, null);
 		if (theme == null) {
 			// set default value
-			theme = getString(R.string.pref_theme_light_value);
-			prefs.edit().putString("pref_key_theme", theme).apply();
+			theme = getString(R.string.pref_theme_system_value);
+			prefs.edit().putString(PREF_THEME, theme).apply();
 		}
 		// set theme
 		UiUtils.setTheme(ctx, theme);

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

@@ -18,7 +18,9 @@ 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
@@ -38,19 +40,27 @@ 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,6 +23,7 @@ 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
@@ -79,6 +80,12 @@ 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/SetPasswordFragment.java

@@ -28,10 +28,12 @@ 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
@@ -57,7 +59,6 @@ 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);
 
@@ -67,17 +68,18 @@ 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()
@@ -94,6 +96,12 @@ 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;
@@ -110,17 +118,27 @@ public class SetPasswordFragment extends SetupFragment {
 		String password2 = passwordConfirmation.getText().toString();
 		boolean passwordsMatch = password1.equals(password2);
 
-		strengthMeter
-				.setVisibility(password1.length() > 0 ? VISIBLE : INVISIBLE);
+		strengthMeter.setVisibility(!password1.isEmpty() ? 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.length() > 0 && !strongEnough);
+				!password1.isEmpty() && !strongEnough);
 		setError(passwordConfirmationWrapper,
 				getString(R.string.passwords_do_not_match),
-				password2.length() > 0 && !passwordsMatch);
+				!password2.isEmpty() && !passwordsMatch);
 
 		boolean enabled = passwordsMatch && strongEnough;
 		nextButton.setEnabled(enabled);

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

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

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

@@ -7,6 +7,8 @@ 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;
@@ -177,8 +179,8 @@ public abstract class BriarActivity extends BaseActivity {
 	}
 
 	protected void showDozeDialog(@StringRes int message) {
-		AlertDialog.Builder b =
-				new AlertDialog.Builder(this, R.style.BriarDialogTheme);
+		MaterialAlertDialogBuilder b =
+				new MaterialAlertDialogBuilder(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,6 +10,8 @@ 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;
@@ -27,7 +29,6 @@ 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;
@@ -220,8 +221,8 @@ public class BlogFragment extends BaseFragment
 	}
 
 	private void showDeleteDialog() {
-		AlertDialog.Builder builder = new AlertDialog.Builder(requireContext(),
-				R.style.BriarDialogTheme);
+		MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(
+				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,6 +4,8 @@ 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;
@@ -13,7 +15,6 @@ 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;
 
@@ -51,8 +52,8 @@ public class RssFeedDeleteFeedDialogFragment extends DialogFragment {
 	public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
 		GroupId groupId = new GroupId(
 				requireNonNull(requireArguments().getByteArray(GROUP_ID)));
-		AlertDialog.Builder builder = new AlertDialog.Builder(requireActivity(),
-				R.style.BriarDialogTheme);
+		MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(
+				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,6 +4,8 @@ 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;
@@ -12,7 +14,6 @@ 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;
 
@@ -47,8 +48,8 @@ public class RssFeedImportFailedDialogFragment extends DialogFragment {
 
 	@Override
 	public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
-		AlertDialog.Builder builder =
-				new AlertDialog.Builder(requireActivity(),
+		MaterialAlertDialogBuilder builder =
+				new MaterialAlertDialogBuilder(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,6 +55,7 @@ public class NicknameFragment extends BaseFragment {
 
 	private TextInputLayout contactNameLayout;
 	private TextInputEditText contactNameInput;
+	private BriarButton addButton;
 
 	@Override
 	public String getUniqueTag() {
@@ -91,7 +92,7 @@ public class NicknameFragment extends BaseFragment {
 		contactNameLayout = v.findViewById(R.id.contactNameLayout);
 		contactNameInput = v.findViewById(R.id.contactNameInput);
 
-		BriarButton addButton = v.findViewById(R.id.addButton);
+		addButton = v.findViewById(R.id.addButton);
 		addButton.setOnClickListener(view -> onAddButtonClicked());
 
 		return v;
@@ -112,7 +113,7 @@ public class NicknameFragment extends BaseFragment {
 	@Nullable
 	private String getNicknameOrNull() {
 		Editable text = contactNameInput.getText();
-		if (text == null || text.toString().trim().length() == 0) {
+		if (text == null || text.toString().trim().isEmpty()) {
 			contactNameLayout.setError(getString(R.string.nickname_missing));
 			contactNameInput.requestFocus();
 			return null;
@@ -129,7 +130,10 @@ public class NicknameFragment extends BaseFragment {
 
 	private void onAddButtonClicked() {
 		String name = getNicknameOrNull();
-		if (name == null) return;  // invalid nickname
+		if (name == null) { // invalid nickname
+			addButton.reset();
+			return;
+		}
 
 		LifecycleOwner owner = getViewLifecycleOwner();
 		viewModel.getAddContactResult().observe(owner, result -> {

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

@@ -4,6 +4,7 @@ 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;
@@ -21,7 +22,6 @@ 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());
-		AlertDialog.Builder builder = new AlertDialog.Builder(
+		MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(
 				PendingContactListActivity.this, R.style.BriarDialogTheme);
 		builder.setTitle(
 				getString(R.string.dialog_title_remove_pending_contact));

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

@@ -19,6 +19,7 @@ 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;
@@ -101,7 +102,6 @@ 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() {
-		AlertDialog.Builder builder =
-				new AlertDialog.Builder(this, R.style.BriarDialogTheme);
+		MaterialAlertDialogBuilder builder =
+				new MaterialAlertDialogBuilder(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
-		AlertDialog.Builder builder =
-				new AlertDialog.Builder(this, R.style.BriarDialogTheme);
+		MaterialAlertDialogBuilder builder =
+				new MaterialAlertDialogBuilder(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();
-		AlertDialog.Builder builder =
-				new AlertDialog.Builder(ConversationActivity.this,
+		MaterialAlertDialogBuilder builder =
+				new MaterialAlertDialogBuilder(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/forum/ForumActivity.java

@@ -7,6 +7,8 @@ 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;
@@ -20,7 +22,6 @@ 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;
 
@@ -128,7 +129,7 @@ public class ForumActivity extends
 
 	private void showUnsubscribeDialog() {
 		OnClickListener okListener = (dialog, which) -> viewModel.deleteForum();
-		AlertDialog.Builder builder = new AlertDialog.Builder(this,
+		MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(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,6 +13,8 @@ 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;
@@ -27,7 +29,6 @@ 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;
@@ -75,8 +76,8 @@ public class ScreenFilterDialogFragment extends DialogFragment {
 	public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
 		Activity activity = getActivity();
 		if (activity == null) throw new IllegalStateException();
-		AlertDialog.Builder builder = new AlertDialog.Builder(activity,
-				R.style.BriarDialogThemeNoFilter);
+		MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(
+				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,12 +6,13 @@ 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;
 
@@ -73,7 +74,8 @@ abstract class AbstractConditionManager {
 	void showRationale(Context ctx, @StringRes int title,
 			@StringRes int body, Runnable onContinueClicked,
 			Runnable onDismiss) {
-		AlertDialog.Builder builder = new AlertDialog.Builder(ctx);
+		MaterialAlertDialogBuilder builder =
+				new MaterialAlertDialogBuilder(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,6 +61,7 @@ public class HotspotIntroFragment extends Fragment {
 		getAndroidComponent(activity).inject(this);
 		viewModel = new ViewModelProvider(activity, viewModelFactory)
 				.get(HotspotViewModel.class);
+		conditionManager.init(requireActivity());
 	}
 
 	@Override
@@ -76,8 +77,6 @@ public class HotspotIntroFragment extends Fragment {
 
 		startButton.setOnClickListener(this::onButtonClick);
 
-		conditionManager.init(requireActivity());
-
 		return v;
 	}
 

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

@@ -32,6 +32,7 @@ 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;
@@ -123,12 +124,25 @@ 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.length() > 0 && strength < QUITE_WEAK);
+				!firstPassword.isEmpty() && strength < QUITE_WEAK);
 		setError(newPasswordConfirmationWrapper,
 				getString(R.string.passwords_do_not_match),
-				secondPassword.length() > 0 && !passwordsMatch);
+				!secondPassword.isEmpty() && !passwordsMatch);
 		changePasswordButton.setEnabled(
 				!currentPassword.getText().toString().isEmpty() &&
 						passwordsMatch && strength >= QUITE_WEAK);

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

@@ -2,6 +2,8 @@ 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;
 
@@ -13,8 +15,8 @@ import static org.briarproject.briar.android.util.UiUtils.getDialogIcon;
 class LoginUtils {
 
 	static AlertDialog createKeyStrengthenerErrorDialog(Context ctx) {
-		AlertDialog.Builder builder =
-				new AlertDialog.Builder(ctx, R.style.BriarDialogTheme);
+		MaterialAlertDialogBuilder builder =
+				new MaterialAlertDialogBuilder(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,6 +9,7 @@ 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;
 
@@ -40,6 +41,7 @@ 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;
 
@@ -100,6 +102,12 @@ 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) {
@@ -147,9 +155,11 @@ public class PasswordFragment extends BaseFragment implements TextWatcher {
 	}
 
 	private void onForgottenPasswordClick() {
-		AlertDialog.Builder builder = new AlertDialog.Builder(requireContext(),
-				R.style.BriarDialogTheme);
+		MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(
+				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,5 +1,6 @@
 package org.briarproject.briar.android.login;
 
+import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.os.Bundle;
 
@@ -74,6 +75,7 @@ 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,6 +11,7 @@ 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;
@@ -24,7 +25,6 @@ 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) {
-		AlertDialog.Builder builder = new AlertDialog.Builder(requireContext(),
-				R.style.BriarDialogTheme);
+		MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(
+				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,6 +5,8 @@ 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;
@@ -31,7 +33,6 @@ 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;
@@ -249,8 +250,8 @@ public class MailboxActivity extends BriarActivity {
 		if (tellUserToWipeMailbox) {
 			showFragment(getSupportFragmentManager(), new BlankFragment(),
 					BlankFragment.TAG);
-			AlertDialog.Builder builder =
-					new AlertDialog.Builder(this, R.style.BriarDialogTheme);
+			MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(
+					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,6 +13,8 @@ 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;
@@ -214,8 +216,8 @@ public class MailboxStatusFragment extends Fragment {
 	}
 
 	private void onUnlinkButtonClicked(boolean showWarning) {
-		AlertDialog.Builder builder = new AlertDialog.Builder(requireContext(),
-				R.style.BriarDialogTheme);
+		MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(
+				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/panic/PanicPreferencesFragment.java

@@ -10,6 +10,8 @@ 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;
@@ -17,7 +19,6 @@ 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;
@@ -201,8 +202,8 @@ public class PanicPreferencesFragment extends PreferenceFragmentCompat
 			getActivity().finish();
 		};
 
-		AlertDialog.Builder builder = new AlertDialog.Builder(getContext(),
-				R.style.BriarDialogTheme);
+		MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(
+				requireContext(), 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,6 +6,8 @@ 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;
@@ -20,7 +22,6 @@ 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;
 
@@ -178,8 +179,8 @@ public class GroupActivity extends
 	}
 
 	private void showLeaveGroupDialog() {
-		AlertDialog.Builder builder =
-				new AlertDialog.Builder(this, R.style.BriarDialogTheme);
+		MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(
+				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,
@@ -189,8 +190,8 @@ public class GroupActivity extends
 	}
 
 	private void showDissolveGroupDialog() {
-		AlertDialog.Builder builder =
-				new AlertDialog.Builder(this, R.style.BriarDialogTheme);
+		MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(
+				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,
@@ -206,8 +207,8 @@ public class GroupActivity extends
 	}
 
 	private void onGroupDissolved() {
-		AlertDialog.Builder builder =
-				new AlertDialog.Builder(this, R.style.BriarDialogTheme);
+		MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(
+				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,6 +9,8 @@ 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;
@@ -26,7 +28,6 @@ import javax.annotation.Nullable;
 import javax.inject.Inject;
 
 import androidx.annotation.LayoutRes;
-import androidx.appcompat.app.AlertDialog;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
@@ -105,7 +106,8 @@ public class RevealContactsActivity extends ContactSelectorActivity
 	}
 
 	private void showOnboardingDialog() {
-		new AlertDialog.Builder(this, R.style.OnboardingDialogTheme)
+		new MaterialAlertDialogBuilder(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/reporting/CrashReportActivity.java

@@ -1,5 +1,6 @@
 package org.briarproject.briar.android.reporting;
 
+import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
@@ -87,6 +88,7 @@ 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,6 +10,7 @@ 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;
@@ -20,7 +21,6 @@ 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 AlertDialog.Builder(activity, theme)
+		return new MaterialAlertDialogBuilder(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,21 +1,19 @@
 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;
@@ -24,10 +22,7 @@ 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;
@@ -36,10 +31,7 @@ import static org.briarproject.briar.android.settings.SettingsActivity.EXTRA_THE
 public class DisplayFragment extends PreferenceFragmentCompat {
 
 	public static final String PREF_LANGUAGE = "pref_key_language";
-	private static final String PREF_THEME = "pref_key_theme";
-
-	private static final Logger LOG =
-			getLogger(DisplayFragment.class.getName());
+	public static final String PREF_THEME = "pref_key_theme";
 
 	@Override
 	public void onCreatePreferences(Bundle bundle, String s) {
@@ -50,7 +42,6 @@ public class DisplayFragment extends PreferenceFragmentCompat {
 		language.setOnPreferenceChangeListener(this::onLanguageChanged);
 
 		ListPreference theme = requireNonNull(findPreference(PREF_THEME));
-		setThemeEntries(theme);
 		theme.setOnPreferenceChangeListener(this::onThemeChanged);
 	}
 
@@ -91,30 +82,6 @@ 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();
@@ -135,8 +102,8 @@ public class DisplayFragment extends PreferenceFragmentCompat {
 	private boolean onLanguageChanged(Preference preference, Object newValue) {
 		ListPreference language = (ListPreference) preference;
 		if (!language.getValue().equals(newValue)) {
-			AlertDialog.Builder builder =
-					new AlertDialog.Builder(getActivity());
+			MaterialAlertDialogBuilder builder =
+					new MaterialAlertDialogBuilder(requireContext());
 			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/TorSummaryProvider.java

@@ -40,15 +40,12 @@ class TorSummaryProvider implements SummaryProvider<ListPreference> {
 		String country = locationUtils.getCurrentCountry();
 		String countryName = getCountryDisplayName(country);
 
-		boolean blocked =
-				circumventionProvider.isTorProbablyBlocked(country);
-		boolean useBridges = circumventionProvider.doBridgesWork(country);
+		boolean useBridgesByDefault =
+				circumventionProvider.shouldUseBridges(country);
 		String setting =
 				ctx.getString(R.string.tor_network_setting_without_bridges);
-		if (blocked && useBridges) {
+		if (useBridgesByDefault) {
 			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/util/BriarSnackbarBuilder.java

@@ -18,7 +18,8 @@ import static androidx.core.content.ContextCompat.getColor;
 public class BriarSnackbarBuilder {
 
 	@ColorRes
-	private int backgroundResId = R.color.briar_primary;
+	@Nullable
+	private Integer backgroundResId = null;
 	@StringRes
 	private int actionResId;
 	@Nullable
@@ -26,7 +27,11 @@ public class BriarSnackbarBuilder {
 
 	public Snackbar make(View view, CharSequence text, int duration) {
 		Snackbar s = Snackbar.make(view, text, duration);
-		s.getView().setBackgroundResource(backgroundResId);
+		if (backgroundResId != null) {
+			s.setBackgroundTint(getColor(view.getContext(), backgroundResId));
+			s.setTextColor(
+					getColor(view.getContext(), R.color.md_theme_onSecondary));
+		}
 		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,6 +6,8 @@ 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;
@@ -16,7 +18,6 @@ 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;
@@ -108,8 +109,8 @@ public class PermissionUtils {
 	}
 
 	public static void showLocationDialog(Context ctx, boolean forBluetooth) {
-		AlertDialog.Builder builder =
-				new AlertDialog.Builder(ctx, R.style.BriarDialogTheme);
+		MaterialAlertDialogBuilder builder =
+				new MaterialAlertDialogBuilder(ctx, R.style.BriarDialogTheme);
 		builder.setTitle(R.string.permission_location_setting_title);
 		if (forBluetooth) {
 			builder.setMessage(R.string.permission_location_setting_body);
@@ -136,8 +137,8 @@ public class PermissionUtils {
 
 	public static void showDenialDialog(FragmentActivity ctx,
 			@StringRes int title, @StringRes int body, Runnable onDenied) {
-		AlertDialog.Builder builder =
-				new AlertDialog.Builder(ctx, R.style.BriarDialogTheme);
+		MaterialAlertDialogBuilder builder =
+				new MaterialAlertDialogBuilder(ctx, R.style.BriarDialogTheme);
 		builder.setTitle(title);
 		builder.setMessage(body);
 		builder.setPositiveButton(R.string.ok, getGoToSettingsListener(ctx));
@@ -148,8 +149,8 @@ public class PermissionUtils {
 
 	public static void showRationale(FragmentActivity ctx, @StringRes int title,
 			@StringRes int body, @Nullable Runnable onOk) {
-		AlertDialog.Builder builder =
-				new AlertDialog.Builder(ctx, R.style.BriarDialogTheme);
+		MaterialAlertDialogBuilder builder =
+				new MaterialAlertDialogBuilder(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,6 +28,7 @@ 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;
@@ -52,7 +53,6 @@ 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,7 +92,6 @@ 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;
@@ -323,7 +322,7 @@ public class UiUtils {
 	}
 
 	public static void showOnboardingDialog(Context ctx, String text) {
-		new AlertDialog.Builder(ctx, R.style.OnboardingDialogTheme)
+		new MaterialAlertDialogBuilder(ctx, R.style.OnboardingDialogTheme)
 				.setMessage(text)
 				.setNeutralButton(R.string.got_it,
 						(dialog, which) -> dialog.cancel())
@@ -349,12 +348,7 @@ public class UiUtils {
 		} else if (theme
 				.equals(ctx.getString(R.string.pref_theme_dark_value))) {
 			setDefaultNightMode(MODE_NIGHT_YES);
-		} 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))) {
+		} else {
 			setDefaultNightMode(MODE_NIGHT_FOLLOW_SYSTEM);
 		}
 	}

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

@@ -8,12 +8,13 @@ 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;
@@ -47,8 +48,7 @@ public class BriarButton extends FrameLayout {
 		attributes.recycle();
 
 		ContextThemeWrapper wrapper = new ContextThemeWrapper(context, style);
-		button = isInEditMode() ? new AppCompatButton(context) :
-				new AppCompatButton(wrapper, null, style);
+		button = new MaterialButton(wrapper, null, style);
 		button.setText(text);
 		addView(button);
 		progressBar = findViewById(R.id.briar_button_progress_bar);

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

@@ -1,9 +0,0 @@
-<?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

@@ -1,7 +0,0 @@
-<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

@@ -1,19 +0,0 @@
-<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

@@ -1,19 +0,0 @@
-<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_completed.xml

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

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

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

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

@@ -0,0 +1,13 @@
+<?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

@@ -1,16 +0,0 @@
-<?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,6 +4,7 @@
 	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
@@ -64,15 +65,27 @@
 				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/new_password_entry_wrapper"
+			app:layout_constraintTop_toBottomOf="@id/strength_meter"
 			app:passwordToggleEnabled="true">
 
 			<com.google.android.material.textfield.TextInputEditText
@@ -86,15 +99,6 @@
 				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"
@@ -103,16 +107,20 @@
 			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/strength_meter"
+			app:layout_constraintTop_toBottomOf="@id/new_password_confirm_wrapper"
+			app:layout_constraintVertical_bias="1.0"
 			tools:enabled="true" />
 
-		<ProgressBar
+		<com.google.android.material.progressindicator.CircularProgressIndicator
 			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">
 
-		<androidx.appcompat.widget.Toolbar
+		<com.google.android.material.appbar.MaterialToolbar
 			android:id="@+id/toolbar"
 			style="@style/BriarToolbar"
 			android:layout_width="match_parent"
@@ -40,7 +40,7 @@
 
 			</LinearLayout>
 
-		</androidx.appcompat.widget.Toolbar>
+		</com.google.android.material.appbar.MaterialToolbar>
 
 	</com.google.android.material.appbar.AppBarLayout>
 

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

@@ -35,8 +35,9 @@
 		android:text="@string/create_forum_button"
 		tools:enabled="true" />
 
-	<ProgressBar
+	<com.google.android.material.progressindicator.CircularProgressIndicator
 		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">
 
-		<androidx.appcompat.widget.Toolbar
+		<com.google.android.material.appbar.MaterialToolbar
 			android:id="@+id/toolbar"
 			style="@style/BriarToolbar"
 			android:layout_width="match_parent"
@@ -50,7 +50,7 @@
 
 			</LinearLayout>
 
-		</androidx.appcompat.widget.Toolbar>
+		</com.google.android.material.appbar.MaterialToolbar>
 
 	</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">
 
-	<ProgressBar
+	<com.google.android.material.progressindicator.CircularProgressIndicator
 		android:id="@+id/progressBar"
-		style="?android:progressBarStyleLarge"
+		style="@style/CircularProgress.Large"
 		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>
 
-	<ProgressBar
+	<com.google.android.material.progressindicator.CircularProgressIndicator
 		android:id="@+id/progressBar"
-		style="?android:attr/progressBarStyleLarge"
+		style="@style/CircularProgress.Large"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center"

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

@@ -6,12 +6,14 @@
 
 	<!-- Button gets added programmatically so we can pass on the styles -->
 
-	<ProgressBar
+	<com.google.android.material.progressindicator.CircularProgressIndicator
 		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" />
 
-	<ProgressBar
+	<com.google.android.material.progressindicator.CircularProgressIndicator
 		android:id="@+id/progressBar"
-		style="?android:attr/progressBarStyleLarge"
+		style="@style/CircularProgress.Large"
 		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,6 +21,7 @@
 		android:id="@+id/aliasEditLayout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:layout_marginTop="16dp"
 		app:errorEnabled="true"
 		app:hintEnabled="false">
 
@@ -28,7 +29,6 @@
 			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_marginLeft="@dimen/margin_xxlarge"
+		android:layout_marginBottom="8dp"
 		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" />
 
-		<ProgressBar
+		<com.google.android.material.progressindicator.CircularProgressIndicator
 			android:id="@+id/progressBar"
-			style="?android:attr/progressBarStyleLarge"
+			style="@style/CircularProgress.Large"
 			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,7 +34,6 @@
 				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" />
 
-	<ProgressBar
+	<com.google.android.material.progressindicator.LinearProgressIndicator
 		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,8 +18,7 @@
 		app:fab_fabDrawable="@drawable/ic_action_add"
 		app:fab_fabRippleColor="@android:color/transparent"
 		app:fab_menu="@menu/contact_list_actions"
-		app:fab_miniFabTextBackground="@color/briar_accent"
-		app:fab_miniFabTextColor="@android:color/white"
+		app:fab_miniFabTextBackground="?attr/colorPrimary"
 		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">
 
-	<androidx.appcompat.widget.Toolbar
+	<com.google.android.material.appbar.MaterialToolbar
 		android:id="@+id/toolbar"
 		style="@style/BriarToolbar"
 		android:layout_width="match_parent"
@@ -40,7 +40,7 @@
 				app:tint="?attr/colorControlNormal"
 				tools:ignore="ContentDescription" />
 
-			<androidx.appcompat.widget.SwitchCompat
+			<com.google.android.material.materialswitch.MaterialSwitch
 				android:id="@+id/switchDisappearingMessages"
 				android:layout_width="0dp"
 				android:layout_height="wrap_content"
@@ -50,6 +50,7 @@
 				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,8 +35,9 @@
 		android:text="@string/groups_create_group_button"
 		tools:enabled="true" />
 
-	<ProgressBar
+	<com.google.android.material.progressindicator.CircularProgressIndicator
 		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" />
 
-	<ProgressBar
+	<com.google.android.material.progressindicator.CircularProgressIndicator
 		android:id="@+id/progressBar"
-		style="?android:progressBarStyle"
+		style="@style/CircularProgress"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:visibility="invisible"

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

@@ -59,19 +59,17 @@
 			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:drawableLeftCompat="@drawable/ic_wifi_tethering"
-			app:drawableStartCompat="@drawable/ic_wifi_tethering"
-			app:drawableTint="@color/button_text"
+			app:icon="@drawable/ic_wifi_tethering"
+			app:iconTint="?attr/colorOnPrimary"
 			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
 			tools:visibility="visible" />
 
-		<ProgressBar
+		<com.google.android.material.progressindicator.CircularProgressIndicator
 			android:id="@+id/progressBar"
-			style="?android:attr/progressBarStyle"
+			style="@style/CircularProgress"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:visibility="invisible"

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

@@ -76,11 +76,9 @@
 		android:layout_height="wrap_content"
 		android:layout_marginHorizontal="16dp"
 		android:layout_marginTop="6dp"
-		android:drawablePadding="8dp"
 		android:text="@string/hotspot_button_connected"
-		app:drawableLeftCompat="@drawable/ic_check_white"
-		app:drawableStartCompat="@drawable/ic_check_white"
-		app:drawableTint="@color/button_text"
+		app:icon="@drawable/ic_check_white"
+		app:iconTint="?attr/colorOnPrimary"
 		app:layout_constraintBottom_toTopOf="@+id/stopButton"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
@@ -94,11 +92,9 @@
 		android:layout_height="wrap_content"
 		android:layout_marginHorizontal="16dp"
 		android:layout_marginTop="6dp"
-		android:drawablePadding="8dp"
 		android:text="@string/hotspot_button_stop_sharing"
-		app:drawableLeftCompat="@drawable/ic_portable_wifi_off"
-		app:drawableStartCompat="@drawable/ic_portable_wifi_off"
-		app:drawableTint="@color/briar_red_500"
+		app:icon="@drawable/ic_portable_wifi_off"
+		app:iconTint="@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">
 
-			<ProgressBar
+			<com.google.android.material.progressindicator.CircularProgressIndicator
 				android:id="@+id/connect_progress"
-				style="?android:attr/progressBarStyleLarge"
+				style="@style/CircularProgress.Large"
 				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="@color/briar_accent"
+				android:background="?colorTertiary"
 				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_accent"
+				android:background="@drawable/bubble_current"
 				android:scaleType="center"
 				app:layout_constraintStart_toStartOf="parent"
 				app:layout_constraintTop_toBottomOf="@+id/imageView"
 				app:srcCompat="@drawable/ic_call_made"
-				app:tint="@android:color/white" />
+				app:tint="?colorOnTertiary" />
 
 			<TextView
 				android:id="@+id/yourLink"
@@ -137,11 +137,10 @@
 				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:drawableLeftCompat="@drawable/ic_content_copy"
-				app:drawableStartCompat="@drawable/ic_content_copy"
+				app:icon="@drawable/ic_content_copy"
+				app:iconPadding="8dp"
 				app:layout_constraintEnd_toStartOf="@id/shareButton"
 				app:layout_constraintHorizontal_bias="1.0"
 				app:layout_constraintHorizontal_chainStyle="packed"
@@ -153,11 +152,10 @@
 				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:drawableLeftCompat="@drawable/social_share_blue"
-				app:drawableStartCompat="@drawable/social_share_blue"
+				app:icon="@drawable/social_share_blue"
+				app:iconPadding="8dp"
 				app:layout_constraintBottom_toBottomOf="@id/copyButton"
 				app:layout_constraintEnd_toEndOf="parent"
 				app:layout_constraintStart_toEndOf="@id/copyButton"
@@ -168,12 +166,12 @@
 				android:layout_width="38dp"
 				android:layout_height="38dp"
 				android:layout_marginTop="16dp"
-				android:background="@drawable/bubble_accent"
+				android:background="@drawable/bubble_current"
 				android:scaleType="center"
 				app:layout_constraintStart_toStartOf="parent"
 				app:layout_constraintTop_toBottomOf="@+id/copyButton"
 				app:srcCompat="@drawable/ic_call_received"
-				app:tint="@android:color/white" />
+				app:tint="?colorOnTertiary" />
 
 			<TextView
 				android:id="@+id/inputLink"
@@ -216,15 +214,14 @@
 				style="@style/BriarButtonFlat.Positive.Tiny"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:drawablePadding="8dp"
 				android:text="@string/paste_button"
-				app:drawableLeftCompat="@drawable/ic_content_paste"
-				app:drawableStartCompat="@drawable/ic_content_paste"
+				app:icon="@drawable/ic_content_paste"
+				app:iconPadding="8dp"
+				app:layout_constraintBottom_toTopOf="@+id/infoView"
 				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

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

@@ -20,18 +20,19 @@
 		app:layout_constraintTop_toTopOf="parent"
 		app:layout_constraintVertical_chainStyle="packed" />
 
-	<ProgressBar
+	<com.google.android.material.progressindicator.LinearProgressIndicator
 		android:id="@+id/progressBar"
-		style="?android:attr/progressBarStyleHorizontal"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginHorizontal="@dimen/margin_xlarge"
 		android:layout_marginTop="@dimen/margin_xlarge"
 		android:max="100"
+		app:indicatorColor="@color/briar_accent"
 		app:layout_constraintBottom_toTopOf="@+id/info"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/title" />
+		app:layout_constraintTop_toBottomOf="@+id/title"
+		tools:progress="50" />
 
 	<TextView
 		android:id="@+id/info"

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

@@ -52,11 +52,9 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginHorizontal="@dimen/margin_large"
-		android:drawablePadding="8dp"
 		android:text="@string/mailbox_setup_button_scan"
-		app:drawableLeftCompat="@drawable/ic_qr_code"
-		app:drawableStartCompat="@drawable/ic_qr_code"
-		app:drawableTint="@color/button_text"
+		app:icon="@drawable/ic_qr_code"
+		app:iconTint="?attr/colorOnPrimary"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"

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

@@ -95,7 +95,6 @@
 			android:layout_marginTop="6dp"
 			android:text="@string/mailbox_error_wizard_button"
 			android:visibility="gone"
-			app:drawableTint="@color/briar_button_text_positive"
 			app:layout_constraintBottom_toTopOf="@+id/unlinkButton"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
@@ -114,8 +113,9 @@
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent" />
 
-		<ProgressBar
+		<com.google.android.material.progressindicator.CircularProgressIndicator
 			android:id="@+id/unlinkProgress"
+			style="@style/CircularProgress"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:visibility="invisible"

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

@@ -49,7 +49,7 @@
 				android:layout_width="0dp"
 				android:layout_height="1dp"
 				android:layout_margin="16dp"
-				android:background="@color/briar_accent"
+				android:background="?colorTertiary"
 				app:layout_constraintBottom_toBottomOf="@+id/stepOne"
 				app:layout_constraintEnd_toStartOf="@+id/stepTwo"
 				app:layout_constraintStart_toEndOf="@+id/stepOne"
@@ -96,13 +96,13 @@
 				android:layout_width="38dp"
 				android:layout_height="38dp"
 				android:layout_marginTop="32dp"
-				android:background="@drawable/bubble_accent"
+				android:background="@drawable/bubble_current"
 				android:scaleType="center"
 				app:layout_constraintBottom_toTopOf="@+id/contactNameLayout"
 				app:layout_constraintStart_toStartOf="parent"
 				app:layout_constraintTop_toBottomOf="@+id/imageView"
 				app:srcCompat="@drawable/ic_person"
-				app:tint="@android:color/white" />
+				app:tint="?colorOnTertiary" />
 
 			<TextView
 				android:id="@+id/nicknameIntro"

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

@@ -7,7 +7,7 @@
 	android:background="@color/briar_primary"
 	android:orientation="vertical">
 
-	<androidx.appcompat.widget.Toolbar
+	<com.google.android.material.appbar.MaterialToolbar
 		android:id="@+id/toolbar"
 		style="@style/BriarToolbar"
 		android:layout_width="match_parent"

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

@@ -20,15 +20,17 @@
 		app:tint="@color/briar_accent"
 		tools:ignore="ContentDescription" />
 
-	<ProgressBar
+	<com.google.android.material.progressindicator.CircularProgressIndicator
 		android:id="@+id/progressBar"
-		style="?android:attr/progressBarStyleLarge"
+		style="@style/CircularProgress.Large"
 		android:layout_width="0dp"
 		android:layout_height="0dp"
+		app:indicatorColor="@color/briar_accent"
 		app:layout_constraintBottom_toBottomOf="@+id/imageView"
 		app:layout_constraintEnd_toEndOf="@+id/imageView"
 		app:layout_constraintStart_toStartOf="@+id/imageView"
-		app:layout_constraintTop_toTopOf="@+id/imageView" />
+		app:layout_constraintTop_toTopOf="@+id/imageView"
+		tools:progress="50" />
 
 	<TextView
 		android:id="@+id/textView"

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

@@ -4,6 +4,7 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
+	android:fillViewport="true"
 	tools:context=".android.login.PasswordFragment">
 
 	<androidx.constraintlayout.widget.ConstraintLayout
@@ -11,15 +12,43 @@
 		android:layout_height="wrap_content"
 		android:padding="@dimen/margin_activity_vertical">
 
+		<ImageView
+			android:id="@+id/logo"
+			android:layout_width="0dp"
+			android:layout_height="@dimen/hero_square"
+			android:layout_margin="16dp"
+			android:importantForAccessibility="no"
+			android:src="@drawable/splash_screen"
+			app:layout_constraintBottom_toTopOf="@+id/sign_in_title"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintHeight_default="percent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			app:layout_constraintVertical_chainStyle="packed" />
+
+		<TextView
+			android:id="@+id/sign_in_title"
+			style="@style/TextAppearance.AppCompat.Large"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="16dp"
+			android:text="@string/sign_in_title"
+			app:layout_constraintBottom_toTopOf="@+id/password_layout"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/logo" />
+
 		<com.google.android.material.textfield.TextInputLayout
 			android:id="@+id/password_layout"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
+			android:layout_marginTop="16dp"
 			app:errorEnabled="true"
 			app:hintEnabled="false"
+			app:layout_constraintBottom_toTopOf="@+id/btn_forgotten"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="parent"
-			app:layout_constraintTop_toTopOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/sign_in_title"
 			app:passwordToggleEnabled="true">
 
 			<com.google.android.material.textfield.TextInputEditText
@@ -36,18 +65,32 @@
 		</com.google.android.material.textfield.TextInputLayout>
 
 		<Button
+			android:id="@+id/btn_forgotten"
+			style="@style/BriarButtonFlat.Neutral"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="8dp"
+			android:layout_marginBottom="8dp"
+			android:text="@string/forgotten_password"
+			android:textColor="?android:attr/textColorLink"
+			app:layout_constraintBottom_toTopOf="@+id/btn_sign_in"
+			app:layout_constraintLeft_toLeftOf="parent"
+			app:layout_constraintRight_toRightOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/password_layout" />
+
+		<com.google.android.material.button.MaterialButton
 			android:id="@+id/btn_sign_in"
 			style="@style/BriarButton"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/margin_medium"
 			android:text="@string/sign_in_button"
+			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/password_layout" />
+			app:layout_constraintStart_toStartOf="parent" />
 
-		<ProgressBar
+		<com.google.android.material.progressindicator.CircularProgressIndicator
 			android:id="@+id/progress_wheel"
+			style="@style/CircularProgress"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:visibility="invisible"
@@ -56,19 +99,6 @@
 			app:layout_constraintRight_toRightOf="parent"
 			app:layout_constraintTop_toTopOf="@id/btn_sign_in" />
 
-		<TextView
-			android:id="@+id/btn_forgotten"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/margin_large"
-			android:clickable="true"
-			android:focusable="true"
-			android:text="@string/forgotten_password"
-			android:textColor="?android:attr/textColorLink"
-			app:layout_constraintLeft_toLeftOf="parent"
-			app:layout_constraintRight_toRightOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/btn_sign_in" />
-
 	</androidx.constraintlayout.widget.ConstraintLayout>
 
 </ScrollView>

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

@@ -11,9 +11,9 @@
 		android:layout_height="wrap_content"
 		android:layout_margin="@dimen/margin_xlarge">
 
-		<ProgressBar
+		<com.google.android.material.progressindicator.CircularProgressIndicator
 			android:id="@+id/progress"
-			style="?android:attr/progressBarStyleLarge"
+			style="@style/CircularProgress.Large"
 			android:layout_width="@dimen/hero_square"
 			android:layout_height="@dimen/hero_square"
 			android:indeterminate="true"

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

@@ -22,9 +22,9 @@
 				android:layout_height="wrap_content"
 				android:layout_margin="@dimen/margin_small" />
 
-			<ProgressBar
+			<com.google.android.material.progressindicator.CircularProgressIndicator
 				android:id="@+id/progressBar"
-				style="?android:attr/progressBarStyleLarge"
+				style="@style/CircularProgress.Large"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_centerInParent="true" />

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

@@ -40,6 +40,7 @@
 			android:layout_height="wrap_content"
 			android:layout_marginStart="@dimen/margin_large"
 			android:layout_marginLeft="@dimen/margin_large"
+			android:layout_marginTop="8dp"
 			android:layout_marginEnd="@dimen/margin_large"
 			android:layout_marginRight="@dimen/margin_large"
 			app:hintEnabled="false"
@@ -109,9 +110,9 @@
 			tools:listitem="@layout/list_item_crash"
 			tools:visibility="visible" />
 
-		<ProgressBar
+		<com.google.android.material.progressindicator.CircularProgressIndicator
 			android:id="@+id/progress_wheel"
-			style="?android:attr/progressBarStyleLarge"
+			style="@style/CircularProgress.Large"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:visibility="invisible"

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

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

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

@@ -16,16 +16,44 @@
 		android:paddingRight="@dimen/margin_activity_horizontal"
 		android:paddingBottom="@dimen/margin_activity_vertical">
 
+		<ImageView
+			android:id="@+id/logo"
+			android:layout_width="0dp"
+			android:layout_height="@dimen/hero_square"
+			android:layout_margin="16dp"
+			android:importantForAccessibility="no"
+			android:src="@drawable/splash_screen"
+			app:layout_constraintBottom_toTopOf="@+id/intro"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintHeight_default="percent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			app:layout_constraintVertical_chainStyle="packed" />
+
+		<TextView
+			android:id="@+id/intro"
+			style="@style/TextAppearance.AppCompat.Large"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="16dp"
+			android:gravity="center"
+			android:text="@string/setup_title"
+			app:layout_constraintBottom_toTopOf="@+id/nickname_entry_wrapper"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/logo" />
+
 		<com.google.android.material.textfield.TextInputLayout
 			android:id="@+id/nickname_entry_wrapper"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/margin_medium"
+			android:layout_marginTop="16dp"
 			app:errorEnabled="true"
 			app:hintEnabled="false"
+			app:layout_constraintBottom_toTopOf="@+id/info_button"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="parent"
-			app:layout_constraintTop_toTopOf="parent">
+			app:layout_constraintTop_toBottomOf="@+id/intro">
 
 			<com.google.android.material.textfield.TextInputEditText
 				android:id="@+id/nickname_entry"
@@ -40,19 +68,28 @@
 
 		</com.google.android.material.textfield.TextInputLayout>
 
+		<Button
+			android:id="@+id/info_button"
+			style="@style/BriarButtonFlat.Positive"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/more_info"
+			app:icon="@drawable/ic_info_white"
+			app:iconPadding="8dp"
+			app:layout_constraintBottom_toTopOf="@+id/next"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/nickname_entry_wrapper" />
+
 		<Button
 			android:id="@+id/next"
 			style="@style/BriarButton"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginTop="@dimen/margin_activity_horizontal"
 			android:enabled="false"
 			android:text="@string/setup_next"
 			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/nickname_entry_wrapper"
-			app:layout_constraintVertical_bias="1.0"
 			tools:enabled="true" />
 
 	</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -11,20 +11,36 @@
 		android:layout_height="wrap_content"
 		android:padding="@dimen/margin_activity_vertical">
 
+		<ImageView
+			android:id="@+id/logo"
+			android:layout_width="0dp"
+			android:layout_height="@dimen/hero_square"
+			android:layout_marginBottom="@dimen/margin_xlarge"
+			android:importantForAccessibility="no"
+			android:src="@drawable/splash_screen"
+			app:layout_constraintBottom_toTopOf="@+id/dozeView"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintHeight_default="percent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			app:layout_constraintVertical_chainStyle="packed" />
+
 		<org.briarproject.briar.android.account.DozeView
 			android:id="@+id/dozeView"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:paddingBottom="@dimen/margin_large"
+			app:layout_constraintBottom_toTopOf="@+id/huaweiProtectedAppsView"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent" />
+			app:layout_constraintTop_toBottomOf="@+id/logo" />
 
 		<org.briarproject.briar.android.account.HuaweiProtectedAppsView
 			android:id="@+id/huaweiProtectedAppsView"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:paddingBottom="@dimen/margin_large"
+			app:layout_constraintBottom_toTopOf="@+id/huaweiAppLaunchView"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/dozeView" />
@@ -34,6 +50,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:paddingBottom="@dimen/margin_large"
+			app:layout_constraintBottom_toTopOf="@+id/xiaomiRecentAppsView"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/huaweiProtectedAppsView" />
@@ -43,6 +60,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:paddingBottom="@dimen/margin_large"
+			app:layout_constraintBottom_toTopOf="@+id/xiaomiLockAppsView"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/huaweiAppLaunchView" />
@@ -52,6 +70,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:paddingBottom="@dimen/margin_large"
+			app:layout_constraintBottom_toTopOf="@+id/next"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/xiaomiRecentAppsView" />
@@ -66,13 +85,11 @@
 			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/xiaomiLockAppsView"
-			app:layout_constraintVertical_bias="1.0"
 			tools:enabled="true" />
 
-		<ProgressBar
+		<com.google.android.material.progressindicator.CircularProgressIndicator
 			android:id="@+id/progress"
-			style="?android:attr/progressBarStyle"
+			style="@style/CircularProgress"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:visibility="invisible"

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

@@ -16,6 +16,33 @@
 		android:paddingRight="@dimen/margin_activity_horizontal"
 		android:paddingBottom="@dimen/margin_activity_vertical">
 
+		<ImageView
+			android:id="@+id/logo"
+			android:layout_width="0dp"
+			android:layout_height="@dimen/hero_square"
+			android:layout_margin="16dp"
+			android:importantForAccessibility="no"
+			android:src="@drawable/splash_screen"
+			app:layout_constraintBottom_toTopOf="@+id/intro"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintHeight_default="percent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			app:layout_constraintVertical_chainStyle="packed" />
+
+		<TextView
+			android:id="@+id/intro"
+			style="@style/TextAppearance.AppCompat.Large"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="16dp"
+			android:gravity="center"
+			android:text="@string/setup_password_intro"
+			app:layout_constraintBottom_toTopOf="@+id/password_entry_wrapper"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/logo" />
+
 		<com.google.android.material.textfield.TextInputLayout
 			android:id="@+id/password_entry_wrapper"
 			android:layout_width="match_parent"
@@ -23,9 +50,10 @@
 			android:layout_marginTop="8dp"
 			app:errorEnabled="true"
 			app:hintEnabled="false"
+			app:layout_constraintBottom_toTopOf="@+id/strength_meter"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="parent"
-			app:layout_constraintTop_toTopOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/intro"
 			app:passwordToggleEnabled="true">
 
 			<com.google.android.material.textfield.TextInputEditText
@@ -46,9 +74,10 @@
 		<org.briarproject.briar.android.login.StrengthMeter
 			android:id="@+id/strength_meter"
 			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
+			android:layout_height="10dp"
 			android:layout_marginTop="8dp"
 			android:visibility="invisible"
+			app:layout_constraintBottom_toTopOf="@+id/password_confirm_wrapper"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/password_entry_wrapper"
@@ -61,6 +90,7 @@
 			android:layout_marginTop="8dp"
 			app:errorEnabled="true"
 			app:hintEnabled="false"
+			app:layout_constraintBottom_toTopOf="@+id/info_button"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="parent"
 			app:layout_constraintTop_toBottomOf="@+id/strength_meter"
@@ -76,6 +106,18 @@
 				android:maxLines="1" />
 		</com.google.android.material.textfield.TextInputLayout>
 
+		<Button
+			android:id="@+id/info_button"
+			style="@style/BriarButtonFlat.Positive"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/more_info"
+			app:icon="@drawable/ic_info_white"
+			app:iconPadding="8dp"
+			app:layout_constraintBottom_toTopOf="@+id/next"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/password_confirm_wrapper" />
+
 		<Button
 			android:id="@+id/next"
 			style="@style/BriarButton"
@@ -86,13 +128,11 @@
 			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/password_confirm_wrapper"
-			app:layout_constraintVertical_bias="1.0"
 			tools:enabled="true" />
 
-		<ProgressBar
+		<com.google.android.material.progressindicator.CircularProgressIndicator
 			android:id="@+id/progress"
-			style="?android:attr/progressBarStyle"
+			style="@style/CircularProgress"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:visibility="invisible"

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

@@ -20,11 +20,12 @@
 		app:tint="@color/briar_accent"
 		tools:ignore="ContentDescription" />
 
-	<ProgressBar
+	<com.google.android.material.progressindicator.CircularProgressIndicator
 		android:id="@+id/progressBar"
-		style="?android:attr/progressBarStyleLarge"
+		style="@style/CircularProgress.Large"
 		android:layout_width="0dp"
 		android:layout_height="0dp"
+		app:indicatorColor="@color/briar_accent"
 		app:layout_constraintBottom_toBottomOf="@+id/imageView"
 		app:layout_constraintEnd_toEndOf="@+id/imageView"
 		app:layout_constraintStart_toStartOf="@+id/imageView"

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

@@ -30,15 +30,15 @@
 				app:srcCompat="@drawable/il_transfer_data_receive"
 				tools:ignore="ContentDescription" />
 
-			<ProgressBar
+			<com.google.android.material.progressindicator.LinearProgressIndicator
 				android:id="@+id/progressBar"
-				style="?android:attr/progressBarStyleHorizontal"
 				android:layout_width="0dp"
 				android:layout_height="wrap_content"
 				android:layout_marginHorizontal="@dimen/margin_xlarge"
 				android:layout_marginTop="@dimen/margin_xlarge"
 				android:indeterminate="true"
 				android:visibility="gone"
+				app:indicatorColor="@color/briar_accent"
 				app:layout_constraintBottom_toTopOf="@+id/introTextView"
 				app:layout_constraintEnd_toEndOf="parent"
 				app:layout_constraintStart_toStartOf="parent"

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

@@ -30,18 +30,19 @@
 				app:srcCompat="@drawable/il_transfer_data_send"
 				tools:ignore="ContentDescription" />
 
-			<ProgressBar
+			<com.google.android.material.progressindicator.LinearProgressIndicator
 				android:id="@+id/progressBar"
-				style="?android:attr/progressBarStyleHorizontal"
 				android:layout_width="0dp"
 				android:layout_height="wrap_content"
 				android:layout_marginHorizontal="@dimen/margin_xlarge"
 				android:layout_marginTop="@dimen/margin_xlarge"
 				android:visibility="gone"
+				app:indicatorColor="@color/briar_accent"
 				app:layout_constraintBottom_toTopOf="@+id/introTextView"
 				app:layout_constraintEnd_toEndOf="parent"
 				app:layout_constraintStart_toStartOf="parent"
 				app:layout_constraintTop_toBottomOf="@+id/imageView"
+				tools:progress="50"
 				tools:visibility="visible" />
 
 			<TextView

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

@@ -38,13 +38,15 @@
 		android:layout_marginEnd="8dp"
 		android:layout_marginRight="8dp"
 		android:layout_marginBottom="8dp"
-		app:backgroundTint="@color/briar_accent"
+		android:contentDescription="@string/close"
+		app:backgroundTint="?colorSecondary"
 		app:fabCustomSize="26dp"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
 		app:layout_constraintVertical_bias="0"
 		app:maxImageSize="18dp"
-		app:srcCompat="@drawable/ic_close" />
+		app:srcCompat="@drawable/ic_close"
+		app:tint="?colorOnSecondary" />
 
 </merge>

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

@@ -14,7 +14,6 @@
 		android:contentDescription="@string/info"
 		android:drawablePadding="@dimen/margin_medium"
 		android:gravity="center_vertical"
-		app:drawableLeftCompat="@drawable/ic_info_dark"
 		app:drawableStartCompat="@drawable/ic_info_dark"
 		app:drawableTint="?attr/colorControlNormal"
 		tools:text="Did you know that if you took all the veins out of your body and laid them out end to end, you would die?" />

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

@@ -86,9 +86,9 @@
 			app:barrierDirection="bottom"
 			app:constraint_referenced_ids="nameContact1,nameContact2" />
 
-		<ProgressBar
+		<com.google.android.material.progressindicator.CircularProgressIndicator
 			android:id="@+id/progressBar"
-			style="?android:attr/progressBarStyleLarge"
+			style="@style/CircularProgress.Large"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_margin="@dimen/margin_large"

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

@@ -6,9 +6,9 @@
 	android:layout_height="match_parent"
 	tools:layout_height="200dp">
 
-	<ProgressBar
+	<com.google.android.material.progressindicator.CircularProgressIndicator
 		android:id="@+id/progressBar"
-		style="?android:attr/progressBarStyleLarge"
+		style="@style/CircularProgress.Large"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_margin="16dp"

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

@@ -6,9 +6,9 @@
 	android:layout_height="match_parent"
 	tools:layout_height="200dp">
 
-	<ProgressBar
+	<com.google.android.material.progressindicator.CircularProgressIndicator
 		android:id="@+id/progressBar"
-		style="?android:attr/progressBarStyleLarge"
+		style="@style/CircularProgress.Large"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_margin="16dp"