Bump version numbers for 1.3.3 release.

Introduce ViewModel for RssFeed*Activity

Closes #1894

See merge request briar/briar!1366

.gitignore

@@ -18,6 +18,7 @@ local.properties
 
 # Android Studio
 .idea/*
+!.idea/inspectionProfiles/
 !.idea/runConfigurations/
 !.idea/codeStyleSettings.xml
 !.idea/codeStyles

.gitlab-ci.yml

@@ -1,30 +1,79 @@
 image: briar/ci-image-android:latest
 
 stages:
-- test
-- optional_tests
-- check_reproducibility
+  - test
+  - optional_tests
+  - check_reproducibility
 
-test:
-  stage: test
+workflow:
+  # when to create a CI pipeline
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+    - if: '$CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS'
+      when: never # avoids duplicate jobs for branch and MR
+    - if: '$CI_COMMIT_BRANCH'
+    - if: '$CI_COMMIT_TAG'
+
+.base-test:
   before_script:
     - set -e
     - export GRADLE_USER_HOME=$PWD/.gradle
-
   cache:
+    key: "$CI_COMMIT_REF_SLUG"
     paths:
       - .gradle/wrapper
       - .gradle/caches
-
-  script:
-    - ./gradlew --no-daemon -Djava.security.egd=file:/dev/urandom animalSnifferMain animalSnifferTest
-    - ./gradlew --no-daemon -Djava.security.egd=file:/dev/urandom check compileOfficialDebugAndroidTestSources compileScreenshotDebugAndroidTestSources
-
   after_script:
-    # these file change every time but should not be cached
+    # these file change every time and should not be cached
     - rm -f $GRADLE_USER_HOME/caches/modules-2/modules-2.lock
     - rm -fr $GRADLE_USER_HOME/caches/*/plugin-resolution/
 
+test:
+  extends: .base-test
+  stage: test
+  script:
+    - ./gradlew --no-daemon -Djava.security.egd=file:/dev/urandom animalSnifferMain animalSnifferTest
+    - ./gradlew --no-daemon -Djava.security.egd=file:/dev/urandom check
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      when: always
+    - when: always
+
+android test:
+  extends: .base-test
+  stage: optional_tests
+  image: briar/ci-image-android-emulator:latest
+  script:
+    # start emulator first, so it can fail early
+    - start-emulator.sh
+    # run normal and screenshot tests together (exclude Large tests)
+    - ./gradlew -Djava.security.egd=file:/dev/urandom connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.package=org.briarproject.briar.android -Pandroid.testInstrumentationRunnerArguments.notAnnotation=androidx.test.filters.LargeTest
+  after_script:
+    - adb pull /sdcard/Pictures/screenshots
+  artifacts:
+    name: "${CI_PROJECT_PATH}_${CI_JOB_STAGE}_${CI_COMMIT_REF_NAME}_${CI_COMMIT_SHA}"
+    paths:
+      - kernel.log
+      - logcat.txt
+      - briar-android/build/reports/androidTests/connected/flavors/*
+      - screenshots
+    expire_in: 3 days
+    when: on_failure
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+      when: on_success
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      changes:
+        - briar-android/**/*
+      when: manual
+      allow_failure: true
+    - if: '$CI_COMMIT_TAG == null'
+      when: manual
+      allow_failure: true
+  retry:
+    max: 1
+  tags:
+    - kvm
 
 test_reproducible:
   stage: check_reproducibility
@@ -40,6 +89,7 @@ test_reproducible:
     - export GRADLE_USER_HOME=$PWD/.gradle
 
   cache:
+    key: "$CI_COMMIT_REF_SLUG"
     paths:
       - .gradle/wrapper
       - .gradle/caches
