Add transactional helper methods to DbViewModel.

.gitignore

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

.gitlab-ci.yml

@@ -1,79 +1,29 @@
 image: briar/ci-image-android:latest
 
 stages:
-  - test
+- test
-  - optional_tests
+- check_reproducibility
-  - check_reproducibility
 
-workflow:
+test:
-  # when to create a CI pipeline
+  stage: test
-  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 and should not be cached
+    # these file change every time but should not be cached
     - rm -f $GRADLE_USER_HOME/caches/modules-2/modules-2.lock
     - rm -fr $GRADLE_USER_HOME/caches/*/plugin-resolution/
 
-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
@@ -81,38 +31,3 @@ test_reproducible:
     - "curl -X POST -F token=${RELEASE_CHECK_TOKEN} -F ref=master -F variables[RELEASE_TAG]=${CI_COMMIT_REF_NAME} https://code.briarproject.org/api/v4/projects/61/trigger/pipeline"
   only:
     - tags
-
-.optional_tests:
-  stage: optional_tests
-  before_script:
-    - set -e
-    - export GRADLE_USER_HOME=$PWD/.gradle
-
-  cache:
-    key: "$CI_COMMIT_REF_SLUG"
-    paths:
-      - .gradle/wrapper
-      - .gradle/caches
-
-  script:
-    - OPTIONAL_TESTS=org.briarproject.bramble.plugin.tor.BridgeTest ./gradlew --info bramble-java:test --tests BridgeTest
-
-  after_script:
-    # these file change every time but should not be cached
-    - rm -f $GRADLE_USER_HOME/caches/modules-2/modules-2.lock
-    - rm -fr $GRADLE_USER_HOME/caches/*/plugin-resolution/
-
-bridge test:
-  extends: .optional_tests
-  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
-  only:
-    - tags

.idea/dictionaries/briar.xml

@@ -1,15 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="briar">
-    <words>
-      <w>briar</w>
-      <w>briarproject</w>
-      <w>emoji</w>
-      <w>encrypter</w>
-      <w>identicon</w>
-      <w>introducee</w>
-      <w>introducees</w>
-      <w>introducer</w>
-      <w>onboarding</w>
-    </words>
-  </dictionary>
-</component>

.idea/inspectionProfiles/Project_Default.xml

@@ -1,14 +0,0 @@
-<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/BridgeTest.xml

@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="BridgeTest" type="AndroidJUnit" factoryName="Android JUnit" nameIsGenerated="true">
-    <module name="briar.bramble-java" />
-    <useClassPathOnly />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.briarproject.bramble.plugin.tor.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <option name="PACKAGE_NAME" value="org.briarproject.bramble.plugin.tor" />
-    <option name="MAIN_CLASS_NAME" value="org.briarproject.bramble.plugin.tor.BridgeTest" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-    <envs>
-      <env name="OPTIONAL_TESTS" value="org.briarproject.bramble.plugin.tor.BridgeTest" />
-    </envs>
-    <method v="2">
-      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
-    </method>
-  </configuration>
-</component>

.idea/runConfigurations/Instrumentation_Tests__destroys_DB_.xml