@@ -52,11 +102,15 @@ test_reproducible:
     - rm -f $GRADLE_USER_HOME/caches/modules-2/modules-2.lock
     - rm -fr $GRADLE_USER_HOME/caches/*/plugin-resolution/
 
-manual_tests:
+bridge test:
   extends: .optional_tests
-  when: manual
-  except:
-    - tags
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+      when: on_success
+      allow_failure: true
+    - if: '$CI_COMMIT_TAG == null'
+      when: manual
+      allow_failure: true
 
 pre_release_tests:
   extends: .optional_tests

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,14 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="MissingOverrideAnnotation" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoreObjectMethods" value="true" />
+      <option name="ignoreAnonymousClassMethods" value="false" />
+    </inspection_tool>
+    <inspection_tool class="WeakerAccess" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="SUGGEST_PACKAGE_LOCAL_FOR_MEMBERS" value="true" />
+      <option name="SUGGEST_PACKAGE_LOCAL_FOR_TOP_CLASSES" value="true" />
+      <option name="SUGGEST_PRIVATE_FOR_INNERS" value="true" />
+    </inspection_tool>
+  </profile>
+</component>

.idea/runConfigurations/Instrumentation_Tests__destroys_DB_.xml

@@ -0,0 +1,51 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Instrumentation Tests (destroys DB)" type="AndroidTestRunConfigurationType" factoryName="Android Instrumented Tests">
+    <module name="briar.briar-android" />
+    <option name="TESTING_TYPE" value="1" />
+    <option name="METHOD_NAME" value="" />
+    <option name="CLASS_NAME" value="" />
+    <option name="PACKAGE_NAME" value="org.briarproject.briar.android" />
+    <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
+    <option name="EXTRA_OPTIONS" value="-e notAnnotation androidx.test.filters.LargeTest" />
+    <option name="INCLUDE_GRADLE_EXTRA_OPTIONS" value="true" />
+    <option name="CLEAR_LOGCAT" value="false" />
+    <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
+    <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
+    <option name="FORCE_STOP_RUNNING_APP" value="true" />
+    <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
+    <option name="DEBUGGER_TYPE" value="Auto" />
+    <Auto>
+      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+      <option name="SHOW_STATIC_VARS" value="true" />
+      <option name="WORKING_DIR" value="" />
+      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+    </Auto>
+    <Hybrid>
+      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+      <option name="SHOW_STATIC_VARS" value="true" />
+      <option name="WORKING_DIR" value="" />
+      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+    </Hybrid>
+    <Java />
+    <Native>
+      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+      <option name="SHOW_STATIC_VARS" value="true" />
+      <option name="WORKING_DIR" value="" />
+      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+    </Native>
+    <Profilers>
+      <option name="ADVANCED_PROFILING_ENABLED" value="false" />
+      <option name="STARTUP_PROFILING_ENABLED" value="false" />
+      <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
+      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
+      <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
+      <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
+    </Profilers>
+    <method v="2">
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    </method>
+  </configuration>
+</component>

bramble-android/build.gradle

@@ -6,13 +6,17 @@ apply from: 'witness.gradle'
 
 android {
 	compileSdkVersion 30
-	buildToolsVersion '30.0.2'
+	buildToolsVersion '30.0.3'
+
+	packagingOptions {
+		doNotStrip '**/*.so'
+	}
 
 	defaultConfig {
 		minSdkVersion 16
-		targetSdkVersion 29
-		versionCode 10216
-		versionName "1.2.16"
+		targetSdkVersion 30
+		versionCode 10303
+		versionName "1.3.3"
 		consumerProguardFiles 'proguard-rules.txt'
 
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java

@@ -59,8 +59,8 @@ import static org.briarproject.bramble.util.PrivacyUtils.scrubMacAddress;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
-class AndroidBluetoothPlugin
-		extends BluetoothPlugin<BluetoothSocket, BluetoothServerSocket> {
+class AndroidBluetoothPlugin extends
+		AbstractBluetoothPlugin<BluetoothSocket, BluetoothServerSocket> {
 
 	private static final Logger LOG =
 			getLogger(AndroidBluetoothPlugin.class.getName());
@@ -75,6 +75,7 @@ class AndroidBluetoothPlugin
 
 	// Non-null if the plugin started successfully
 	private volatile BluetoothAdapter adapter = null;
+	private volatile boolean stopDiscoverAndConnect;
 
 	AndroidBluetoothPlugin(BluetoothConnectionLimiter connectionLimiter,
 			BluetoothConnectionFactory<BluetoothSocket> connectionFactory,
@@ -175,6 +176,11 @@ class AndroidBluetoothPlugin
 		} catch (IOException e) {
 			IoUtils.tryToClose(s, LOG, WARNING);
 			throw e;
+		} catch (NullPointerException e) {
+			// BluetoothSocket#connect() may throw an NPE under unknown
+			// circumstances
+			IoUtils.tryToClose(s, LOG, WARNING);
+			throw new IOException(e);
 		}
 	}
 
@@ -182,22 +188,40 @@ class AndroidBluetoothPlugin
 	@Nullable
 	DuplexTransportConnection discoverAndConnect(String uuid) {
 		if (adapter == null) return null;
-		for (String address : discoverDevices()) {
-			try {
-				if (LOG.isLoggable(INFO))
-					LOG.info("Connecting to " + scrubMacAddress(address));
-				return connectTo(address, uuid);
-			} catch (IOException e) {
-				if (LOG.isLoggable(INFO)) {
-					LOG.info("Could not connect to "
-							+ scrubMacAddress(address));
+		if (!discoverSemaphore.tryAcquire()) {
+			LOG.info("Discover already running");
+			return null;
+		}
+		try {
+			stopDiscoverAndConnect = false;
+			for (String address : discoverDevices()) {
+				if (stopDiscoverAndConnect) {
+					break;
+				}
+				try {
+					if (LOG.isLoggable(INFO))
+						LOG.info("Connecting to " + scrubMacAddress(address));
+					return connectTo(address, uuid);
+				} catch (IOException e) {
+					if (LOG.isLoggable(INFO)) {
+						LOG.info("Could not connect to "
+								+ scrubMacAddress(address));
+					}
 				}
 			}
+		} finally {
+			discoverSemaphore.release();
 		}
 		LOG.info("Could not connect to any devices");
 		return null;
 	}
 
+	@Override
+	public void stopDiscoverAndConnect() {
+		stopDiscoverAndConnect = true;
+		adapter.cancelDiscovery();
+	}
+
 	private Collection<String> discoverDevices() {
 		List<String> addresses = new ArrayList<>();
 		BlockingQueue<Intent> intents = new LinkedBlockingQueue<>();

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

@@ -114,12 +114,8 @@ public class AndroidUtils {
 
 	/**
 	 * Returns an array of supported content types for image attachments.
-	 * GIFs can't be compressed on API < 24 so they're not supported.
-	 * <p>
-	 * TODO: Remove this restriction when large message support is added
 	 */
 	public static String[] getSupportedImageContentTypes() {
-		if (SDK_INT < 24) return new String[] {"image/jpeg", "image/png"};
-		else return new String[] {"image/jpeg", "image/png", "image/gif"};
+		return new String[] {"image/jpeg", "image/png", "image/gif"};
 	}
 }

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

@@ -10,4 +10,6 @@ public interface FeatureFlags {
 	boolean shouldEnableProfilePictures();
 
 	boolean shouldEnableDisappearingMessages();
+
+	boolean shouldEnableConnectViaBluetooth();
 }

bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactAliasChangedEvent.java

@@ -0,0 +1,35 @@
+package org.briarproject.bramble.api.contact.event;
+
+import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.event.Event;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
+
+/**
+ * An event that is broadcast when the alias for a contact changed.
+ */
+@Immutable
+@NotNullByDefault
+public class ContactAliasChangedEvent extends Event {
+
+	private final ContactId contactId;
+	@Nullable
+	private final String alias;
+
+	public ContactAliasChangedEvent(ContactId contactId,
+			@Nullable String alias) {
+		this.contactId = contactId;
+		this.alias = alias;
+	}
+
+	public ContactId getContactId() {
+		return contactId;
+	}
+
+	@Nullable
+	public String getAlias() {
+		return alias;
+	}
+}

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

@@ -57,6 +57,7 @@ public class Author implements Nameable {
 	/**
 	 * Returns the author's name.
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}

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

@@ -21,5 +21,6 @@ public interface ReportingConstants {
 	 * Hidden service address for reporting crashes and feedback to the
 	 * developers.
 	 */
-	String DEV_ONION_ADDRESS = "cwqmubyvnig3wag3.onion";
+	String DEV_ONION_ADDRESS =
+			"b2nkt5doeamvdmjzfz7g42hk5vdtlnktlgzhel2bgjcc4v4jhnx2qrqd.onion";
 }

bramble-core/src/main/java/org/briarproject/bramble/db/Database.java

@@ -68,6 +68,13 @@ interface Database<T> {
 	 */
 	void close() throws DbException;
 
+	/**
+	 * Returns true if the dirty flag was set while opening the database,
+	 * indicating that the database has not been shut down properly the last
+	 * time it was closed and some data could be lost.
+	 */
+	boolean wasDirtyOnInitialisation();
+
 	/**
 	 * Starts a new transaction and returns an object representing it.
 	 */

bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseComponentImpl.java

@@ -6,6 +6,7 @@ import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.contact.PendingContact;
 import org.briarproject.bramble.api.contact.PendingContactId;
 import org.briarproject.bramble.api.contact.event.ContactAddedEvent;
+import org.briarproject.bramble.api.contact.event.ContactAliasChangedEvent;
 import org.briarproject.bramble.api.contact.event.ContactRemovedEvent;
 import org.briarproject.bramble.api.contact.event.ContactVerifiedEvent;
 import org.briarproject.bramble.api.contact.event.PendingContactAddedEvent;
@@ -1013,6 +1014,7 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		T txn = unbox(transaction);
 		if (!db.containsContact(txn, c))
 			throw new NoSuchContactException();
+		transaction.attach(new ContactAliasChangedEvent(c, alias));
 		db.setContactAlias(txn, c, alias);
 	}
 

bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseConstants.java

@@ -37,4 +37,10 @@ interface DatabaseConstants {
 	 * has passed since the last compaction.
 	 */
 	long MAX_COMPACTION_INTERVAL_MS = DAYS.toMillis(30);
+
+	/**
+	 * The {@link Settings} key under which the flag is stored indicating
+	 * whether the database is marked as dirty.
+	 */
+	String DIRTY_KEY = "dirty";
 }

bramble-core/src/main/java/org/briarproject/bramble/db/H2Database.java

@@ -84,9 +84,14 @@ class H2Database extends JdbcDatabase {
 	@Override
 	public void close() throws DbException {
 		// H2 will close the database when the last connection closes
+		Connection c = null;
 		try {
+			c = createConnection();
 			super.closeAllConnections();
+			setDirty(c, false);
+			c.close();
 		} catch (SQLException e) {
+			tryToClose(c, LOG, WARNING);
 			throw new DbException(e);
 		}
 	}

bramble-core/src/main/java/org/briarproject/bramble/db/HyperSqlDatabase.java

@@ -81,6 +81,7 @@ class HyperSqlDatabase extends JdbcDatabase {
 		try {
 			super.closeAllConnections();
 			c = createConnection();
+			setDirty(c, false);
 			s = c.createStatement();
 			s.executeQuery("SHUTDOWN");
 			s.close();

bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java

@@ -83,6 +83,7 @@ import static org.briarproject.bramble.api.sync.validation.MessageState.DELIVERE
 import static org.briarproject.bramble.api.sync.validation.MessageState.PENDING;
 import static org.briarproject.bramble.api.sync.validation.MessageState.UNKNOWN;
 import static org.briarproject.bramble.db.DatabaseConstants.DB_SETTINGS_NAMESPACE;
+import static org.briarproject.bramble.db.DatabaseConstants.DIRTY_KEY;
 import static org.briarproject.bramble.db.DatabaseConstants.LAST_COMPACTED_KEY;
 import static org.briarproject.bramble.db.DatabaseConstants.MAX_COMPACTION_INTERVAL_MS;
 import static org.briarproject.bramble.db.DatabaseConstants.SCHEMA_VERSION_KEY;
@@ -365,9 +366,14 @@ abstract class JdbcDatabase implements Database<Connection> {
 	@GuardedBy("connectionsLock")
 	private boolean closed = false;
 
+	private volatile boolean wasDirtyOnInitialisation = false;
+
 	protected abstract Connection createConnection()
 			throws DbException, SQLException;
 
+	// Used exclusively during open to compact the database after schema
+	// migrations or after DatabaseConstants#MAX_COMPACTION_INTERVAL_MS has
+	// elapsed
 	protected abstract void compactAndClose() throws DbException;
 
 	JdbcDatabase(DatabaseTypes databaseTypes, MessageFactory messageFactory,
@@ -392,13 +398,19 @@ abstract class JdbcDatabase implements Database<Connection> {
 		try {
 			if (reopen) {
 				Settings s = getSettings(txn, DB_SETTINGS_NAMESPACE);
+				wasDirtyOnInitialisation = isDirty(s);
 				compact = migrateSchema(txn, s, listener) || isCompactionDue(s);
 			} else {
+				wasDirtyOnInitialisation = false;
 				createTables(txn);
 				initialiseSettings(txn);
 				compact = false;
 			}
+			if (LOG.isLoggable(INFO)) {
+				LOG.info("db dirty? " + wasDirtyOnInitialisation);
+			}
 			createIndexes(txn);
+			setDirty(txn, true);
 			commitTransaction(txn);
 		} catch (DbException e) {
 			abortTransaction(txn);
@@ -425,6 +437,11 @@ abstract class JdbcDatabase implements Database<Connection> {
 		}
 	}
 
+	@Override
+	public boolean wasDirtyOnInitialisation() {
+		return wasDirtyOnInitialisation;
+	}
+
 	/**
 	 * Compares the schema version stored in the database with the schema
 	 * version used by the current code and applies any suitable migrations to
@@ -500,6 +517,16 @@ abstract class JdbcDatabase implements Database<Connection> {
 		mergeSettings(txn, s, DB_SETTINGS_NAMESPACE);
 	}
 
+	private boolean isDirty(Settings s) {
+		return s.getBoolean(DIRTY_KEY, false);
+	}
+
+	protected void setDirty(Connection txn, boolean dirty) throws DbException {
+		Settings s = new Settings();
+		s.putBoolean(DIRTY_KEY, dirty);
+		mergeSettings(txn, s, DB_SETTINGS_NAMESPACE);
+	}
+
 	private void initialiseSettings(Connection txn) throws DbException {
 		Settings s = new Settings();
 		s.putInt(SCHEMA_VERSION_KEY, CODE_SCHEMA_VERSION);

bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementTransport.java

@@ -34,12 +34,12 @@ class KeyAgreementTransport {
 			Logger.getLogger(KeyAgreementTransport.class.getName());
 
 	// Accept records with current protocol version, known record type
-	private static Predicate<Record> ACCEPT = r ->
+	private static final Predicate<Record> ACCEPT = r ->
 			r.getProtocolVersion() == PROTOCOL_VERSION &&
 					isKnownRecordType(r.getRecordType());
 
 	// Ignore records with current protocol version, unknown record type
-	private static Predicate<Record> IGNORE = r ->
+	private static final Predicate<Record> IGNORE = r ->
 			r.getProtocolVersion() == PROTOCOL_VERSION &&
 					!isKnownRecordType(r.getRecordType());
 

bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/AbstractBluetoothPlugin.java

@@ -0,0 +1,623 @@
+package org.briarproject.bramble.plugin.bluetooth;
+
+import org.briarproject.bramble.api.FormatException;
+import org.briarproject.bramble.api.Multiset;
+import org.briarproject.bramble.api.Pair;
+import org.briarproject.bramble.api.data.BdfList;
+import org.briarproject.bramble.api.event.Event;
+import org.briarproject.bramble.api.event.EventListener;
+import org.briarproject.bramble.api.keyagreement.KeyAgreementConnection;
+import org.briarproject.bramble.api.keyagreement.KeyAgreementListener;
+import org.briarproject.bramble.api.keyagreement.event.KeyAgreementListeningEvent;
+import org.briarproject.bramble.api.keyagreement.event.KeyAgreementStoppedListeningEvent;
+import org.briarproject.bramble.api.lifecycle.IoExecutor;
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.bramble.api.plugin.Backoff;
+import org.briarproject.bramble.api.plugin.ConnectionHandler;
+import org.briarproject.bramble.api.plugin.PluginCallback;
+import org.briarproject.bramble.api.plugin.PluginException;
+import org.briarproject.bramble.api.plugin.TransportId;
+import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
+import org.briarproject.bramble.api.properties.TransportProperties;
+import org.briarproject.bramble.api.properties.event.RemoteTransportPropertiesUpdatedEvent;
+import org.briarproject.bramble.api.rendezvous.KeyMaterialSource;
+import org.briarproject.bramble.api.rendezvous.RendezvousEndpoint;
+import org.briarproject.bramble.api.settings.Settings;
+import org.briarproject.bramble.api.settings.event.SettingsUpdatedEvent;
+
+import java.io.IOException;
+import java.security.SecureRandom;
+import java.util.Collection;
+import java.util.UUID;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.logging.Logger;
+
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.GuardedBy;
+import javax.annotation.concurrent.ThreadSafe;
+
+import static java.util.logging.Level.INFO;
+import static java.util.logging.Level.WARNING;
+import static java.util.logging.Logger.getLogger;
+import static org.briarproject.bramble.api.keyagreement.KeyAgreementConstants.TRANSPORT_ID_BLUETOOTH;
+import static org.briarproject.bramble.api.plugin.BluetoothConstants.DEFAULT_PREF_ADDRESS_IS_REFLECTED;
+import static org.briarproject.bramble.api.plugin.BluetoothConstants.DEFAULT_PREF_EVER_CONNECTED;
+import static org.briarproject.bramble.api.plugin.BluetoothConstants.DEFAULT_PREF_PLUGIN_ENABLE;
+import static org.briarproject.bramble.api.plugin.BluetoothConstants.ID;
+import static org.briarproject.bramble.api.plugin.BluetoothConstants.PREF_ADDRESS_IS_REFLECTED;
+import static org.briarproject.bramble.api.plugin.BluetoothConstants.PREF_EVER_CONNECTED;
+import static org.briarproject.bramble.api.plugin.BluetoothConstants.PROP_ADDRESS;
+import static org.briarproject.bramble.api.plugin.BluetoothConstants.PROP_UUID;
+import static org.briarproject.bramble.api.plugin.BluetoothConstants.UUID_BYTES;
+import static org.briarproject.bramble.api.plugin.Plugin.State.ACTIVE;
+import static org.briarproject.bramble.api.plugin.Plugin.State.DISABLED;
+import static org.briarproject.bramble.api.plugin.Plugin.State.INACTIVE;
+import static org.briarproject.bramble.api.plugin.Plugin.State.STARTING_STOPPING;
+import static org.briarproject.bramble.api.properties.TransportPropertyConstants.REFLECTED_PROPERTY_PREFIX;
+import static org.briarproject.bramble.util.LogUtils.logException;
+import static org.briarproject.bramble.util.PrivacyUtils.scrubMacAddress;
+import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
+import static org.briarproject.bramble.util.StringUtils.macToBytes;
+import static org.briarproject.bramble.util.StringUtils.macToString;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+abstract class AbstractBluetoothPlugin<S, SS> implements BluetoothPlugin,
+		EventListener {
+
+	private static final Logger LOG =
+			getLogger(AbstractBluetoothPlugin.class.getName());
+
+	private final BluetoothConnectionLimiter connectionLimiter;
+	final BluetoothConnectionFactory<S> connectionFactory;
+
+	private final Executor ioExecutor, wakefulIoExecutor;
+	private final SecureRandom secureRandom;
+	private final Backoff backoff;
+	private final PluginCallback callback;
+	private final int maxLatency, maxIdleTime;
+	private final AtomicBoolean used = new AtomicBoolean(false);
+	private final AtomicBoolean everConnected = new AtomicBoolean(false);
+
+	protected final PluginState state = new PluginState();
+	protected final Semaphore discoverSemaphore = new Semaphore(1);
+
+	private volatile String contactConnectionsUuid = null;
+
+	abstract void initialiseAdapter() throws IOException;
+
+	abstract boolean isAdapterEnabled();
+
+	/**
+	 * Returns the local Bluetooth address, or null if no valid address can
+	 * be found.
+	 */
+	@Nullable
+	abstract String getBluetoothAddress();
+
+	abstract SS openServerSocket(String uuid) throws IOException;
+
+	abstract void tryToClose(@Nullable SS ss);
+
+	abstract DuplexTransportConnection acceptConnection(SS ss)
+			throws IOException;
+
+	abstract boolean isValidAddress(String address);
+
+	abstract DuplexTransportConnection connectTo(String address, String uuid)
+			throws IOException;
+
+	@Nullable
+	abstract DuplexTransportConnection discoverAndConnect(String uuid);
+
+	AbstractBluetoothPlugin(BluetoothConnectionLimiter connectionLimiter,
+			BluetoothConnectionFactory<S> connectionFactory,
+			Executor ioExecutor,
+			Executor wakefulIoExecutor,
+			SecureRandom secureRandom,
+			Backoff backoff,
+			PluginCallback callback,
+			int maxLatency,
+			int maxIdleTime) {
+		this.connectionLimiter = connectionLimiter;
+		this.connectionFactory = connectionFactory;
+		this.ioExecutor = ioExecutor;
+		this.wakefulIoExecutor = wakefulIoExecutor;
+		this.secureRandom = secureRandom;
+		this.backoff = backoff;
+		this.callback = callback;
+		this.maxLatency = maxLatency;
+		this.maxIdleTime = maxIdleTime;
+	}
+
+	void onAdapterEnabled() {
+		LOG.info("Bluetooth enabled");
+		// We may not have been able to get the local address before
+		ioExecutor.execute(this::updateProperties);
+		if (getState() == INACTIVE) bind();
+	}
+
+	void onAdapterDisabled() {
+		LOG.info("Bluetooth disabled");
+		connectionLimiter.allConnectionsClosed();
+		// The server socket may not have been closed automatically
+		SS ss = state.clearServerSocket();
+		if (ss != null) {
+			LOG.info("Closing server socket");
+			tryToClose(ss);
+		}
+	}
+
+	@Override
+	public TransportId getId() {
+		return ID;
+	}
+
+	@Override
+	public int getMaxLatency() {
+		return maxLatency;
+	}
+
+	@Override
+	public int getMaxIdleTime() {
+		return maxIdleTime;
+	}
+
+	@Override
+	public void start() throws PluginException {
+		if (used.getAndSet(true)) throw new IllegalStateException();
+		Settings settings = callback.getSettings();
+		boolean enabledByUser = settings.getBoolean(PREF_PLUGIN_ENABLE,
+				DEFAULT_PREF_PLUGIN_ENABLE);
+		everConnected.set(settings.getBoolean(PREF_EVER_CONNECTED,
+				DEFAULT_PREF_EVER_CONNECTED));
+		state.setStarted(enabledByUser);
+		try {
+			initialiseAdapter();
+		} catch (IOException e) {
+			throw new PluginException(e);
+		}
+		updateProperties();
+		if (enabledByUser && isAdapterEnabled()) bind();
+	}
+
+	private void bind() {
+		ioExecutor.execute(() -> {
+			if (getState() != INACTIVE) return;
+			// Bind a server socket to accept connections from contacts
+			SS ss;
+			try {
+				ss = openServerSocket(contactConnectionsUuid);
+			} catch (IOException e) {
+				logException(LOG, WARNING, e);
+				return;
+			}
+			if (!state.setServerSocket(ss)) {
+				LOG.info("Closing redundant server socket");
+				tryToClose(ss);
+				return;
+			}
+			backoff.reset();
+			acceptContactConnections(ss);
+		});
+	}
+
+	private void updateProperties() {
+		TransportProperties p = callback.getLocalProperties();
+		String address = p.get(PROP_ADDRESS);
+		String uuid = p.get(PROP_UUID);
+		Settings s = callback.getSettings();
+		boolean isReflected = s.getBoolean(PREF_ADDRESS_IS_REFLECTED,
+				DEFAULT_PREF_ADDRESS_IS_REFLECTED);
+		boolean changed = false;
+		if (address == null || isReflected) {
+			address = getBluetoothAddress();
+			if (LOG.isLoggable(INFO)) {
+				LOG.info("Local address " + scrubMacAddress(address));
+			}
+			if (address == null) {
+				if (everConnected.get()) {
+					address = getReflectedAddress();
+					if (LOG.isLoggable(INFO)) {
+						LOG.info("Reflected address " +
+								scrubMacAddress(address));
+					}
+					if (address != null) {
+						changed = true;
+						isReflected = true;
+					}
+				}
+			} else {
+				changed = true;
+				isReflected = false;
+			}
+		}
+		if (uuid == null) {
+			byte[] random = new byte[UUID_BYTES];
+			secureRandom.nextBytes(random);
+			uuid = UUID.nameUUIDFromBytes(random).toString();
+			changed = true;
+		}
+		contactConnectionsUuid = uuid;
+		if (changed) {
+			p = new TransportProperties();
+			// If we previously used a reflected address and there's no longer
+			// a reflected address with enough votes to be used, we'll continue
+			// to use the old reflected address until there's a new winner
+			if (address != null) p.put(PROP_ADDRESS, address);
+			p.put(PROP_UUID, uuid);
+			callback.mergeLocalProperties(p);
+			s = new Settings();
+			s.putBoolean(PREF_ADDRESS_IS_REFLECTED, isReflected);
+			callback.mergeSettings(s);
+		}
+	}
+
+	@Nullable
+	private String getReflectedAddress() {
+		// Count the number of votes for each reflected address
+		String key = REFLECTED_PROPERTY_PREFIX + PROP_ADDRESS;
+		Multiset<String> votes = new Multiset<>();
+		for (TransportProperties p : callback.getRemoteProperties()) {
+			String address = p.get(key);
+			if (address != null && isValidAddress(address)) votes.add(address);
+		}
+		// If an address gets more than half of the votes, accept it
+		int total = votes.getTotal();
+		for (String address : votes.keySet()) {
+			if (votes.getCount(address) * 2 > total) return address;
+		}
+		return null;
+	}
+
+	private void acceptContactConnections(SS ss) {
+		while (true) {
+			DuplexTransportConnection conn;
+			try {
+				conn = acceptConnection(ss);
+			} catch (IOException e) {
+				// This is expected when the server socket is closed
+				LOG.info("Server socket closed");
+				state.clearServerSocket();
+				return;
+			}
+			LOG.info("Connection received");
+			connectionLimiter.connectionOpened(conn);
+			backoff.reset();
+			setEverConnected();
+			callback.handleConnection(conn);
+		}
+	}
+
+	private void setEverConnected() {
+		if (!everConnected.getAndSet(true)) {
+			ioExecutor.execute(() -> {
+				Settings s = new Settings();
+				s.putBoolean(PREF_EVER_CONNECTED, true);
+				callback.mergeSettings(s);
+				// Contacts may already have sent a reflected address
+				updateProperties();
+			});
+		}
+	}
+
+	@Override
+	public void stop() {
+		SS ss = state.setStopped();
+		tryToClose(ss);
+	}
+
+	@Override
+	public State getState() {
+		return state.getState();
+	}
+
+	@Override
+	public int getReasonsDisabled() {
+		return state.getReasonsDisabled();
+	}
+
+	@Override
+	public boolean shouldPoll() {
+		return true;
+	}
+
+	@Override
+	public int getPollingInterval() {
+		return backoff.getPollingInterval();
+	}
+
+	@Override
+	public void poll(Collection<Pair<TransportProperties, ConnectionHandler>>
+			properties) {
+		if (getState() != ACTIVE) return;
+		backoff.increment();
+		for (Pair<TransportProperties, ConnectionHandler> p : properties) {
+			connect(p.getFirst(), p.getSecond());
+		}
+	}
+
+	private void connect(TransportProperties p, ConnectionHandler h) {
+		String address = p.get(PROP_ADDRESS);
+		if (isNullOrEmpty(address)) return;
+		String uuid = p.get(PROP_UUID);
+		if (isNullOrEmpty(uuid)) return;
+		wakefulIoExecutor.execute(() -> {
+			DuplexTransportConnection d = createConnection(p);
+			if (d != null) {
+				backoff.reset();
+				setEverConnected();
+				h.handleConnection(d);
+			}
+		});
+	}
+
+	@Nullable
+	private DuplexTransportConnection connect(String address, String uuid) {
+		// Validate the address
+		if (!isValidAddress(address)) {
+			if (LOG.isLoggable(WARNING))
+				// Not scrubbing here to be able to figure out the problem
+				LOG.warning("Invalid address " + address);
+			return null;
+		}
+		// Validate the UUID
+		try {
+			//noinspection ResultOfMethodCallIgnored
+			UUID.fromString(uuid);
+		} catch (IllegalArgumentException e) {
+			if (LOG.isLoggable(WARNING)) LOG.warning("Invalid UUID " + uuid);
+			return null;
+		}
+		if (LOG.isLoggable(INFO))
+			LOG.info("Connecting to " + scrubMacAddress(address));
+		try {
+			DuplexTransportConnection conn = connectTo(address, uuid);
+			if (LOG.isLoggable(INFO))
+				LOG.info("Connected to " + scrubMacAddress(address));
+			return conn;
+		} catch (IOException e) {
+			if (LOG.isLoggable(INFO))
+				LOG.info("Could not connect to " + scrubMacAddress(address));
+			return null;
+		}
+	}
+
+	@Override
+	public DuplexTransportConnection createConnection(TransportProperties p) {
+		if (getState() != ACTIVE) return null;
+		if (!connectionLimiter.canOpenContactConnection()) return null;
+		String address = p.get(PROP_ADDRESS);
+		if (isNullOrEmpty(address)) return null;
+		String uuid = p.get(PROP_UUID);
+		if (isNullOrEmpty(uuid)) return null;
+		DuplexTransportConnection conn = connect(address, uuid);
+		if (conn != null) connectionLimiter.connectionOpened(conn);
+		return conn;
+	}
+
+	@Override
+	public boolean supportsKeyAgreement() {
+		return true;
+	}
+
+	@Override
+	public KeyAgreementListener createKeyAgreementListener(byte[] commitment) {
+		if (getState() != ACTIVE) return null;
+		// No truncation necessary because COMMIT_LENGTH = 16
+		String uuid = UUID.nameUUIDFromBytes(commitment).toString();
+		if (LOG.isLoggable(INFO)) LOG.info("Key agreement UUID " + uuid);
+		// Bind a server socket for receiving key agreement connections
+		SS ss;
+		try {
+			ss = openServerSocket(uuid);
+		} catch (IOException e) {
+			logException(LOG, WARNING, e);
+			return null;
+		}
+		if (getState() != ACTIVE) {
+			tryToClose(ss);
+			return null;
+		}
+		BdfList descriptor = new BdfList();
+		descriptor.add(TRANSPORT_ID_BLUETOOTH);
+		String address = getBluetoothAddress();
+		if (address != null) descriptor.add(macToBytes(address));
+		return new BluetoothKeyAgreementListener(descriptor, ss);
+	}
+
+	@Override
+	public DuplexTransportConnection createKeyAgreementConnection(
+			byte[] commitment, BdfList descriptor) {
+		if (getState() != ACTIVE) return null;
+		// No truncation necessary because COMMIT_LENGTH = 16
+		String uuid = UUID.nameUUIDFromBytes(commitment).toString();
+		DuplexTransportConnection conn;
+		if (descriptor.size() == 1) {
+			if (LOG.isLoggable(INFO)) {
+				LOG.info("Discovering address for key agreement UUID " +
+						uuid);
+			}
+			conn = discoverAndConnect(uuid);
+		} else {
+			String address;
+			try {
+				address = parseAddress(descriptor);
+			} catch (FormatException e) {
+				LOG.info("Invalid address in key agreement descriptor");
+				return null;
+			}
+			if (LOG.isLoggable(INFO))
+				LOG.info("Connecting to key agreement UUID " + uuid);
+			conn = connect(address, uuid);
+		}
+		if (conn != null) {
+			connectionLimiter.connectionOpened(conn);
+			setEverConnected();
+		}
+		return conn;
+	}
+
+	private String parseAddress(BdfList descriptor) throws FormatException {
+		byte[] mac = descriptor.getRaw(1);
+		if (mac.length != 6) throw new FormatException();
+		return macToString(mac);
+	}
+
+	@Override
+	public boolean isDiscovering() {
+		return discoverSemaphore.availablePermits() == 0;
+	}
+
+	@Override
+	public DuplexTransportConnection discoverAndConnectForSetup(String uuid) {
+		DuplexTransportConnection conn = discoverAndConnect(uuid);
+		if (conn != null) {
+			connectionLimiter.connectionOpened(conn);
+			setEverConnected();
+		}
+		return conn;
+	}
+
+	@Override
+	public boolean supportsRendezvous() {
+		return false;
+	}
+
+	@Override
+	public RendezvousEndpoint createRendezvousEndpoint(KeyMaterialSource k,
+			boolean alice, ConnectionHandler incoming) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public void eventOccurred(Event e) {
+		if (e instanceof SettingsUpdatedEvent) {
+			SettingsUpdatedEvent s = (SettingsUpdatedEvent) e;
+			if (s.getNamespace().equals(ID.getString()))
+				ioExecutor.execute(() -> onSettingsUpdated(s.getSettings()));
+		} else if (e instanceof KeyAgreementListeningEvent) {
+			ioExecutor.execute(connectionLimiter::keyAgreementStarted);
+		} else if (e instanceof KeyAgreementStoppedListeningEvent) {
+			ioExecutor.execute(connectionLimiter::keyAgreementEnded);
+		} else if (e instanceof RemoteTransportPropertiesUpdatedEvent) {
+			RemoteTransportPropertiesUpdatedEvent r =
+					(RemoteTransportPropertiesUpdatedEvent) e;
+			if (r.getTransportId().equals(ID)) {
+				ioExecutor.execute(this::updateProperties);
+			}
+		}
+	}
+
+	@IoExecutor
+	private void onSettingsUpdated(Settings settings) {
+		boolean enabledByUser = settings.getBoolean(PREF_PLUGIN_ENABLE,
+				DEFAULT_PREF_PLUGIN_ENABLE);
+		SS ss = state.setEnabledByUser(enabledByUser);
+		State s = getState();
+		if (ss != null) {
+			LOG.info("Disabled by user, closing server socket");
+			tryToClose(ss);
+		} else if (s == INACTIVE) {
+			if (isAdapterEnabled()) {
+				LOG.info("Enabled by user, opening server socket");
+				bind();
+			} else {
+				LOG.info("Enabled by user but adapter is disabled");
+			}
+		}
+	}
+
+	private class BluetoothKeyAgreementListener extends KeyAgreementListener {
+
+		private final SS ss;
+
+		private BluetoothKeyAgreementListener(BdfList descriptor, SS ss) {
+			super(descriptor);
+			this.ss = ss;
+		}
+
+		@Override
+		public KeyAgreementConnection accept() throws IOException {
+			DuplexTransportConnection conn = acceptConnection(ss);
+			if (LOG.isLoggable(INFO)) LOG.info(ID + ": Incoming connection");
+			connectionLimiter.connectionOpened(conn);
+			return new KeyAgreementConnection(conn, ID);
+		}
+
+		@Override
+		public void close() {
+			tryToClose(ss);
+		}
+	}
+
+	@ThreadSafe
+	@NotNullByDefault
+	private class PluginState {
+
+		@GuardedBy("this")
+		private boolean started = false,
+				stopped = false,
+				enabledByUser = false;
+
+		@GuardedBy("this")
+		@Nullable
+		private SS serverSocket = null;
+
+		private synchronized void setStarted(boolean enabledByUser) {
+			started = true;
+			this.enabledByUser = enabledByUser;
+			callback.pluginStateChanged(getState());
+		}
+
+		@Nullable
+		private synchronized SS setStopped() {
+			stopped = true;
+			SS ss = serverSocket;
+			serverSocket = null;
+			callback.pluginStateChanged(getState());
+			return ss;
+		}
+
+		@Nullable
+		private synchronized SS setEnabledByUser(boolean enabledByUser) {
+			this.enabledByUser = enabledByUser;
+			SS ss = null;
+			if (!enabledByUser) {
+				ss = serverSocket;
+				serverSocket = null;
+			}
+			callback.pluginStateChanged(getState());
+			return ss;
+		}
+
+		private synchronized boolean setServerSocket(SS ss) {
+			if (stopped || serverSocket != null) return false;
+			serverSocket = ss;
+			callback.pluginStateChanged(getState());
+			return true;
+		}
+
+		@Nullable
+		private synchronized SS clearServerSocket() {
+			SS ss = serverSocket;
+			serverSocket = null;
+			callback.pluginStateChanged(getState());
+			return ss;
+		}
+
+		private synchronized State getState() {
+			if (!started || stopped) return STARTING_STOPPING;
+			if (!enabledByUser) return DISABLED;
+			return serverSocket == null ? INACTIVE : ACTIVE;
+		}
+
+		private synchronized int getReasonsDisabled() {
+			return getState() == DISABLED ? REASON_USER : 0;
+		}
+	}
+}

bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java

@@ -1,606 +1,18 @@
 package org.briarproject.bramble.plugin.bluetooth;
 
-import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.Multiset;
-import org.briarproject.bramble.api.Pair;
-import org.briarproject.bramble.api.data.BdfList;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.event.EventListener;
-import org.briarproject.bramble.api.keyagreement.KeyAgreementConnection;
-import org.briarproject.bramble.api.keyagreement.KeyAgreementListener;
-import org.briarproject.bramble.api.keyagreement.event.KeyAgreementListeningEvent;
-import org.briarproject.bramble.api.keyagreement.event.KeyAgreementStoppedListeningEvent;
-import org.briarproject.bramble.api.lifecycle.IoExecutor;
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
-import org.briarproject.bramble.api.plugin.Backoff;
-import org.briarproject.bramble.api.plugin.ConnectionHandler;
-import org.briarproject.bramble.api.plugin.PluginCallback;
-import org.briarproject.bramble.api.plugin.PluginException;
-import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
 import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
-import org.briarproject.bramble.api.properties.TransportProperties;
-import org.briarproject.bramble.api.properties.event.RemoteTransportPropertiesUpdatedEvent;
-import org.briarproject.bramble.api.rendezvous.KeyMaterialSource;
-import org.briarproject.bramble.api.rendezvous.RendezvousEndpoint;
-import org.briarproject.bramble.api.settings.Settings;
-import org.briarproject.bramble.api.settings.event.SettingsUpdatedEvent;
-
-import java.io.IOException;
-import java.security.SecureRandom;
-import java.util.Collection;
-import java.util.UUID;
-import java.util.concurrent.Executor;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.logging.Logger;
 
 import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
 
-import static java.util.logging.Level.INFO;
-import static java.util.logging.Level.WARNING;
-import static java.util.logging.Logger.getLogger;
-import static org.briarproject.bramble.api.keyagreement.KeyAgreementConstants.TRANSPORT_ID_BLUETOOTH;
-import static org.briarproject.bramble.api.plugin.BluetoothConstants.DEFAULT_PREF_ADDRESS_IS_REFLECTED;
-import static org.briarproject.bramble.api.plugin.BluetoothConstants.DEFAULT_PREF_EVER_CONNECTED;
-import static org.briarproject.bramble.api.plugin.BluetoothConstants.DEFAULT_PREF_PLUGIN_ENABLE;
-import static org.briarproject.bramble.api.plugin.BluetoothConstants.ID;
-import static org.briarproject.bramble.api.plugin.BluetoothConstants.PREF_ADDRESS_IS_REFLECTED;
-import static org.briarproject.bramble.api.plugin.BluetoothConstants.PREF_EVER_CONNECTED;
-import static org.briarproject.bramble.api.plugin.BluetoothConstants.PROP_ADDRESS;
-import static org.briarproject.bramble.api.plugin.BluetoothConstants.PROP_UUID;
-import static org.briarproject.bramble.api.plugin.BluetoothConstants.UUID_BYTES;
-import static org.briarproject.bramble.api.plugin.Plugin.State.ACTIVE;
-import static org.briarproject.bramble.api.plugin.Plugin.State.DISABLED;
-import static org.briarproject.bramble.api.plugin.Plugin.State.INACTIVE;
-import static org.briarproject.bramble.api.plugin.Plugin.State.STARTING_STOPPING;
-import static org.briarproject.bramble.api.properties.TransportPropertyConstants.REFLECTED_PROPERTY_PREFIX;
-import static org.briarproject.bramble.util.LogUtils.logException;
-import static org.briarproject.bramble.util.PrivacyUtils.scrubMacAddress;
-import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
-import static org.briarproject.bramble.util.StringUtils.macToBytes;
-import static org.briarproject.bramble.util.StringUtils.macToString;
+@NotNullByDefault
+public interface BluetoothPlugin extends DuplexPlugin {
 
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
-abstract class BluetoothPlugin<S, SS> implements DuplexPlugin, EventListener {
-
-	private static final Logger LOG =
-			getLogger(BluetoothPlugin.class.getName());
-
-	final BluetoothConnectionLimiter connectionLimiter;
-	final BluetoothConnectionFactory<S> connectionFactory;
-
-	private final Executor ioExecutor, wakefulIoExecutor;
-	private final SecureRandom secureRandom;
-	private final Backoff backoff;
-	private final PluginCallback callback;
-	private final int maxLatency, maxIdleTime;
-	private final AtomicBoolean used = new AtomicBoolean(false);
-	private final AtomicBoolean everConnected = new AtomicBoolean(false);
-
-	protected final PluginState state = new PluginState();
-
-	private volatile String contactConnectionsUuid = null;
-
-	abstract void initialiseAdapter() throws IOException;
-
-	abstract boolean isAdapterEnabled();
-
-	/**
-	 * Returns the local Bluetooth address, or null if no valid address can
-	 * be found.
-	 */
-	@Nullable
-	abstract String getBluetoothAddress();
-
-	abstract SS openServerSocket(String uuid) throws IOException;
-
-	abstract void tryToClose(@Nullable SS ss);
-
-	abstract DuplexTransportConnection acceptConnection(SS ss)
-			throws IOException;
-
-	abstract boolean isValidAddress(String address);
-
-	abstract DuplexTransportConnection connectTo(String address, String uuid)
-			throws IOException;
+	boolean isDiscovering();
 
 	@Nullable
-	abstract DuplexTransportConnection discoverAndConnect(String uuid);
+	DuplexTransportConnection discoverAndConnectForSetup(String uuid);
 
-	BluetoothPlugin(BluetoothConnectionLimiter connectionLimiter,
-			BluetoothConnectionFactory<S> connectionFactory,
-			Executor ioExecutor,
-			Executor wakefulIoExecutor,
-			SecureRandom secureRandom,
-			Backoff backoff,
-			PluginCallback callback,
-			int maxLatency,
-			int maxIdleTime) {
-		this.connectionLimiter = connectionLimiter;
-		this.connectionFactory = connectionFactory;
-		this.ioExecutor = ioExecutor;
-		this.wakefulIoExecutor = wakefulIoExecutor;
-		this.secureRandom = secureRandom;
-		this.backoff = backoff;
-		this.callback = callback;
-		this.maxLatency = maxLatency;
-		this.maxIdleTime = maxIdleTime;
-	}
-
-	void onAdapterEnabled() {
-		LOG.info("Bluetooth enabled");
-		// We may not have been able to get the local address before
-		ioExecutor.execute(this::updateProperties);
-		if (getState() == INACTIVE) bind();
-	}
-
-	void onAdapterDisabled() {
-		LOG.info("Bluetooth disabled");
-		connectionLimiter.allConnectionsClosed();
-		// The server socket may not have been closed automatically
-		SS ss = state.clearServerSocket();
-		if (ss != null) {
-			LOG.info("Closing server socket");
-			tryToClose(ss);
-		}
-	}
-
-	@Override
-	public TransportId getId() {
-		return ID;
-	}
-
-	@Override
-	public int getMaxLatency() {
-		return maxLatency;
-	}
-
-	@Override
-	public int getMaxIdleTime() {
-		return maxIdleTime;
-	}
-
-	@Override
-	public void start() throws PluginException {
-		if (used.getAndSet(true)) throw new IllegalStateException();
-		Settings settings = callback.getSettings();
-		boolean enabledByUser = settings.getBoolean(PREF_PLUGIN_ENABLE,
-				DEFAULT_PREF_PLUGIN_ENABLE);
-		everConnected.set(settings.getBoolean(PREF_EVER_CONNECTED,
-				DEFAULT_PREF_EVER_CONNECTED));
-		state.setStarted(enabledByUser);
-		try {
-			initialiseAdapter();
-		} catch (IOException e) {
-			throw new PluginException(e);
-		}
-		updateProperties();
-		if (enabledByUser && isAdapterEnabled()) bind();
-	}
-
-	private void bind() {
-		ioExecutor.execute(() -> {
-			if (getState() != INACTIVE) return;
-			// Bind a server socket to accept connections from contacts
-			SS ss;
-			try {
-				ss = openServerSocket(contactConnectionsUuid);
-			} catch (IOException e) {
-				logException(LOG, WARNING, e);
-				return;
-			}
-			if (!state.setServerSocket(ss)) {
-				LOG.info("Closing redundant server socket");
-				tryToClose(ss);
-				return;
-			}
-			backoff.reset();
-			acceptContactConnections(ss);
-		});
-	}
-
-	private void updateProperties() {
-		TransportProperties p = callback.getLocalProperties();
-		String address = p.get(PROP_ADDRESS);
-		String uuid = p.get(PROP_UUID);
-		Settings s = callback.getSettings();
-		boolean isReflected = s.getBoolean(PREF_ADDRESS_IS_REFLECTED,
-				DEFAULT_PREF_ADDRESS_IS_REFLECTED);
-		boolean changed = false;
-		if (address == null || isReflected) {
-			address = getBluetoothAddress();
-			if (LOG.isLoggable(INFO)) {
-				LOG.info("Local address " + scrubMacAddress(address));
-			}
-			if (address == null) {
-				if (everConnected.get()) {
-					address = getReflectedAddress();
-					if (LOG.isLoggable(INFO)) {
-						LOG.info("Reflected address " +
-								scrubMacAddress(address));
-					}
-					if (address != null) {
-						changed = true;
-						isReflected = true;
-					}
-				}
-			} else {
-				changed = true;
-				isReflected = false;
-			}
-		}
-		if (uuid == null) {
-			byte[] random = new byte[UUID_BYTES];
-			secureRandom.nextBytes(random);
-			uuid = UUID.nameUUIDFromBytes(random).toString();
-			changed = true;
-		}
-		contactConnectionsUuid = uuid;
-		if (changed) {
-			p = new TransportProperties();
-			// If we previously used a reflected address and there's no longer
-			// a reflected address with enough votes to be used, we'll continue
-			// to use the old reflected address until there's a new winner
-			if (address != null) p.put(PROP_ADDRESS, address);
-			p.put(PROP_UUID, uuid);
-			callback.mergeLocalProperties(p);
-			s = new Settings();
-			s.putBoolean(PREF_ADDRESS_IS_REFLECTED, isReflected);
-			callback.mergeSettings(s);
-		}
-	}
-
-	@Nullable
-	private String getReflectedAddress() {
-		// Count the number of votes for each reflected address
-		String key = REFLECTED_PROPERTY_PREFIX + PROP_ADDRESS;
-		Multiset<String> votes = new Multiset<>();
-		for (TransportProperties p : callback.getRemoteProperties()) {
-			String address = p.get(key);
-			if (address != null && isValidAddress(address)) votes.add(address);
-		}
-		// If an address gets more than half of the votes, accept it
-		int total = votes.getTotal();
-		for (String address : votes.keySet()) {
-			if (votes.getCount(address) * 2 > total) return address;
-		}
-		return null;
-	}
-
-	private void acceptContactConnections(SS ss) {
-		while (true) {
-			DuplexTransportConnection conn;
-			try {
-				conn = acceptConnection(ss);
-			} catch (IOException e) {
-				// This is expected when the server socket is closed
-				LOG.info("Server socket closed");
-				state.clearServerSocket();
-				return;
-			}
-			LOG.info("Connection received");
-			connectionLimiter.connectionOpened(conn);
-			backoff.reset();
-			setEverConnected();
-			callback.handleConnection(conn);
-		}
-	}
-
-	private void setEverConnected() {
-		if (!everConnected.getAndSet(true)) {
-			ioExecutor.execute(() -> {
-				Settings s = new Settings();
-				s.putBoolean(PREF_EVER_CONNECTED, true);
-				callback.mergeSettings(s);
-				// Contacts may already have sent a reflected address
-				updateProperties();
-			});
-		}
-	}
-
-	@Override
-	public void stop() {
-		SS ss = state.setStopped();
-		tryToClose(ss);
-	}
-
-	@Override
-	public State getState() {
-		return state.getState();
-	}
-
-	@Override
-	public int getReasonsDisabled() {
-		return state.getReasonsDisabled();
-	}
-
-	@Override
-	public boolean shouldPoll() {
-		return true;
-	}
-
-	@Override
-	public int getPollingInterval() {
-		return backoff.getPollingInterval();
-	}
-
-	@Override
-	public void poll(Collection<Pair<TransportProperties, ConnectionHandler>>
-			properties) {
-		if (getState() != ACTIVE) return;
-		backoff.increment();
-		for (Pair<TransportProperties, ConnectionHandler> p : properties) {
-			connect(p.getFirst(), p.getSecond());
-		}
-	}
-
-	private void connect(TransportProperties p, ConnectionHandler h) {
-		String address = p.get(PROP_ADDRESS);
-		if (isNullOrEmpty(address)) return;
-		String uuid = p.get(PROP_UUID);
-		if (isNullOrEmpty(uuid)) return;
-		wakefulIoExecutor.execute(() -> {
-			DuplexTransportConnection d = createConnection(p);
-			if (d != null) {
-				backoff.reset();
-				setEverConnected();
-				h.handleConnection(d);
-			}
-		});
-	}
-
-	@Nullable
-	private DuplexTransportConnection connect(String address, String uuid) {
-		// Validate the address
-		if (!isValidAddress(address)) {
-			if (LOG.isLoggable(WARNING))
-				// Not scrubbing here to be able to figure out the problem
-				LOG.warning("Invalid address " + address);
-			return null;
-		}
-		// Validate the UUID
-		try {
-			//noinspection ResultOfMethodCallIgnored
-			UUID.fromString(uuid);
-		} catch (IllegalArgumentException e) {
-			if (LOG.isLoggable(WARNING)) LOG.warning("Invalid UUID " + uuid);
-			return null;
-		}
-		if (LOG.isLoggable(INFO))
-			LOG.info("Connecting to " + scrubMacAddress(address));
-		try {
-			DuplexTransportConnection conn = connectTo(address, uuid);
-			if (LOG.isLoggable(INFO))
-				LOG.info("Connected to " + scrubMacAddress(address));
-			return conn;
-		} catch (IOException e) {
-			if (LOG.isLoggable(INFO))
-				LOG.info("Could not connect to " + scrubMacAddress(address));
-			return null;
-		}
-	}
-
-	@Override
-	public DuplexTransportConnection createConnection(TransportProperties p) {
-		if (getState() != ACTIVE) return null;
-		if (!connectionLimiter.canOpenContactConnection()) return null;
-		String address = p.get(PROP_ADDRESS);
-		if (isNullOrEmpty(address)) return null;
-		String uuid = p.get(PROP_UUID);
-		if (isNullOrEmpty(uuid)) return null;
-		DuplexTransportConnection conn = connect(address, uuid);
-		if (conn != null) connectionLimiter.connectionOpened(conn);
-		return conn;
-	}
-
-	@Override
-	public boolean supportsKeyAgreement() {
-		return true;
-	}
-
-	@Override
-	public KeyAgreementListener createKeyAgreementListener(byte[] commitment) {
-		if (getState() != ACTIVE) return null;
-		// No truncation necessary because COMMIT_LENGTH = 16
-		String uuid = UUID.nameUUIDFromBytes(commitment).toString();
-		if (LOG.isLoggable(INFO)) LOG.info("Key agreement UUID " + uuid);
-		// Bind a server socket for receiving key agreement connections
-		SS ss;
-		try {
-			ss = openServerSocket(uuid);
-		} catch (IOException e) {
-			logException(LOG, WARNING, e);
-			return null;
-		}
-		if (getState() != ACTIVE) {
-			tryToClose(ss);
-			return null;
-		}
-		BdfList descriptor = new BdfList();
-		descriptor.add(TRANSPORT_ID_BLUETOOTH);
-		String address = getBluetoothAddress();
-		if (address != null) descriptor.add(macToBytes(address));
-		return new BluetoothKeyAgreementListener(descriptor, ss);
-	}
-
-	@Override
-	public DuplexTransportConnection createKeyAgreementConnection(
-			byte[] commitment, BdfList descriptor) {
-		if (getState() != ACTIVE) return null;
-		// No truncation necessary because COMMIT_LENGTH = 16
-		String uuid = UUID.nameUUIDFromBytes(commitment).toString();
-		DuplexTransportConnection conn;
-		if (descriptor.size() == 1) {
-			if (LOG.isLoggable(INFO)) {
-				LOG.info("Discovering address for key agreement UUID " +
-						uuid);
-			}
-			conn = discoverAndConnect(uuid);
-		} else {
-			String address;
-			try {
-				address = parseAddress(descriptor);
-			} catch (FormatException e) {
-				LOG.info("Invalid address in key agreement descriptor");
-				return null;
-			}
-			if (LOG.isLoggable(INFO))
-				LOG.info("Connecting to key agreement UUID " + uuid);
-			conn = connect(address, uuid);
-		}
-		if (conn != null) {
-			connectionLimiter.connectionOpened(conn);
-			setEverConnected();
-		}
-		return conn;
-	}
-
-	private String parseAddress(BdfList descriptor) throws FormatException {
-		byte[] mac = descriptor.getRaw(1);
-		if (mac.length != 6) throw new FormatException();
-		return macToString(mac);
-	}
-
-	@Override
-	public boolean supportsRendezvous() {
-		return false;
-	}
-
-	@Override
-	public RendezvousEndpoint createRendezvousEndpoint(KeyMaterialSource k,
-			boolean alice, ConnectionHandler incoming) {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public void eventOccurred(Event e) {
-		if (e instanceof SettingsUpdatedEvent) {
-			SettingsUpdatedEvent s = (SettingsUpdatedEvent) e;
-			if (s.getNamespace().equals(ID.getString()))
-				ioExecutor.execute(() -> onSettingsUpdated(s.getSettings()));
-		} else if (e instanceof KeyAgreementListeningEvent) {
-			ioExecutor.execute(connectionLimiter::keyAgreementStarted);
-		} else if (e instanceof KeyAgreementStoppedListeningEvent) {
-			ioExecutor.execute(connectionLimiter::keyAgreementEnded);
-		} else if (e instanceof RemoteTransportPropertiesUpdatedEvent) {
-			RemoteTransportPropertiesUpdatedEvent r =
-					(RemoteTransportPropertiesUpdatedEvent) e;
-			if (r.getTransportId().equals(ID)) {
-				ioExecutor.execute(this::updateProperties);
-			}
-		}
-	}
-
-	@IoExecutor
-	private void onSettingsUpdated(Settings settings) {
-		boolean enabledByUser = settings.getBoolean(PREF_PLUGIN_ENABLE,
-				DEFAULT_PREF_PLUGIN_ENABLE);
-		SS ss = state.setEnabledByUser(enabledByUser);
-		State s = getState();
-		if (ss != null) {
-			LOG.info("Disabled by user, closing server socket");
-			tryToClose(ss);
-		} else if (s == INACTIVE) {
-			if (isAdapterEnabled()) {
-				LOG.info("Enabled by user, opening server socket");
-				bind();
-			} else {
-				LOG.info("Enabled by user but adapter is disabled");
-			}
-		}
-	}
-
-	private class BluetoothKeyAgreementListener extends KeyAgreementListener {
-
-		private final SS ss;
-
-		private BluetoothKeyAgreementListener(BdfList descriptor, SS ss) {
-			super(descriptor);
-			this.ss = ss;
-		}
-
-		@Override
-		public KeyAgreementConnection accept() throws IOException {
-			DuplexTransportConnection conn = acceptConnection(ss);
-			if (LOG.isLoggable(INFO)) LOG.info(ID + ": Incoming connection");
-			connectionLimiter.connectionOpened(conn);
-			return new KeyAgreementConnection(conn, ID);
-		}
-
-		@Override
-		public void close() {
-			tryToClose(ss);
-		}
-	}
-
-	@ThreadSafe
-	@NotNullByDefault
-	protected class PluginState {
-
-		@GuardedBy("this")
-		private boolean started = false,
-				stopped = false,
-				enabledByUser = false;
-
-		@GuardedBy("this")
-		@Nullable
-		private SS serverSocket = null;
-
-		synchronized void setStarted(boolean enabledByUser) {
-			started = true;
-			this.enabledByUser = enabledByUser;
-			callback.pluginStateChanged(getState());
-		}
-
-		@Nullable
-		synchronized SS setStopped() {
-			stopped = true;
-			SS ss = serverSocket;
-			serverSocket = null;
-			callback.pluginStateChanged(getState());
-			return ss;
-		}
-
-		@Nullable
-		synchronized SS setEnabledByUser(boolean enabledByUser) {
-			this.enabledByUser = enabledByUser;
-			SS ss = null;
-			if (!enabledByUser) {
-				ss = serverSocket;
-				serverSocket = null;
-			}
-			callback.pluginStateChanged(getState());
-			return ss;
-		}
-
-		synchronized boolean setServerSocket(SS ss) {
-			if (stopped || serverSocket != null) return false;
-			serverSocket = ss;
-			callback.pluginStateChanged(getState());
-			return true;
-		}
-
-		@Nullable
-		synchronized SS clearServerSocket() {
-			SS ss = serverSocket;
-			serverSocket = null;
-			callback.pluginStateChanged(getState());
-			return ss;
-		}
-
-		synchronized State getState() {
-			if (!started || stopped) return STARTING_STOPPING;
-			if (!enabledByUser) return DISABLED;
-			return serverSocket == null ? INACTIVE : ACTIVE;
-		}
-
-		synchronized int getReasonsDisabled() {
-			return getState() == DISABLED ? REASON_USER : 0;
-		}
-	}
+	void stopDiscoverAndConnect();
 }

bramble-core/src/main/resources/bridges

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

bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabaseTest.java

@@ -41,8 +41,12 @@ import org.junit.Test;
 
 import java.io.File;
 import java.sql.Connection;
+import java.sql.Driver;
+import java.sql.DriverManager;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Enumeration;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -2346,6 +2350,67 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 		db.close();
 	}
 
+
+	@Test
+	public void testShutdownGracefully() throws Exception {
+		Database<Connection> db = open(false);
+		db.close();
+		open(true);
+		assertFalse(db.wasDirtyOnInitialisation());
+	}
+
+	@Test
+	public void testShutdownDirty() throws Exception {
+		Database<Connection> db = open(false);
+
+		// We want to simulate a dirty shutdown here which would normally be
+		// caused by an empty battery or by force closing the Android app.
+		// As there is no obvious way to simulate this, we're artificially
+		// causing an SqlException during close() here by unloading the JDBC
+		// drivers.
+		List<String> unloadedDrivers = unloadDrivers();
+
+		try {
+			db.close();
+			fail();
+		} catch (Exception e) {
+			// continue
+			e.printStackTrace();
+		}
+
+		// Reloading drivers to continue so that we're able to work with the
+		// database again.
+		reloadDrivers(unloadedDrivers);
+
+		db = open(true);
+		assertTrue(db.wasDirtyOnInitialisation());
+	}
+
+	@Test
+	public void testShutdownDirtyThenGracefully() throws Exception {
+		Database<Connection> db = open(false);
+
+		// Simulating a dirty shutdown here, look at #testShutdownDirty for
+		// details.
+		List<String> unloadedDrivers = unloadDrivers();
+
+		try {
+			db.close();
+			fail();
+		} catch (Exception e) {
+			// continue
+		}
+
+		reloadDrivers(unloadedDrivers);
+
+		db = open(true);
+		assertTrue(db.wasDirtyOnInitialisation());
+
+		db.close();
+		db = open(true);
+		assertFalse(db.wasDirtyOnInitialisation());
+	}
+
 	@Test
 	public void testCleanupTimer() throws Exception {
 		long duration = 60_000;
@@ -2482,6 +2547,31 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 				rootKey, alice);
 	}
 
+	private List<String> unloadDrivers() {
+		Enumeration<Driver> drivers = DriverManager.getDrivers();
+		List<String> unloaded = new ArrayList<>();
+		while (drivers.hasMoreElements()) {
+			Driver d = drivers.nextElement();
+			try {
+				DriverManager.deregisterDriver(d);
+				unloaded.add(d.getClass().getName());
+			} catch (SQLException e) {
+				e.printStackTrace();
+				fail();
+			}
+		}
+		return unloaded;
+	}
+
+	private void reloadDrivers(List<String> unloadedDrivers)
+			throws ClassNotFoundException, IllegalAccessException,
+			InstantiationException, SQLException {
+		for (String driverName : unloadedDrivers) {
+			DriverManager.registerDriver(
+					(Driver) Class.forName(driverName).newInstance());
+		}
+	}
+
 	@After
 	public void tearDown() {
 		deleteTestDirectory(testDir);

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

@@ -38,6 +38,11 @@ public class BrambleCoreIntegrationTestModule {
 			public boolean shouldEnableDisappearingMessages() {
 				return true;
 			}
+
+			@Override
+			public boolean shouldEnableConnectViaBluetooth() {
+				return true;
+			}
 		};
 	}
 }

bramble-java/build.gradle

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

bramble-java/src/main/java/org/briarproject/bramble/plugin/bluetooth/JavaBluetoothPlugin.java

@@ -25,8 +25,8 @@ import static org.briarproject.bramble.util.StringUtils.isValidMac;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
-class JavaBluetoothPlugin
-		extends BluetoothPlugin<StreamConnection, StreamConnectionNotifier> {
+class JavaBluetoothPlugin extends
+		AbstractBluetoothPlugin<StreamConnection, StreamConnectionNotifier> {
 
 	private static final Logger LOG =
 			getLogger(JavaBluetoothPlugin.class.getName());
@@ -108,6 +108,11 @@ class JavaBluetoothPlugin
 		return null; // TODO
 	}
 
+	@Override
+	public void stopDiscoverAndConnect() {
+		// TODO
+	}
+
 	private String makeUrl(String address, String uuid) {
 		return "btspp://" + address + ":" + uuid + ";name=RFCOMM";
 	}

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

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

bramble-java/witness.gradle

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

briar-android/.gitignore

@@ -10,4 +10,6 @@ src/main/res/values-iw
 /fastlane/metadata/android/screenshots.html
 /fastlane/metadata/android/*/images
 /fastlane/report.xml
-/fastlane/README.md
+/fastlane/README.md
+
+/fastlane/metadata/android/*/changelogs

briar-android/.tx/config

@@ -9,3 +9,19 @@ source_lang = en
 type = ANDROID
 minimum_perc = 80
 
+[briar.google-play-short-description]
+# https://support.google.com/googleplay/android-developer/answer/9844778?hl=en#zippy=%2Cview-list-of-available-languages
+lang_map = en: en-US, de: de-DE, es: es-ES, gl: gl-ES, tr: tr-TR, zh-Hans: zh-CN
+file_filter = fastlane/metadata/android/<lang>/short_description.txt
+source_file = fastlane/metadata/android/en-US/short_description.txt
+source_lang = en
+type = TXT
+minimum_perc = 100
+
+[briar.google-play-full-description]
+lang_map = en: en-US, de: de-DE, es: es-ES, gl: gl-ES, tr: tr-TR, zh-Hans: zh-CN
+file_filter = fastlane/metadata/android/<lang>/full_description.txt
+source_file = fastlane/metadata/android/en-US/full_description.txt
+source_lang = en
+type = TXT
+minimum_perc = 100

briar-android/build.gradle

@@ -17,13 +17,17 @@ def getStdout = { command, defaultValue ->
 
 android {
 	compileSdkVersion 30
-	buildToolsVersion '30.0.2'
+	buildToolsVersion '30.0.3'
+
+	packagingOptions {
+		doNotStrip '**/*.so'
+	}
 
 	defaultConfig {
 		minSdkVersion 16
-		targetSdkVersion 29
-		versionCode 10216
-		versionName "1.2.16"
+		targetSdkVersion 30
+		versionCode 10303
+		versionName "1.3.3"
 		applicationId "org.briarproject.briar.android"
 
 		vectorDrawables.useSupportLibrary = true
@@ -76,6 +80,7 @@ android {
 	}
 
 	testOptions {
+		execution 'ANDROIDX_TEST_ORCHESTRATOR'
 		unitTests {
 			includeAndroidResources = true
 		}
@@ -144,6 +149,8 @@ dependencies {
 	androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
 	androidTestImplementation "androidx.test.espresso:espresso-contrib:$espressoVersion"
 	androidTestImplementation "androidx.test.espresso:espresso-intents:$espressoVersion"
+	androidTestImplementation 'androidx.test:runner:1.3.0'
+	androidTestUtil 'androidx.test:orchestrator:1.3.0'
 	androidTestAnnotationProcessor "com.google.dagger:dagger-compiler:2.24"
 	androidTestCompileOnly 'javax.annotation:jsr250-api:1.0'
 	androidTestImplementation 'junit:junit:4.13.1'

briar-android/fastlane/Appfile

@@ -1,2 +1,2 @@
-json_key_file("") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one
+json_key_file(ENV["BRIAR_GOOGLE_PLAY_JSON_KEY_FILE"])
 package_name("org.briarproject.briar.android")

briar-android/fastlane/Fastfile

@@ -13,6 +13,8 @@
 # Uncomment the line if you want fastlane to automatically update itself
 # update_fastlane
 
+opt_out_usage
+
 default_platform(:android)
 
 platform :android do
@@ -24,6 +26,21 @@ platform :android do
     system './demo-mode-deactivate.sh'
     system './rename_screenshots.py'
   end
+
+  desc "Updates Google Play metadata (title, descriptions, video, etc.)"
+  lane :metadata do
+    system './update-metadata.sh'
+    upload_to_play_store(
+      skip_upload_apk: true,
+	  skip_upload_aab: true,
+	  skip_upload_metadata: false,
+	  skip_upload_changelogs: true,
+	  skip_upload_images: true,
+	  skip_upload_screenshots: true,
+	  validate_only: false,
+	)
+  end
+
 end
 
 

briar-android/fastlane/metadata/android/ca/full_description.txt

@@ -0,0 +1,5 @@
+El Briar és una aplicació de missatgeria dissenyada per a activistes, periodistes i qualsevol persona en general que necessiti una manera segura, fàcil i robsuta de comunicar-se. Al contrari que les aplicacions tradicionals, el Briar no depèn d'un servidor central: els missatges se sincronitzen directament entre els dispositius dels usuaris. Si Internet cau, el Briar pot continuar funcionant mitjançant Bluetooth o Wi-Fi, mantenint el flux fins i tot amb aquesta situació caòtica. Amb un funcionament normal d'Internet, el Briar es pot sincronitzar a través de la xarxa Tor, protegint els usuaris i les seves comunicacions d'ulls indiscrets.
+
+L'aplicació té com a característica principal l'enviament de missatges privats en grups, fòrums o blocs, atès que es basa en la xarxa Tor. Qualsevol interacció al Briar s'emmagatzema només al vostre dispositiu fins que vulgueu compartir-ho amb altres usuaris.
+
+No hi han anuncis ni seguiment  El codi font d'aquesta aplicació està disponible per a tothom que vulgui inspeccionar-ho, com ja l'han auditat empreses professionals. Totes les versions del Briar són reproduïbles, la qual cosa permet verificar que el codi font publicat coincideix exactament amb l'aplicació publicada aquí. El desenvolupament és a càrrec d'un petit equip sense ànim lucratiu.

briar-android/fastlane/metadata/android/ca/short_description.txt

@@ -0,0 +1 @@
+Missatgeria segura, arreu.

briar-android/fastlane/metadata/android/ca/title.txt

@@ -0,0 +1 @@
+Briar

briar-android/fastlane/metadata/android/de-DE/full_description.txt

@@ -0,0 +1,5 @@
+Briar ist eine Messaging-App für Aktivisten, Journalisten und jeden, der eine sichere, einfache und robuste Art der Kommunikation benötigt. Im Gegensatz zu herkömmlichen Messaging-Apps benötigt Briar keinen zentralen Server. Nachrichten werden direkt zwischen den Endgeräten der Benutzer ausgetauscht. Wenn das Internet ausfällt, kann Briar diese auch über Bluetooth oder WLAN austauschen, um den Informationsaustausch in einer Krise aufrecht zu erhalten. Mit einer Internet Verbindung synchronisiert sich Briar über das Tor-Netzwerk und schützt so die Benutzer und ihre Kontakte vor Überwachung.
+
+Die App bietet private Nachrichten, Gruppen und Foren sowie Blogs. Die Unterstützung für das Tor-Netzwerk ist in die App integriert. Alles, was du in Briar machst, wird nur auf deinem Gerät gespeichert, es sei denn, du entscheidest dich, es mit anderen Benutzern zu teilen.
+
+Es gibt keine Werbung und kein Tracking. Der Quellcode der App ist komplett offen für jeden einsehbar und wurde bereits professionell auditiert. Alle Versionen von Briar sind reproduzierbar, so dass überprüft werden kann, ob der veröffentlichte Quellcode genau mit der hier veröffentlichten App übereinstimmt. Die Entwicklung wird von einem kleinen Non-Profit-Team durchgeführt.

briar-android/fastlane/metadata/android/de-DE/short_description.txt

@@ -0,0 +1 @@
+Sicher kommunizieren, überall

briar-android/fastlane/metadata/android/de-DE/title.txt

@@ -0,0 +1 @@
+Briar

briar-android/fastlane/metadata/android/en-US/full_description.txt

@@ -0,0 +1,5 @@
+Briar is a messaging app designed for activists, journalists, and anyone else who needs a safe, easy and robust way to communicate. Unlike traditional messaging apps, Briar doesn't rely on a central server - messages are synchronized directly between the users' devices. If the internet's down, Briar can sync via Bluetooth or Wi-Fi, keeping the information flowing in a crisis. If the internet's up, Briar can sync via the Tor network, protecting users and their relationships from surveillance.
+
+The app features private messages, groups and forums as well as blogs. Support for Tor network is built into the app. Everything you do in Briar is only stored on your device unless you decide to share it with other users.
+
+There are no advertisements and no tracking. The source code of the app is completely open for anyone to inspect and has already been professionally audited. All releases of Briar are reproducible, making it possible to verify that the published source code matches exactly the app published here. Development is done by a small non-profit team.

briar-android/fastlane/metadata/android/en-US/short_description.txt

@@ -0,0 +1 @@
+Secure messaging, anywhere.

briar-android/fastlane/metadata/android/en-US/title.txt

@@ -0,0 +1 @@
+Briar

briar-android/fastlane/metadata/android/en-US/video.txt

@@ -0,0 +1 @@
+https://www.youtube.com/watch?v=ark7Y4u__SM

briar-android/fastlane/metadata/android/es-ES/full_description.txt

@@ -0,0 +1,5 @@
+Briar es una aplicación de mensajería diseñada para activistas, periodistas y cualquier otra persona que necesita una forma segura, fácil y robusta de comunicación. A diferencia de las aplicaciones de mensajería tradicionales, Briar no necesita un servidor central – los mensajes son sincronizados directamente entre los dispositivos de los usuarios. Si no hay conexión a internet disponible, Briar puede sincronizarse vía Bluetooth o WiFi, manteniendo la información fluyendo en crisis. Si Internet está disponible, Briar puede sincronizarse vía red Tor, protegiendo a los usuarios y sus relaciones de la vigilancia.
+
+La aplicación tiene como características mensajes, grupos y foros privados, como así también blogs. El soporte para red Tor está incorporado en la aplicación. Todo lo que haces en Briar solamente es almacenado en tu dispositivo, a menos que decidas compartirlo con otros usuarios.
+
+No hay publicidades ni rastreo. El código fuente de la aplicación está completamente abierto para que cualquiera lo inspeccione, y ya ha sido auditado profesionalmente. Todas las versiones de Briar son reproducibles, haciendo posible verificar que el código fuente publicado se corresponda exactamente con la aplicación publicada aquí. El desarrollo es realizado por un reducido equipo sin fines de lucro.

briar-android/fastlane/metadata/android/es-ES/short_description.txt

@@ -0,0 +1 @@
+Mensajería segura, en cualquier lado.

briar-android/fastlane/metadata/android/es-ES/title.txt

@@ -0,0 +1 @@
+Briar

briar-android/fastlane/metadata/android/es-ES/video.txt

@@ -0,0 +1 @@
+https://www.youtube.com/watch?v=OuJjWdDfKuY

briar-android/fastlane/metadata/android/fa/full_description.txt

@@ -0,0 +1,5 @@
+Briar یک برنامه پیام رسان می باشد که برای فعالان، روزنامه نگاران و هر کسی که نیازمند یک راه امن، راحت و پیشرفته برای ارتباط با دیگران است می باشد. برخلاف برنامه‌ های پیام‌رسان‌ مرسوم، Briar به سرور متمرکز اتکا ندارد - پیام ها به صورت مستقیم بین دستگاه کاربران همگام می شود. اگر اینترنت کار نکند، Briar می‌تواند از طریق بلوتوث یا وای‌-فای همگام سازی کرده، جریان اطلاعات را در زمان بحران نگه دارد. اگر اینترنت کار کند، Briar می‌تواند برای محافظت کاربران و وابط آن ها از از شنود، از طریق شبکه تور همگام سازی کند.
+
+این برنامه امکان ارسال پیام خصوصی، گروهی، تالارهای گفتمان و وبلاگ را در اختیار شما می‌گذارد. در این برنامه از شبکه‌ی تور پشتیبانی می‌شود. هر آنچه در برایر (Briar) انجام می‌دهید، تنها در دستگاه شما ذخیره می‌شود مگر اینکه خودتان آن را با دیگران به اشتراک بگذارید.
+
+این برنامه هیچ تبلیغ و ردیابی از کاربران خود انجام نمی‌دهد. کد منبع برنامه به صورت کاملا باز در اختیار همه قرار دارد و کاملا حرفه‌ای بررسی شده است. تمامی نسخه‌های جدید برایر (Briar) قابل تولید مجدد هستند که امکان تائید یکسان بودن برنامه منتشر شده با کد منبع را می‌دهد. توسعه این برنامه توسط یک تیم غیرانتفاعی کوچک صورت می‌پذیرد.

briar-android/fastlane/metadata/android/fa/short_description.txt

@@ -0,0 +1 @@
+پیام‌رسان امن، در هر کجا

briar-android/fastlane/metadata/android/fa/title.txt

@@ -0,0 +1 @@
+Briar

briar-android/fastlane/metadata/android/fa/video.txt

@@ -0,0 +1 @@
+https://www.youtube.com/watch?v=ogDywPyPrB4

briar-android/fastlane/metadata/android/gl-ES/full_description.txt

@@ -0,0 +1,5 @@
+Briar é unha app de mensaxería deseñada para activistas, xornalistas e calquera que precise comunicarse de xeito robusto, simple e seguro. Ao contrario que as apps de mensaxería tradicionais, Briar non depende dun servidor central - as mensaxes sincronízanse directamente entre os dispositivos das persoas usuarias. Se caese internet, Briar pode sincronizar a través de Bluetooth ou Wi-Fi, mantendo o fluxo de información en períodos de crise. Se hai internet, Briar pode sincronizar a través da rede Tor, protexendo ás usuarias e ás súas relacións da vixilancia.
+
+A app proporciona mensaxes privadas, grupos e foros así como blogs. O soporte para a rede Tor está incluído na propia app. Todo o que fas en Briar só se garda no teu dispositivo a non ser que decidas compartilo con outras usuarias.
+
+Non hai publicidade nen rastrexo da túa actividade. O código fonte da app está completamente aberto a calquera que queira revisalo e xa foi auditado profesionalmente. Todas as versións de Briar son reproducibles, facendo posible verificar que o código fonte publicado coincide exactamente coa app publicada aquí. O desenvolvemento realízase por un pequeno equipo de voluntarias.

briar-android/fastlane/metadata/android/gl-ES/short_description.txt

@@ -0,0 +1 @@
+Mensaxería segura, en todo lugar.

briar-android/fastlane/metadata/android/gl-ES/title.txt

@@ -0,0 +1 @@
+Briar

briar-android/fastlane/metadata/android/lt/full_description.txt

@@ -0,0 +1,5 @@
+Briar yra žinučių perdavimo programėlė, skirta aktyvistams, žurnalistams ir visiems kitiems, kam reikia saugaus, lengvo ir veiksmingo bendravimo būdo. Kitaip nei kitos tradicinės žinučių perdavimo programėlės, Briar nepasikliauja centriniu serveriu - žinutės yra sinchronizuojamos tiesiogiai tarp naudotojų įrenginių. Jei nėra interneto, Briar gali sinchronizuotis per Bluetooth ar belaidį ryšį (Wi-Fi), kad palaikytų informacijos perdavimą kriziniais atvejais. Jei internetas veikia, Briar gali sinchronizuotis per Tor tinklą, apsaugodama naudotojus ir jų tarpusavio ryšius nuo stebėjimo.
+
+Programėlėje yra galimybė naudotis privačiomis žinutėmis, grupėmis, forumais, o taip pat tinklaraščiais. Tor tinklo palaikymas yra įtaisytas į programėlę. Viskas, ką atliekate Briar programėlėje, yra laikoma jūsų įrenginyje, nebent nuspręsite pasidalinti tuo su kitais naudotojais.
+
+Nėra jokių reklamų ir jokio sekimo. Pradinis programėlės kodas yra visiškai atviras kiekvienam, norinčiam jį ištirti, ir jau buvo profesionaliai patikrintas. Visos Briar laidos yra atgaminamos, todėl galima patikrinti ir įsitikinti, kad paskelbtas pradinis kodas tiksliai atitinka čia paskelbtą programėlę. Programėlės plėtojimą vykdo maža nepelno siekianti komanda.

briar-android/fastlane/metadata/android/lt/short_description.txt

@@ -0,0 +1 @@
+Saugus susirašinėjimas, bet kur.

briar-android/fastlane/metadata/android/lt/title.txt

@@ -0,0 +1 @@
+Briar

briar-android/fastlane/metadata/android/tr-TR/full_description.txt

@@ -0,0 +1,5 @@
+Briar aktivistler ve gazeteciler başta olmak üzere güvenli, kolay ve sağlam bir iletişim isteyen herkes için tasarlanmış bir ileti sistemidir. Geleneksel ileti sistemlerinin aksine Briar merkezi bir sunucu kullanmaz, iletiler doğrudan kullanıcıların aygıtları arasında eşleştirilir. Briar, eğer İnternet yoksa Bluetooth veya Wi-Fi aracılığıyla da iletileri iletebilir, böylece kriz durumlarında bilgi akışını sürdürür. İnternet varken Briar Tor ağı aracılığıyla iletim sağlar, böylece kullanıcıları ve ilişkilerini gözetimden korumuş olur.  
+
+Bu uygulama özel iletiler, gruplar ve forumlarla birlikte blog özelliklerine sahiptir. Tor ağı desteği uygulamada gömülüdür. Briar üzerinde yaptığınız her şey, siz başka kullanıcılarla paylaşmayı seçmediğiniz sürece, sadece kendi aygıtınızda saklanır.
+
+Ne reklam var, ne de sizi izleme. Uygulamanın kaynak kodu, incelemek isteyen herkese tamamen açıktır ve zaten profesyonel olarak da denetlenmiştir. Briar'ın tüm sürümleri yeniden üretilebilir, böylece yayınlanan kaynak kodun, burada yayınlanan uygulamayla tam olarak eşlendiğini doğrulamak mümkündür. Uygulama kâr amacı gütmeyen küçük bir ekip tarafından geliştirilmektedir.

briar-android/fastlane/metadata/android/tr-TR/short_description.txt

@@ -0,0 +1 @@
+Güvenli mesajlaşma, nerede olursa olsun.

briar-android/fastlane/metadata/android/tr-TR/title.txt

@@ -0,0 +1 @@
+Briar

briar-android/fastlane/metadata/android/zh-CN/full_description.txt

@@ -0,0 +1,5 @@
+Briar 是一款为活动人士、记者和其他需要安全、轻松和强大的通信方式的人设计的消息应用。与传统的消息应用不同，Briar 不依赖中央服务器——消息在用户设备之间直接同步。即便互联网中断，Briar 也可以通过蓝牙或 Wi-Fi 进行同步，在危机中保持信息流通。如果互联网连接正常，Briar 可以通过 Tor 网络进行同步，从而保护用户及其关系不受监视。
+
+这款应用的功能包括私人信息、群组、论坛和博客。应用程序内置了对Tor网络的支持。你在Briar中所做的一切都只存储在你的设备上，除非你决定与其他用户共享它。 
+
+没有广告，也没有跟踪。该应用程序的源代码是完全开放的，任何人都可以检查，并且已经经过专业审计。Briar的所有版本都是可复制的，这使得验证发布的源代码与这里发布的应用程序完全匹配成为可能。开发是由一个小型非营利团队完成的。 

briar-android/fastlane/metadata/android/zh-CN/short_description.txt

@@ -0,0 +1 @@
+安全收发信息，不论何处 

briar-android/fastlane/metadata/android/zh-CN/title.txt

@@ -0,0 +1 @@
+Briar

briar-android/fastlane/update-metadata.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+tx pull -a -r briar.google-play-full-description,briar.google-play-short-description
+
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
+
+for LANG_DIR in "$DIR"/metadata/android/*; do
+  if [[ "$LANG_DIR" == *en-US ]]; then
+    continue
+  fi
+  if [[ -f "$LANG_DIR/full_description.txt" ]] && [[ -f "$LANG_DIR/short_description.txt" ]]; then
+    # every language uses the same app title
+    cp "$DIR/metadata/android/en-US/title.txt" "$LANG_DIR/title.txt"
+    echo "$LANG_DIR"
+  else
+    # not complete, remove
+    rm -r "$LANG_DIR"
+  fi
+done

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

@@ -19,4 +19,9 @@ public class BriarTestComponentApplication extends BriarApplicationImpl {
 		return component;
 	}
 
+	@Override
+	public boolean isInstrumentationTest() {
+		return true;
+	}
+
 }

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

@@ -0,0 +1,65 @@
+package org.briarproject.briar.android;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import androidx.test.espresso.Espresso;
+import androidx.test.espresso.FailureHandler;
+import androidx.test.espresso.base.DefaultFailureHandler;
+import androidx.test.runner.screenshot.BasicScreenCaptureProcessor;
+import androidx.test.runner.screenshot.ScreenCapture;
+import androidx.test.runner.screenshot.ScreenCaptureProcessor;
+import androidx.test.runner.screenshot.Screenshot;
+
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+
+@NotNullByDefault
+public class ScreenshotOnFailureRule implements TestRule {
+
+	FailureHandler defaultFailureHandler =
+			new DefaultFailureHandler(getApplicationContext());
+
+	@Override
+	public Statement apply(Statement base, Description description) {
+		HashSet<ScreenCaptureProcessor> processors = new HashSet<>(1);
+		processors.add(new BasicScreenCaptureProcessor());
+		Screenshot.addScreenCaptureProcessors(processors);
+		return new Statement() {
+			@Override
+			public void evaluate() throws Throwable {
+				AtomicBoolean errorHandled = new AtomicBoolean(false);
+				Espresso.setFailureHandler((throwable, matcher) -> {
+					takeScreenshot(description);
+					errorHandled.set(true);
+					defaultFailureHandler.handle(throwable, matcher);
+				});
+				try {
+					base.evaluate();
+				} catch (Throwable t) {
+					if (!errorHandled.get()) {
+						takeScreenshot(description);
+					}
+					throw t;
+				}
+			}
+		};
+	}
+
+	private void takeScreenshot(Description description) {
+		String name = description.getTestClass().getSimpleName();
+		ScreenCapture capture = Screenshot.capture();
+		capture.setName(name);
+		try {
+			capture.process();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+}

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

@@ -6,19 +6,25 @@ import android.content.Intent;
 import org.briarproject.bramble.api.account.AccountManager;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.settings.SettingsManager;
 import org.briarproject.briar.R;
+import org.junit.ClassRule;
 
-import javax.annotation.Nullable;
 import javax.inject.Inject;
 
 import androidx.test.espresso.intent.rule.IntentsTestRule;
 
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
 
 
 @SuppressWarnings("WeakerAccess")
 public abstract class UiTest {
 
+	@ClassRule
+	public static final ScreenshotOnFailureRule screenshotOnFailureRule =
+			new ScreenshotOnFailureRule();
+
 	protected final String USERNAME =
 			getApplicationContext().getString(R.string.screenshot_alice);
 	protected static final String PASSWORD = "123456";
@@ -27,6 +33,8 @@ public abstract class UiTest {
 	protected AccountManager accountManager;
 	@Inject
 	protected LifecycleManager lifecycleManager;
+	@Inject
+	protected SettingsManager settingsManager;
 
 	public UiTest() {
 		BriarTestComponentApplication app = getApplicationContext();
@@ -35,26 +43,18 @@ public abstract class UiTest {
 
 	protected abstract void inject(BriarUiTestComponent component);
 
+	protected void startActivity(Class<? extends Activity> clazz) {
+		Intent i = new Intent(getApplicationContext(), clazz);
+		i.addFlags(FLAG_ACTIVITY_NEW_TASK);
+		getApplicationContext().startActivity(i);
+	}
+
 	@NotNullByDefault
 	protected class CleanAccountTestRule<A extends Activity>
 			extends IntentsTestRule<A> {
 
-		@Nullable
-		private final Runnable runnable;
-
 		public CleanAccountTestRule(Class<A> activityClass) {
 			super(activityClass);
-			this.runnable = null;
-		}
-
-		/**
-		 * Use this if you need to run code before launching the activity.
-		 * Note: You need to use {@link #launchActivity(Intent)} yourself
-		 * to start the activity.
-		 */
-		public CleanAccountTestRule(Class<A> activityClass, Runnable runnable) {
-			super(activityClass, false, false);
-			this.runnable = runnable;
 		}
 
 		@Override
@@ -62,16 +62,13 @@ public abstract class UiTest {
 			super.beforeActivityLaunched();
 			accountManager.deleteAccount();
 			accountManager.createAccount(USERNAME, PASSWORD);
-			if (runnable != null) {
-				Intent serviceIntent =
-						new Intent(getApplicationContext(), BriarService.class);
-				getApplicationContext().startService(serviceIntent);
-				try {
-					lifecycleManager.waitForStartup();
-				} catch (InterruptedException e) {
-					throw new AssertionError(e);
-				}
-				runnable.run();
+			Intent serviceIntent =
+					new Intent(getApplicationContext(), BriarService.class);
+			getApplicationContext().startService(serviceIntent);
+			try {
+				lifecycleManager.waitForStartup();
+			} catch (InterruptedException e) {
+				throw new AssertionError(e);
 			}
 		}
 	}

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

@@ -1,6 +1,7 @@
 package org.briarproject.briar.android;
 
 import android.app.Activity;
+import android.util.Log;
 import android.view.View;
 
 import org.hamcrest.Matcher;
@@ -14,9 +15,13 @@ import androidx.test.runner.lifecycle.ActivityLifecycleMonitor;
 import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry;
 import androidx.test.runner.lifecycle.Stage;
 
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant;
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
 import static androidx.test.espresso.util.HumanReadables.describe;
 import static androidx.test.espresso.util.TreeIterables.breadthFirstViewTraversal;
+import static androidx.test.runner.lifecycle.Stage.RESUMED;
 import static java.lang.System.currentTimeMillis;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
@@ -25,13 +30,26 @@ public class ViewActions {
 	private final static long TIMEOUT_MS = SECONDS.toMillis(10);
 	private final static long WAIT_MS = 50;
 
+	public static void waitFor(final Matcher<View> viewMatcher) {
+		onView(isRoot()).perform(waitUntilMatches(hasDescendant(viewMatcher)));
+	}
+
+	public static void waitFor(final Class<? extends Activity> clazz) {
+		onView(isRoot()).perform(waitForActivity(clazz, RESUMED, TIMEOUT_MS));
+	}
+
+	public static void waitFor(final Class<? extends Activity> clazz,
+			long timeout) {
+		onView(isRoot()).perform(waitForActivity(clazz, RESUMED, timeout));
+	}
+
 	public static ViewAction waitUntilMatches(Matcher<View> viewMatcher) {
 		return waitUntilMatches(viewMatcher, TIMEOUT_MS);
 	}
 
 	private static ViewAction waitUntilMatches(Matcher<View> viewMatcher,
 			long timeout) {
-		return new CustomViewAction() {
+		return new CustomViewAction(timeout) {
 			@Override
 			protected boolean exitConditionTrue(View view) {
 				for (View child : breadthFirstViewTraversal(view)) {
@@ -48,24 +66,62 @@ public class ViewActions {
 		};
 	}
 
-	public static ViewAction waitForActivity(Activity activity, Stage stage) {
-		return new CustomViewAction() {
+	public static ViewAction waitForActivity(Class<? extends Activity> clazz,
+			Stage stage, long timeout) {
+		return new CustomViewAction(timeout) {
 			@Override
 			protected boolean exitConditionTrue(View view) {
+				boolean found = false;
 				ActivityLifecycleMonitor lifecycleMonitor =
 						ActivityLifecycleMonitorRegistry.getInstance();
-				return lifecycleMonitor.getLifecycleStageOf(activity) == stage;
+				log(lifecycleMonitor);
+				for (Activity a : lifecycleMonitor
+						.getActivitiesInStage(stage)) {
+					if (a.getClass().equals(clazz)) found = true;
+				}
+				return found;
+			}
+
+			private void log(ActivityLifecycleMonitor lifecycleMonitor) {
+				log(lifecycleMonitor, Stage.PRE_ON_CREATE);
+				log(lifecycleMonitor, Stage.CREATED);
+				log(lifecycleMonitor, Stage.STARTED);
+				log(lifecycleMonitor, Stage.RESUMED);
+				log(lifecycleMonitor, Stage.PAUSED);
+				log(lifecycleMonitor, Stage.STOPPED);
+				log(lifecycleMonitor, Stage.RESTARTED);
+				log(lifecycleMonitor, Stage.DESTROYED);
+			}
+
+			private void log(ActivityLifecycleMonitor lifecycleMonitor,
+					Stage stage) {
+				for (Activity a : lifecycleMonitor
+						.getActivitiesInStage(stage)) {
+					Log.e("TEST", a.getClass().getSimpleName() +
+							" is in state " + stage);
+				}
 			}
 
 			@Override
 			public String getDescription() {
-				return "Wait for activity " + activity.getClass().getName() +
-						" to resume within " + TIMEOUT_MS + " milliseconds.";
+				return "Wait for activity " + clazz.getName() + " in stage " +
+						stage.name() + " within " + timeout +
+						" milliseconds.";
 			}
 		};
 	}
 
 	private static abstract class CustomViewAction implements ViewAction {
+		private final long timeout;
+
+		public CustomViewAction() {
+			this(TIMEOUT_MS);
+		}
+
+		public CustomViewAction(long timeout) {
+			this.timeout = timeout;
+		}
+
 		@Override
 		public Matcher<View> getConstraints() {
 			return isDisplayed();
@@ -74,7 +130,7 @@ public class ViewActions {
 		@Override
 		public void perform(UiController uiController, View view) {
 			uiController.loopMainThreadUntilIdle();
-			long endTime = currentTimeMillis() + TIMEOUT_MS;
+			long endTime = currentTimeMillis() + timeout;
 			do {
 				if (exitConditionTrue(view)) return;
 				uiController.loopMainThreadForAtLeast(WAIT_MS);

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

@@ -5,6 +5,8 @@ import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.bramble.account.BriarAccountModule;
 import org.briarproject.bramble.system.ClockModule;
 import org.briarproject.briar.BriarCoreModule;
+import org.briarproject.briar.android.account.SignInTestCreateAccount;
+import org.briarproject.briar.android.account.SignInTestSignIn;
 import org.briarproject.briar.android.attachment.AttachmentModule;
 import org.briarproject.briar.android.attachment.media.MediaModule;
 import org.briarproject.briar.android.navdrawer.NavDrawerActivityTest;
@@ -28,4 +30,8 @@ public interface BriarUiTestComponent extends AndroidComponent {
 
 	void inject(NavDrawerActivityTest test);
 
+	void inject(SignInTestCreateAccount test);
+
+	void inject(SignInTestSignIn test);
+
 }

briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/account/SignInTestCreateAccount.java

@@ -0,0 +1,65 @@
+package org.briarproject.briar.android.account;
+
+import android.view.Gravity;
+
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.BriarUiTestComponent;
+import org.briarproject.briar.android.UiTest;
+import org.briarproject.briar.android.navdrawer.NavDrawerActivity;
+import org.briarproject.briar.android.splash.SplashScreenActivity;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import androidx.test.espresso.contrib.DrawerActions;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.contrib.DrawerMatchers.isClosed;
+import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
+import static androidx.test.espresso.matcher.ViewMatchers.withClassName;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
+import static org.briarproject.briar.android.ViewActions.waitFor;
+import static org.briarproject.briar.android.ViewActions.waitUntilMatches;
+import static org.hamcrest.Matchers.endsWith;
+
+@RunWith(AndroidJUnit4.class)
+public class SignInTestCreateAccount extends UiTest {
+
+	@Override
+	protected void inject(BriarUiTestComponent component) {
+		component.inject(this);
+	}
+
+	@Test
+	public void createAccount() throws Exception {
+		accountManager.deleteAccount();
+		accountManager.createAccount(USERNAME, PASSWORD);
+
+		startActivity(SplashScreenActivity.class);
+		lifecycleManager.waitForStartup();
+		waitFor(NavDrawerActivity.class);
+
+		// open nav drawer
+		onView(withId(R.id.drawer_layout))
+				.check(matches(isClosed(Gravity.START)))
+				.perform(DrawerActions.open());
+
+		// click onboarding away (once shown)
+		onView(isRoot()).perform(waitUntilMatches(hasDescendant(
+				withClassName(endsWith("PromptView")))));
+		onView(withClassName(endsWith("PromptView")))
+				.perform(click());
+
+		// sign-out manually
+		onView(withText(R.string.sign_out_button))
+				.check(matches(isDisplayed()))
+				.perform(click());
+		lifecycleManager.waitForShutdown();
+	}
+
+}

briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/account/SignInTestSignIn.java

@@ -0,0 +1,59 @@
+package org.briarproject.briar.android.account;
+
+import android.view.Gravity;
+
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.BriarUiTestComponent;
+import org.briarproject.briar.android.UiTest;
+import org.briarproject.briar.android.login.StartupActivity;
+import org.briarproject.briar.android.navdrawer.NavDrawerActivity;
+import org.briarproject.briar.android.splash.SplashScreenActivity;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.action.ViewActions.replaceText;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.contrib.DrawerMatchers.isClosed;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.isEnabled;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static org.briarproject.briar.android.ViewActions.waitFor;
+import static org.hamcrest.CoreMatchers.allOf;
+
+/**
+ * This relies on class sorting to run after {@link SignInTestCreateAccount}.
+ */
+@RunWith(AndroidJUnit4.class)
+public class SignInTestSignIn extends UiTest {
+
+	@Override
+	protected void inject(BriarUiTestComponent component) {
+		component.inject(this);
+	}
+
+	@Test
+	public void signIn() throws Exception {
+		startActivity(SplashScreenActivity.class);
+
+		waitFor(StartupActivity.class);
+
+		// enter password
+		onView(withId(R.id.edit_password))
+				.check(matches(isDisplayed()))
+				.perform(replaceText(PASSWORD));
+		onView(withId(R.id.btn_sign_in))
+				.check(matches(allOf(isDisplayed(), isEnabled())))
+				.perform(click());
+
+		lifecycleManager.waitForStartup();
+		waitFor(NavDrawerActivity.class);
+
+		// ensure nav drawer is visible
+		onView(withId(R.id.drawer_layout))
+				.check(matches(isClosed(Gravity.START)));
+	}
+}

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

@@ -10,12 +10,15 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
 
+import androidx.test.filters.LargeTest;
+
 import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
 import static org.briarproject.bramble.test.TestUtils.isOptionalTestEnabled;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeTrue;
 
+@LargeTest
 @RunWith(Parameterized.class)
 public class PngSuiteImageCompressorTest
 		extends AbstractImageCompressorTest {

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

@@ -12,11 +12,14 @@ import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
 
+import androidx.test.filters.LargeTest;
+
 import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
 import static org.briarproject.bramble.test.TestUtils.isOptionalTestEnabled;
 import static org.junit.Assume.assumeTrue;
 
+@LargeTest
 @RunWith(Parameterized.class)
 public class PngSuiteImageSizeCalculatorTest
 		extends AbstractImageSizeCalculatorTest {

briar-android/src/androidTestOfficial/java/org/briarproject/briar/android/conversation/ConversationActivityNotSignedInTest.java

@@ -1,39 +0,0 @@
-package org.briarproject.briar.android.conversation;
-
-import android.content.Context;
-import android.content.Intent;
-
-import org.briarproject.briar.R;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.rule.ActivityTestRule;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
-import static org.briarproject.briar.android.ViewActions.waitUntilMatches;
-import static org.briarproject.briar.android.conversation.ConversationActivity.CONTACT_ID;
-
-@RunWith(AndroidJUnit4.class)
-public class ConversationActivityNotSignedInTest {
-
-	@Rule
-	public ActivityTestRule<ConversationActivity> testRule =
-			new ActivityTestRule<>(ConversationActivity.class, false, false);
-
-	@Test
-	public void openWithoutSignedIn() {
-		Context targetContext = getInstrumentation().getTargetContext();
-		Intent intent = new Intent(targetContext, ConversationActivity.class);
-		intent.putExtra(CONTACT_ID, 1);
-		testRule.launchActivity(intent);
-
-		onView(withText(R.string.sign_in_button))
-				.perform(waitUntilMatches(isDisplayed()));
-	}
-
-}

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

@@ -33,4 +33,6 @@ public interface BriarUiTestComponent extends AndroidComponent {
 
 	void inject(SettingsActivityScreenshotTest test);
 
+	void inject(PromoVideoTest test);
+
 }

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

@@ -0,0 +1,41 @@
+package org.briarproject.briar.android;
+
+import android.view.View;
+
+import org.hamcrest.Matcher;
+
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
+
+import static androidx.test.espresso.action.GeneralLocation.VISIBLE_CENTER;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast;
+
+public class OverlayTapViewAction implements ViewAction {
+
+	public static ViewAction visualClick(OverlayView overlayView) {
+		return new OverlayTapViewAction(overlayView);
+	}
+
+	private final OverlayView overlayView;
+
+	public OverlayTapViewAction(OverlayView overlayView) {
+		this.overlayView = overlayView;
+	}
+
+	@Override
+	public Matcher<View> getConstraints() {
+		return isDisplayingAtLeast(90);
+	}
+
+	@Override
+	public String getDescription() {
+		return null;
+	}
+
+	@Override
+	public void perform(UiController uiController, View view) {
+		float[] coordinates = VISIBLE_CENTER.calculateCoordinates(view);
+		overlayView.tap(coordinates);
+	}
+}
+

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

@@ -0,0 +1,86 @@
+package org.briarproject.briar.android;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.PixelFormat;
+import android.os.Handler;
+import android.view.View;
+import android.view.WindowManager;
+
+import java.util.Random;
+
+import javax.annotation.Nullable;
+
+import static android.content.Context.WINDOW_SERVICE;
+import static android.provider.Settings.canDrawOverlays;
+import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
+import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE;
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+import static androidx.test.internal.runner.junit4.statement.UiThreadStatement.runOnUiThread;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * A full-screen overlay used to make taps visible in instrumentation tests.
+ */
+public class OverlayView extends View {
+
+	public static OverlayView attach(Context ctx) throws Throwable {
+		assertTrue(canDrawOverlays(ctx));
+		OverlayView view = new OverlayView(getApplicationContext());
+		runOnUiThread(() -> attachInternal(ctx, view));
+		return view;
+	}
+
+	private static void attachInternal(Context ctx, OverlayView view) {
+		WindowManager.LayoutParams params = new WindowManager.LayoutParams(
+				WindowManager.LayoutParams.MATCH_PARENT,
+				WindowManager.LayoutParams.MATCH_PARENT,
+				WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY,
+				FLAG_NOT_TOUCHABLE | FLAG_NOT_FOCUSABLE,
+				PixelFormat.TRANSLUCENT);
+		WindowManager wm = (WindowManager) ctx.getSystemService(WINDOW_SERVICE);
+		wm.addView(view, params);
+	}
+
+	private final Random random = new Random();
+	private final Paint paint;
+	private final int yOffset;
+	@Nullable
+	private float[] coordinates;
+
+	public OverlayView(Context ctx) {
+		super(ctx);
+		int resourceId = getResources()
+				.getIdentifier("status_bar_height", "dimen", "android");
+		yOffset = getResources().getDimensionPixelSize(resourceId);
+		paint = new Paint();
+		paint.setAntiAlias(true);
+		paint.setARGB(175, 255, 0, 0);
+		setWillNotDraw(false);
+	}
+
+	@Override
+	protected void onLayout(boolean changed, int l, int t, int r, int b) {
+	}
+
+	void tap(float[] coordinates) {
+		this.coordinates = coordinates;
+		invalidate();
+		new Handler().postDelayed(this::untap, 750);
+	}
+
+	private void untap() {
+		this.coordinates = null;
+		invalidate();
+	}
+
+	@Override
+	protected void onDraw(Canvas canvas) {
+		super.onDraw(canvas);
+		if (coordinates == null) return;
+		float x = coordinates[0] + random.nextInt(42);
+		float y = coordinates[1] - yOffset + random.nextInt(13);
+		canvas.drawCircle(x, y, 42, paint);
+	}
+}

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

@@ -0,0 +1,285 @@
+package org.briarproject.briar.android;
+
+import android.view.View;
+
+import org.briarproject.bramble.api.Pair;
+import org.briarproject.bramble.api.contact.Contact;
+import org.briarproject.bramble.api.contact.ContactManager;
+import org.briarproject.bramble.api.contact.PendingContact;
+import org.briarproject.bramble.api.contact.PendingContactState;
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.account.SetupActivity;
+import org.briarproject.briar.android.contact.add.remote.PendingContactListActivity;
+import org.briarproject.briar.android.navdrawer.NavDrawerActivity;
+import org.briarproject.briar.android.splash.SplashScreenActivity;
+import org.hamcrest.Matcher;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.inject.Inject;
+
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
+
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard;
+import static androidx.test.espresso.action.ViewActions.replaceText;
+import static androidx.test.espresso.action.ViewActions.scrollTo;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.isEnabled;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+import static java.lang.Thread.sleep;
+import static org.briarproject.bramble.api.plugin.LanTcpConstants.ID;
+import static org.briarproject.briar.android.OverlayTapViewAction.visualClick;
+import static org.briarproject.briar.android.ViewActions.waitFor;
+import static org.briarproject.briar.android.ViewActions.waitUntilMatches;
+import static org.briarproject.briar.android.util.UiUtils.needsDozeWhitelisting;
+import static org.hamcrest.CoreMatchers.allOf;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(AndroidJUnit4.class)
+public class PromoVideoTest extends ScreenshotTest {
+
+	// we can leave isFilming to false (to speed up CI)
+	// and only set it to true when doing recordings
+	private static final boolean isFilming = false;
+
+	private static final int DELAY_SMALL = isFilming ? 4_000 : 0;
+	private static final int DELAY_MEDIUM = isFilming ? 7_500 : 0;
+	private static final int DELAY_LONG = isFilming ? 10_000 : 0;
+
+	@Rule
+	public ActivityScenarioRule<SplashScreenActivity> testRule =
+			new ActivityScenarioRule<>(SplashScreenActivity.class);
+
+	@Inject
+	protected ContactManager contactManager;
+
+	private OverlayView overlayView;
+
+	@Override
+	protected void inject(BriarUiTestComponent component) {
+		component.inject(this);
+		accountManager.deleteAccount();
+	}
+
+	@Test
+	public void createAccountAddContact() throws Throwable {
+		if (isFilming) {
+			// Using this breaks emulator CI tests for some reason.
+			// Only use it for filming for now until we have time to debug this.
+			overlayView = OverlayView.attach(getApplicationContext());
+		}
+
+		// Splash screen shows logo
+		onView(withId(R.id.logoView))
+				.perform(waitUntilMatches(isDisplayed()));
+
+		// It takes a long time for SetupActivity to start after the splash,
+		// (because it is shown longer for videos), so increase timeout.
+		if (!isFilming) waitFor(SetupActivity.class, 30_000);
+
+		// Note: We use waiting code only when not filming,
+		//       to make the test reliable for CI. Otherwise, we used fixed
+		//       delays to deterministically align with subtitles.
+
+		sleep(DELAY_LONG);
+
+		// Enter username
+		onView(withText(R.string.setup_title))
+				.perform(waitUntilMatches(isDisplayed()));
+		sleep(DELAY_SMALL);
+		onView(withId(R.id.nickname_entry))
+				.check(matches(isDisplayed()))
+				.perform(replaceText(USERNAME));
+		closeKeyboard(withId(R.id.nickname_entry));
+
+		sleep(DELAY_SMALL);
+
+		doClick(withId(R.id.next));
+
+		sleep(DELAY_MEDIUM);
+
+		// Enter password
+		doClick(withId(R.id.password_entry), 1000);
+		onView(withId(R.id.password_entry))
+				.check(matches(isDisplayed()))
+				.perform(replaceText(PASSWORD));
+		sleep(DELAY_SMALL);
+		doClick(withId(R.id.password_confirm), 1000);
+		onView(withId(R.id.password_confirm))
+				.check(matches(isDisplayed()))
+				.perform(replaceText(PASSWORD));
+
+		sleep(DELAY_SMALL);
+		// click next or create account
+		doClick(withId(R.id.next));
+
+		sleep(DELAY_SMALL);
+
+		// White-list Doze if needed
+		if (needsDozeWhitelisting(getApplicationContext())) {
+			doClick(withText(R.string.setup_doze_button));
+			UiDevice device = UiDevice.getInstance(getInstrumentation());
+			UiObject allowButton = device.findObject(
+					new UiSelector().className("android.widget.Button")
+							.index(1));
+			allowButton.click();
+			doClick(withId(R.id.next));
+		}
+
+		lifecycleManager.waitForStartup();
+		assertTrue(accountManager.hasDatabaseKey());
+
+		sleep(DELAY_SMALL);
+
+		// wait for contact list to be shown
+		if (!isFilming) waitFor(NavDrawerActivity.class);
+
+		// clicking the FAB doesn't work, so we click its inner FAB as well
+		onView(withId(R.id.speedDial))
+				.check(matches(isDisplayed()))
+				.perform(click());
+		doClick(withId(R.id.fab_main)); // this is inside R.id.speedDial
+		sleep(DELAY_MEDIUM);
+
+		// click adding contact at a distance menu item
+		doClick(withText(R.string.add_contact_remotely_title));
+		sleep(DELAY_LONG);
+
+		// enter briar:// link
+		String link =
+				"briar://ab54fpik6sjyetzjhlwto2fv7tspibx2uhpdnei4tdidkvjpbphvy";
+		doClick(withId(R.id.pasteButton));
+		onView(withId(R.id.linkInput))
+				.perform(waitUntilMatches(isDisplayed()))
+				.perform(replaceText(link));
+		sleep(DELAY_MEDIUM);
+
+		doClick(withId(R.id.addButton));
+		sleep(DELAY_MEDIUM);
+
+		// enter contact alias
+		String contactName = getApplicationContext()
+				.getString(R.string.screenshot_bob);
+		doClick(withId(R.id.contactNameInput), 1000);
+		onView(withId(R.id.contactNameInput))
+				.perform(waitUntilMatches(isDisplayed()))
+				.perform(replaceText(contactName));
+		sleep(DELAY_SMALL);
+		closeKeyboard(withId(R.id.contactNameInput));
+		sleep(DELAY_SMALL);
+
+		// add pending contact
+		onView(withId(R.id.addButton)).perform(scrollTo());
+		doClick(withId(R.id.addButton));
+		sleep(DELAY_LONG);
+
+		// wait for pending contact list activity to be shown
+		if (!isFilming) {
+			waitFor(PendingContactListActivity.class);
+			waitFor(allOf(withText(R.string.pending_contact_requests),
+					isDisplayed()));
+		}
+
+		// remove pending contact
+		for (Pair<PendingContact, PendingContactState> p : contactManager
+				.getPendingContacts()) {
+			contactManager.removePendingContact(p.getFirst().getId());
+		}
+		// add contact and make them appear online
+		Contact bob = testDataCreator.addContact(contactName, false, true);
+		sleep(DELAY_SMALL);
+		connectionRegistry.registerIncomingConnection(bob.getId(), ID, () -> {
+		});
+
+		sleep(DELAY_LONG);
+
+		// wait for contact list to be shown
+		if (!isFilming) {
+			waitFor(NavDrawerActivity.class);
+			waitFor(allOf(withText(R.string.contact_list_button),
+					isDisplayed()));
+			waitFor(allOf(withId(R.id.recyclerView), isDisplayed()));
+		}
+
+		// click on new contact
+		doItemClick(withId(R.id.recyclerView), 0);
+
+		sleep(DELAY_MEDIUM);
+
+		// bring up keyboard
+		doClick(withId(R.id.input_text), DELAY_SMALL);
+
+		String msg1 = getApplicationContext()
+				.getString(R.string.screenshot_message_1);
+		onView(withId(R.id.input_text))
+				.perform(waitUntilMatches(isEnabled()))
+				.perform(replaceText(msg1));
+
+		sleep(DELAY_SMALL);
+
+		doClick(withId(R.id.compositeSendButton));
+
+		sleep(DELAY_SMALL);
+
+		// send emoji
+		doClick(withId(R.id.emoji_toggle), DELAY_SMALL);
+		onView(withId(R.id.input_text))
+				.perform(replaceText("\uD83D\uDE0E"));
+		sleep(DELAY_SMALL);
+		doClick(withId(R.id.compositeSendButton));
+
+		// close keyboard
+		closeKeyboard(withId(R.id.compositeSendButton));
+
+		sleep(DELAY_LONG);
+	}
+
+	private void doClick(final Matcher<View> viewMatcher, long sleepMs)
+			throws InterruptedException {
+		doClick(viewMatcher);
+		if (isFilming) sleep(sleepMs);
+	}
+
+	private void doClick(final Matcher<View> viewMatcher)
+			throws InterruptedException {
+		if (isFilming) {
+			onView(viewMatcher)
+					.perform(waitUntilMatches(isDisplayed()))
+					.perform(visualClick(overlayView));
+			sleep(500);
+		}
+		onView(viewMatcher)
+				.perform(waitUntilMatches(allOf(isDisplayed(), isEnabled())))
+				.perform(click());
+	}
+
+	private void doItemClick(final Matcher<View> viewMatcher, int pos)
+			throws InterruptedException {
+		if (isFilming) {
+			onView(viewMatcher).perform(
+					actionOnItemAtPosition(pos, visualClick(overlayView)));
+			sleep(500);
+		}
+		onView(viewMatcher).perform(
+				actionOnItemAtPosition(pos, click()));
+	}
+
+	private void closeKeyboard(final Matcher<View> viewMatcher)
+			throws InterruptedException {
+		if (isFilming) sleep(750);
+		onView(viewMatcher).perform(closeSoftKeyboard());
+	}
+
+}

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

@@ -3,6 +3,8 @@ package org.briarproject.briar.android;
 import android.app.Activity;
 import android.util.Log;
 
+import com.jraska.falcon.Falcon.UnableToTakeScreenshotException;
+
 import org.briarproject.bramble.api.connection.ConnectionRegistry;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.briar.api.test.TestDataCreator;
@@ -10,6 +12,7 @@ import org.junit.ClassRule;
 
 import javax.inject.Inject;
 
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import tools.fastlane.screengrab.FalconScreenshotStrategy;
 import tools.fastlane.screengrab.Screengrab;
 import tools.fastlane.screengrab.locale.LocaleTestRule;
@@ -26,9 +29,15 @@ public abstract class ScreenshotTest extends UiTest {
 	@Inject
 	protected Clock clock;
 
+	protected void screenshot(String name, ActivityScenarioRule<?> rule) {
+		rule.getScenario().onActivity(activity -> screenshot(name, activity));
+	}
+
 	protected void screenshot(String name, Activity activity) {
 		try {
 			Screengrab.screenshot(name, new FalconScreenshotStrategy(activity));
+		} catch (UnableToTakeScreenshotException e) {
+			Log.e("Screengrab", "Error taking screenshot", e);
 		} catch (RuntimeException e) {
 			if (e.getMessage() == null ||
 					!e.getMessage().equals("Unable to capture screenshot."))

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

@@ -10,7 +10,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import androidx.test.espresso.intent.rule.IntentsTestRule;
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.uiautomator.UiDevice;
 import androidx.test.uiautomator.UiObject;
@@ -22,30 +22,27 @@ import static androidx.test.espresso.action.ViewActions.click;
 import static androidx.test.espresso.action.ViewActions.typeText;
 import static androidx.test.espresso.assertion.ViewAssertions.matches;
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.isEnabled;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 import static org.briarproject.bramble.api.plugin.LanTcpConstants.ID;
 import static org.briarproject.briar.android.ViewActions.waitUntilMatches;
 import static org.briarproject.briar.android.util.UiUtils.needsDozeWhitelisting;
+import static org.hamcrest.Matchers.allOf;
 import static org.junit.Assert.assertTrue;
 
 @RunWith(AndroidJUnit4.class)
 public class SetupDataTest extends ScreenshotTest {
 
 	@Rule
-	public IntentsTestRule<SetupActivity> testRule =
-			new IntentsTestRule<SetupActivity>(SetupActivity.class) {
-				@Override
-				protected void beforeActivityLaunched() {
-					super.beforeActivityLaunched();
-					accountManager.deleteAccount();
-				}
-			};
+	public ActivityScenarioRule<SetupActivity> testRule =
+			new ActivityScenarioRule<>(SetupActivity.class);
 
 	@Override
 	protected void inject(BriarUiTestComponent component) {
 		component.inject(this);
+		accountManager.deleteAccount();
 	}
 
 	@Test
@@ -59,7 +56,7 @@ public class SetupDataTest extends ScreenshotTest {
 		onView(withId(R.id.nickname_entry))
 				.perform(waitUntilMatches(withText(USERNAME)));
 
-		screenshot("manual_create_account", testRule.getActivity());
+		screenshot("manual_create_account", testRule);
 
 		onView(withId(R.id.next))
 				.check(matches(isDisplayed()))
@@ -73,7 +70,7 @@ public class SetupDataTest extends ScreenshotTest {
 				.check(matches(isDisplayed()))
 				.perform(typeText(PASSWORD));
 		onView(withId(R.id.next))
-				.check(matches(isDisplayed()))
+				.check(matches(allOf(isDisplayed(), isEnabled())))
 				.perform(click());
 
 		// White-list Doze if needed
@@ -94,14 +91,6 @@ public class SetupDataTest extends ScreenshotTest {
 		lifecycleManager.waitForStartup();
 		assertTrue(accountManager.hasDatabaseKey());
 		createTestData();
-
-		// close expiry warning
-		onView(withId(R.id.expiryWarning))
-				.perform(waitUntilMatches(isDisplayed()));
-		onView(withId(R.id.expiryWarningClose))
-				.check(matches(isDisplayed()));
-		onView(withId(R.id.expiryWarningClose))
-				.perform(click());
 	}
 
 	private void createTestData() {
@@ -116,7 +105,7 @@ public class SetupDataTest extends ScreenshotTest {
 			throws DbException {
 		Context ctx = getApplicationContext();
 		String bobName = ctx.getString(R.string.screenshot_bob);
-		Contact bob = testDataCreator.addContact(bobName, true);
+		Contact bob = testDataCreator.addContact(bobName, false, true);
 
 		// TODO add messages
 

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

@@ -11,32 +11,29 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import androidx.recyclerview.widget.RecyclerView;
 import androidx.test.espresso.contrib.DrawerActions;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.rule.ActivityTestRule;
 
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.action.ViewActions.click;
 import static androidx.test.espresso.assertion.ViewAssertions.matches;
 import static androidx.test.espresso.contrib.DrawerMatchers.isClosed;
-import static androidx.test.espresso.contrib.RecyclerViewActions.scrollTo;
-import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant;
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static androidx.test.espresso.matcher.ViewMatchers.isEnabled;
 import static androidx.test.espresso.matcher.ViewMatchers.withChild;
-import static androidx.test.espresso.matcher.ViewMatchers.withClassName;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static org.briarproject.briar.android.ViewActions.waitUntilMatches;
-import static org.hamcrest.CoreMatchers.is;
+import static org.briarproject.briar.android.util.UiUtils.hasScreenLock;
+import static org.junit.Assume.assumeTrue;
 
 @RunWith(AndroidJUnit4.class)
 public class SettingsActivityScreenshotTest extends ScreenshotTest {
 
 	@Rule
-	public ActivityTestRule<SettingsActivity> testRule =
-			new ActivityTestRule<>(SettingsActivity.class);
+	public CleanAccountTestRule<SettingsActivity> testRule =
+			new CleanAccountTestRule<>(SettingsActivity.class);
 
 	@Override
 	protected void inject(BriarUiTestComponent component) {
@@ -48,6 +45,10 @@ public class SettingsActivityScreenshotTest extends ScreenshotTest {
 		onView(withText(R.string.settings_button))
 				.check(matches(isDisplayed()));
 
+		onView(withText(R.string.display_settings_title))
+				.perform(waitUntilMatches(isDisplayed()))
+				.perform(click(), click());
+
 		screenshot("manual_dark_theme_settings", testRule.getActivity());
 
 		// switch to dark theme
@@ -66,6 +67,9 @@ public class SettingsActivityScreenshotTest extends ScreenshotTest {
 		onView(withText(R.string.settings_button))
 				.check(matches(isDisplayed()))
 				.perform(click());
+		onView(withText(R.string.display_settings_title))
+				.check(matches(isDisplayed()))
+				.perform(click());
 		onView(withText(R.string.pref_theme_title))
 				.check(matches(isDisplayed()))
 				.perform(click());
@@ -76,20 +80,17 @@ public class SettingsActivityScreenshotTest extends ScreenshotTest {
 
 	@Test
 	public void appLock() {
-		// scroll down
-		onView(withClassName(is(RecyclerView.class.getName())))
-				.perform(scrollTo(hasDescendant(
-						// scroll down a bit more to have settings in the middle
-						withText(R.string.panic_setting))));
+		assumeTrue("device has no screen lock",
+				hasScreenLock(getApplicationContext()));
 
-		// wait for settings to get loaded and enabled
-		onView(withText(R.string.tor_mobile_data_title))
-				.perform(waitUntilMatches(isEnabled()));
+		onView(withText(R.string.security_settings_title))
+				.perform(waitUntilMatches(isDisplayed()))
+				.perform(click(), click());
 
 		// ensure app lock is displayed and enabled
 		onView(withText(R.string.pref_lock_title))
 				.check(matches(isDisplayed()))
-				.check(matches(isEnabled()))
+				.perform(waitUntilMatches(isEnabled()))
 				.perform(click());
 		onView(withChild(withText(R.string.pref_lock_timeout_title)))
 				.check(matches(isDisplayed()))
@@ -104,11 +105,10 @@ public class SettingsActivityScreenshotTest extends ScreenshotTest {
 
 	@Test
 	public void torSettings() {
-		// scroll down
-		onView(withClassName(is(RecyclerView.class.getName())))
-				.perform(scrollTo(hasDescendant(
-						// scroll down a bit more to have settings in the middle
-						withText(R.string.pref_lock_timeout_title))));
+		// click network/connections settings
+		onView(withText(R.string.network_settings_title))
+				.perform(waitUntilMatches(isDisplayed()))
+				.perform(click(), click());
 
 		// wait for settings to get loaded and enabled
 		onView(withText(R.string.tor_network_setting))

briar-android/src/main/AndroidManifest.xml

@@ -27,7 +27,10 @@
 	<uses-permission android:name="android.permission.USE_FINGERPRINT" />
 	<uses-permission android:name="android.permission.VIBRATE" />
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+	<uses-permission
+		android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+		android:maxSdkVersion="18"
+		tools:ignore="ScopedStorage" />
 
 	<uses-permission-sdk-23 android:name="android.permission.ACCESS_FINE_LOCATION" />
 	<uses-permission-sdk-23 android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
@@ -38,6 +41,7 @@
 		android:name="org.briarproject.briar.android.BriarApplicationImpl"
 		android:allowBackup="false"
 		android:banner="@mipmap/tv_banner"
+		android:fullBackupContent="@xml/backup_rules"
 		android:icon="@mipmap/ic_launcher_round"
 		android:label="@string/app_name"
 		android:logo="@mipmap/ic_launcher_round"
@@ -319,26 +323,7 @@
 		</activity>
 
 		<activity
-			android:name="org.briarproject.briar.android.blog.RssFeedImportActivity"
-			android:label="@string/blogs_rss_feeds_import"
-			android:parentActivityName="org.briarproject.briar.android.navdrawer.NavDrawerActivity"
-			android:windowSoftInputMode="adjustResize|stateAlwaysVisible">
-			<meta-data
-				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity" />
-		</activity>
-
-		<activity
-			android:name="org.briarproject.briar.android.blog.RssFeedManageActivity"
-			android:label="@string/blogs_rss_feeds_manage"
-			android:parentActivityName="org.briarproject.briar.android.navdrawer.NavDrawerActivity">
-			<meta-data
-				android:name="android.support.PARENT_ACTIVITY"
-				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity" />
-		</activity>
-
-		<activity
-			android:name="org.briarproject.briar.android.keyagreement.ContactExchangeActivity"
+			android:name="org.briarproject.briar.android.contact.add.nearby.AddNearbyContactActivity"
 			android:label="@string/add_contact_title"
 			android:parentActivityName="org.briarproject.briar.android.navdrawer.NavDrawerActivity"
 			android:theme="@style/BriarTheme.NoActionBar">
@@ -443,6 +428,15 @@
 			android:theme="@style/BriarTheme"
 			android:windowSoftInputMode="adjustResize|stateHidden" />
 
+		<activity
+			android:name="org.briarproject.briar.android.blog.RssFeedActivity"
+			android:label="@string/blogs_rss_feeds"
+			android:parentActivityName="org.briarproject.briar.android.navdrawer.NavDrawerActivity">
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value="org.briarproject.briar.android.navdrawer.NavDrawerActivity" />
+		</activity>
+
 		<activity
 			android:name=".android.contact.add.remote.PendingContactListActivity"
 			android:label="@string/pending_contact_requests"

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

@@ -37,6 +37,10 @@ import org.briarproject.briar.android.attachment.media.MediaModule;
 import org.briarproject.briar.android.conversation.glide.BriarModelLoader;
 import org.briarproject.briar.android.logging.CachingLogHandler;
 import org.briarproject.briar.android.login.SignInReminderReceiver;
+import org.briarproject.briar.android.settings.ConnectionsFragment;
+import org.briarproject.briar.android.settings.NotificationsFragment;
+import org.briarproject.briar.android.settings.SecurityFragment;
+import org.briarproject.briar.android.settings.SettingsFragment;
 import org.briarproject.briar.android.view.EmojiTextInputView;
 import org.briarproject.briar.api.android.AndroidNotificationManager;
 import org.briarproject.briar.api.android.DozeWatchdog;
@@ -198,4 +202,12 @@ public interface AndroidComponent
 	void inject(EmojiTextInputView textInputView);
 
 	void inject(BriarModelLoader briarModelLoader);
+
+	void inject(SettingsFragment settingsFragment);
+
+	void inject(ConnectionsFragment connectionsFragment);
+
+	void inject(SecurityFragment securityFragment);
+
+	void inject(NotificationsFragment notificationsFragment);
 }

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

@@ -1,6 +1,7 @@
 package org.briarproject.briar.android;
 
 import android.app.Application;
+import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.StrictMode;
 
@@ -30,9 +31,11 @@ import org.briarproject.bramble.util.StringUtils;
 import org.briarproject.briar.android.account.DozeHelperModule;
 import org.briarproject.briar.android.account.LockManagerImpl;
 import org.briarproject.briar.android.account.SetupModule;
+import org.briarproject.briar.android.blog.BlogModule;
 import org.briarproject.briar.android.contact.ContactListModule;
+import org.briarproject.briar.android.contact.add.nearby.AddNearbyContactModule;
 import org.briarproject.briar.android.forum.ForumModule;
-import org.briarproject.briar.android.keyagreement.ContactExchangeModule;
+import org.briarproject.briar.android.introduction.IntroductionModule;
 import org.briarproject.briar.android.logging.LoggingModule;
 import org.briarproject.briar.android.login.LoginModule;
 import org.briarproject.briar.android.navdrawer.NavDrawerModule;
@@ -74,7 +77,7 @@ import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
 @Module(includes = {
 		SetupModule.class,
 		DozeHelperModule.class,
-		ContactExchangeModule.class,
+		AddNearbyContactModule.class,
 		LoggingModule.class,
 		LoginModule.class,
 		NavDrawerModule.class,
@@ -82,7 +85,9 @@ import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
 		SettingsModule.class,
 		DevReportModule.class,
 		ContactListModule.class,
+		IntroductionModule.class,
 		// below need to be within same scope as ViewModelProvider.Factory
+		BlogModule.class,
 		ForumModule.class,
 		GroupListModule.class,
 		GroupConversationModule.class,
@@ -111,6 +116,11 @@ public class AppModule {
 		this.application = application;
 	}
 
+	public static AndroidComponent getAndroidComponent(Context ctx) {
+		BriarApplication app = (BriarApplication) ctx.getApplicationContext();
+		return app.getApplicationComponent();
+	}
+
 	@Provides
 	@Singleton
 	Application providesApplication() {
@@ -276,16 +286,21 @@ public class AppModule {
 
 			@Override
 			public boolean shouldEnableImageAttachments() {
-				return IS_DEBUG_BUILD;
+				return true;
 			}
 
 			@Override
 			public boolean shouldEnableProfilePictures() {
-				return IS_DEBUG_BUILD;
+				return true;
 			}
 
 			@Override
 			public boolean shouldEnableDisappearingMessages() {
+				return true;
+			}
+
+			@Override
+			public boolean shouldEnableConnectViaBluetooth() {
 				return IS_DEBUG_BUILD;
 			}
 		};

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

@@ -19,4 +19,6 @@ public interface BriarApplication extends BrambleApplication {
 	SharedPreferences getDefaultSharedPreferences();
 
 	boolean isRunningInBackground();
+
+	boolean isInstrumentationTest();
 }

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

@@ -151,4 +151,9 @@ public class BriarApplicationImpl extends Application
 		ActivityManager.getMyMemoryState(info);
 		return (info.importance != IMPORTANCE_FOREGROUND);
 	}
+
+	@Override
+	public boolean isInstrumentationTest() {
+		return false;
+	}
 }

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

@@ -301,7 +301,9 @@ public class BriarService extends Service {
 					LOG.info("Interrupted while waiting for shutdown");
 				}
 				LOG.info("Exiting");
-				System.exit(0);
+				if (!app.isInstrumentationTest()) {
+					System.exit(0);
+				}
 			}, "BackgroundShutdown");
 		}, "BackgroundShutdown");
 	}

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

@@ -12,7 +12,7 @@ import java.util.Locale;
 import javax.annotation.Nullable;
 
 import static android.os.Build.VERSION.SDK_INT;
-import static org.briarproject.briar.android.settings.SettingsFragment.LANGUAGE;
+import static org.briarproject.briar.android.settings.DisplayFragment.PREF_LANGUAGE;
 
 @NotNullByDefault
 public class Localizer {
@@ -25,7 +25,7 @@ public class Localizer {
 
 	private Localizer(SharedPreferences sharedPreferences) {
 		this(Locale.getDefault(), getLocaleFromTag(
-				sharedPreferences.getString(LANGUAGE, "default")));
+				sharedPreferences.getString(PREF_LANGUAGE, "default")));
 	}
 
 	private Localizer(Locale systemLocale, @Nullable Locale userLocale) {

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

@@ -13,7 +13,6 @@ import com.google.android.material.textfield.TextInputLayout;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
-import org.briarproject.briar.android.activity.ActivityComponent;
 
 import javax.annotation.Nullable;
 
@@ -35,11 +34,6 @@ public class AuthorNameFragment extends SetupFragment {
 		return new AuthorNameFragment();
 	}
 
-	@Override
-	public void injectFragment(ActivityComponent component) {
-		component.inject(this);
-	}
-
 	@Override
 	public View onCreateView(LayoutInflater inflater,
 			@Nullable ViewGroup container,

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

@@ -13,7 +13,6 @@ import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.account.PowerView.OnCheckedChangedListener;
-import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.util.UiUtils;
 
 import androidx.annotation.Nullable;
@@ -31,20 +30,15 @@ public class DozeFragment extends SetupFragment
 	private final static String TAG = DozeFragment.class.getName();
 
 	private DozeView dozeView;
-	private HuaweiView huaweiView;
+	private HuaweiProtectedAppsView huaweiProtectedAppsView;
+	private HuaweiAppLaunchView huaweiAppLaunchView;
 	private Button next;
-	private ProgressBar progressBar;
 	private boolean secondAttempt = false;
 
 	public static DozeFragment newInstance() {
 		return new DozeFragment();
 	}
 
-	@Override
-	public void injectFragment(ActivityComponent component) {
-		component.inject(this);
-	}
-
 	@Override
 	public View onCreateView(LayoutInflater inflater,
 			@Nullable ViewGroup container,
@@ -55,14 +49,24 @@ public class DozeFragment extends SetupFragment
 				false);
 		dozeView = v.findViewById(R.id.dozeView);
 		dozeView.setOnCheckedChangedListener(this);
-		huaweiView = v.findViewById(R.id.huaweiView);
-		huaweiView.setOnCheckedChangedListener(this);
+		huaweiProtectedAppsView = v.findViewById(R.id.huaweiProtectedAppsView);
+		huaweiProtectedAppsView.setOnCheckedChangedListener(this);
+		huaweiAppLaunchView = v.findViewById(R.id.huaweiAppLaunchView);
+		huaweiAppLaunchView.setOnCheckedChangedListener(this);
 		next = v.findViewById(R.id.next);
-		progressBar = v.findViewById(R.id.progress);
+		ProgressBar progressBar = v.findViewById(R.id.progress);
 
 		dozeView.setOnButtonClickListener(this::askForDozeWhitelisting);
 		next.setOnClickListener(this);
 
+		viewModel.getIsCreatingAccount()
+				.observe(getViewLifecycleOwner(), isCreatingAccount -> {
+					if (isCreatingAccount) {
+						next.setVisibility(INVISIBLE);
+						progressBar.setVisibility(VISIBLE);
+					}
+				});
+
 		return v;
 	}
 
@@ -92,7 +96,9 @@ public class DozeFragment extends SetupFragment
 
 	@Override
 	public void onCheckedChanged() {
-		next.setEnabled(dozeView.isChecked() && huaweiView.isChecked());
+		next.setEnabled(dozeView.isChecked() &&
+				huaweiProtectedAppsView.isChecked() &&
+				huaweiAppLaunchView.isChecked());
 	}
 
 	@SuppressLint("BatteryLife")
@@ -104,15 +110,6 @@ public class DozeFragment extends SetupFragment
 
 	@Override
 	public void onClick(View view) {
-		setNextClicked();
 		viewModel.dozeExceptionConfirmed();
 	}
-
-	@Override
-	void setNextClicked() {
-		super.setNextClicked();
-
-		next.setVisibility(INVISIBLE);
-		progressBar.setVisibility(VISIBLE);
-	}
 }

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

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

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

@@ -0,0 +1,78 @@
+package org.briarproject.briar.android.account;
+
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.util.AttributeSet;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.briar.R;
+
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import androidx.annotation.StringRes;
+import androidx.annotation.UiThread;
+
+import static android.content.pm.PackageManager.MATCH_DEFAULT_ONLY;
+import static android.os.Build.VERSION.SDK_INT;
+
+@UiThread
+@NotNullByDefault
+class HuaweiAppLaunchView extends PowerView {
+
+	private final static String PACKAGE_NAME = "com.huawei.systemmanager";
+	private final static String CLASS_NAME =
+			PACKAGE_NAME + ".power.ui.HwPowerManagerActivity";
+
+	public HuaweiAppLaunchView(Context context) {
+		this(context, null);
+	}
+
+	public HuaweiAppLaunchView(Context context, @Nullable AttributeSet attrs) {
+		this(context, attrs, 0);
+	}
+
+	public HuaweiAppLaunchView(Context context, @Nullable AttributeSet attrs,
+			int defStyleAttr) {
+		super(context, attrs, defStyleAttr);
+		setText(R.string.setup_huawei_app_launch_text);
+		setButtonText(R.string.setup_huawei_app_launch_button);
+	}
+
+	@Override
+	public boolean needsToBeShown() {
+		return needsToBeShown(getContext());
+	}
+
+	public static boolean needsToBeShown(Context context) {
+		// "App launch" was introduced in EMUI 8 (Android 8.0)
+		if (SDK_INT < 26) return false;
+		PackageManager pm = context.getPackageManager();
+		List<ResolveInfo> resolveInfos = pm.queryIntentActivities(getIntent(),
+				MATCH_DEFAULT_ONLY);
+		return !resolveInfos.isEmpty();
+	}
+
+	@Override
+	@StringRes
+	protected int getHelpText() {
+		return R.string.setup_huawei_app_launch_help;
+	}
+
+	@Override
+	protected void onButtonClick() {
+		getContext().startActivity(getIntent());
+		setChecked(true);
+	}
+
+	private static Intent getIntent() {
+		Intent intent = new Intent();
+		intent.setClassName(PACKAGE_NAME, CLASS_NAME);
+		return intent;
+	}
+
+}

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

@@ -17,25 +17,28 @@ import javax.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.annotation.UiThread;
 
+import static android.content.pm.PackageManager.MATCH_DEFAULT_ONLY;
 import static android.os.Build.VERSION.SDK_INT;
 
 @UiThread
 @NotNullByDefault
-class HuaweiView extends PowerView {
+class HuaweiProtectedAppsView extends PowerView {
 
 	private final static String PACKAGE_NAME = "com.huawei.systemmanager";
 	private final static String CLASS_NAME =
 			PACKAGE_NAME + ".optimize.process.ProtectActivity";
 
-	public HuaweiView(Context context) {
+	public HuaweiProtectedAppsView(Context context) {
 		this(context, null);
 	}
 
-	public HuaweiView(Context context, @Nullable AttributeSet attrs) {
+	public HuaweiProtectedAppsView(Context context,
+			@Nullable AttributeSet attrs) {
 		this(context, attrs, 0);
 	}
 
-	public HuaweiView(Context context, @Nullable AttributeSet attrs,
+	public HuaweiProtectedAppsView(Context context,
+			@Nullable AttributeSet attrs,
 			int defStyleAttr) {
 		super(context, attrs, defStyleAttr);
 		setText(R.string.setup_huawei_text);
@@ -52,7 +55,7 @@ class HuaweiView extends PowerView {
 		if (SDK_INT >= 24) return false;
 		PackageManager pm = context.getPackageManager();
 		List<ResolveInfo> resolveInfos = pm.queryIntentActivities(getIntent(),
-				PackageManager.MATCH_DEFAULT_ONLY);
+				MATCH_DEFAULT_ONLY);
 		return !resolveInfos.isEmpty();
 	}
 

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

@@ -40,8 +40,8 @@ import static android.os.SystemClock.elapsedRealtime;
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.util.LogUtils.logException;
-import static org.briarproject.briar.android.settings.SettingsFragment.PREF_SCREEN_LOCK;
-import static org.briarproject.briar.android.settings.SettingsFragment.PREF_SCREEN_LOCK_TIMEOUT;
+import static org.briarproject.briar.android.settings.SecurityFragment.PREF_SCREEN_LOCK;
+import static org.briarproject.briar.android.settings.SecurityFragment.PREF_SCREEN_LOCK_TIMEOUT;
 import static org.briarproject.briar.android.settings.SettingsFragment.SETTINGS_NAMESPACE;
 import static org.briarproject.briar.android.util.UiUtils.hasScreenLock;
 

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

@@ -43,7 +43,6 @@ abstract class PowerView extends ConstraintLayout {
 		this(context, attrs, 0);
 	}
 
-	@SuppressWarnings("ConstantConditions")
 	public PowerView(Context context, @Nullable AttributeSet attrs,
 			int defStyleAttr) {
 		super(context, attrs, defStyleAttr);
@@ -85,6 +84,7 @@ abstract class PowerView extends ConstraintLayout {
 		setChecked(ss.value[0]);  // also calls listener
 	}
 
+	@SuppressWarnings("BooleanMethodIsAlwaysInverted")
 	public abstract boolean needsToBeShown();
 
 	public void setChecked(boolean checked) {
@@ -146,10 +146,12 @@ abstract class PowerView extends ConstraintLayout {
 
 		static final Parcelable.Creator<SavedState> CREATOR
 				= new Parcelable.Creator<SavedState>() {
+			@Override
 			public SavedState createFromParcel(Parcel in) {
 				return new SavedState(in);
 			}
 
+			@Override
 			public SavedState[] newArray(int size) {
 				return new SavedState[size];
 			}

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

@@ -15,7 +15,6 @@ import com.google.android.material.textfield.TextInputLayout;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
-import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.login.StrengthMeter;
 
 import javax.annotation.Nullable;
@@ -38,17 +37,11 @@ public class SetPasswordFragment extends SetupFragment {
 	private TextInputEditText passwordConfirmation;
 	private StrengthMeter strengthMeter;
 	private Button nextButton;
-	private ProgressBar progressBar;
 
 	public static SetPasswordFragment newInstance() {
 		return new SetPasswordFragment();
 	}
 
-	@Override
-	public void injectFragment(ActivityComponent component) {
-		component.inject(this);
-	}
-
 	@Override
 	public View onCreateView(LayoutInflater inflater,
 			@Nullable ViewGroup container,
@@ -64,7 +57,7 @@ public class SetPasswordFragment extends SetupFragment {
 				v.findViewById(R.id.password_confirm_wrapper);
 		passwordConfirmation = v.findViewById(R.id.password_confirm);
 		nextButton = v.findViewById(R.id.next);
-		progressBar = v.findViewById(R.id.progress);
+		ProgressBar progressBar = v.findViewById(R.id.progress);
 
 		passwordEntry.addTextChangedListener(this);
 		passwordConfirmation.addTextChangedListener(this);
@@ -75,6 +68,17 @@ public class SetPasswordFragment extends SetupFragment {
 			passwordConfirmation.setImeOptions(IME_ACTION_DONE);
 		}
 
+		viewModel.getIsCreatingAccount()
+				.observe(getViewLifecycleOwner(), isCreatingAccount -> {
+					if (isCreatingAccount) {
+						nextButton.setVisibility(INVISIBLE);
+						progressBar.setVisibility(VISIBLE);
+						// this also avoids the keyboard popping up
+						passwordEntry.setFocusable(false);
+						passwordConfirmation.setFocusable(false);
+					}
+				});
+
 		return v;
 	}
 
@@ -116,20 +120,6 @@ public class SetPasswordFragment extends SetupFragment {
 		IBinder token = passwordEntry.getWindowToken();
 		Object o = getContext().getSystemService(INPUT_METHOD_SERVICE);
 		((InputMethodManager) o).hideSoftInputFromWindow(token, 0);
-
-		setNextClicked();
 		viewModel.setPassword(passwordEntry.getText().toString());
 	}
-
-	@Override
-	void setNextClicked() {
-		super.setNextClicked();
-
-		passwordEntry.setFocusable(false);
-		passwordConfirmation.setFocusable(false);
-		if (!viewModel.needToShowDozeFragment()) {
-			nextButton.setVisibility(INVISIBLE);
-			progressBar.setVisibility(VISIBLE);
-		}
-	}
 }

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

@@ -1,13 +1,11 @@
 package org.briarproject.briar.android.account;
 
-import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
@@ -15,12 +13,12 @@ import android.widget.TextView.OnEditorActionListener;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.fragment.BaseFragment;
 
 import javax.inject.Inject;
 
 import androidx.annotation.CallSuper;
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.lifecycle.ViewModelProvider;
 
@@ -31,44 +29,21 @@ import static org.briarproject.briar.android.util.UiUtils.showOnboardingDialog;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
-abstract class SetupFragment extends BaseFragment implements TextWatcher,
+public abstract class SetupFragment extends BaseFragment implements TextWatcher,
 		OnEditorActionListener, OnClickListener {
 
-	private final static String STATE_KEY_CLICKED = "setupFragmentClicked";
-	private boolean clicked = false;
-
 	@Inject
 	ViewModelProvider.Factory viewModelFactory;
 	SetupViewModel viewModel;
 
 	@Override
-	public void onCreate(@Nullable Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
+	@CallSuper
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
 		viewModel = new ViewModelProvider(requireActivity())
 				.get(SetupViewModel.class);
 	}
 
-	@Override
-	public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-		if (savedInstanceState != null) {
-			clicked = savedInstanceState.getBoolean(STATE_KEY_CLICKED);
-		}
-		if (clicked) {
-			setNextClicked();
-		}
-	}
-
-	@Override
-	public void onSaveInstanceState(@NonNull Bundle outState) {
-		super.onSaveInstanceState(outState);
-		outState.putBoolean(STATE_KEY_CLICKED, clicked);
-	}
-
-	@CallSuper
-	void setNextClicked() {
-		this.clicked = true;
-	}
-
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 		inflater.inflate(R.menu.help_action, menu);
@@ -114,5 +89,4 @@ abstract class SetupFragment extends BaseFragment implements TextWatcher,
 	public void afterTextChanged(Editable editable) {
 		// noop
 	}
-
 }

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

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

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

@@ -51,6 +51,7 @@ public class UnlockActivity extends BaseActivity {
 		component.inject(this);
 	}
 
+	@Override
 	public void onCreate(@Nullable Bundle state) {
 		super.onCreate(state);
 		overridePendingTransition(0, 0);

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

@@ -4,28 +4,32 @@ import android.app.Activity;
 
 import org.briarproject.briar.android.AndroidComponent;
 import org.briarproject.briar.android.StartupFailureActivity;
-import org.briarproject.briar.android.account.AuthorNameFragment;
-import org.briarproject.briar.android.account.DozeFragment;
-import org.briarproject.briar.android.account.SetPasswordFragment;
 import org.briarproject.briar.android.account.SetupActivity;
+import org.briarproject.briar.android.account.SetupFragment;
 import org.briarproject.briar.android.account.UnlockActivity;
 import org.briarproject.briar.android.blog.BlogActivity;
 import org.briarproject.briar.android.blog.BlogFragment;
-import org.briarproject.briar.android.blog.BlogModule;
 import org.briarproject.briar.android.blog.BlogPostFragment;
 import org.briarproject.briar.android.blog.FeedFragment;
-import org.briarproject.briar.android.blog.FeedPostFragment;
 import org.briarproject.briar.android.blog.ReblogActivity;
 import org.briarproject.briar.android.blog.ReblogFragment;
-import org.briarproject.briar.android.blog.RssFeedImportActivity;
-import org.briarproject.briar.android.blog.RssFeedManageActivity;
+import org.briarproject.briar.android.blog.RssFeedActivity;
+import org.briarproject.briar.android.blog.RssFeedDeleteFeedDialogFragment;
+import org.briarproject.briar.android.blog.RssFeedImportFailedDialogFragment;
+import org.briarproject.briar.android.blog.RssFeedImportFragment;
+import org.briarproject.briar.android.blog.RssFeedManageFragment;
 import org.briarproject.briar.android.blog.WriteBlogPostActivity;
 import org.briarproject.briar.android.contact.ContactListFragment;
+import org.briarproject.briar.android.contact.add.nearby.AddNearbyContactActivity;
+import org.briarproject.briar.android.contact.add.nearby.AddNearbyContactErrorFragment;
+import org.briarproject.briar.android.contact.add.nearby.AddNearbyContactFragment;
+import org.briarproject.briar.android.contact.add.nearby.AddNearbyContactIntroFragment;
 import org.briarproject.briar.android.contact.add.remote.AddContactActivity;
 import org.briarproject.briar.android.contact.add.remote.LinkExchangeFragment;
 import org.briarproject.briar.android.contact.add.remote.NicknameFragment;
 import org.briarproject.briar.android.contact.add.remote.PendingContactListActivity;
 import org.briarproject.briar.android.conversation.AliasDialogFragment;
+import org.briarproject.briar.android.conversation.BluetoothConnecterDialogFragment;
 import org.briarproject.briar.android.conversation.ConversationActivity;
 import org.briarproject.briar.android.conversation.ConversationSettingsDialog;
 import org.briarproject.briar.android.conversation.ImageActivity;
@@ -37,10 +41,6 @@ import org.briarproject.briar.android.fragment.ScreenFilterDialogFragment;
 import org.briarproject.briar.android.introduction.ContactChooserFragment;
 import org.briarproject.briar.android.introduction.IntroductionActivity;
 import org.briarproject.briar.android.introduction.IntroductionMessageFragment;
-import org.briarproject.briar.android.keyagreement.ContactExchangeActivity;
-import org.briarproject.briar.android.keyagreement.ContactExchangeErrorFragment;
-import org.briarproject.briar.android.keyagreement.KeyAgreementActivity;
-import org.briarproject.briar.android.keyagreement.KeyAgreementFragment;
 import org.briarproject.briar.android.login.ChangePasswordActivity;
 import org.briarproject.briar.android.login.OpenDatabaseFragment;
 import org.briarproject.briar.android.login.PasswordFragment;
@@ -86,7 +86,6 @@ import dagger.Component;
 @ActivityScope
 @Component(modules = {
 		ActivityModule.class,
-		BlogModule.class,
 		CreateGroupModule.class,
 		GroupInvitationModule.class,
 		GroupMemberModule.class,
@@ -109,9 +108,7 @@ public interface ActivityComponent {
 
 	void inject(PanicPreferencesActivity activity);
 
-	void inject(ContactExchangeActivity activity);
-
-	void inject(KeyAgreementActivity activity);
+	void inject(AddNearbyContactActivity activity);
 
 	void inject(ConversationActivity activity);
 
@@ -153,8 +150,6 @@ public interface ActivityComponent {
 
 	void inject(BlogPostFragment fragment);
 
-	void inject(FeedPostFragment fragment);
-
 	void inject(ReblogFragment fragment);
 
 	void inject(ReblogActivity activity);
@@ -169,9 +164,7 @@ public interface ActivityComponent {
 
 	void inject(IntroductionActivity activity);
 
-	void inject(RssFeedImportActivity activity);
-
-	void inject(RssFeedManageActivity activity);
+	void inject(RssFeedActivity activity);
 
 	void inject(StartupFailureActivity activity);
 
@@ -185,11 +178,7 @@ public interface ActivityComponent {
 
 	// Fragments
 
-	void inject(AuthorNameFragment fragment);
-
-	void inject(SetPasswordFragment fragment);
-
-	void inject(DozeFragment fragment);
+	void inject(SetupFragment fragment);
 
 	void inject(PasswordFragment imageFragment);
 
@@ -209,7 +198,9 @@ public interface ActivityComponent {
 
 	void inject(FeedFragment fragment);
 
-	void inject(KeyAgreementFragment fragment);
+	void inject(AddNearbyContactIntroFragment fragment);
+
+	void inject(AddNearbyContactFragment fragment);
 
 	void inject(LinkExchangeFragment fragment);
 
@@ -227,7 +218,7 @@ public interface ActivityComponent {
 
 	void inject(ScreenFilterDialogFragment fragment);
 
-	void inject(ContactExchangeErrorFragment fragment);
+	void inject(AddNearbyContactErrorFragment fragment);
 
 	void inject(AliasDialogFragment aliasDialogFragment);
 
@@ -241,4 +232,14 @@ public interface ActivityComponent {
 
 	void inject(ConversationSettingsDialog dialog);
 
+	void inject(
+			BluetoothConnecterDialogFragment bluetoothConnecterDialogFragment);
+
+	void inject(RssFeedImportFragment fragment);
+
+	void inject(RssFeedManageFragment fragment);
+
+	void inject(RssFeedImportFailedDialogFragment fragment);
+
+	void inject(RssFeedDeleteFeedDialogFragment fragment);
 }

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

@@ -193,6 +193,9 @@ public abstract class BaseActivity extends AppCompatActivity
 	}
 
 	private boolean showScreenFilterWarning() {
+		if (((BriarApplication) getApplication()).isInstrumentationTest()) {
+			return false;
+		}
 		// If the dialog is already visible, filter the tap
 		ScreenFilterDialogFragment f = findDialogFragment();
 		if (f != null && f.isVisible()) return false;