@@ -1,51 +0,0 @@
-<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,17 +6,13 @@ apply from: 'witness.gradle'
 
 android {
 	compileSdkVersion 30
-	buildToolsVersion '30.0.3'
+	buildToolsVersion '30.0.2'
-
-	packagingOptions {
-		doNotStrip '**/*.so'
-	}
 
 	defaultConfig {
 		minSdkVersion 16
-		targetSdkVersion 30
+		targetSdkVersion 29
-		versionCode 10304
+		versionCode 10213
-		versionName "1.3.4"
+		versionName "1.2.13"
 		consumerProguardFiles 'proguard-rules.txt'
 
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -42,8 +38,8 @@ configurations {
 
 dependencies {
 	implementation project(path: ':bramble-core', configuration: 'default')
-	tor 'org.briarproject:tor-android:0.3.5.13@zip'
+	tor 'org.briarproject:tor-android:0.3.5.12@zip'
-	tor 'org.briarproject:obfs4proxy-android:0.0.12-dev-40245c4a@zip'
+	tor 'org.briarproject:obfs4proxy-android:0.0.11-2@zip'
 
 	annotationProcessor 'com.google.dagger:dagger-compiler:2.24'
 

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

@@ -59,8 +59,8 @@ import static org.briarproject.bramble.util.PrivacyUtils.scrubMacAddress;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
-class AndroidBluetoothPlugin extends
+class AndroidBluetoothPlugin
-		AbstractBluetoothPlugin<BluetoothSocket, BluetoothServerSocket> {
+		extends BluetoothPlugin<BluetoothSocket, BluetoothServerSocket> {
 
 	private static final Logger LOG =
 			getLogger(AndroidBluetoothPlugin.class.getName());
@@ -75,7 +75,6 @@ class AndroidBluetoothPlugin extends
 
 	// Non-null if the plugin started successfully
 	private volatile BluetoothAdapter adapter = null;
-	private volatile boolean stopDiscoverAndConnect;
 
 	AndroidBluetoothPlugin(BluetoothConnectionLimiter connectionLimiter,
 			BluetoothConnectionFactory<BluetoothSocket> connectionFactory,
@@ -176,11 +175,6 @@ class AndroidBluetoothPlugin extends
 		} 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);
 		}
 	}
 
@@ -188,40 +182,22 @@ class AndroidBluetoothPlugin extends
 	@Nullable
 	DuplexTransportConnection discoverAndConnect(String uuid) {
 		if (adapter == null) return null;
-		if (!discoverSemaphore.tryAcquire()) {
+		for (String address : discoverDevices()) {
-			LOG.info("Discover already running");
+			try {
-			return null;
+				if (LOG.isLoggable(INFO))
-		}
+					LOG.info("Connecting to " + scrubMacAddress(address));
-		try {
+				return connectTo(address, uuid);
-			stopDiscoverAndConnect = false;
+			} catch (IOException e) {
-			for (String address : discoverDevices()) {
+				if (LOG.isLoggable(INFO)) {
-				if (stopDiscoverAndConnect) {
+					LOG.info("Could not connect to "
-					break;
+							+ scrubMacAddress(address));
-				}
-				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

@@ -10,20 +10,17 @@ import org.briarproject.bramble.api.Pair;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import java.io.File;
-import java.io.IOException;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Scanner;
 
 import javax.annotation.Nullable;
 
 import static android.content.Context.MODE_PRIVATE;
 import static android.os.Build.VERSION.SDK_INT;
-import static java.lang.Runtime.getRuntime;
 import static java.util.Arrays.asList;
 import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
 
@@ -34,7 +31,6 @@ public class AndroidUtils {
 	private static final String FAKE_BLUETOOTH_ADDRESS = "02:00:00:00:00:00";
 
 	private static final String STORED_REPORTS = "dev-reports";
-	private static final String STORED_LOGCAT = "dev-logcat";
 
 	public static Collection<String> getSupportedArchitectures() {
 		List<String> abis = new ArrayList<>();
@@ -111,27 +107,14 @@ public class AndroidUtils {
 		return ctx.getDir(STORED_REPORTS, MODE_PRIVATE);
 	}
 
-	public static File getLogcatFile(Context ctx) {
-		return new File(ctx.getFilesDir(), STORED_LOGCAT);
-	}
-
 	/**
 	 * Returns an array of supported content types for image attachments.
+	 * GIFs can't be compressed on API < 24 so they're not supported.
+	 * <p>
+	 * TODO: Remove this restriction when large message support is added
 	 */
 	public static String[] getSupportedImageContentTypes() {
-		return new String[] {"image/jpeg", "image/png", "image/gif"};
+		if (SDK_INT < 24) return new String[] {"image/jpeg", "image/png"};
-	}
+		else return new String[] {"image/jpeg", "image/png", "image/gif"};
-
-	@Nullable
-	public static String getSystemProperty(String propName) {
-		try {
-			Process p = getRuntime().exec("getprop " + propName);
-			Scanner s = new Scanner(p.getInputStream());
-			String line = s.nextLine();
-			s.close();
-			return line;
-		} catch (SecurityException | IOException e) {
-			return null;
-		}
 	}
 }

bramble-android/witness.gradle

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

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

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

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

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

bramble-api/src/main/java/org/briarproject/bramble/api/cleanup/CleanupHook.java

@@ -1,29 +0,0 @@
-package org.briarproject.bramble.api.cleanup;
-
-import org.briarproject.bramble.api.db.DatabaseComponent;
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.GroupId;
-import org.briarproject.bramble.api.sync.MessageId;
-
-import java.util.Collection;
-
-/**
- * An interface for registering a hook with the {@link CleanupManager}
- * that will be called when a message's cleanup deadline is reached.
- */
-@NotNullByDefault
-public interface CleanupHook {
-
-	/**
-	 * Called when the cleanup deadlines of one or more messages are reached.
-	 * <p>
-	 * The callee is not required to delete the messages, but the hook won't be
-	 * called again for these messages unless another cleanup timer is set (see
-	 * {@link DatabaseComponent#setCleanupTimerDuration(Transaction, MessageId, long)}
-	 * and {@link DatabaseComponent#startCleanupTimer(Transaction, MessageId)}).
-	 */
-	void deleteMessages(Transaction txn, GroupId g,
-			Collection<MessageId> messageIds) throws DbException;
-}

bramble-api/src/main/java/org/briarproject/bramble/api/cleanup/CleanupManager.java

@@ -1,42 +0,0 @@
-package org.briarproject.bramble.api.cleanup;
-
-import org.briarproject.bramble.api.cleanup.event.CleanupTimerStartedEvent;
-import org.briarproject.bramble.api.crypto.SecretKey;
-import org.briarproject.bramble.api.db.DatabaseComponent;
-import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.lifecycle.LifecycleManager;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.ClientId;
-import org.briarproject.bramble.api.sync.MessageId;
-
-/**
- * The CleanupManager is responsible for tracking the cleanup deadlines of
- * messages and passing them to their respective
- * {@link CleanupHook CleanupHooks} when the deadlines are reached.
- * <p>
- * The CleanupManager responds to
- * {@link CleanupTimerStartedEvent CleanupTimerStartedEvents} broadcast by the
- * {@link DatabaseComponent}.
- * <p>
- * See {@link DatabaseComponent#setCleanupTimerDuration(Transaction, MessageId, long)},
- * {@link DatabaseComponent#startCleanupTimer(Transaction, MessageId)},
- * {@link DatabaseComponent#stopCleanupTimer(Transaction, MessageId)}.
- */
-@NotNullByDefault
-public interface CleanupManager {
-
-	/**
-	 * When scheduling a cleanup task we overshoot the deadline by this many
-	 * milliseconds to reduce the number of tasks that need to be scheduled
-	 * when messages have cleanup deadlines that are close together.
-	 */
-	long BATCH_DELAY_MS = 1000;
-
-	/**
-	 * Registers a hook to be called when messages are due for cleanup.
-	 * This method should be called before
-	 * {@link LifecycleManager#startServices(SecretKey)}.
-	 */
-	void registerCleanupHook(ClientId c, int majorVersion,
-			CleanupHook hook);
-}

bramble-api/src/main/java/org/briarproject/bramble/api/cleanup/event/CleanupTimerStartedEvent.java

@@ -1,32 +0,0 @@
-package org.briarproject.bramble.api.cleanup.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.MessageId;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a message's cleanup timer is started.
- */
-@Immutable
-@NotNullByDefault
-public class CleanupTimerStartedEvent extends Event {
-
-	private final MessageId messageId;
-	private final long cleanupDeadline;
-
-	public CleanupTimerStartedEvent(MessageId messageId,
-			long cleanupDeadline) {
-		this.messageId = messageId;
-		this.cleanupDeadline = cleanupDeadline;
-	}
-
-	public MessageId getMessageId() {
-		return messageId;
-	}
-
-	public long getCleanupDeadline() {
-		return cleanupDeadline;
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/client/ClientHelper.java

@@ -1,7 +1,6 @@
 package org.briarproject.bramble.api.client;
 
 import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.crypto.PrivateKey;
 import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.data.BdfDictionary;
@@ -17,7 +16,6 @@ import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageId;
 
 import java.security.GeneralSecurityException;
-import java.util.Collection;
 import java.util.Map;
 
 @NotNullByDefault
@@ -52,11 +50,9 @@ public interface ClientHelper {
 	BdfDictionary getGroupMetadataAsDictionary(Transaction txn, GroupId g)
 			throws DbException, FormatException;
 
-	Collection<MessageId> getMessageIds(Transaction txn, GroupId g,
-			BdfDictionary query) throws DbException, FormatException;
-
 	BdfDictionary getMessageMetadataAsDictionary(MessageId m)
-			throws DbException, FormatException;
+			throws DbException,
+			FormatException;
 
 	BdfDictionary getMessageMetadataAsDictionary(Transaction txn, MessageId m)
 			throws DbException, FormatException;
@@ -123,17 +119,4 @@ public interface ClientHelper {
 	Map<TransportId, TransportProperties> parseAndValidateTransportPropertiesMap(
 			BdfDictionary properties) throws FormatException;
 
-	/**
-	 * Retrieves the contact ID from the group metadata of the given contact
-	 * group.
-	 */
-	ContactId getContactId(Transaction txn, GroupId contactGroupId)
-			throws DbException, FormatException;
-
-	/**
-	 * Stores the given contact ID in the group metadata of the given contact
-	 * group.
-	 */
-	void setContactId(Transaction txn, GroupId contactGroupId, ContactId c)
-			throws DbException;
 }

bramble-api/src/main/java/org/briarproject/bramble/api/client/ContactGroupConstants.java

@@ -1,9 +0,0 @@
-package org.briarproject.bramble.api.client;
-
-public interface ContactGroupConstants {
-
-	/**
-	 * Group metadata key for associating a contact ID with a contact group.
-	 */
-	String GROUP_KEY_CONTACT_ID = "contactId";
-}

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

@@ -1,35 +0,0 @@
-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/crypto/StreamDecrypterFactory.java

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

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

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

bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseComponent.java

@@ -41,18 +41,6 @@ import javax.annotation.Nullable;
 @NotNullByDefault
 public interface DatabaseComponent extends TransactionManager {
 
-	/**
-	 * Return value for {@link #getNextCleanupDeadline(Transaction)} if
-	 * no messages are scheduled to be deleted.
-	 */
-	long NO_CLEANUP_DEADLINE = -1;
-
-	/**
-	 * Return value for {@link #startCleanupTimer(Transaction, MessageId)}
-	 * if the cleanup timer was not started.
-	 */
-	long TIMER_NOT_STARTED = -1;
-
 	/**
 	 * Opens the database and returns true if the database already existed.
 	 *
@@ -300,16 +288,6 @@ public interface DatabaseComponent extends TransactionManager {
 	Collection<MessageId> getMessageIds(Transaction txn, GroupId g)
 			throws DbException;
 
-	/**
-	 * Returns the IDs of any delivered messages in the given group with
-	 * metadata that matches all entries in the given query. If the query is
-	 * empty, the IDs of all delivered messages are returned.
-	 * <p/>
-	 * Read-only.
-	 */
-	Collection<MessageId> getMessageIds(Transaction txn, GroupId g,
-			Metadata query) throws DbException;
-
 	/**
 	 * Returns the IDs of any messages that need to be validated.
 	 * <p/>
@@ -336,15 +314,6 @@ public interface DatabaseComponent extends TransactionManager {
 	Collection<MessageId> getMessagesToShare(Transaction txn)
 			throws DbException;
 
-	/**
-	 * Returns the IDs of any messages of any messages that are due for
-	 * deletion, along with their group IDs.
-	 * <p/>
-	 * Read-only.
-	 */
-	Map<GroupId, Collection<MessageId>> getMessagesToDelete(Transaction txn)
-			throws DbException;
-
 	/**
 	 * Returns the metadata for all delivered messages in the given group.
 	 * <p/>
@@ -426,15 +395,6 @@ public interface DatabaseComponent extends TransactionManager {
 	MessageStatus getMessageStatus(Transaction txn, ContactId c, MessageId m)
 			throws DbException;
 
-	/**
-	 * Returns the next time (in milliseconds since the Unix epoch) when a
-	 * message is due to be deleted, or {@link #NO_CLEANUP_DEADLINE}
-	 * if no messages are scheduled to be deleted.
-	 * <p/>
-	 * Read-only.
-	 */
-	long getNextCleanupDeadline(Transaction txn) throws DbException;
-
 	/*
 	 * Returns the next time (in milliseconds since the Unix epoch) when a
 	 * message is due to be sent to the given contact. The returned value may
@@ -575,13 +535,6 @@ public interface DatabaseComponent extends TransactionManager {
 	void removeTransportKeys(Transaction txn, TransportId t, KeySetId k)
 			throws DbException;
 
-	/**
-	 * Sets the cleanup timer duration for the given message. This does not
-	 * start the message's cleanup timer.
-	 */
-	void setCleanupTimerDuration(Transaction txn, MessageId m, long duration)
-			throws DbException;
-
 	/**
 	 * Marks the given contact as verified.
 	 */
@@ -604,12 +557,6 @@ public interface DatabaseComponent extends TransactionManager {
 	 */
 	void setMessagePermanent(Transaction txn, MessageId m) throws DbException;
 
-	/**
-	 * Marks the given message as not shared. This method is only meant for
-	 * testing.
-	 */
-	void setMessageNotShared(Transaction txn, MessageId m) throws DbException;
-
 	/**
 	 * Marks the given message as shared.
 	 */
@@ -652,22 +599,6 @@ public interface DatabaseComponent extends TransactionManager {
 	void setTransportKeysActive(Transaction txn, TransportId t, KeySetId k)
 			throws DbException;
 
-	/**
-	 * Starts the cleanup timer for the given message, if a timer duration
-	 * has been set and the timer has not already been started.
-	 *
-	 * @return The cleanup deadline, or {@link #TIMER_NOT_STARTED} if no
-	 * timer duration has been set for this message or its timer has already
-	 * been started.
-	 */
-	long startCleanupTimer(Transaction txn, MessageId m) throws DbException;
-
-	/**
-	 * Stops the cleanup timer for the given message, if the timer has been
-	 * started.
-	 */
-	void stopCleanupTimer(Transaction txn, MessageId m) throws DbException;
-
 	/**
 	 * Stores the given transport keys, deleting any keys they have replaced.
 	 */

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

@@ -57,7 +57,6 @@ 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/keyagreement/event/KeyAgreementStartedEvent.java

@@ -3,7 +3,7 @@ package org.briarproject.bramble.api.keyagreement.event;
 import org.briarproject.bramble.api.event.Event;
 
 /**
- * An event that is broadcast when a BQP protocol begins.
+ * An event that is broadcast when a BQP protocol completes.
  */
 public class KeyAgreementStartedEvent extends Event {
 }

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

@@ -13,6 +13,4 @@ public interface DevConfig {
 	String getDevOnionAddress();
 
 	File getReportDir();
-
-	File getLogcatFile();
 }

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

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

bramble-api/src/main/java/org/briarproject/bramble/api/transport/StreamReaderFactory.java

@@ -16,13 +16,8 @@ public interface StreamReaderFactory {
 
 	/**
 	 * Creates an {@link InputStream InputStream} for reading from a contact
-	 * exchange stream.
+	 * exchangestream.
 	 */
 	InputStream createContactExchangeStreamReader(InputStream in,
 			SecretKey headerKey);
-
-	/**
-	 * Creates an {@link InputStream} for reading from a log stream.
-	 */
-	InputStream createLogStreamReader(InputStream in, SecretKey headerKey);
 }

bramble-api/src/main/java/org/briarproject/bramble/api/transport/StreamWriterFactory.java

@@ -7,19 +7,17 @@ import java.io.OutputStream;
 
 @NotNullByDefault
 public interface StreamWriterFactory {
+
 	/**
-	 * Creates a {@link StreamWriter} for writing to a transport stream.
+	 * Creates an {@link OutputStream OutputStream} for writing to a
+	 * transport stream
 	 */
 	StreamWriter createStreamWriter(OutputStream out, StreamContext ctx);
 
 	/**
-	 * Creates a {@link StreamWriter} for writing to a contact exchange stream.
+	 * Creates an {@link OutputStream OutputStream} for writing to a contact
+	 * exchange stream.
 	 */
 	StreamWriter createContactExchangeStreamWriter(OutputStream out,
 			SecretKey headerKey);
-
-	/**
-	 * Creates a {@link StreamWriter} for writing to a log stream.
-	 */
-	StreamWriter createLogStreamWriter(OutputStream out, SecretKey headerKey);
 }

bramble-api/src/main/java/org/briarproject/bramble/util/ValidationUtils.java

@@ -6,9 +6,7 @@ import org.briarproject.bramble.api.data.BdfList;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
 
-@Immutable
 @NotNullByDefault
 public class ValidationUtils {
 
@@ -66,9 +64,4 @@ public class ValidationUtils {
 		if (dictionary != null && dictionary.size() != size)
 			throw new FormatException();
 	}
-
-	public static void checkRange(@Nullable Long l, long min, long max)
-			throws FormatException {
-		if (l != null && (l < min || l > max)) throw new FormatException();
-	}
 }

bramble-api/src/test/java/org/briarproject/bramble/test/TimeTravel.java

@@ -1,8 +0,0 @@
-package org.briarproject.bramble.test;
-
-public interface TimeTravel {
-
-	void setCurrentTimeMillis(long now) throws InterruptedException;
-
-	void addCurrentTimeMillis(long add) throws InterruptedException;
-}

bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreEagerSingletons.java

@@ -1,6 +1,5 @@
 package org.briarproject.bramble;
 
-import org.briarproject.bramble.cleanup.CleanupModule;
 import org.briarproject.bramble.contact.ContactModule;
 import org.briarproject.bramble.crypto.CryptoExecutorModule;
 import org.briarproject.bramble.db.DatabaseExecutorModule;
@@ -15,8 +14,6 @@ import org.briarproject.bramble.versioning.VersioningModule;
 
 public interface BrambleCoreEagerSingletons {
 
-	void inject(CleanupModule.EagerSingletons init);
-
 	void inject(ContactModule.EagerSingletons init);
 
 	void inject(CryptoExecutorModule.EagerSingletons init);
@@ -42,7 +39,6 @@ public interface BrambleCoreEagerSingletons {
 	class Helper {
 
 		public static void injectEagerSingletons(BrambleCoreEagerSingletons c) {
-			c.inject(new CleanupModule.EagerSingletons());
 			c.inject(new ContactModule.EagerSingletons());
 			c.inject(new CryptoExecutorModule.EagerSingletons());
 			c.inject(new DatabaseExecutorModule.EagerSingletons());

bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreModule.java

@@ -1,6 +1,5 @@
 package org.briarproject.bramble;
 
-import org.briarproject.bramble.cleanup.CleanupModule;
 import org.briarproject.bramble.client.ClientModule;
 import org.briarproject.bramble.connection.ConnectionModule;
 import org.briarproject.bramble.contact.ContactModule;
@@ -22,14 +21,15 @@ import org.briarproject.bramble.rendezvous.RendezvousModule;
 import org.briarproject.bramble.settings.SettingsModule;
 import org.briarproject.bramble.sync.SyncModule;
 import org.briarproject.bramble.sync.validation.ValidationModule;
+import org.briarproject.bramble.system.ClockModule;
 import org.briarproject.bramble.transport.TransportModule;
 import org.briarproject.bramble.versioning.VersioningModule;
 
 import dagger.Module;
 
 @Module(includes = {
-		CleanupModule.class,
 		ClientModule.class,
+		ClockModule.class,
 		ConnectionModule.class,
 		ContactModule.class,
 		CryptoModule.class,

bramble-core/src/main/java/org/briarproject/bramble/cleanup/CleanupManagerImpl.java

@@ -1,159 +0,0 @@
-package org.briarproject.bramble.cleanup;
-
-import org.briarproject.bramble.api.cleanup.CleanupHook;
-import org.briarproject.bramble.api.cleanup.CleanupManager;
-import org.briarproject.bramble.api.cleanup.event.CleanupTimerStartedEvent;
-import org.briarproject.bramble.api.db.DatabaseComponent;
-import org.briarproject.bramble.api.db.DatabaseExecutor;
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.event.EventListener;
-import org.briarproject.bramble.api.lifecycle.Service;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.sync.ClientId;
-import org.briarproject.bramble.api.sync.Group;
-import org.briarproject.bramble.api.sync.GroupId;
-import org.briarproject.bramble.api.sync.MessageId;
-import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.api.system.TaskScheduler;
-import org.briarproject.bramble.api.versioning.ClientMajorVersion;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executor;
-import java.util.logging.Logger;
-
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
-import javax.inject.Inject;
-
-import static java.lang.Math.max;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-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.db.DatabaseComponent.NO_CLEANUP_DEADLINE;
-import static org.briarproject.bramble.util.LogUtils.logException;
-
-@ThreadSafe
-@NotNullByDefault
-class CleanupManagerImpl implements CleanupManager, Service, EventListener {
-
-	private static final Logger LOG =
-			getLogger(CleanupManagerImpl.class.getName());
-
-	private final Executor dbExecutor;
-	private final DatabaseComponent db;
-	private final TaskScheduler taskScheduler;
-	private final Clock clock;
-	private final Map<ClientMajorVersion, CleanupHook> hooks =
-			new ConcurrentHashMap<>();
-	private final Object lock = new Object();
-
-	@GuardedBy("lock")
-	private final Set<CleanupTask> pending = new HashSet<>();
-
-	@Inject
-	CleanupManagerImpl(@DatabaseExecutor Executor dbExecutor,
-			DatabaseComponent db, TaskScheduler taskScheduler, Clock clock) {
-		this.dbExecutor = dbExecutor;
-		this.db = db;
-		this.taskScheduler = taskScheduler;
-		this.clock = clock;
-	}
-
-	@Override
-	public void registerCleanupHook(ClientId c, int majorVersion,
-			CleanupHook hook) {
-		hooks.put(new ClientMajorVersion(c, majorVersion), hook);
-	}
-
-	@Override
-	public void startService() {
-		maybeScheduleTask(clock.currentTimeMillis());
-	}
-
-	@Override
-	public void stopService() {
-	}
-
-	@Override
-	public void eventOccurred(Event e) {
-		if (e instanceof CleanupTimerStartedEvent) {
-			CleanupTimerStartedEvent a = (CleanupTimerStartedEvent) e;
-			maybeScheduleTask(a.getCleanupDeadline());
-		}
-	}
-
-	private void maybeScheduleTask(long deadline) {
-		synchronized (lock) {
-			for (CleanupTask task : pending) {
-				if (task.deadline <= deadline) return;
-			}
-			CleanupTask task = new CleanupTask(deadline);
-			pending.add(task);
-			scheduleTask(task);
-		}
-	}
-
-	private void scheduleTask(CleanupTask task) {
-		long now = clock.currentTimeMillis();
-		long delay = max(0, task.deadline - now + BATCH_DELAY_MS);
-		if (LOG.isLoggable(INFO)) {
-			LOG.info("Scheduling cleanup task in " + delay + " ms");
-		}
-		taskScheduler.schedule(() -> deleteMessagesAndScheduleNextTask(task),
-				dbExecutor, delay, MILLISECONDS);
-	}
-
-	private void deleteMessagesAndScheduleNextTask(CleanupTask task) {
-		try {
-			synchronized (lock) {
-				pending.remove(task);
-			}
-			long deadline = db.transactionWithResult(false, txn -> {
-				deleteMessages(txn);
-				return db.getNextCleanupDeadline(txn);
-			});
-			if (deadline != NO_CLEANUP_DEADLINE) {
-				maybeScheduleTask(deadline);
-			}
-		} catch (DbException e) {
-			logException(LOG, WARNING, e);
-		}
-	}
-
-	private void deleteMessages(Transaction txn) throws DbException {
-		Map<GroupId, Collection<MessageId>> ids = db.getMessagesToDelete(txn);
-		for (Entry<GroupId, Collection<MessageId>> e : ids.entrySet()) {
-			GroupId groupId = e.getKey();
-			Collection<MessageId> messageIds = e.getValue();
-			if (LOG.isLoggable(INFO)) {
-				LOG.info(messageIds.size() + " messages to delete");
-			}
-			for (MessageId m : messageIds) db.stopCleanupTimer(txn, m);
-			Group group = db.getGroup(txn, groupId);
-			ClientMajorVersion cv = new ClientMajorVersion(group.getClientId(),
-					group.getMajorVersion());
-			CleanupHook hook = hooks.get(cv);
-			if (hook == null) {
-				throw new IllegalStateException("No cleanup hook for " + cv);
-			}
-			hook.deleteMessages(txn, groupId, messageIds);
-		}
-	}
-
-	private static class CleanupTask {
-
-		private final long deadline;
-
-		private CleanupTask(long deadline) {
-			this.deadline = deadline;
-		}
-	}
-}

bramble-core/src/main/java/org/briarproject/bramble/cleanup/CleanupModule.java

@@ -1,29 +0,0 @@
-package org.briarproject.bramble.cleanup;
-
-import org.briarproject.bramble.api.cleanup.CleanupManager;
-import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.lifecycle.LifecycleManager;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import dagger.Module;
-import dagger.Provides;
-
-@Module
-public class CleanupModule {
-
-	public static class EagerSingletons {
-		@Inject
-		CleanupManager cleanupManager;
-	}
-
-	@Provides
-	@Singleton
-	CleanupManager provideCleanupManager(LifecycleManager lifecycleManager,
-			EventBus eventBus, CleanupManagerImpl cleanupManager) {
-		lifecycleManager.registerService(cleanupManager);
-		eventBus.addListener(cleanupManager);
-		return cleanupManager;
-	}
-}

bramble-core/src/main/java/org/briarproject/bramble/client/ClientHelperImpl.java

@@ -2,13 +2,11 @@ package org.briarproject.bramble.client;
 
 import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.client.ClientHelper;
-import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.crypto.KeyParser;
 import org.briarproject.bramble.api.crypto.PrivateKey;
 import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.data.BdfDictionary;
-import org.briarproject.bramble.api.data.BdfEntry;
 import org.briarproject.bramble.api.data.BdfList;
 import org.briarproject.bramble.api.data.BdfReader;
 import org.briarproject.bramble.api.data.BdfReaderFactory;
@@ -34,7 +32,6 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -42,7 +39,6 @@ import java.util.Map.Entry;
 import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
 
-import static org.briarproject.bramble.api.client.ContactGroupConstants.GROUP_KEY_CONTACT_ID;
 import static org.briarproject.bramble.api.identity.Author.FORMAT_VERSION;
 import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
 import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
@@ -155,12 +151,6 @@ class ClientHelperImpl implements ClientHelper {
 		return metadataParser.parse(metadata);
 	}
 
-	@Override
-	public Collection<MessageId> getMessageIds(Transaction txn, GroupId g,
-			BdfDictionary query) throws DbException, FormatException {
-		return db.getMessageIds(txn, g, metadataEncoder.encode(query));
-	}
-
 	@Override
 	public BdfDictionary getMessageMetadataAsDictionary(MessageId m)
 			throws DbException, FormatException {
@@ -399,27 +389,4 @@ class ClientHelperImpl implements ClientHelper {
 		return tpMap;
 	}
 
-	@Override
-	public ContactId getContactId(Transaction txn, GroupId contactGroupId)
-			throws DbException {
-		try {
-			BdfDictionary meta =
-					getGroupMetadataAsDictionary(txn, contactGroupId);
-			return new ContactId(meta.getLong(GROUP_KEY_CONTACT_ID).intValue());
-		} catch (FormatException e) {
-			throw new DbException(e); // Invalid group metadata
-		}
-	}
-
-	@Override
-	public void setContactId(Transaction txn, GroupId contactGroupId,
-			ContactId c) throws DbException {
-		BdfDictionary meta = BdfDictionary.of(
-				new BdfEntry(GROUP_KEY_CONTACT_ID, c.getInt()));
-		try {
-			mergeGroupMetadata(txn, contactGroupId, meta);
-		} catch (FormatException e) {
-			throw new AssertionError(e);
-		}
-	}
 }

bramble-core/src/main/java/org/briarproject/bramble/crypto/ScryptKdf.java

@@ -9,16 +9,14 @@ import java.util.logging.Logger;
 
 import javax.inject.Inject;
 
-import static java.lang.Math.min;
 import static java.util.logging.Level.INFO;
-import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.util.LogUtils.logDuration;
 import static org.briarproject.bramble.util.LogUtils.now;
 
 class ScryptKdf implements PasswordBasedKdf {
 
 	private static final Logger LOG =
-			getLogger(ScryptKdf.class.getName());
+			Logger.getLogger(ScryptKdf.class.getName());
 
 	private static final int MIN_COST = 256; // Min parameter N
 	private static final int MAX_COST = 1024 * 1024; // Max parameter N
@@ -35,20 +33,10 @@ class ScryptKdf implements PasswordBasedKdf {
 
 	@Override
 	public int chooseCostParameter() {
-		// Scrypt uses at least 128 * N * r bytes of memory. Don't use more
-		// than half of the JVM's max heap size or we may run out of memory.
-		// https://blog.filippo.io/the-scrypt-parameters/
-		long maxMemory = Runtime.getRuntime().maxMemory();
-		long maxCost = min(MAX_COST, maxMemory / BLOCK_SIZE / 256);
-		if (LOG.isLoggable(INFO) && maxCost < MAX_COST) {
-			LOG.info("Max cost capped at " + maxCost
-					+ " due to max heap size " + maxMemory);
-		}
 		// Increase the cost from min to max while measuring performance
 		int cost = MIN_COST;
-		while (cost * 2 <= maxCost && measureDuration(cost) * 2 <= TARGET_MS) {
+		while (cost * 2 <= MAX_COST && measureDuration(cost) * 2 <= TARGET_MS)
 			cost *= 2;
-		}
 		if (LOG.isLoggable(INFO))
 			LOG.info("KDF cost parameter " + cost);
 		return cost;

bramble-core/src/main/java/org/briarproject/bramble/crypto/StreamDecrypterFactoryImpl.java

@@ -36,10 +36,4 @@ class StreamDecrypterFactoryImpl implements StreamDecrypterFactory {
 			SecretKey headerKey) {
 		return new StreamDecrypterImpl(in, cipherProvider.get(), 0, headerKey);
 	}
-
-	@Override
-	public StreamDecrypter createLogStreamDecrypter(InputStream in,
-			SecretKey headerKey) {
-		return createContactExchangeStreamDecrypter(in, headerKey);
-	}
 }

bramble-core/src/main/java/org/briarproject/bramble/crypto/StreamEncrypterFactoryImpl.java

@@ -51,7 +51,7 @@ class StreamEncrypterFactoryImpl implements StreamEncrypterFactory {
 	}
 
 	@Override
-	public StreamEncrypter createContactExchangeStreamEncrypter(
+	public StreamEncrypter createContactExchangeStreamDecrypter(
 			OutputStream out, SecretKey headerKey) {
 		AuthenticatedCipher cipher = cipherProvider.get();
 		byte[] streamHeaderNonce = new byte[STREAM_HEADER_NONCE_LENGTH];
@@ -60,10 +60,4 @@ class StreamEncrypterFactoryImpl implements StreamEncrypterFactory {
 		return new StreamEncrypterImpl(out, cipher, 0, null, streamHeaderNonce,
 				headerKey, frameKey);
 	}
-
-	@Override
-	public StreamEncrypter createLogStreamEncrypter(OutputStream out,
-			SecretKey headerKey) {
-		return createContactExchangeStreamEncrypter(out, headerKey);
-	}
 }

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

@@ -68,13 +68,6 @@ 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.
 	 */
@@ -504,25 +497,6 @@ interface Database<T> {
 	 */
 	Collection<MessageId> getMessagesToShare(T txn) throws DbException;
 
-	/**
-	 * Returns the IDs of any messages of any messages that are due for
-	 * deletion, along with their group IDs.
-	 * <p/>
-	 * Read-only.
-	 */
-	Map<GroupId, Collection<MessageId>> getMessagesToDelete(T txn)
-			throws DbException;
-
-	/**
-	 * Returns the next time (in milliseconds since the Unix epoch) when a
-	 * message is due to be deleted, or
-	 * {@link DatabaseComponent#NO_CLEANUP_DEADLINE} if no messages are
-	 * scheduled to be deleted.
-	 * <p/>
-	 * Read-only.
-	 */
-	long getNextCleanupDeadline(T txn) throws DbException;
-
 	/**
 	 * Returns the next time (in milliseconds since the Unix epoch) when a
 	 * message is due to be sent to the given contact. The returned value may
@@ -632,10 +606,8 @@ interface Database<T> {
 
 	/**
 	 * Marks a message as having been seen by the given contact.
-	 *
-	 * @return True if the message was not already marked as seen.
 	 */
-	boolean raiseSeenFlag(T txn, ContactId c, MessageId m) throws DbException;
+	void raiseSeenFlag(T txn, ContactId c, MessageId m) throws DbException;
 
 	/**
 	 * Removes a contact from the database.
@@ -699,13 +671,6 @@ interface Database<T> {
 	 */
 	void resetExpiryTime(T txn, ContactId c, MessageId m) throws DbException;
 
-	/**
-	 * Sets the cleanup timer duration for the given message. This does not
-	 * start the message's cleanup timer.
-	 */
-	void setCleanupTimerDuration(T txn, MessageId m, long duration)
-			throws DbException;
-
 	/**
 	 * Marks the given contact as verified.
 	 */
@@ -736,10 +701,9 @@ interface Database<T> {
 	void setMessagePermanent(T txn, MessageId m) throws DbException;
 
 	/**
-	 * Marks the given message as shared or not.
+	 * Marks the given message as shared.
 	 */
-	void setMessageShared(T txn, MessageId m, boolean shared)
+	void setMessageShared(T txn, MessageId m) throws DbException;
-			throws DbException;
 
 	/**
 	 * Sets the validation and delivery state of the given message.
@@ -766,22 +730,6 @@ interface Database<T> {
 	void setTransportKeysActive(T txn, TransportId t, KeySetId k)
 			throws DbException;
 
-	/**
-	 * Starts the cleanup timer for the given message, if a timer duration
-	 * has been set and the timer has not already been started.
-	 *
-	 * @return The cleanup deadline, or
-	 * {@link DatabaseComponent#TIMER_NOT_STARTED} if no timer duration has
-	 * been set for this message or its timer has already been started.
-	 */
-	long startCleanupTimer(T txn, MessageId m) throws DbException;
-
-	/**
-	 * Stops the cleanup timer for the given message, if the timer has been
-	 * started.
-	 */
-	void stopCleanupTimer(T txn, MessageId m) throws DbException;
-
 	/**
 	 * Updates the transmission count, expiry time and estimated time of arrival
 	 * of the given message with respect to the given contact, using the latency

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

@@ -1,12 +1,10 @@
 package org.briarproject.bramble.db;
 
-import org.briarproject.bramble.api.cleanup.event.CleanupTimerStartedEvent;
 import org.briarproject.bramble.api.contact.Contact;
 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;
@@ -578,15 +576,6 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		return db.getMessageIds(txn, g);
 	}
 
-	@Override
-	public Collection<MessageId> getMessageIds(Transaction transaction,
-			GroupId g, Metadata query) throws DbException {
-		T txn = unbox(transaction);
-		if (!db.containsGroup(txn, g))
-			throw new NoSuchGroupException();
-		return db.getMessageIds(txn, g, query);
-	}
-
 	@Override
 	public Collection<MessageId> getMessagesToValidate(Transaction transaction)
 			throws DbException {
@@ -608,13 +597,6 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		return db.getMessagesToShare(txn);
 	}
 
-	@Override
-	public Map<GroupId, Collection<MessageId>> getMessagesToDelete(
-			Transaction transaction) throws DbException {
-		T txn = unbox(transaction);
-		return db.getMessagesToDelete(txn);
-	}
-
 	@Override
 	public Map<MessageId, Metadata> getMessageMetadata(Transaction transaction,
 			GroupId g) throws DbException {
@@ -710,13 +692,6 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		return db.getMessageDependents(txn, m);
 	}
 
-	@Override
-	public long getNextCleanupDeadline(Transaction transaction)
-			throws DbException {
-		T txn = unbox(transaction);
-		return db.getNextCleanupDeadline(txn);
-	}
-
 	@Override
 	public long getNextSendTime(Transaction transaction, ContactId c)
 			throws DbException {
@@ -820,17 +795,8 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		Collection<MessageId> acked = new ArrayList<>();
 		for (MessageId m : a.getMessageIds()) {
 			if (db.containsVisibleMessage(txn, c, m)) {
-				if (db.raiseSeenFlag(txn, c, m)) {
+				db.raiseSeenFlag(txn, c, m);
-					// This is the first time the message has been acked by
+				acked.add(m);
-					// this contact. Start the cleanup timer (a no-op unless
-					// a cleanup deadline has been set for this message)
-					long deadline = db.startCleanupTimer(txn, m);
-					if (deadline != TIMER_NOT_STARTED) {
-						transaction.attach(new CleanupTimerStartedEvent(m,
-								deadline));
-					}
-					acked.add(m);
-				}
 			}
 		}
 		if (acked.size() > 0) {
@@ -986,16 +952,6 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		db.removeTransportKeys(txn, t, k);
 	}
 
-	@Override
-	public void setCleanupTimerDuration(Transaction transaction, MessageId m,
-			long duration) throws DbException {
-		if (transaction.isReadOnly()) throw new IllegalArgumentException();
-		T txn = unbox(transaction);
-		if (!db.containsMessage(txn, m))
-			throw new NoSuchMessageException();
-		db.setCleanupTimerDuration(txn, m, duration);
-	}
-
 	@Override
 	public void setContactVerified(Transaction transaction, ContactId c)
 			throws DbException {
@@ -1014,7 +970,6 @@ 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);
 	}
 
@@ -1046,16 +1001,6 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		db.setMessagePermanent(txn, m);
 	}
 
-	@Override
-	public void setMessageNotShared(Transaction transaction, MessageId m)
-			throws DbException {
-		if (transaction.isReadOnly()) throw new IllegalArgumentException();
-		T txn = unbox(transaction);
-		if (!db.containsMessage(txn, m))
-			throw new NoSuchMessageException();
-		db.setMessageShared(txn, m, false);
-	}
-
 	@Override
 	public void setMessageShared(Transaction transaction, MessageId m)
 			throws DbException {
@@ -1065,7 +1010,7 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 			throw new NoSuchMessageException();
 		if (db.getMessageState(txn, m) != DELIVERED)
 			throw new IllegalArgumentException("Shared undelivered message");
-		db.setMessageShared(txn, m, true);
+		db.setMessageShared(txn, m);
 		transaction.attach(new MessageSharedEvent(m));
 	}
 
@@ -1137,30 +1082,6 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		db.setTransportKeysActive(txn, t, k);
 	}
 
-	@Override
-	public long startCleanupTimer(Transaction transaction, MessageId m)
-			throws DbException {
-		if (transaction.isReadOnly()) throw new IllegalArgumentException();
-		T txn = unbox(transaction);
-		if (!db.containsMessage(txn, m))
-			throw new NoSuchMessageException();
-		long deadline = db.startCleanupTimer(txn, m);
-		if (deadline != TIMER_NOT_STARTED) {
-			transaction.attach(new CleanupTimerStartedEvent(m, deadline));
-		}
-		return deadline;
-	}
-
-	@Override
-	public void stopCleanupTimer(Transaction transaction, MessageId m)
-			throws DbException {
-		if (transaction.isReadOnly()) throw new IllegalArgumentException();
-		T txn = unbox(transaction);
-		if (!db.containsMessage(txn, m))
-			throw new NoSuchMessageException();
-		db.stopCleanupTimer(txn, m);
-	}
-
 	@Override
 	public void updateTransportKeys(Transaction transaction,
 			Collection<TransportKeySet> keys) throws DbException {

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

@@ -37,10 +37,4 @@ 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,14 +84,9 @@ 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,7 +81,6 @@ 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

@@ -72,8 +72,6 @@ import static java.util.Arrays.asList;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
-import static org.briarproject.bramble.api.db.DatabaseComponent.NO_CLEANUP_DEADLINE;
-import static org.briarproject.bramble.api.db.DatabaseComponent.TIMER_NOT_STARTED;
 import static org.briarproject.bramble.api.db.Metadata.REMOVE;
 import static org.briarproject.bramble.api.sync.Group.Visibility.INVISIBLE;
 import static org.briarproject.bramble.api.sync.Group.Visibility.SHARED;
@@ -83,7 +81,6 @@ 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;
@@ -101,7 +98,7 @@ import static org.briarproject.bramble.util.LogUtils.now;
 abstract class JdbcDatabase implements Database<Connection> {
 
 	// Package access for testing
-	static final int CODE_SCHEMA_VERSION = 48;
+	static final int CODE_SCHEMA_VERSION = 47;
 
 	// Time period offsets for incoming transport keys
 	private static final int OFFSET_PREV = -1;
@@ -183,11 +180,6 @@ abstract class JdbcDatabase implements Database<Connection> {
 					+ " state INT NOT NULL,"
 					+ " shared BOOLEAN NOT NULL,"
 					+ " temporary BOOLEAN NOT NULL,"
-					// Null if no timer duration has been set
-					+ " cleanupTimerDuration BIGINT,"
-					// Null if no timer duration has been set or the timer
-					// hasn't started
-					+ " cleanupDeadline BIGINT,"
 					+ " length INT NOT NULL,"
 					+ " raw BLOB," // Null if message has been deleted
 					+ " PRIMARY KEY (messageId),"
@@ -344,10 +336,6 @@ abstract class JdbcDatabase implements Database<Connection> {
 			"CREATE INDEX IF NOT EXISTS statusesByContactIdTimestamp"
 					+ " ON statuses (contactId, timestamp)";
 
-	private static final String INDEX_MESSAGES_BY_CLEANUP_DEADLINE =
-			"CREATE INDEX IF NOT EXISTS messagesByCleanupDeadline"
-					+ " ON messages (cleanupDeadline)";
-
 	private static final Logger LOG =
 			getLogger(JdbcDatabase.class.getName());
 
@@ -366,14 +354,9 @@ 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,
@@ -398,19 +381,13 @@ 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);
@@ -437,11 +414,6 @@ 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
@@ -491,8 +463,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 				new Migration43_44(dbTypes),
 				new Migration44_45(),
 				new Migration45_46(),
-				new Migration46_47(dbTypes),
+				new Migration46_47(dbTypes)
-				new Migration47_48()
 		);
 	}
 
@@ -517,16 +488,6 @@ 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);
@@ -570,7 +531,6 @@ abstract class JdbcDatabase implements Database<Connection> {
 			s.executeUpdate(INDEX_MESSAGE_DEPENDENCIES_BY_DEPENDENCY_ID);
 			s.executeUpdate(INDEX_STATUSES_BY_CONTACT_ID_GROUP_ID);
 			s.executeUpdate(INDEX_STATUSES_BY_CONTACT_ID_TIMESTAMP);
-			s.executeUpdate(INDEX_MESSAGES_BY_CLEANUP_DEADLINE);
 			s.close();
 		} catch (SQLException e) {
 			tryToClose(s, LOG, WARNING);
@@ -1330,9 +1290,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 	public void deleteMessage(Connection txn, MessageId m) throws DbException {
 		PreparedStatement ps = null;
 		try {
-			String sql = "UPDATE messages"
+			String sql = "UPDATE messages SET raw = NULL WHERE messageId = ?";
-					+ " SET raw = NULL, cleanupDeadline = NULL"
-					+ " WHERE messageId = ?";
 			ps = txn.prepareStatement(sql);
 			ps.setBytes(1, m.getBytes());
 			int affected = ps.executeUpdate();
@@ -1811,6 +1769,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 				// Return early if there are no matches
 				if (intersection.isEmpty()) return Collections.emptySet();
 			}
+			if (intersection == null) throw new AssertionError();
 			return intersection;
 		} catch (SQLException e) {
 			tryToClose(rs, LOG, WARNING);
@@ -2267,39 +2226,6 @@ abstract class JdbcDatabase implements Database<Connection> {
 		}
 	}
 
-	@Override
-	public Map<GroupId, Collection<MessageId>> getMessagesToDelete(
-			Connection txn) throws DbException {
-		long now = clock.currentTimeMillis();
-		PreparedStatement ps = null;
-		ResultSet rs = null;
-		try {
-			String sql = "SELECT messageId, groupId FROM messages"
-					+ " WHERE cleanupDeadline <= ?";
-			ps = txn.prepareStatement(sql);
-			ps.setLong(1, now);
-			rs = ps.executeQuery();
-			Map<GroupId, Collection<MessageId>> ids = new HashMap<>();
-			while (rs.next()) {
-				MessageId m = new MessageId(rs.getBytes(1));
-				GroupId g = new GroupId(rs.getBytes(2));
-				Collection<MessageId> messageIds = ids.get(g);
-				if (messageIds == null) {
-					messageIds = new ArrayList<>();
-					ids.put(g, messageIds);
-				}
-				messageIds.add(m);
-			}
-			rs.close();
-			ps.close();
-			return ids;
-		} catch (SQLException e) {
-			tryToClose(rs, LOG, WARNING);
-			tryToClose(ps, LOG, WARNING);
-			throw new DbException(e);
-		}
-	}
-
 	@Override
 	public long getNextSendTime(Connection txn, ContactId c)
 			throws DbException {
@@ -2330,31 +2256,6 @@ abstract class JdbcDatabase implements Database<Connection> {
 		}
 	}
 
-	@Override
-	public long getNextCleanupDeadline(Connection txn) throws DbException {
-		Statement s = null;
-		ResultSet rs = null;
-		try {
-			String sql = "SELECT cleanupDeadline FROM messages"
-					+ " WHERE cleanupDeadline IS NOT NULL"
-					+ " ORDER BY cleanupDeadline LIMIT 1";
-			s = txn.createStatement();
-			rs = s.executeQuery(sql);
-			long nextDeadline = NO_CLEANUP_DEADLINE;
-			if (rs.next()) {
-				nextDeadline = rs.getLong(1);
-				if (rs.next()) throw new AssertionError();
-			}
-			rs.close();
-			s.close();
-			return nextDeadline;
-		} catch (SQLException e) {
-			tryToClose(rs, LOG, WARNING);
-			tryToClose(s, LOG, WARNING);
-			throw new DbException(e);
-		}
-	}
-
 	@Override
 	public PendingContact getPendingContact(Connection txn, PendingContactId p)
 			throws DbException {
@@ -2875,7 +2776,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 	}
 
 	@Override
-	public boolean raiseSeenFlag(Connection txn, ContactId c, MessageId m)
+	public void raiseSeenFlag(Connection txn, ContactId c, MessageId m)
 			throws DbException {
 		PreparedStatement ps = null;
 		try {
@@ -2887,7 +2788,6 @@ abstract class JdbcDatabase implements Database<Connection> {
 			int affected = ps.executeUpdate();
 			if (affected < 0 || affected > 1) throw new DbStateException();
 			ps.close();
-			return affected == 1;
 		} catch (SQLException e) {
 			tryToClose(ps, LOG, WARNING);
 			throw new DbException(e);
@@ -3121,25 +3021,6 @@ abstract class JdbcDatabase implements Database<Connection> {
 		}
 	}
 
-	@Override
-	public void setCleanupTimerDuration(Connection txn, MessageId m,
-			long duration) throws DbException {
-		PreparedStatement ps = null;
-		try {
-			String sql = "UPDATE messages SET cleanupTimerDuration = ?"
-					+ " WHERE messageId = ? AND cleanupTimerDuration IS NULL";
-			ps = txn.prepareStatement(sql);
-			ps.setLong(1, duration);
-			ps.setBytes(2, m.getBytes());
-			int affected = ps.executeUpdate();
-			if (affected < 0 || affected > 1) throw new DbStateException();
-			ps.close();
-		} catch (SQLException e) {
-			tryToClose(ps, LOG, WARNING);
-			throw new DbException(e);
-		}
-	}
-
 	@Override
 	public void setContactVerified(Connection txn, ContactId c)
 			throws DbException {
@@ -3247,24 +3128,22 @@ abstract class JdbcDatabase implements Database<Connection> {
 	}
 
 	@Override
-	public void setMessageShared(Connection txn, MessageId m, boolean shared)
+	public void setMessageShared(Connection txn, MessageId m)
 			throws DbException {
 		PreparedStatement ps = null;
 		try {
-			String sql = "UPDATE messages SET shared = ?"
+			String sql = "UPDATE messages SET shared = TRUE"
 					+ " WHERE messageId = ?";
 			ps = txn.prepareStatement(sql);
-			ps.setBoolean(1, shared);
+			ps.setBytes(1, m.getBytes());
-			ps.setBytes(2, m.getBytes());
 			int affected = ps.executeUpdate();
 			if (affected < 0 || affected > 1) throw new DbStateException();
 			ps.close();
 			// Update denormalised column in statuses
-			sql = "UPDATE statuses SET messageShared = ?"
+			sql = "UPDATE statuses SET messageShared = TRUE"
 					+ " WHERE messageId = ?";
 			ps = txn.prepareStatement(sql);
-			ps.setBoolean(1, shared);
+			ps.setBytes(1, m.getBytes());
-			ps.setBytes(2, m.getBytes());
 			affected = ps.executeUpdate();
 			if (affected < 0) throw new DbStateException();
 			ps.close();
@@ -3393,60 +3272,6 @@ abstract class JdbcDatabase implements Database<Connection> {
 		}
 	}
 
-	@Override
-	public long startCleanupTimer(Connection txn, MessageId m)
-			throws DbException {
-		long now = clock.currentTimeMillis();
-		PreparedStatement ps = null;
-		ResultSet rs = null;
-		try {
-			String sql = "UPDATE messages"
-					+ " SET cleanupDeadline = ? + cleanupTimerDuration"
-					+ " WHERE messageId = ?"
-					+ " AND cleanupTimerDuration IS NOT NULL"
-					+ " AND cleanupDeadline IS NULL";
-			ps = txn.prepareStatement(sql);
-			ps.setLong(1, now);
-			ps.setBytes(2, m.getBytes());
-			int affected = ps.executeUpdate();
-			if (affected < 0 || affected > 1) throw new DbStateException();
-			ps.close();
-			if (affected == 0) return TIMER_NOT_STARTED;
-			sql = "SELECT cleanupDeadline FROM messages WHERE messageId = ?";
-			ps = txn.prepareStatement(sql);
-			ps.setBytes(1, m.getBytes());
-			rs = ps.executeQuery();
-			if (!rs.next()) throw new DbStateException();
-			long deadline = rs.getLong(1);
-			if (rs.next()) throw new DbStateException();
-			rs.close();
-			ps.close();
-			return deadline;
-		} catch (SQLException e) {
-			tryToClose(rs, LOG, WARNING);
-			tryToClose(ps, LOG, WARNING);
-			throw new DbException(e);
-		}
-	}
-
-	@Override
-	public void stopCleanupTimer(Connection txn, MessageId m)
-			throws DbException {
-		PreparedStatement ps = null;
-		try {
-			String sql = "UPDATE messages SET cleanupDeadline = NULL"
-					+ " WHERE messageId = ?";
-			ps = txn.prepareStatement(sql);
-			ps.setBytes(1, m.getBytes());
-			int affected = ps.executeUpdate();
-			if (affected < 0 || affected > 1) throw new DbStateException();
-			ps.close();
-		} catch (SQLException e) {
-			tryToClose(ps, LOG, WARNING);
-			throw new DbException(e);
-		}
-	}
-
 	@Override
 	public void updateExpiryTimeAndEta(Connection txn, ContactId c, MessageId m,
 			int maxLatency) throws DbException {

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

@@ -1,47 +0,0 @@
-package org.briarproject.bramble.db;
-
-import org.briarproject.bramble.api.db.DbException;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.logging.Logger;
-
-import static java.util.logging.Level.WARNING;
-import static java.util.logging.Logger.getLogger;
-import static org.briarproject.bramble.db.JdbcUtils.tryToClose;
-
-class Migration47_48 implements Migration<Connection> {
-
-	private static final Logger LOG = getLogger(Migration47_48.class.getName());
-
-	@Override
-	public int getStartVersion() {
-		return 47;
-	}
-
-	@Override
-	public int getEndVersion() {
-		return 48;
-	}
-
-	@Override
-	public void migrate(Connection txn) throws DbException {
-		Statement s = null;
-		try {
-			s = txn.createStatement();
-			// Null if no timer duration has been set
-			s.execute("ALTER TABLE messages"
-					+ " ADD COLUMN cleanupTimerDuration BIGINT");
-			// Null if no timer duration has been set or the timer
-			// hasn't started
-			s.execute("ALTER TABLE messages"
-					+ " ADD COLUMN cleanupDeadline BIGINT");
-			s.execute("CREATE INDEX IF NOT EXISTS messagesByCleanupDeadline"
-					+ " ON messages (cleanupDeadline)");
-		} catch (SQLException e) {
-			tryToClose(s, LOG, WARNING);
-			throw new DbException(e);
-		}
-	}
-}

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 final Predicate<Record> ACCEPT = r ->
+	private static Predicate<Record> ACCEPT = r ->
 			r.getProtocolVersion() == PROTOCOL_VERSION &&
 					isKnownRecordType(r.getRecordType());
 
 	// Ignore records with current protocol version, unknown record type
-	private static final Predicate<Record> IGNORE = r ->
+	private static Predicate<Record> IGNORE = r ->
 			r.getProtocolVersion() == PROTOCOL_VERSION &&
 					!isKnownRecordType(r.getRecordType());
 

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

@@ -1,633 +0,0 @@
-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 void disablePolling() {
-		connectionLimiter.startLimiting();
-	}
-
-	@Override
-	public void enablePolling() {
-		connectionLimiter.endLimiting();
-	}
-
-	@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) {
-			connectionLimiter.startLimiting();
-		} else if (e instanceof KeyAgreementStoppedListeningEvent) {
-			connectionLimiter.endLimiting();
-		} 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/BluetoothConnectionLimiter.java

@@ -7,15 +7,14 @@ import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
 interface BluetoothConnectionLimiter {
 
 	/**
-	 * Tells the limiter to not allow regular polling connections (because we
+	 * Informs the limiter that key agreement has started.
-	 * are about to do key agreement, or connect via BT for setup).
 	 */
-	void startLimiting();
+	void keyAgreementStarted();
 
 	/**
-	 * Tells the limiter to no longer limit regular polling connections.
+	 * Informs the limiter that key agreement has ended.
 	 */
-	void endLimiting();
+	void keyAgreementEnded();
 
 	/**
 	 * Returns true if a contact connection can be opened. This method does not

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

@@ -30,37 +30,34 @@ class BluetoothConnectionLimiterImpl implements BluetoothConnectionLimiter {
 	private final List<DuplexTransportConnection> connections =
 			new LinkedList<>();
 	@GuardedBy("lock")
-	private int limitingInProgress = 0;
+	private boolean keyAgreementInProgress = false;
 
 	BluetoothConnectionLimiterImpl(EventBus eventBus) {
 		this.eventBus = eventBus;
 	}
 
 	@Override
-	public void startLimiting() {
+	public void keyAgreementStarted() {
 		synchronized (lock) {
-			limitingInProgress++;
+			keyAgreementInProgress = true;
 		}
-		LOG.info("Limiting started");
+		LOG.info("Key agreement started");
 		eventBus.broadcast(new CloseSyncConnectionsEvent(ID));
 	}
 
 	@Override
-	public void endLimiting() {
+	public void keyAgreementEnded() {
 		synchronized (lock) {
-			limitingInProgress--;
+			keyAgreementInProgress = false;
-			if (limitingInProgress < 0) {
-				throw new IllegalStateException();
-			}
 		}
-		LOG.info("Limiting ended");
+		LOG.info("Key agreement ended");
 	}
 
 	@Override
 	public boolean canOpenContactConnection() {
 		synchronized (lock) {
-			if (limitingInProgress > 0) {
+			if (keyAgreementInProgress) {
-				LOG.info("Can't open contact connection while limiting");
+				LOG.info("Can't open contact connection during key agreement");
 				return false;
 			} else {
 				LOG.info("Can open contact connection");

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

@@ -1,22 +1,606 @@
 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;
 
-@NotNullByDefault
+import static java.util.logging.Level.INFO;
-public interface BluetoothPlugin extends DuplexPlugin {
+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;
 
-	boolean isDiscovering();
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+abstract class BluetoothPlugin<S, SS> implements DuplexPlugin, EventListener {
 
-	void disablePolling();
+	private static final Logger LOG =
+			getLogger(BluetoothPlugin.class.getName());
 
-	void enablePolling();
+	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;
 
 	@Nullable
-	DuplexTransportConnection discoverAndConnectForSetup(String uuid);
+	abstract DuplexTransportConnection discoverAndConnect(String uuid);
 
-	void stopDiscoverAndConnect();
+	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;
+		}
+	}
 }

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

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

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

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

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

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

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

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

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

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

bramble-core/src/main/java/org/briarproject/bramble/versioning/ClientVersioningConstants.java

@@ -5,5 +5,6 @@ interface ClientVersioningConstants {
 	// Metadata keys
 	String MSG_KEY_UPDATE_VERSION = "version";
 	String MSG_KEY_LOCAL = "local";
+	String GROUP_KEY_CONTACT_ID = "contactId";
 }
 

bramble-core/src/main/java/org/briarproject/bramble/versioning/ClientVersioningManagerImpl.java

@@ -50,6 +50,7 @@ import static java.util.Collections.emptyList;
 import static org.briarproject.bramble.api.sync.Group.Visibility.INVISIBLE;
 import static org.briarproject.bramble.api.sync.Group.Visibility.SHARED;
 import static org.briarproject.bramble.api.sync.Group.Visibility.VISIBLE;
+import static org.briarproject.bramble.versioning.ClientVersioningConstants.GROUP_KEY_CONTACT_ID;
 import static org.briarproject.bramble.versioning.ClientVersioningConstants.MSG_KEY_LOCAL;
 import static org.briarproject.bramble.versioning.ClientVersioningConstants.MSG_KEY_UPDATE_VERSION;
 
@@ -160,7 +161,13 @@ class ClientVersioningManagerImpl implements ClientVersioningManager,
 		db.addGroup(txn, g);
 		db.setGroupVisibility(txn, c.getId(), g.getId(), SHARED);
 		// Attach the contact ID to the group
-		clientHelper.setContactId(txn, g.getId(), c.getId());
+		BdfDictionary meta = new BdfDictionary();
+		meta.put(GROUP_KEY_CONTACT_ID, c.getId().getInt());
+		try {
+			clientHelper.mergeGroupMetadata(txn, g.getId(), meta);
+		} catch (FormatException e) {
+			throw new AssertionError(e);
+		}
 		// Create and store the first local update
 		List<ClientVersion> versions = new ArrayList<>(clients);
 		Collections.sort(versions);
@@ -222,7 +229,7 @@ class ClientVersioningManagerImpl implements ClientVersioningManager,
 			Map<ClientMajorVersion, Visibility> after =
 					getVisibilities(newLocalStates, newRemoteStates);
 			// Call hooks for any visibilities that have changed
-			ContactId c = clientHelper.getContactId(txn, m.getGroupId());
+			ContactId c = getContactId(txn, m.getGroupId());
 			if (!before.equals(after)) {
 				Contact contact = db.getContact(txn, c);
 				callVisibilityHooks(txn, contact, before, after);
@@ -514,6 +521,17 @@ class ClientVersioningManagerImpl implements ClientVersioningManager,
 		storeUpdate(txn, g, states, 1);
 	}
 
+	private ContactId getContactId(Transaction txn, GroupId g)
+			throws DbException {
+		try {
+			BdfDictionary meta =
+					clientHelper.getGroupMetadataAsDictionary(txn, g);
+			return new ContactId(meta.getLong(GROUP_KEY_CONTACT_ID).intValue());
+		} catch (FormatException e) {
+			throw new DbException(e);
+		}
+	}
+
 	private List<ClientState> updateStatesFromRemoteStates(
 			List<ClientState> oldLocalStates, List<ClientState> remoteStates) {
 		Set<ClientMajorVersion> remoteSet = new HashSet<>();

bramble-core/src/main/resources/bridges

@@ -1,10 +1,5 @@
-Bridge obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg 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 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0
-Bridge obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0
 Bridge obfs4 78.46.188.239:37356 5A2D2F4158D0453E00C7C176978D3F41D69C45DB cert=3c0SwxpOisbohNxEc4tb875RVW8eOu1opRTVXJhafaKA/PNNtI7ElQIVOVZg1AdL5bxGCw iat-mode=0
-Bridge meek_lite 192.0.2.2:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com
+Bridge obfs4 52.15.78.72:9443 02069A3C5362476936B62BA6F5ACC41ABD573A9B cert=ijYG/OKc7kqu2YzKNFfeXN7/BG2BOgfEP2KyYEiGDQthnHbsOiTWHeIG0WJVW+BckzDgKw iat-mode=0
+Bridge obfs4 13.58.29.242:9443 0C58939A77DA6B6B29D4B5236A75865659607AE0 cert=OylWIEHb/ezpq1zWxW0sgKRn+9ARH2eOcQOZ8/Gew+4l+oKOhQ2jUX/Y+FSl61JorXZUWA iat-mode=0
+Bridge obfs4 45.33.37.112:9443 60A609BB4ABE8D46E634AE81ED29ADAB7776B399 cert=t5v19WmNv5Sc2YPNr8RQids365W7MY8zJwQVkOxBjUMFomMWARDzsbYpcWLLcw0J9Gm+BQ iat-mode=0
+Bridge meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com

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

@@ -1,18 +1,18 @@
 package org.briarproject.bramble;
 
-import org.briarproject.bramble.system.TimeTravelModule;
+import org.briarproject.bramble.system.DefaultTaskSchedulerModule;
 
 public interface BrambleCoreIntegrationTestEagerSingletons
 		extends BrambleCoreEagerSingletons {
 
-	void inject(TimeTravelModule.EagerSingletons init);
+	void inject(DefaultTaskSchedulerModule.EagerSingletons init);
 
 	class Helper {
 
 		public static void injectEagerSingletons(
 				BrambleCoreIntegrationTestEagerSingletons c) {
 			BrambleCoreEagerSingletons.Helper.injectEagerSingletons(c);
-			c.inject(new TimeTravelModule.EagerSingletons());
+			c.inject(new DefaultTaskSchedulerModule.EagerSingletons());
 		}
 	}
 }

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

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.db;
 
-import org.briarproject.bramble.api.cleanup.event.CleanupTimerStartedEvent;
 import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.contact.PendingContactId;
@@ -70,8 +69,6 @@ import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.emptyMap;
 import static java.util.Collections.singletonList;
-import static java.util.concurrent.TimeUnit.HOURS;
-import static org.briarproject.bramble.api.db.DatabaseComponent.TIMER_NOT_STARTED;
 import static org.briarproject.bramble.api.sync.Group.Visibility.INVISIBLE;
 import static org.briarproject.bramble.api.sync.Group.Visibility.SHARED;
 import static org.briarproject.bramble.api.sync.Group.Visibility.VISIBLE;
@@ -513,11 +510,11 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 			throws Exception {
 		context.checking(new Expectations() {{
 			// Check whether the group is in the DB (which it's not)
-			exactly(10).of(database).startTransaction();
+			exactly(8).of(database).startTransaction();
 			will(returnValue(txn));
-			exactly(10).of(database).containsGroup(txn, groupId);
+			exactly(8).of(database).containsGroup(txn, groupId);
 			will(returnValue(false));
-			exactly(10).of(database).abortTransaction(txn);
+			exactly(8).of(database).abortTransaction(txn);
 			// Allow other checks to pass
 			allowing(database).containsContact(txn, contactId);
 			will(returnValue(true));
@@ -526,7 +523,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 				eventExecutor, shutdownManager);
 
 		try {
-			db.transaction(true, transaction ->
+			db.transaction(false, transaction ->
 					db.getGroup(transaction, groupId));
 			fail();
 		} catch (NoSuchGroupException expected) {
@@ -534,7 +531,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		}
 
 		try {
-			db.transaction(true, transaction ->
+			db.transaction(false, transaction ->
 					db.getGroupMetadata(transaction, groupId));
 			fail();
 		} catch (NoSuchGroupException expected) {
@@ -542,23 +539,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		}
 
 		try {
-			db.transaction(true, transaction ->
+			db.transaction(false, transaction ->
-					db.getMessageIds(transaction, groupId));
-			fail();
-		} catch (NoSuchGroupException expected) {
-			// Expected
-		}
-
-		try {
-			db.transaction(true, transaction ->
-					db.getMessageIds(transaction, groupId, new Metadata()));
-			fail();
-		} catch (NoSuchGroupException expected) {
-			// Expected
-		}
-
-		try {
-			db.transaction(true, transaction ->
 					db.getMessageMetadata(transaction, groupId));
 			fail();
 		} catch (NoSuchGroupException expected) {
@@ -566,7 +547,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		}
 
 		try {
-			db.transaction(true, transaction ->
+			db.transaction(false, transaction ->
 					db.getMessageMetadata(transaction, groupId,
 							new Metadata()));
 			fail();
@@ -575,7 +556,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		}
 
 		try {
-			db.transaction(true, transaction ->
+			db.transaction(false, transaction ->
 					db.getMessageStatus(transaction, contactId, groupId));
 			fail();
 		} catch (NoSuchGroupException expected) {
@@ -613,11 +594,11 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 			throws Exception {
 		context.checking(new Expectations() {{
 			// Check whether the message is in the DB (which it's not)
-			exactly(15).of(database).startTransaction();
+			exactly(12).of(database).startTransaction();
 			will(returnValue(txn));
-			exactly(15).of(database).containsMessage(txn, messageId);
+			exactly(12).of(database).containsMessage(txn, messageId);
 			will(returnValue(false));
-			exactly(15).of(database).abortTransaction(txn);
+			exactly(12).of(database).abortTransaction(txn);
 			// Allow other checks to pass
 			allowing(database).containsContact(txn, contactId);
 			will(returnValue(true));
@@ -642,7 +623,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		}
 
 		try {
-			db.transaction(true, transaction ->
+			db.transaction(false, transaction ->
 					db.getMessage(transaction, messageId));
 			fail();
 		} catch (NoSuchMessageException expected) {
@@ -650,7 +631,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		}
 
 		try {
-			db.transaction(true, transaction ->
+			db.transaction(false, transaction ->
 					db.getMessageMetadata(transaction, messageId));
 			fail();
 		} catch (NoSuchMessageException expected) {
@@ -658,7 +639,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		}
 
 		try {
-			db.transaction(true, transaction ->
+			db.transaction(false, transaction ->
 					db.getMessageState(transaction, messageId));
 			fail();
 		} catch (NoSuchMessageException expected) {
@@ -666,7 +647,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		}
 
 		try {
-			db.transaction(true, transaction ->
+			db.transaction(false, transaction ->
 					db.getMessageStatus(transaction, contactId, messageId));
 			fail();
 		} catch (NoSuchMessageException expected) {
@@ -681,15 +662,6 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 			// Expected
 		}
 
-		try {
-			db.transaction(false, transaction ->
-					db.setCleanupTimerDuration(transaction, message.getId(),
-							HOURS.toMillis(1)));
-			fail();
-		} catch (NoSuchMessageException expected) {
-			// Expected
-		}
-
 		try {
 			db.transaction(false, transaction ->
 					db.setMessagePermanent(transaction, message.getId()));
@@ -715,7 +687,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		}
 
 		try {
-			db.transaction(true, transaction ->
+			db.transaction(false, transaction ->
 					db.getMessageDependencies(transaction, messageId));
 			fail();
 		} catch (NoSuchMessageException expected) {
@@ -723,28 +695,12 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		}
 
 		try {
-			db.transaction(true, transaction ->
+			db.transaction(false, transaction ->
 					db.getMessageDependents(transaction, messageId));
 			fail();
 		} catch (NoSuchMessageException expected) {
 			// Expected
 		}
-
-		try {
-			db.transaction(false, transaction ->
-					db.startCleanupTimer(transaction, messageId));
-			fail();
-		} catch (NoSuchMessageException expected) {
-			// Expected
-		}
-
-		try {
-			db.transaction(false, transaction ->
-					db.stopCleanupTimer(transaction, messageId));
-			fail();
-		} catch (NoSuchMessageException expected) {
-			// Expected
-		}
 	}
 
 	@Test
@@ -1025,9 +981,6 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 			oneOf(database).containsVisibleMessage(txn, contactId, messageId);
 			will(returnValue(true));
 			oneOf(database).raiseSeenFlag(txn, contactId, messageId);
-			will(returnValue(true));
-			oneOf(database).startCleanupTimer(txn, messageId);
-			will(returnValue(TIMER_NOT_STARTED)); // No cleanup duration was set
 			oneOf(database).commitTransaction(txn);
 			oneOf(eventBus).broadcast(with(any(MessagesAckedEvent.class)));
 		}});
@@ -1040,56 +993,6 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		});
 	}
 
-	@Test
-	public void testReceiveDuplicateAck() throws Exception {
-		context.checking(new Expectations() {{
-			oneOf(database).startTransaction();
-			will(returnValue(txn));
-			oneOf(database).containsContact(txn, contactId);
-			will(returnValue(true));
-			oneOf(database).containsVisibleMessage(txn, contactId, messageId);
-			will(returnValue(true));
-			oneOf(database).raiseSeenFlag(txn, contactId, messageId);
-			will(returnValue(false)); // Already acked
-			oneOf(database).commitTransaction(txn);
-		}});
-		DatabaseComponent db = createDatabaseComponent(database, eventBus,
-				eventExecutor, shutdownManager);
-
-		db.transaction(false, transaction -> {
-			Ack a = new Ack(singletonList(messageId));
-			db.receiveAck(transaction, contactId, a);
-		});
-	}
-
-	@Test
-	public void testReceiveAckWithCleanupTimer() throws Exception {
-		long deadline = System.currentTimeMillis();
-		context.checking(new Expectations() {{
-			oneOf(database).startTransaction();
-			will(returnValue(txn));
-			oneOf(database).containsContact(txn, contactId);
-			will(returnValue(true));
-			oneOf(database).containsVisibleMessage(txn, contactId, messageId);
-			will(returnValue(true));
-			oneOf(database).raiseSeenFlag(txn, contactId, messageId);
-			will(returnValue(true));
-			oneOf(database).startCleanupTimer(txn, messageId);
-			will(returnValue(deadline));
-			oneOf(database).commitTransaction(txn);
-			oneOf(eventBus).broadcast(with(any(
-					CleanupTimerStartedEvent.class)));
-			oneOf(eventBus).broadcast(with(any(MessagesAckedEvent.class)));
-		}});
-		DatabaseComponent db = createDatabaseComponent(database, eventBus,
-				eventExecutor, shutdownManager);
-
-		db.transaction(false, transaction -> {
-			Ack a = new Ack(singletonList(messageId));
-			db.receiveAck(transaction, contactId, a);
-		});
-	}
-
 	@Test
 	public void testReceiveMessage() throws Exception {
 		context.checking(new Expectations() {{

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

@@ -41,12 +41,8 @@ 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;
@@ -57,11 +53,10 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
+import static java.util.Collections.emptyMap;
 import static java.util.Collections.singletonList;
 import static java.util.Collections.singletonMap;
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.briarproject.bramble.api.db.DatabaseComponent.NO_CLEANUP_DEADLINE;
-import static org.briarproject.bramble.api.db.DatabaseComponent.TIMER_NOT_STARTED;
 import static org.briarproject.bramble.api.db.Metadata.REMOVE;
 import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
 import static org.briarproject.bramble.api.sync.Group.Visibility.INVISIBLE;
@@ -356,7 +351,7 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 		assertTrue(ids.isEmpty());
 
 		// Sharing the message should make it sendable
-		db.setMessageShared(txn, messageId, true);
+		db.setMessageShared(txn, messageId);
 		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE, MAX_LATENCY);
 		assertEquals(singletonList(messageId), ids);
 		ids = db.getMessagesToOffer(txn, contactId, 100, MAX_LATENCY);
@@ -636,7 +631,8 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 
 		// The group should not be visible to the contact
 		assertEquals(INVISIBLE, db.getGroupVisibility(txn, contactId, groupId));
-		assertTrue(db.getGroupVisibility(txn, groupId).isEmpty());
+		assertEquals(emptyMap(),
+				db.getGroupVisibility(txn, groupId));
 
 		// Make the group visible to the contact
 		db.addGroupVisibility(txn, contactId, groupId, false);
@@ -659,7 +655,8 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 		// Make the group invisible again
 		db.removeGroupVisibility(txn, contactId, groupId);
 		assertEquals(INVISIBLE, db.getGroupVisibility(txn, contactId, groupId));
-		assertTrue(db.getGroupVisibility(txn, groupId).isEmpty());
+		assertEquals(emptyMap(),
+				db.getGroupVisibility(txn, groupId));
 
 		db.commitTransaction(txn);
 		db.close();
@@ -2043,7 +2040,7 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 		assertEquals(Long.MAX_VALUE, db.getNextSendTime(txn, contactId));
 
 		// Share the message - now it should be sendable immediately
-		db.setMessageShared(txn, messageId, true);
+		db.setMessageShared(txn, messageId);
 		assertEquals(0, db.getNextSendTime(txn, contactId));
 
 		// Mark the message as requested - it should still be sendable
@@ -2350,148 +2347,6 @@ 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;
-		long now = System.currentTimeMillis();
-		AtomicLong time = new AtomicLong(now);
-		Database<Connection> db =
-				open(false, new TestMessageFactory(), new SettableClock(time));
-		Connection txn = db.startTransaction();
-
-		// No messages should be due or scheduled for deletion
-		assertTrue(db.getMessagesToDelete(txn).isEmpty());
-		assertEquals(NO_CLEANUP_DEADLINE, db.getNextCleanupDeadline(txn));
-
-		// Add a group and a message
-		db.addGroup(txn, group);
-		db.addMessage(txn, message, DELIVERED, false, false, null);
-
-		// No messages should be due or scheduled for deletion
-		assertTrue(db.getMessagesToDelete(txn).isEmpty());
-		assertEquals(NO_CLEANUP_DEADLINE, db.getNextCleanupDeadline(txn));
-
-		// Set the message's cleanup timer duration
-		db.setCleanupTimerDuration(txn, messageId, duration);
-
-		// No messages should be due or scheduled for deletion
-		assertTrue(db.getMessagesToDelete(txn).isEmpty());
-		assertEquals(NO_CLEANUP_DEADLINE, db.getNextCleanupDeadline(txn));
-
-		// Start the message's cleanup timer
-		assertEquals(now + duration, db.startCleanupTimer(txn, messageId));
-
-		// The timer can't be started again
-		assertEquals(TIMER_NOT_STARTED, db.startCleanupTimer(txn, messageId));
-
-		// No messages should be due for deletion, but the message should be
-		// scheduled for deletion
-		assertTrue(db.getMessagesToDelete(txn).isEmpty());
-		assertEquals(now + duration, db.getNextCleanupDeadline(txn));
-
-		// Stop the timer
-		db.stopCleanupTimer(txn, messageId);
-
-		// No messages should be due or scheduled for deletion
-		assertTrue(db.getMessagesToDelete(txn).isEmpty());
-		assertEquals(NO_CLEANUP_DEADLINE, db.getNextCleanupDeadline(txn));
-
-		// Start the timer again
-		assertEquals(now + duration, db.startCleanupTimer(txn, messageId));
-
-		// No messages should be due for deletion, but the message should be
-		// scheduled for deletion
-		assertTrue(db.getMessagesToDelete(txn).isEmpty());
-		assertEquals(now + duration, db.getNextCleanupDeadline(txn));
-
-		// 1 ms before the timer expires, no messages should be due for
-		// deletion but the message should be scheduled for deletion
-		time.set(now + duration - 1);
-		assertTrue(db.getMessagesToDelete(txn).isEmpty());
-		assertEquals(now + duration, db.getNextCleanupDeadline(txn));
-
-		// When the timer expires, the message should be due and scheduled for
-		// deletion
-		time.set(now + duration);
-		assertEquals(singletonMap(groupId, singletonList(messageId)),
-				db.getMessagesToDelete(txn));
-		assertEquals(now + duration, db.getNextCleanupDeadline(txn));
-
-		// 1 ms after the timer expires, the message should be due and
-		// scheduled for deletion
-		time.set(now + duration + 1);
-		assertEquals(singletonMap(groupId, singletonList(messageId)),
-				db.getMessagesToDelete(txn));
-		assertEquals(now + duration, db.getNextCleanupDeadline(txn));
-
-		// Once the message has been deleted, it should no longer be due
-		// or scheduled for deletion
-		db.deleteMessage(txn, messageId);
-		assertTrue(db.getMessagesToDelete(txn).isEmpty());
-		assertEquals(NO_CLEANUP_DEADLINE, db.getNextCleanupDeadline(txn));
-	}
-
 	private Database<Connection> open(boolean resume) throws Exception {
 		return open(resume, new TestMessageFactory(), new SystemClock());
 	}
@@ -2547,31 +2402,6 @@ 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/system/TestTaskScheduler.java

@@ -1,122 +0,0 @@
-package org.briarproject.bramble.system;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.api.system.TaskScheduler;
-
-import java.util.Queue;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Executor;
-import java.util.concurrent.PriorityBlockingQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.concurrent.TimeUnit.MINUTES;
-import static org.junit.Assert.fail;
-
-/**
- * A {@link TaskScheduler} for use in tests. The scheduler keeps all scheduled
- * tasks in a queue until {@link #runTasks()} is called.
- */
-@NotNullByDefault
-class TestTaskScheduler implements TaskScheduler {
-
-	private final Queue<Task> queue = new PriorityBlockingQueue<>();
-	private final Clock clock;
-
-	TestTaskScheduler(Clock clock) {
-		this.clock = clock;
-	}
-
-	@Override
-	public Cancellable schedule(Runnable task, Executor executor, long delay,
-			TimeUnit unit) {
-		AtomicBoolean cancelled = new AtomicBoolean(false);
-		return schedule(task, executor, delay, unit, cancelled);
-	}
-
-	@Override
-	public Cancellable scheduleWithFixedDelay(Runnable task, Executor executor,
-			long delay, long interval, TimeUnit unit) {
-		AtomicBoolean cancelled = new AtomicBoolean(false);
-		return scheduleWithFixedDelay(task, executor, delay, interval, unit,
-				cancelled);
-	}
-
-	private Cancellable schedule(Runnable task, Executor executor, long delay,
-			TimeUnit unit, AtomicBoolean cancelled) {
-		long delayMillis = MILLISECONDS.convert(delay, unit);
-		long dueMillis = clock.currentTimeMillis() + delayMillis;
-		Task t = new Task(task, executor, dueMillis, cancelled);
-		queue.add(t);
-		return t;
-	}
-
-	private Cancellable scheduleWithFixedDelay(Runnable task, Executor executor,
-			long delay, long interval, TimeUnit unit, AtomicBoolean cancelled) {
-		// All executions of this periodic task share a cancelled flag
-		Runnable wrapped = () -> {
-			task.run();
-			scheduleWithFixedDelay(task, executor, interval, interval, unit,
-					cancelled);
-		};
-		return schedule(wrapped, executor, delay, unit, cancelled);
-	}
-
-	/**
-	 * Runs any scheduled tasks that are due.
-	 */
-	void runTasks() throws InterruptedException {
-		long now = clock.currentTimeMillis();
-		while (true) {
-			Task t = queue.peek();
-			if (t == null || t.dueMillis > now) return;
-			t = queue.poll();
-			// Submit the task to its executor and wait for it to finish
-			if (!t.run().await(1, MINUTES)) fail();
-		}
-	}
-
-	private static class Task
-			implements Cancellable, Comparable<Task> {
-
-		private final Runnable task;
-		private final Executor executor;
-		private final long dueMillis;
-		private final AtomicBoolean cancelled;
-
-		private Task(Runnable task, Executor executor, long dueMillis,
-				AtomicBoolean cancelled) {
-			this.task = task;
-			this.executor = executor;
-			this.dueMillis = dueMillis;
-			this.cancelled = cancelled;
-		}
-
-		@SuppressWarnings("UseCompareMethod") // Animal Sniffer
-		@Override
-		public int compareTo(Task task) {
-			return Long.valueOf(dueMillis).compareTo(task.dueMillis);
-		}
-
-		/**
-		 * Submits the task to its executor and returns a latch that will be
-		 * released when the task finishes.
-		 */
-		public CountDownLatch run() {
-			if (cancelled.get()) return new CountDownLatch(0);
-			CountDownLatch latch = new CountDownLatch(1);
-			executor.execute(() -> {
-				task.run();
-				latch.countDown();
-			});
-			return latch;
-		}
-
-		@Override
-		public void cancel() {
-			cancelled.set(true);
-		}
-	}
-}

bramble-core/src/test/java/org/briarproject/bramble/system/TimeTravelModule.java

@@ -1,98 +0,0 @@
-package org.briarproject.bramble.system;
-
-import org.briarproject.bramble.api.lifecycle.LifecycleManager;
-import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.api.system.TaskScheduler;
-import org.briarproject.bramble.test.SettableClock;
-import org.briarproject.bramble.test.TimeTravel;
-
-import java.util.concurrent.RejectedExecutionHandler;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.atomic.AtomicLong;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import dagger.Module;
-import dagger.Provides;
-
-@Module
-public class TimeTravelModule {
-
-	public static class EagerSingletons {
-		@Inject
-		TaskScheduler scheduler;
-	}
-
-	private final ScheduledExecutorService scheduledExecutorService;
-	private final Clock clock;
-	private final TaskScheduler taskScheduler;
-	private final TimeTravel timeTravel;
-
-	public TimeTravelModule() {
-		this(false);
-	}
-
-	public TimeTravelModule(boolean travel) {
-		// Discard tasks that are submitted during shutdown
-		RejectedExecutionHandler policy =
-				new ScheduledThreadPoolExecutor.DiscardPolicy();
-		scheduledExecutorService =
-				new ScheduledThreadPoolExecutor(1, policy);
-		if (travel) {
-			// Use a SettableClock and TestTaskScheduler to allow time travel
-			AtomicLong time = new AtomicLong(System.currentTimeMillis());
-			clock = new SettableClock(time);
-			TestTaskScheduler testTaskScheduler = new TestTaskScheduler(clock);
-			taskScheduler = testTaskScheduler;
-			timeTravel = new TimeTravel() {
-				@Override
-				public void setCurrentTimeMillis(long now)
-						throws InterruptedException {
-					time.set(now);
-					testTaskScheduler.runTasks();
-				}
-
-				@Override
-				public void addCurrentTimeMillis(long add)
-						throws InterruptedException {
-					time.addAndGet(add);
-					testTaskScheduler.runTasks();
-				}
-			};
-		} else {
-			// Use the default clock and task scheduler
-			clock = new SystemClock();
-			taskScheduler = new TaskSchedulerImpl(scheduledExecutorService);
-			timeTravel = new TimeTravel() {
-				@Override
-				public void setCurrentTimeMillis(long now) {
-					throw new UnsupportedOperationException();
-				}
-
-				@Override
-				public void addCurrentTimeMillis(long add) {
-					throw new UnsupportedOperationException();
-				}
-			};
-		}
-	}
-
-	@Provides
-	Clock provideClock() {
-		return clock;
-	}
-
-	@Provides
-	@Singleton
-	TaskScheduler provideTaskScheduler(LifecycleManager lifecycleManager) {
-		lifecycleManager.registerForShutdown(scheduledExecutorService);
-		return taskScheduler;
-	}
-
-	@Provides
-	TimeTravel provideTimeTravel() {
-		return timeTravel;
-	}
-}

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

@@ -3,8 +3,8 @@ package org.briarproject.bramble.test;
 import org.briarproject.bramble.api.FeatureFlags;
 import org.briarproject.bramble.battery.DefaultBatteryManagerModule;
 import org.briarproject.bramble.event.DefaultEventExecutorModule;
+import org.briarproject.bramble.system.DefaultTaskSchedulerModule;
 import org.briarproject.bramble.system.DefaultWakefulIoExecutorModule;
-import org.briarproject.bramble.system.TimeTravelModule;
 
 import dagger.Module;
 import dagger.Provides;
@@ -12,11 +12,11 @@ import dagger.Provides;
 @Module(includes = {
 		DefaultBatteryManagerModule.class,
 		DefaultEventExecutorModule.class,
+		DefaultTaskSchedulerModule.class,
 		DefaultWakefulIoExecutorModule.class,
 		TestDatabaseConfigModule.class,
 		TestPluginConfigModule.class,
-		TestSecureRandomModule.class,
+		TestSecureRandomModule.class
-		TimeTravelModule.class
 })
 public class BrambleCoreIntegrationTestModule {
 
@@ -33,16 +33,6 @@ public class BrambleCoreIntegrationTestModule {
 			public boolean shouldEnableProfilePictures() {
 				return true;
 			}
-
-			@Override
-			public boolean shouldEnableDisappearingMessages() {
-				return true;
-			}
-
-			@Override
-			public boolean shouldEnableConnectViaBluetooth() {
-				return true;
-			}
 		};
 	}
 }

bramble-core/src/test/java/org/briarproject/bramble/versioning/ClientVersioningManagerImplTest.java

@@ -38,6 +38,7 @@ import static org.briarproject.bramble.test.TestUtils.getContact;
 import static org.briarproject.bramble.test.TestUtils.getGroup;
 import static org.briarproject.bramble.test.TestUtils.getMessage;
 import static org.briarproject.bramble.test.TestUtils.getRandomId;
+import static org.briarproject.bramble.versioning.ClientVersioningConstants.GROUP_KEY_CONTACT_ID;
 import static org.briarproject.bramble.versioning.ClientVersioningConstants.MSG_KEY_LOCAL;
 import static org.briarproject.bramble.versioning.ClientVersioningConstants.MSG_KEY_UPDATE_VERSION;
 import static org.junit.Assert.assertEquals;
@@ -59,6 +60,8 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase {
 	private final ClientId clientId = getClientId();
 	private final long now = System.currentTimeMillis();
 	private final Transaction txn = new Transaction(null, false);
+	private final BdfDictionary groupMeta = BdfDictionary.of(
+			new BdfEntry(GROUP_KEY_CONTACT_ID, contact.getId().getInt()));
 
 	private ClientVersioningManagerImpl createInstance() {
 		context.checking(new Expectations() {{
@@ -120,8 +123,8 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).addGroup(txn, contactGroup);
 			oneOf(db).setGroupVisibility(txn, contact.getId(),
 					contactGroup.getId(), SHARED);
-			oneOf(clientHelper).setContactId(txn, contactGroup.getId(),
+			oneOf(clientHelper).mergeGroupMetadata(txn, contactGroup.getId(),
-					contact.getId());
+					groupMeta);
 			oneOf(clock).currentTimeMillis();
 			will(returnValue(now));
 			oneOf(clientHelper).createMessage(contactGroup.getId(), now,
@@ -457,8 +460,9 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).deleteMessage(txn, oldRemoteUpdateId);
 			oneOf(db).deleteMessageMetadata(txn, oldRemoteUpdateId);
 			// Get contact ID
-			oneOf(clientHelper).getContactId(txn, contactGroup.getId());
+			oneOf(clientHelper).getGroupMetadataAsDictionary(txn,
-			will(returnValue(contact.getId()));
+					contactGroup.getId());
+			will(returnValue(groupMeta));
 			// No states or visibilities have changed
 		}});
 
@@ -488,9 +492,10 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase {
 			// Load the latest local update
 			oneOf(clientHelper).getMessageAsList(txn, oldLocalUpdateId);
 			will(returnValue(oldLocalUpdateBody));
-			// Get contact ID
+			// Get client ID
-			oneOf(clientHelper).getContactId(txn, contactGroup.getId());
+			oneOf(clientHelper).getGroupMetadataAsDictionary(txn,
-			will(returnValue(contact.getId()));
+					contactGroup.getId());
+			will(returnValue(groupMeta));
 			// No states or visibilities have changed
 		}});
 
@@ -541,6 +546,8 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase {
 		BdfDictionary newLocalUpdateMeta = BdfDictionary.of(
 				new BdfEntry(MSG_KEY_UPDATE_VERSION, 2L),
 				new BdfEntry(MSG_KEY_LOCAL, true));
+		BdfDictionary groupMeta = BdfDictionary.of(
+				new BdfEntry(GROUP_KEY_CONTACT_ID, contact.getId().getInt()));
 
 		context.checking(new Expectations() {{
 			oneOf(clientHelper).toList(newRemoteUpdate);
@@ -570,8 +577,9 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase {
 			oneOf(clientHelper).addLocalMessage(txn, newLocalUpdate,
 					newLocalUpdateMeta, true, false);
 			// The client's visibility has changed
-			oneOf(clientHelper).getContactId(txn, contactGroup.getId());
+			oneOf(clientHelper).getGroupMetadataAsDictionary(txn,
-			will(returnValue(contact.getId()));
+					contactGroup.getId());
+			will(returnValue(groupMeta));
 			oneOf(db).getContact(txn, contact.getId());
 			will(returnValue(contact));
 			oneOf(hook).onClientVisibilityChanging(txn, contact, visibility);
@@ -611,6 +619,8 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase {
 		BdfDictionary newLocalUpdateMeta = BdfDictionary.of(
 				new BdfEntry(MSG_KEY_UPDATE_VERSION, 2L),
 				new BdfEntry(MSG_KEY_LOCAL, true));
+		BdfDictionary groupMeta = BdfDictionary.of(
+				new BdfEntry(GROUP_KEY_CONTACT_ID, contact.getId().getInt()));
 
 		context.checking(new Expectations() {{
 			oneOf(clientHelper).toList(newRemoteUpdate);
@@ -640,8 +650,9 @@ public class ClientVersioningManagerImplTest extends BrambleMockTestCase {
 			oneOf(clientHelper).addLocalMessage(txn, newLocalUpdate,
 					newLocalUpdateMeta, true, false);
 			// The client's visibility has changed
-			oneOf(clientHelper).getContactId(txn, contactGroup.getId());
+			oneOf(clientHelper).getGroupMetadataAsDictionary(txn,
-			will(returnValue(contact.getId()));
+					contactGroup.getId());
+			will(returnValue(groupMeta));
 			oneOf(db).getContact(txn, contact.getId());
 			will(returnValue(contact));
 			oneOf(hook).onClientVisibilityChanging(txn, contact, INVISIBLE);

bramble-java/build.gradle

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

bramble-java/src/main/java/org/briarproject/bramble/BrambleJavaModule.java

@@ -8,9 +8,9 @@ import org.briarproject.bramble.system.JavaSystemModule;
 import dagger.Module;
 
 @Module(includes = {
-		CircumventionModule.class,
 		JavaNetworkModule.class,
 		JavaSystemModule.class,
+		CircumventionModule.class,
 		SocksModule.class
 })
 public class BrambleJavaModule {

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

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

@@ -23,10 +23,8 @@ import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
 import java.io.File;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Executor;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Logger;
 
 import javax.inject.Inject;
@@ -47,22 +45,15 @@ import static org.junit.Assume.assumeTrue;
 public class BridgeTest extends BrambleTestCase {
 
 	@Parameters
-	public static Iterable<Params> data() {
+	public static Iterable<String> data() {
 		BrambleJavaIntegrationTestComponent component =
 				DaggerBrambleJavaIntegrationTestComponent.builder().build();
 		BrambleCoreIntegrationTestEagerSingletons.Helper
 				.injectEagerSingletons(component);
-		// Share a failure counter among all the test instances
+		return component.getCircumventionProvider().getBridges(false);
-		AtomicInteger failures = new AtomicInteger(0);
-		List<String> bridges =
-				component.getCircumventionProvider().getBridges(false);
-		List<Params> states = new ArrayList<>(bridges.size());
-		for (String bridge : bridges) states.add(new Params(bridge, failures));
-		return states;
 	}
 
-	private final static long TIMEOUT = SECONDS.toMillis(60);
+	private final static long TIMEOUT = SECONDS.toMillis(30);
-	private final static int NUM_FAILURES_ALLOWED = 1;
 
 	private final static Logger LOG = getLogger(BridgeTest.class.getName());
 
@@ -89,13 +80,11 @@ public class BridgeTest extends BrambleTestCase {
 
 	private final File torDir = getTestDirectory();
 	private final String bridge;
-	private final AtomicInteger failures;
 
 	private UnixTorPluginFactory factory;
 
-	public BridgeTest(Params params) {
+	public BridgeTest(String bridge) {
-		bridge = params.bridge;
+		this.bridge = bridge;
-		failures = params.failures;
 	}
 
 	@Before
@@ -163,24 +152,10 @@ public class BridgeTest extends BrambleTestCase {
 				clock.sleep(500);
 			}
 			if (plugin.getState() != ACTIVE) {
-				LOG.warning("Could not connect to Tor within timeout");
+				fail("Could not connect to Tor within timeout.");
-				if (failures.incrementAndGet() > NUM_FAILURES_ALLOWED) {
-					fail(failures.get() + " bridges are unreachable");
-				}
 			}
 		} finally {
 			plugin.stop();
 		}
 	}
-
-	private static class Params {
-
-		private final String bridge;
-		private final AtomicInteger failures;
-
-		private Params(String bridge, AtomicInteger failures) {
-			this.bridge = bridge;
-			this.failures = failures;
-		}
-	}
 }

bramble-java/witness.gradle

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

briar-android/.gitignore

@@ -11,5 +11,3 @@ src/main/res/values-iw
 /fastlane/metadata/android/*/images
 /fastlane/report.xml
 /fastlane/README.md
-
-/fastlane/metadata/android/*/changelogs

briar-android/.tx/config

@@ -9,19 +9,3 @@ 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/artwork/notification_signout.svg

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

briar-android/build.gradle

@@ -17,20 +17,14 @@ def getStdout = { command, defaultValue ->
 
 android {
 	compileSdkVersion 30
-	buildToolsVersion '30.0.3'
+	buildToolsVersion '30.0.2'
-
-	packagingOptions {
-		doNotStrip '**/*.so'
-	}
 
 	defaultConfig {
 		minSdkVersion 16
-		targetSdkVersion 30
+		targetSdkVersion 29
-		versionCode 10304
+		versionCode 10213
-		versionName "1.3.4"
+		versionName "1.2.13"
 		applicationId "org.briarproject.briar.android"
-
-		vectorDrawables.useSupportLibrary = true
 		buildConfigField "String", "GitHash",
 				"\"${getStdout(['git', 'rev-parse', '--short=7', 'HEAD'], 'No commit hash')}\""
 		def now = (long) (System.currentTimeMillis() / 1000)
@@ -80,7 +74,6 @@ android {
 	}
 
 	testOptions {
-		execution 'ANDROIDX_TEST_ORCHESTRATOR'
 		unitTests {
 			includeAndroidResources = true
 		}
@@ -100,7 +93,6 @@ dependencies {
 	implementation project(path: ':bramble-core', configuration: 'default')
 	implementation project(':bramble-android')
 
-	implementation 'androidx.fragment:fragment:1.3.0'
 	implementation 'androidx.preference:preference:1.1.1'
 	implementation 'androidx.exifinterface:exifinterface:1.3.1'
 	implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
@@ -142,15 +134,12 @@ dependencies {
 	testImplementation "org.jmock:jmock:$jmockVersion"
 	testImplementation "org.jmock:jmock-junit4:$jmockVersion"
 	testImplementation "org.jmock:jmock-legacy:$jmockVersion"
-	testAnnotationProcessor "com.google.dagger:dagger-compiler:2.24"
 
 	androidTestImplementation project(path: ':bramble-api', configuration: 'testOutput')
 	androidTestImplementation 'androidx.test.ext:junit:1.1.2'
 	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(ENV["BRIAR_GOOGLE_PLAY_JSON_KEY_FILE"])
+json_key_file("") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one
 package_name("org.briarproject.briar.android")

briar-android/fastlane/Fastfile

@@ -13,8 +13,6 @@
 # Uncomment the line if you want fastlane to automatically update itself
 # update_fastlane
 
-opt_out_usage
-
 default_platform(:android)
 
 platform :android do
@@ -26,21 +24,6 @@ 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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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