Listen for wifi AP state changes.

We won't necessarily receive a connectivity change event when the wifi AP is enabled.
Log active network info.
2026-02-12 10:49:06 +01:00 · 2018-03-26 17:19:17 +01:00 · 2018-03-26 11:49:03 +01:00 · 2018-03-22 17:41:07 +00:00
1452 changed files with 34231 additions and 69150 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -20,9 +20,7 @@ local.properties
 .idea/*
 !.idea/runConfigurations/
 !.idea/codeStyleSettings.xml
 !.idea/codeStyles
 .gradle
 build/
 captures
 *.iml
 projectFilesBackup/
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,33 +1,29 @@
-image: briar/ci-image-android:latest
+image: registry.gitlab.com/fdroid/ci-images-base:latest
-stages:
+cache:
- test
+  paths:
- check_reproducibility
+    - .gradle/wrapper
    - .gradle/caches
 before_script:
  - set -e
  - export GRADLE_USER_HOME=$PWD/.gradle
  # Accept the license for the Android build tools
  - echo y | /opt/android-sdk/tools/bin/sdkmanager "build-tools;26.0.2"
  # Download OpenJDK 6 so we can compile against its standard library
  - JDK_FILE=openjdk-6-jre-headless_6b38-1.13.10-1~deb7u1_amd64.deb
  - if [ ! -d openjdk ]
  - then
  - wget -q http://ftp.uk.debian.org/debian/pool/main/o/openjdk-6/$JDK_FILE
  - dpkg-deb -x $JDK_FILE openjdk
  - fi
  - export JAVA_6_HOME=$PWD/openjdk/usr/lib/jvm/java-6-openjdk-amd64
 test:
  stage: test
  before_script:
    - set -e
    - export GRADLE_USER_HOME=$PWD/.gradle
  cache:
    paths:
      - .gradle/wrapper
      - .gradle/caches
  script:
-    - ./gradlew --no-daemon -Djava.security.egd=file:/dev/urandom animalSnifferMain animalSnifferTest
+    - ./gradlew test
    - ./gradlew --no-daemon -Djava.security.egd=file:/dev/urandom test
-  after_script:
+after_script:
-    # these file change every time but should not be cached
+    # this file changes 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_reproducible:
  stage: check_reproducibility
  script:
    - "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
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,245 +0,0 @@
 <component name="ProjectCodeStyleConfiguration">
  <code_scheme name="Project" version="173">
    <option name="RIGHT_MARGIN" value="100" />
    <AndroidXmlCodeStyleSettings>
      <option name="USE_CUSTOM_SETTINGS" value="true" />
    </AndroidXmlCodeStyleSettings>
    <JavaCodeStyleSettings>
      <option name="ANNOTATION_PARAMETER_WRAP" value="1" />
      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
      <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
        <value />
      </option>
      <option name="IMPORT_LAYOUT_TABLE">
        <value>
          <package name="android" withSubpackages="true" static="false" />
          <emptyLine />
          <package name="com" withSubpackages="true" static="false" />
          <emptyLine />
          <package name="junit" withSubpackages="true" static="false" />
          <emptyLine />
          <package name="net" withSubpackages="true" static="false" />
          <emptyLine />
          <package name="org" withSubpackages="true" static="false" />
          <emptyLine />
          <package name="java" withSubpackages="true" static="false" />
          <emptyLine />
          <package name="javax" withSubpackages="true" static="false" />
          <emptyLine />
          <package name="" withSubpackages="true" static="false" />
          <emptyLine />
          <package name="" withSubpackages="true" static="true" />
          <emptyLine />
        </value>
      </option>
      <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
      <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
    </JavaCodeStyleSettings>
    <JetCodeStyleSettings>
      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
    </JetCodeStyleSettings>
    <XML>
      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
    </XML>
    <codeStyleSettings language="Groovy">
      <indentOptions>
        <option name="USE_TAB_CHARACTER" value="true" />
        <option name="SMART_TABS" value="true" />
      </indentOptions>
    </codeStyleSettings>
    <codeStyleSettings language="JAVA">
      <option name="RIGHT_MARGIN" value="80" />
      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
      <option name="ALIGN_MULTILINE_RESOURCES" value="false" />
      <option name="ALIGN_MULTILINE_FOR" value="false" />
      <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
      <option name="CALL_PARAMETERS_WRAP" value="1" />
      <option name="METHOD_PARAMETERS_WRAP" value="1" />
      <option name="RESOURCE_LIST_WRAP" value="1" />
      <option name="EXTENDS_LIST_WRAP" value="1" />
      <option name="THROWS_LIST_WRAP" value="1" />
      <option name="EXTENDS_KEYWORD_WRAP" value="1" />
      <option name="THROWS_KEYWORD_WRAP" value="1" />
      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
      <option name="BINARY_OPERATION_WRAP" value="1" />
      <option name="TERNARY_OPERATION_WRAP" value="1" />
      <option name="FOR_STATEMENT_WRAP" value="1" />
      <option name="ARRAY_INITIALIZER_WRAP" value="1" />
      <option name="ASSIGNMENT_WRAP" value="1" />
      <option name="ASSERT_STATEMENT_WRAP" value="1" />
      <option name="PARAMETER_ANNOTATION_WRAP" value="1" />
      <option name="VARIABLE_ANNOTATION_WRAP" value="1" />
      <option name="ENUM_CONSTANTS_WRAP" value="1" />
      <indentOptions>
        <option name="USE_TAB_CHARACTER" value="true" />
        <option name="SMART_TABS" value="true" />
      </indentOptions>
    </codeStyleSettings>
    <codeStyleSettings language="XML">
      <option name="FORCE_REARRANGE_MODE" value="1" />
      <indentOptions>
        <option name="CONTINUATION_INDENT_SIZE" value="4" />
        <option name="USE_TAB_CHARACTER" value="true" />
        <option name="SMART_TABS" value="true" />
      </indentOptions>
      <arrangement>
        <rules>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>xmlns:android</NAME>
                  <XML_NAMESPACE>Namespace:</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>xmlns:.*</NAME>
                  <XML_NAMESPACE>Namespace:</XML_NAMESPACE>
                </AND>
              </match>
              <order>BY_NAME</order>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*:id</NAME>
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*:name</NAME>
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>name</NAME>
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>style</NAME>
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*</NAME>
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
              <order>BY_NAME</order>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*:layout_width</NAME>
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*:layout_height</NAME>
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*:layout_.*</NAME>
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
              <order>BY_NAME</order>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*:width</NAME>
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
              <order>BY_NAME</order>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*:height</NAME>
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
              <order>BY_NAME</order>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*</NAME>
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
              <order>BY_NAME</order>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*</NAME>
                  <XML_NAMESPACE>.*</XML_NAMESPACE>
                </AND>
              </match>
              <order>BY_NAME</order>
            </rule>
          </section>
        </rules>
      </arrangement>
    </codeStyleSettings>
    <codeStyleSettings language="kotlin">
      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
      <option name="PARAMETER_ANNOTATION_WRAP" value="1" />
      <option name="VARIABLE_ANNOTATION_WRAP" value="1" />
      <option name="ENUM_CONSTANTS_WRAP" value="1" />
    </codeStyleSettings>
  </code_scheme>
 </component>
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,5 +0,0 @@
 <component name="ProjectCodeStyleConfiguration">
  <state>
    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
  </state>
 </component>
--- a/.idea/runConfigurations/All_tests.xml
+++ b/.idea/runConfigurations/All_tests.xml
@@ -1,20 +1,28 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="All tests" type="AndroidJUnit" factoryName="Android JUnit">
    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
    <module name="briar-android" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
    <option name="ALTERNATIVE_JRE_PATH" />
    <option name="PACKAGE_NAME" value="" />
    <option name="MAIN_CLASS_NAME" value="" />
    <option name="METHOD_NAME" value="" />
    <option name="TEST_OBJECT" value="package" />
    <option name="VM_PARAMETERS" value="-ea" />
    <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/briar-android" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/briar-android" />
-    <method v="2">
+    <option name="ENV_VARIABLES" />
-      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    <option name="PASS_PARENT_ENVS" value="true" />
    <option name="TEST_SEARCH_SCOPE">
      <value defaultName="singleModule" />
    </option>
    <envs />
    <patterns />
    <method>
      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-api" run_configuration_type="AndroidJUnit" />
      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-core" run_configuration_type="AndroidJUnit" />
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-android" run_configuration_type="AndroidJUnit" />
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-j2se" run_configuration_type="AndroidJUnit" />
      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-java" run_configuration_type="AndroidJUnit" />
      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in briar-core" run_configuration_type="AndroidJUnit" />
      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in briar-headless" run_configuration_type="AndroidJUnit" />
    </method>
  </configuration>
 </component>
--- a/.idea/runConfigurations/All_tests_in_bramble_android.xml
+++ b/.idea/runConfigurations/All_tests_in_bramble_android.xml
@@ -1,20 +0,0 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="All tests in bramble-android" type="AndroidJUnit" factoryName="Android JUnit">
    <module name="bramble-android" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
    <option name="ALTERNATIVE_JRE_PATH" />
    <option name="PACKAGE_NAME" value="" />
    <option name="MAIN_CLASS_NAME" value="" />
    <option name="METHOD_NAME" value="" />
    <option name="TEST_OBJECT" value="package" />
    <option name="VM_PARAMETERS" value="-ea" />
    <option name="PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-android" />
    <option name="PASS_PARENT_ENVS" value="true" />
    <option name="TEST_SEARCH_SCOPE">
      <value defaultName="singleModule" />
    </option>
    <patterns />
    <method />
  </configuration>
 </component>
--- a/.idea/runConfigurations/All_tests_in_bramble_api.xml
+++ b/.idea/runConfigurations/All_tests_in_bramble_api.xml
@@ -1,5 +1,6 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="All tests in bramble-api" type="AndroidJUnit" factoryName="Android JUnit">
    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
    <module name="bramble-api" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
    <option name="ALTERNATIVE_JRE_PATH" />
@@ -10,10 +11,12 @@
    <option name="VM_PARAMETERS" value="-ea" />
    <option name="PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-api" />
    <option name="ENV_VARIABLES" />
    <option name="PASS_PARENT_ENVS" value="true" />
    <option name="TEST_SEARCH_SCOPE">
      <value defaultName="singleModule" />
    </option>
    <envs />
    <patterns />
    <method />
  </configuration>
--- a/.idea/runConfigurations/All_tests_in_bramble_core.xml
+++ b/.idea/runConfigurations/All_tests_in_bramble_core.xml
@@ -1,5 +1,6 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="All tests in bramble-core" type="AndroidJUnit" factoryName="Android JUnit">
    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
    <module name="bramble-core" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
    <option name="ALTERNATIVE_JRE_PATH" />
@@ -10,10 +11,12 @@
    <option name="VM_PARAMETERS" value="-ea" />
    <option name="PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-core" />
    <option name="ENV_VARIABLES" />
    <option name="PASS_PARENT_ENVS" value="true" />
    <option name="TEST_SEARCH_SCOPE">
      <value defaultName="singleModule" />
    </option>
    <envs />
    <patterns />
    <method />
  </configuration>
--- a/.idea/runConfigurations/All_tests_in_bramble_j2se.xml
+++ b/.idea/runConfigurations/All_tests_in_bramble_j2se.xml
@@ -1,6 +1,7 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests in bramble-java" type="AndroidJUnit" factoryName="Android JUnit">
+  <configuration default="false" name="All tests in bramble-j2se" type="AndroidJUnit" factoryName="Android JUnit">
-    <module name="bramble-java" />
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
    <module name="bramble-j2se" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
    <option name="ALTERNATIVE_JRE_PATH" />
    <option name="PACKAGE_NAME" value="" />
@@ -9,11 +10,13 @@
    <option name="TEST_OBJECT" value="package" />
    <option name="VM_PARAMETERS" value="-ea -Djava.library.path=libs" />
    <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-java" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-j2se" />
    <option name="ENV_VARIABLES" />
    <option name="PASS_PARENT_ENVS" value="true" />
    <option name="TEST_SEARCH_SCOPE">
      <value defaultName="singleModule" />
    </option>
    <envs />
    <patterns />
    <method />
  </configuration>
--- a/.idea/runConfigurations/All_tests_in_briar_android.xml
+++ b/.idea/runConfigurations/All_tests_in_briar_android.xml
@@ -1,5 +1,6 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="All tests in briar-android" type="AndroidJUnit" factoryName="Android JUnit">
    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
    <module name="briar-android" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
    <option name="ALTERNATIVE_JRE_PATH" />
@@ -10,10 +11,12 @@
    <option name="VM_PARAMETERS" value="-ea" />
    <option name="PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/briar-android" />
    <option name="ENV_VARIABLES" />
    <option name="PASS_PARENT_ENVS" value="true" />
    <option name="TEST_SEARCH_SCOPE">
      <value defaultName="singleModule" />
    </option>
    <envs />
    <patterns />
    <method />
  </configuration>
--- a/.idea/runConfigurations/All_tests_in_briar_core.xml
+++ b/.idea/runConfigurations/All_tests_in_briar_core.xml
@@ -1,5 +1,6 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="All tests in briar-core" type="AndroidJUnit" factoryName="Android JUnit">
    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
    <module name="briar-core" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
    <option name="ALTERNATIVE_JRE_PATH" />
@@ -10,10 +11,12 @@
    <option name="VM_PARAMETERS" value="-ea" />
    <option name="PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/briar-core" />
    <option name="ENV_VARIABLES" />
    <option name="PASS_PARENT_ENVS" value="true" />
    <option name="TEST_SEARCH_SCOPE">
      <value defaultName="singleModule" />
    </option>
    <envs />
    <patterns />
    <method />
  </configuration>
--- a/.idea/runConfigurations/All_tests_in_briar_headless.xml
+++ b/.idea/runConfigurations/All_tests_in_briar_headless.xml
@@ -1,15 +0,0 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="All tests in briar-headless" type="AndroidJUnit" factoryName="Android JUnit">
    <module name="briar-headless" />
    <option name="PACKAGE_NAME" value="org.briarproject.briar.headless" />
    <option name="MAIN_CLASS_NAME" value="" />
    <option name="METHOD_NAME" value="" />
    <option name="TEST_OBJECT" value="package" />
    <option name="VM_PARAMETERS" />
    <option name="PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/briar-headless" />
    <method v="2">
      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
    </method>
  </configuration>
 </component>
--- a/.idea/runConfigurations/H2_Performance_Test.xml
+++ b/.idea/runConfigurations/H2_Performance_Test.xml
@@ -1,5 +1,6 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="H2 Performance Test" type="AndroidJUnit" factoryName="Android JUnit">
    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
    <module name="bramble-core" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
    <option name="ALTERNATIVE_JRE_PATH" />
@@ -10,10 +11,12 @@
    <option name="VM_PARAMETERS" value="-ea" />
    <option name="PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="" />
    <option name="ENV_VARIABLES" />
    <option name="PASS_PARENT_ENVS" value="true" />
    <option name="TEST_SEARCH_SCOPE">
      <value defaultName="singleModule" />
    </option>
    <envs />
    <patterns />
    <method />
  </configuration>
--- a/.idea/runConfigurations/HyperSQL_Performance_Test.xml
+++ b/.idea/runConfigurations/HyperSQL_Performance_Test.xml
@@ -1,5 +1,6 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="HyperSQL Performance Test" type="AndroidJUnit" factoryName="Android JUnit">
    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
    <module name="bramble-core" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
    <option name="ALTERNATIVE_JRE_PATH" />
@@ -10,10 +11,12 @@
    <option name="VM_PARAMETERS" value="-ea" />
    <option name="PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="" />
    <option name="ENV_VARIABLES" />
    <option name="PASS_PARENT_ENVS" value="true" />
    <option name="TEST_SEARCH_SCOPE">
      <value defaultName="singleModule" />
    </option>
    <envs />
    <patterns />
    <method />
  </configuration>
--- a/.idea/runConfigurations/briar_headless.xml
+++ b/.idea/runConfigurations/briar_headless.xml
@@ -1,17 +0,0 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="briar-headless" type="JetRunConfigurationType" factoryName="Kotlin" singleton="true">
    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
    <option name="VM_PARAMETERS" value="" />
    <option name="PROGRAM_PARAMETERS" value="-v" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
    <option name="ALTERNATIVE_JRE_PATH" />
    <option name="PASS_PARENT_ENVS" value="true" />
    <option name="MAIN_CLASS_NAME" value="org.briarproject.briar.headless.MainKt" />
    <option name="WORKING_DIRECTORY" value="" />
    <module name="briar-headless" />
    <envs />
    <method>
      <option name="Gradle.BeforeRunTask" enabled="true" tasks="jar" externalProjectPath="$PROJECT_DIR$/briar-headless" vmOptions="" scriptParameters="" />
    </method>
  </configuration>
 </component>
--- a/bramble-android/build.gradle
+++ b/bramble-android/build.gradle
@@ -1,21 +1,20 @@
-import com.android.build.gradle.tasks.MergeResources
+import de.undercouch.gradle.tasks.download.Download
 import de.undercouch.gradle.tasks.download.Verify
 apply plugin: 'com.android.library'
 apply plugin: 'witness'
-apply from: 'witness.gradle'
+apply plugin: 'de.undercouch.download'
 android {
-	compileSdkVersion 28
+	compileSdkVersion 27
-	buildToolsVersion '28.0.3'
+	buildToolsVersion '26.0.2'
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 26
-		versionCode 10107
+		versionCode 1700
-		versionName "1.1.7"
+		versionName "0.17.0"
 		consumerProguardFiles 'proguard-rules.txt'
 		testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 	}
 	compileOptions {
@@ -24,47 +23,74 @@ android {
 	}
 }
 configurations {
 	tor
 }
 dependencies {
 	implementation project(path: ':bramble-core', configuration: 'default')
-	tor 'org.briarproject:tor-android:0.3.5.8@zip'
+	implementation fileTree(dir: 'libs', include: '*.jar')
 	tor 'org.briarproject:obfs4proxy-android:0.0.9@zip'
-	annotationProcessor 'com.google.dagger:dagger-compiler:2.22.1'
+	annotationProcessor 'com.google.dagger:dagger-compiler:2.0.2'
 	compileOnly 'javax.annotation:jsr250-api:1.0'
 	testImplementation project(path: ':bramble-api', configuration: 'testOutput')
 	testImplementation 'junit:junit:4.12'
 	testImplementation "org.jmock:jmock:2.8.2"
 	testImplementation "org.jmock:jmock-junit4:2.8.2"
 	testImplementation "org.jmock:jmock-legacy:2.8.2"
 }
-def torBinariesDir = 'src/main/res/raw'
+dependencyVerification {
 	verify = [
 			'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
 			'com.google.dagger:dagger-compiler:2.0.2:dagger-compiler-2.0.2.jar:b74bc9de063dd4c6400b232231f2ef5056145b8fbecbf5382012007dd1c071b3',
 			'com.google.dagger:dagger-producers:2.0-beta:dagger-producers-2.0-beta.jar:99ec15e8a0507ba569e7655bc1165ee5e5ca5aa914b3c8f7e2c2458f724edd6b',
 			'com.google.dagger:dagger:2.0.2:dagger-2.0.2.jar:84c0282ed8be73a29e0475d639da030b55dee72369e58dd35ae7d4fe6243dcf9',
 			'com.google.guava:guava:18.0:guava-18.0.jar:d664fbfc03d2e5ce9cab2a44fb01f1d0bf9dfebeccc1a473b1f9ea31f79f6f99',
 			'com.h2database:h2:1.4.192:h2-1.4.192.jar:225b22e9857235c46c93861410b60b8c81c10dc8985f4faf188985ba5445126c',
 			'com.madgag.spongycastle:core:1.58.0.0:core-1.58.0.0.jar:199617dd5698c5a9312b898c0a4cec7ce9dd8649d07f65d91629f58229d72728',
 			'javax.annotation:jsr250-api:1.0:jsr250-api-1.0.jar:a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f',
 			'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
 			'net.i2p.crypto:eddsa:0.2.0:eddsa-0.2.0.jar:a7cb1b85c16e2f0730b9204106929a1d9aaae1df728adc7041a8b8b605692140',
 			'org.bitlet:weupnp:0.1.4:weupnp-0.1.4.jar:88df7e6504929d00bdb832863761385c68ab92af945b04f0770b126270a444fb',
 			'org.jacoco:org.jacoco.agent:0.7.4.201502262128:org.jacoco.agent-0.7.4.201502262128-runtime.jar:e357a0f1d573c2f702a273992b1b6cb661734f66311854efb3778a888515c5b5',
 			'org.jacoco:org.jacoco.agent:0.7.4.201502262128:org.jacoco.agent-0.7.4.201502262128.jar:47b4bec6df11a1118da3953da8b9fa1e7079d6fec857faa1a3cf912e53a6fd4e',
 			'org.jacoco:org.jacoco.ant:0.7.4.201502262128:org.jacoco.ant-0.7.4.201502262128.jar:013ce2a68ba57a3c59215ae0dec4df3498c078062a38c3b94c841fc14450f283',
 			'org.jacoco:org.jacoco.core:0.7.4.201502262128:org.jacoco.core-0.7.4.201502262128.jar:ec4c74554312fac5116350164786f91b35c9e082fa4ea598bfa42b5db05d7abb',
 			'org.jacoco:org.jacoco.report:0.7.4.201502262128:org.jacoco.report-0.7.4.201502262128.jar:7a3554c605e088e7e323b1084656243f0444fa353e2f2dee1f1a4204eb64ff09',
 			'org.ow2.asm:asm-debug-all:5.0.1:asm-debug-all-5.0.1.jar:4734de5b515a454b0096db6971fb068e5f70e6f10bbee2b3bd2fdfe5d978ed57',
 	]
 }
-task cleanTorBinaries {
+ext.torBinaryDir = 'src/main/res/raw'
-	doLast {
+ext.torVersion = '0.2.9.14'
-		delete fileTree(torBinariesDir) { include '*.zip' }
+ext.geoipVersion = '2017-11-06'
 ext.torDownloadUrl = 'https://briarproject.org/build/'
 def torBinaries = [
 		"tor_arm"    : '1710ea6c47b7f4c1a88bdf4858c7893837635db10e8866854eed8d61629f50e8',
 		"tor_arm_pie": '974e6949507db8fa2ea45231817c2c3677ed4ccf5488a2252317d744b0be1917',
 		"tor_x86"    : '3a5e45b3f051fcda9353b098b7086e762ffe7ba9242f7d7c8bf6523faaa8b1e9',
 		"tor_x86_pie": 'd1d96d8ce1a4b68accf04850185780d10cd5563d3552f7e1f040f8ca32cb4e51',
 		"geoip"      : '8239b98374493529a29096e45fc5877d4d6fdad0146ad8380b291f90d61484ea'
 ]
 def downloadBinary(name) {
 	return tasks.create("downloadBinary${name}", Download) {
 		src "${torDownloadUrl}${name}.zip"
 				.replace('tor_', "tor-${torVersion}-")
 				.replace('geoip', "geoip-${geoipVersion}")
 				.replaceAll('_', '-')
 		dest "${torBinaryDir}/${name}.zip"
 		onlyIfNewer true
 	}
 }
-clean.dependsOn cleanTorBinaries
+def verifyBinary(name, chksum) {
-
+	return tasks.create([
-task unpackTorBinaries {
+			name     : "verifyBinary${name}",
-	doLast {
+			type     : Verify,
-		copy {
+			dependsOn: downloadBinary(name)]) {
-			from configurations.tor.collect { zipTree(it) }
+		src "${torBinaryDir}/${name}.zip"
-			into torBinariesDir
+		algorithm 'SHA-256'
-		}
+		checksum chksum
 	}
 	dependsOn cleanTorBinaries
 }
-tasks.withType(MergeResources) {
+project.afterEvaluate {
-	inputs.dir torBinariesDir
+	torBinaries.every { key, value ->
-	dependsOn unpackTorBinaries
+		preBuild.dependsOn.add(verifyBinary(key, value))
 	}
 }
--- a/bramble-android/libs/jtorctl-briar.jar
+++ b/bramble-android/libs/jtorctl-briar.jar
--- a/bramble-android/src/main/AndroidManifest.xml
+++ b/bramble-android/src/main/AndroidManifest.xml
@@ -2,13 +2,14 @@
 	package="org.briarproject.bramble"
 	xmlns:android="http://schemas.android.com/apk/res/android">
-	<uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
+	<uses-feature android:name="android.hardware.bluetooth"/>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
 	<uses-permission android:name="android.permission.BLUETOOTH"/>
 	<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<uses-permission android:name="android.permission.READ_LOGS"/>
 	<uses-permission android:name="android.permission.WAKE_LOCK"/>
 	<application
--- a/bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidEagerSingletons.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidEagerSingletons.java
@@ -1,14 +0,0 @@
 package org.briarproject.bramble;
 import org.briarproject.bramble.battery.AndroidBatteryModule;
 import org.briarproject.bramble.network.AndroidNetworkModule;
 import org.briarproject.bramble.reporting.ReportingModule;
 public interface BrambleAndroidEagerSingletons {
 	void inject(AndroidBatteryModule.EagerSingletons init);
 	void inject(AndroidNetworkModule.EagerSingletons init);
 	void inject(ReportingModule.EagerSingletons init);
 }
--- a/bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidModule.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidModule.java
@@ -1,27 +1,13 @@
 package org.briarproject.bramble;
-import org.briarproject.bramble.battery.AndroidBatteryModule;
+import org.briarproject.bramble.plugin.AndroidPluginModule;
 import org.briarproject.bramble.network.AndroidNetworkModule;
 import org.briarproject.bramble.plugin.tor.CircumventionModule;
 import org.briarproject.bramble.reporting.ReportingModule;
 import org.briarproject.bramble.socks.SocksModule;
 import org.briarproject.bramble.system.AndroidSystemModule;
 import dagger.Module;
@Module(includes = {
-		AndroidBatteryModule.class,
+		AndroidPluginModule.class,
-		AndroidNetworkModule.class,
+		AndroidSystemModule.class
 		AndroidSystemModule.class,
 		CircumventionModule.class,
 		ReportingModule.class,
 		SocksModule.class
 })
 public class BrambleAndroidModule {
 	public static void initEagerSingletons(BrambleAndroidEagerSingletons c) {
 		c.inject(new AndroidBatteryModule.EagerSingletons());
 		c.inject(new AndroidNetworkModule.EagerSingletons());
 		c.inject(new ReportingModule.EagerSingletons());
 	}
 }
--- a/bramble-android/src/main/java/org/briarproject/bramble/account/AndroidAccountManager.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/account/AndroidAccountManager.java
@@ -1,158 +0,0 @@
 package org.briarproject.bramble.account;
 import android.app.Application;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import org.briarproject.bramble.api.account.AccountManager;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.db.DatabaseConfig;
 import org.briarproject.bramble.api.identity.IdentityManager;
 import java.io.File;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.logging.Logger;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 import static android.os.Build.VERSION.SDK_INT;
 import static java.util.logging.Level.INFO;
 import static org.briarproject.bramble.util.IoUtils.deleteFileOrDir;
 import static org.briarproject.bramble.util.LogUtils.logFileOrDir;
 class AndroidAccountManager extends AccountManagerImpl
 		implements AccountManager {
 	private static final Logger LOG =
 			Logger.getLogger(AndroidAccountManager.class.getName());
 	private static final String PREF_DB_KEY = "key";
 	protected final Context appContext;
 	private final SharedPreferences prefs;
 	@Inject
 	AndroidAccountManager(DatabaseConfig databaseConfig,
 			CryptoComponent crypto, IdentityManager identityManager,
 			SharedPreferences prefs, Application app) {
 		super(databaseConfig, crypto, identityManager);
 		this.prefs = prefs;
 		appContext = app.getApplicationContext();
 	}
 	@Override
 	public boolean accountExists() {
 		boolean exists = super.accountExists();
 		if (!exists && LOG.isLoggable(INFO)) {
 			LOG.info("Account does not exist. Contents of account directory:");
 			logFileOrDir(LOG, INFO, getDataDir());
 		}
 		return exists;
 	}
 	// Locking: stateChangeLock
 	@Override
 	@Nullable
 	protected String loadEncryptedDatabaseKey() {
 		String key = getDatabaseKeyFromPreferences();
 		if (key == null) key = super.loadEncryptedDatabaseKey();
 		else migrateDatabaseKeyToFile(key);
 		return key;
 	}
 	// Locking: stateChangeLock
 	@Nullable
 	private String getDatabaseKeyFromPreferences() {
 		String key = prefs.getString(PREF_DB_KEY, null);
 		if (key == null) LOG.info("No database key in preferences");
 		else LOG.info("Found database key in preferences");
 		return key;
 	}
 	// Locking: stateChangeLock
 	private void migrateDatabaseKeyToFile(String key) {
 		if (storeEncryptedDatabaseKey(key)) {
 			if (prefs.edit().remove(PREF_DB_KEY).commit())
 				LOG.info("Database key migrated to file");
 			else LOG.warning("Database key not removed from preferences");
 		} else {
 			LOG.warning("Database key not migrated to file");
 		}
 	}
 	@Override
 	public void deleteAccount() {
 		synchronized (stateChangeLock) {
 			if (LOG.isLoggable(INFO)) {
 				LOG.info("Contents of account directory before deleting:");
 				logFileOrDir(LOG, INFO, getDataDir());
 			}
 			super.deleteAccount();
 			SharedPreferences defaultPrefs = getDefaultSharedPreferences();
 			deleteAppData(prefs, defaultPrefs);
 			if (LOG.isLoggable(INFO)) {
 				LOG.info("Contents of account directory after deleting:");
 				logFileOrDir(LOG, INFO, getDataDir());
 			}
 		}
 	}
 	// Package access for testing
 	SharedPreferences getDefaultSharedPreferences() {
 		return PreferenceManager.getDefaultSharedPreferences(appContext);
 	}
 	// Locking: stateChangeLock
 	private void deleteAppData(SharedPreferences... clear) {
 		// Clear and commit shared preferences
 		for (SharedPreferences prefs : clear) {
 			if (!prefs.edit().clear().commit())
 				LOG.warning("Could not clear shared preferences");
 		}
 		// Delete files, except lib and shared_prefs directories
 		Set<File> files = new HashSet<>();
 		File dataDir = getDataDir();
 		@Nullable
 		File[] fileArray = dataDir.listFiles();
 		if (fileArray == null) {
 			LOG.warning("Could not list files in app data dir");
 		} else {
 			for (File file : fileArray) {
 				String name = file.getName();
 				if (!name.equals("lib") && !name.equals("shared_prefs")) {
 					files.add(file);
 				}
 			}
 		}
 		files.add(appContext.getFilesDir());
 		files.add(appContext.getCacheDir());
 		addIfNotNull(files, appContext.getExternalCacheDir());
 		if (SDK_INT >= 19) {
 			for (File file : appContext.getExternalCacheDirs()) {
 				addIfNotNull(files, file);
 			}
 		}
 		if (SDK_INT >= 21) {
 			for (File file : appContext.getExternalMediaDirs()) {
 				addIfNotNull(files, file);
 			}
 		}
 		for (File file : files) {
 			deleteFileOrDir(file);
 		}
 		// Recreate the cache dir as some OpenGL drivers expect it to exist
 		if (!new File(dataDir, "cache").mkdirs())
 			LOG.warning("Could not recreate cache dir");
 	}
 	private File getDataDir() {
 		return new File(appContext.getApplicationInfo().dataDir);
 	}
 	private void addIfNotNull(Set<File> files, @Nullable File file) {
 		if (file != null) files.add(file);
 	}
 }
--- a/bramble-android/src/main/java/org/briarproject/bramble/battery/AndroidBatteryManager.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/battery/AndroidBatteryManager.java
@@ -1,81 +0,0 @@
 package org.briarproject.bramble.battery;
 import android.app.Application;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import org.briarproject.bramble.api.battery.BatteryManager;
 import org.briarproject.bramble.api.battery.event.BatteryEvent;
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.lifecycle.Service;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Logger;
 import javax.inject.Inject;
 import static android.content.Intent.ACTION_BATTERY_CHANGED;
 import static android.content.Intent.ACTION_POWER_CONNECTED;
 import static android.content.Intent.ACTION_POWER_DISCONNECTED;
 import static android.os.BatteryManager.EXTRA_PLUGGED;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Logger.getLogger;
 class AndroidBatteryManager implements BatteryManager, Service {
 	private static final Logger LOG =
 			getLogger(AndroidBatteryManager.class.getName());
 	private final Context appContext;
 	private final EventBus eventBus;
 	private final AtomicBoolean used = new AtomicBoolean(false);
 	private volatile BroadcastReceiver batteryReceiver = null;
 	@Inject
 	AndroidBatteryManager(Application app, EventBus eventBus) {
 		this.appContext = app.getApplicationContext();
 		this.eventBus = eventBus;
 	}
 	@Override
 	public boolean isCharging() {
 		// Get the sticky intent for ACTION_BATTERY_CHANGED
 		IntentFilter filter = new IntentFilter(ACTION_BATTERY_CHANGED);
 		Intent i = appContext.registerReceiver(null, filter);
 		if (i == null) return false;
 		int status = i.getIntExtra(EXTRA_PLUGGED, 0);
 		return status != 0;
 	}
 	@Override
 	public void startService() {
 		if (used.getAndSet(true)) throw new IllegalStateException();
 		batteryReceiver = new BatteryReceiver();
 		IntentFilter filter = new IntentFilter();
 		filter.addAction(ACTION_POWER_CONNECTED);
 		filter.addAction(ACTION_POWER_DISCONNECTED);
 		appContext.registerReceiver(batteryReceiver, filter);
 	}
 	@Override
 	public void stopService() {
 		if (batteryReceiver != null)
 			appContext.unregisterReceiver(batteryReceiver);
 	}
 	private class BatteryReceiver extends BroadcastReceiver {
 		@Override
 		public void onReceive(Context ctx, Intent i) {
 			String action = i.getAction();
 			if (LOG.isLoggable(INFO)) LOG.info("Received broadcast " + action);
 			if (ACTION_POWER_CONNECTED.equals(action))
 				eventBus.broadcast(new BatteryEvent(true));
 			else if (ACTION_POWER_DISCONNECTED.equals(action))
 				eventBus.broadcast(new BatteryEvent(false));
 		}
 	}
 }
--- a/bramble-android/src/main/java/org/briarproject/bramble/battery/AndroidBatteryModule.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/battery/AndroidBatteryModule.java
@@ -1,27 +0,0 @@
 package org.briarproject.bramble.battery;
 import org.briarproject.bramble.api.battery.BatteryManager;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import dagger.Module;
 import dagger.Provides;
@Module
 public class AndroidBatteryModule {
 	public static class EagerSingletons {
 		@Inject
 		BatteryManager batteryManager;
 	}
 	@Provides
 	@Singleton
 	BatteryManager provideBatteryManager(LifecycleManager lifecycleManager,
 			AndroidBatteryManager batteryManager) {
 		lifecycleManager.registerService(batteryManager);
 		return batteryManager;
 	}
 }
--- a/bramble-android/src/main/java/org/briarproject/bramble/network/AndroidNetworkManager.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/network/AndroidNetworkManager.java
@@ -1,142 +0,0 @@
 package org.briarproject.bramble.network;
 import android.app.Application;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.lifecycle.Service;
 import org.briarproject.bramble.api.network.NetworkManager;
 import org.briarproject.bramble.api.network.NetworkStatus;
 import org.briarproject.bramble.api.network.event.NetworkStatusEvent;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.api.system.Scheduler;
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.logging.Logger;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 import static android.content.Context.CONNECTIVITY_SERVICE;
 import static android.content.Intent.ACTION_SCREEN_OFF;
 import static android.content.Intent.ACTION_SCREEN_ON;
 import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;
 import static android.net.ConnectivityManager.TYPE_WIFI;
 import static android.os.Build.VERSION.SDK_INT;
 import static android.os.PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED;
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static java.util.logging.Level.INFO;
@MethodsNotNullByDefault
@ParametersNotNullByDefault
 class AndroidNetworkManager implements NetworkManager, Service {
 	private static final Logger LOG =
 			Logger.getLogger(AndroidNetworkManager.class.getName());
 	// See android.net.wifi.WifiManager
 	private static final String WIFI_AP_STATE_CHANGED_ACTION =
 			"android.net.wifi.WIFI_AP_STATE_CHANGED";
 	private final ScheduledExecutorService scheduler;
 	private final EventBus eventBus;
 	private final Context appContext;
 	private final AtomicReference<Future<?>> connectivityCheck =
 			new AtomicReference<>();
 	private final AtomicBoolean used = new AtomicBoolean(false);
 	private volatile BroadcastReceiver networkStateReceiver = null;
 	@Inject
 	AndroidNetworkManager(@Scheduler ScheduledExecutorService scheduler,
 			EventBus eventBus, Application app) {
 		this.scheduler = scheduler;
 		this.eventBus = eventBus;
 		this.appContext = app.getApplicationContext();
 	}
 	@Override
 	public void startService() {
 		if (used.getAndSet(true)) throw new IllegalStateException();
 		// Register to receive network status events
 		networkStateReceiver = new NetworkStateReceiver();
 		IntentFilter filter = new IntentFilter();
 		filter.addAction(CONNECTIVITY_ACTION);
 		filter.addAction(ACTION_SCREEN_ON);
 		filter.addAction(ACTION_SCREEN_OFF);
 		filter.addAction(WIFI_AP_STATE_CHANGED_ACTION);
 		if (SDK_INT >= 23) filter.addAction(ACTION_DEVICE_IDLE_MODE_CHANGED);
 		appContext.registerReceiver(networkStateReceiver, filter);
 	}
 	@Override
 	public void stopService() {
 		if (networkStateReceiver != null)
 			appContext.unregisterReceiver(networkStateReceiver);
 	}
 	@Override
 	public NetworkStatus getNetworkStatus() {
 		ConnectivityManager cm = (ConnectivityManager)
 				appContext.getSystemService(CONNECTIVITY_SERVICE);
 		if (cm == null) throw new AssertionError();
 		NetworkInfo net = cm.getActiveNetworkInfo();
 		boolean connected = net != null && net.isConnected();
 		boolean wifi = connected && net.getType() == TYPE_WIFI;
 		return new NetworkStatus(connected, wifi);
 	}
 	private void updateConnectionStatus() {
 		eventBus.broadcast(new NetworkStatusEvent(getNetworkStatus()));
 	}
 	private void scheduleConnectionStatusUpdate(int delay, TimeUnit unit) {
 		Future<?> newConnectivityCheck =
 				scheduler.schedule(this::updateConnectionStatus, delay, unit);
 		Future<?> oldConnectivityCheck =
 				connectivityCheck.getAndSet(newConnectivityCheck);
 		if (oldConnectivityCheck != null) oldConnectivityCheck.cancel(false);
 	}
 	private class NetworkStateReceiver extends BroadcastReceiver {
 		@Override
 		public void onReceive(Context ctx, Intent i) {
 			String action = i.getAction();
 			if (LOG.isLoggable(INFO)) LOG.info("Received broadcast " + action);
 			updateConnectionStatus();
 			if (isSleepOrDozeEvent(action)) {
 				// Allow time for the network to be enabled or disabled
 				scheduleConnectionStatusUpdate(1, MINUTES);
 			} else if (isApEvent(action)) {
 				// The state change may be broadcast before the AP address is
 				// visible, so delay handling the event
 				scheduleConnectionStatusUpdate(5, SECONDS);
 			}
 		}
 		private boolean isSleepOrDozeEvent(@Nullable String action) {
 			boolean isSleep = ACTION_SCREEN_ON.equals(action) ||
 					ACTION_SCREEN_OFF.equals(action);
 			boolean isDoze = SDK_INT >= 23 &&
 					ACTION_DEVICE_IDLE_MODE_CHANGED.equals(action);
 			return isSleep || isDoze;
 		}
 		private boolean isApEvent(@Nullable String action) {
 			return WIFI_AP_STATE_CHANGED_ACTION.equals(action);
 		}
 	}
 }
--- a/bramble-android/src/main/java/org/briarproject/bramble/network/AndroidNetworkModule.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/network/AndroidNetworkModule.java
@@ -1,27 +0,0 @@
 package org.briarproject.bramble.network;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.network.NetworkManager;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import dagger.Module;
 import dagger.Provides;
@Module
 public class AndroidNetworkModule {
 	public static class EagerSingletons {
 		@Inject
 		NetworkManager networkManager;
 	}
 	@Provides
 	@Singleton
 	NetworkManager provideNetworkManager(LifecycleManager lifecycleManager,
 			AndroidNetworkManager networkManager) {
 		lifecycleManager.registerService(networkManager);
 		return networkManager;
 	}
 }
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/AndroidPluginModule.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/AndroidPluginModule.java
@@ -0,0 +1,69 @@
 package org.briarproject.bramble.plugin;
 import android.app.Application;
 import android.content.Context;
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.lifecycle.IoExecutor;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.BackoffFactory;
 import org.briarproject.bramble.api.plugin.PluginConfig;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
 import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory;
 import org.briarproject.bramble.api.reporting.DevReporter;
 import org.briarproject.bramble.api.system.AndroidExecutor;
 import org.briarproject.bramble.api.system.LocationUtils;
 import org.briarproject.bramble.api.system.Scheduler;
 import org.briarproject.bramble.plugin.bluetooth.AndroidBluetoothPluginFactory;
 import org.briarproject.bramble.plugin.tcp.AndroidLanTcpPluginFactory;
 import org.briarproject.bramble.plugin.tor.TorPluginFactory;
 import java.security.SecureRandom;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledExecutorService;
 import javax.net.SocketFactory;
 import dagger.Module;
 import dagger.Provides;
@Module
 public class AndroidPluginModule {
 	@Provides
 	PluginConfig providePluginConfig(@IoExecutor Executor ioExecutor,
 			@Scheduler ScheduledExecutorService scheduler,
 			AndroidExecutor androidExecutor, SecureRandom random,
 			SocketFactory torSocketFactory, BackoffFactory backoffFactory,
 			Application app, LocationUtils locationUtils, DevReporter reporter,
 			EventBus eventBus) {
 		Context appContext = app.getApplicationContext();
 		DuplexPluginFactory bluetooth =
 				new AndroidBluetoothPluginFactory(ioExecutor, androidExecutor,
 						appContext, random, eventBus, backoffFactory);
 		DuplexPluginFactory tor = new TorPluginFactory(ioExecutor, scheduler,
 				appContext, locationUtils, reporter, eventBus,
 				torSocketFactory, backoffFactory);
 		DuplexPluginFactory lan = new AndroidLanTcpPluginFactory(ioExecutor,
 				backoffFactory, appContext);
 		Collection<DuplexPluginFactory> duplex =
 				Arrays.asList(bluetooth, tor, lan);
 		@NotNullByDefault
 		PluginConfig pluginConfig = new PluginConfig() {
 			@Override
 			public Collection<DuplexPluginFactory> getDuplexFactories() {
 				return duplex;
 			}
 			@Override
 			public Collection<SimplexPluginFactory> getSimplexFactories() {
 				return Collections.emptyList();
 			}
 		};
 		return pluginConfig;
 	}
 }
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java
@@ -12,31 +12,22 @@ import android.content.IntentFilter;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.plugin.PluginException;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
 import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
 import org.briarproject.bramble.api.system.AndroidExecutor;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.util.AndroidUtils;
 import org.briarproject.bramble.util.IoUtils;
 import java.io.Closeable;
 import java.io.IOException;
 import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.logging.Logger;
 import javax.annotation.Nullable;
 import static android.bluetooth.BluetoothAdapter.ACTION_DISCOVERY_FINISHED;
 import static android.bluetooth.BluetoothAdapter.ACTION_DISCOVERY_STARTED;
 import static android.bluetooth.BluetoothAdapter.ACTION_SCAN_MODE_CHANGED;
 import static android.bluetooth.BluetoothAdapter.ACTION_STATE_CHANGED;
 import static android.bluetooth.BluetoothAdapter.EXTRA_SCAN_MODE;
@@ -46,26 +37,17 @@ import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERA
 import static android.bluetooth.BluetoothAdapter.SCAN_MODE_NONE;
 import static android.bluetooth.BluetoothAdapter.STATE_OFF;
 import static android.bluetooth.BluetoothAdapter.STATE_ON;
 import static android.bluetooth.BluetoothDevice.ACTION_FOUND;
 import static android.bluetooth.BluetoothDevice.EXTRA_DEVICE;
 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.util.PrivacyUtils.scrubMacAddress;
@MethodsNotNullByDefault
@ParametersNotNullByDefault
 class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
 	private static final Logger LOG =
-			getLogger(AndroidBluetoothPlugin.class.getName());
+			Logger.getLogger(AndroidBluetoothPlugin.class.getName());
 	private static final int MAX_DISCOVERY_MS = 10_000;
 	private final AndroidExecutor androidExecutor;
 	private final Context appContext;
 	private final Clock clock;
 	private volatile boolean wasEnabledByUs = false;
 	private volatile BluetoothStateReceiver receiver = null;
@@ -73,15 +55,12 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
 	// Non-null if the plugin started successfully
 	private volatile BluetoothAdapter adapter = null;
-	AndroidBluetoothPlugin(BluetoothConnectionLimiter connectionLimiter,
+	AndroidBluetoothPlugin(Executor ioExecutor, AndroidExecutor androidExecutor,
-			Executor ioExecutor, AndroidExecutor androidExecutor,
+			Context appContext, SecureRandom secureRandom, Backoff backoff,
-			Context appContext, SecureRandom secureRandom, Clock clock,
+			DuplexPluginCallback callback, int maxLatency) {
-			Backoff backoff, PluginCallback callback, int maxLatency) {
+		super(ioExecutor, secureRandom, backoff, callback, maxLatency);
 		super(connectionLimiter, ioExecutor, secureRandom, backoff, callback,
 				maxLatency);
 		this.androidExecutor = androidExecutor;
 		this.appContext = appContext;
 		this.clock = clock;
 	}
 	@Override
@@ -161,7 +140,11 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
 	@Override
 	void tryToClose(@Nullable BluetoothServerSocket ss) {
-		IoUtils.tryToClose(ss, LOG, WARNING);
+		try {
 			if (ss != null) ss.close();
 		} catch (IOException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 		}
 	}
 	@Override
@@ -171,8 +154,7 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
 	}
 	private DuplexTransportConnection wrapSocket(BluetoothSocket s) {
-		return new AndroidBluetoothTransportConnection(this,
+		return new AndroidBluetoothTransportConnection(this, s);
 				connectionLimiter, s);
 	}
 	@Override
@@ -191,77 +173,17 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
 			s.connect();
 			return wrapSocket(s);
 		} catch (IOException e) {
-			IoUtils.tryToClose(s, LOG, WARNING);
+			tryToClose(s);
 			throw e;
 		}
 	}
-	@Override
+	private void tryToClose(@Nullable Closeable c) {
 	@Nullable
 	DuplexTransportConnection discoverAndConnect(String uuid) {
 		if (adapter == null) return null;
 		for (String address : discoverDevices()) {
 			try {
 				if (LOG.isLoggable(INFO))
 					LOG.info("Connecting to " + scrubMacAddress(address));
 				return connectTo(address, uuid);
 			} catch (IOException e) {
 				if (LOG.isLoggable(INFO)) {
 					LOG.info("Could not connect to "
 							+ scrubMacAddress(address));
 				}
 			}
 		}
 		LOG.info("Could not connect to any devices");
 		return null;
 	}
 	private Collection<String> discoverDevices() {
 		List<String> addresses = new ArrayList<>();
 		BlockingQueue<Intent> intents = new LinkedBlockingQueue<>();
 		DiscoveryReceiver receiver = new DiscoveryReceiver(intents);
 		IntentFilter filter = new IntentFilter();
 		filter.addAction(ACTION_DISCOVERY_STARTED);
 		filter.addAction(ACTION_DISCOVERY_FINISHED);
 		filter.addAction(ACTION_FOUND);
 		appContext.registerReceiver(receiver, filter);
 		try {
-			if (adapter.startDiscovery()) {
+			if (c != null) c.close();
-				long now = clock.currentTimeMillis();
+		} catch (IOException e) {
-				long end = now + MAX_DISCOVERY_MS;
+			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 				while (now < end) {
 					Intent i = intents.poll(end - now, MILLISECONDS);
 					if (i == null) break;
 					String action = i.getAction();
 					if (ACTION_DISCOVERY_STARTED.equals(action)) {
 						LOG.info("Discovery started");
 					} else if (ACTION_DISCOVERY_FINISHED.equals(action)) {
 						LOG.info("Discovery finished");
 						break;
 					} else if (ACTION_FOUND.equals(action)) {
 						BluetoothDevice d = i.getParcelableExtra(EXTRA_DEVICE);
 						String address = d.getAddress();
 						if (LOG.isLoggable(INFO))
 							LOG.info("Discovered " + scrubMacAddress(address));
 						if (!addresses.contains(address))
 							addresses.add(address);
 					}
 					now = clock.currentTimeMillis();
 				}
 			} else {
 				LOG.info("Could not start discovery");
 			}
 		} catch (InterruptedException e) {
 			LOG.info("Interrupted while discovering devices");
 			Thread.currentThread().interrupt();
 		} finally {
 			LOG.info("Cancelling discovery");
 			adapter.cancelDiscovery();
 			appContext.unregisterReceiver(receiver);
 		}
 		// Shuffle the addresses so we don't always try the same one first
 		Collections.shuffle(addresses);
 		return addresses;
 	}
 	private class BluetoothStateReceiver extends BroadcastReceiver {
@@ -281,18 +203,4 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
 			}
 		}
 	}
 	private static class DiscoveryReceiver extends BroadcastReceiver {
 		private final BlockingQueue<Intent> intents;
 		private DiscoveryReceiver(BlockingQueue<Intent> intents) {
 			this.intents = intents;
 		}
 		@Override
 		public void onReceive(Context ctx, Intent intent) {
 			intents.add(intent);
 		}
 	}
 }
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPluginFactory.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPluginFactory.java
@@ -6,12 +6,11 @@ import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.BackoffFactory;
 import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
 import org.briarproject.bramble.api.system.AndroidExecutor;
 import org.briarproject.bramble.api.system.Clock;
 import java.security.SecureRandom;
 import java.util.concurrent.Executor;
@@ -34,19 +33,17 @@ public class AndroidBluetoothPluginFactory implements DuplexPluginFactory {
 	private final Context appContext;
 	private final SecureRandom secureRandom;
 	private final EventBus eventBus;
 	private final Clock clock;
 	private final BackoffFactory backoffFactory;
 	public AndroidBluetoothPluginFactory(Executor ioExecutor,
 			AndroidExecutor androidExecutor, Context appContext,
-			SecureRandom secureRandom, EventBus eventBus, Clock clock,
+			SecureRandom secureRandom, EventBus eventBus,
 			BackoffFactory backoffFactory) {
 		this.ioExecutor = ioExecutor;
 		this.androidExecutor = androidExecutor;
 		this.appContext = appContext;
 		this.secureRandom = secureRandom;
 		this.eventBus = eventBus;
 		this.clock = clock;
 		this.backoffFactory = backoffFactory;
 	}
@@ -61,14 +58,12 @@ public class AndroidBluetoothPluginFactory implements DuplexPluginFactory {
 	}
 	@Override
-	public DuplexPlugin createPlugin(PluginCallback callback) {
+	public DuplexPlugin createPlugin(DuplexPluginCallback callback) {
 		BluetoothConnectionLimiter connectionLimiter =
 				new BluetoothConnectionLimiterImpl();
 		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
 				MAX_POLLING_INTERVAL, BACKOFF_BASE);
-		AndroidBluetoothPlugin plugin = new AndroidBluetoothPlugin(
+		AndroidBluetoothPlugin plugin = new AndroidBluetoothPlugin(ioExecutor,
-				connectionLimiter, ioExecutor, androidExecutor, appContext,
+				androidExecutor, appContext, secureRandom, backoff, callback,
-				secureRandom, clock, backoff, callback, MAX_LATENCY);
+				MAX_LATENCY);
 		eventBus.addListener(plugin);
 		return plugin;
 	}
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothTransportConnection.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothTransportConnection.java
@@ -14,14 +14,10 @@ import java.io.OutputStream;
 class AndroidBluetoothTransportConnection
 		extends AbstractDuplexTransportConnection {
 	private final BluetoothConnectionLimiter connectionManager;
 	private final BluetoothSocket socket;
-	AndroidBluetoothTransportConnection(Plugin plugin,
+	AndroidBluetoothTransportConnection(Plugin plugin, BluetoothSocket socket) {
 			BluetoothConnectionLimiter connectionManager,
 			BluetoothSocket socket) {
 		super(plugin);
 		this.connectionManager = connectionManager;
 		this.socket = socket;
 	}
@@ -37,10 +33,6 @@ class AndroidBluetoothTransportConnection
 	@Override
 	protected void closeConnection(boolean exception) throws IOException {
-		try {
+		socket.close();
 			socket.close();
 		} finally {
 			connectionManager.connectionClosed(this);
 		}
 	}
 }
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPlugin.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPlugin.java
@@ -1,167 +1,102 @@
 package org.briarproject.bramble.plugin.tcp;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.ConnectivityManager;
 import android.net.Network;
 import android.net.NetworkInfo;
-import android.net.wifi.WifiInfo;
+import android.os.Bundle;
 import android.net.wifi.WifiManager;
 import org.briarproject.bramble.PoliteExecutor;
 import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.event.EventListener;
 import org.briarproject.bramble.api.network.event.NetworkStatusEvent;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.Backoff;
-import org.briarproject.bramble.api.plugin.PluginCallback;
+import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.net.UnknownHostException;
 import java.util.Collection;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 import javax.annotation.Nullable;
 import javax.net.SocketFactory;
 import static android.content.Context.CONNECTIVITY_SERVICE;
-import static android.content.Context.WIFI_SERVICE;
+import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;
 import static android.net.ConnectivityManager.TYPE_WIFI;
-import static android.os.Build.VERSION.SDK_INT;
+import static android.net.wifi.WifiManager.EXTRA_WIFI_STATE;
-import static java.util.Collections.emptyList;
+import static java.util.logging.Level.INFO;
-import static java.util.Collections.singletonList;
+import static org.briarproject.bramble.util.AndroidUtils.logNetworkState;
 import static java.util.logging.Logger.getLogger;
@NotNullByDefault
-class AndroidLanTcpPlugin extends LanTcpPlugin implements EventListener {
+class AndroidLanTcpPlugin extends LanTcpPlugin {
 	private static final String WIFI_AP_STATE_ACTION =
 			"android.net.wifi.WIFI_AP_STATE_CHANGED";
 	private static final Logger LOG =
-			getLogger(AndroidLanTcpPlugin.class.getName());
+			Logger.getLogger(AndroidLanTcpPlugin.class.getName());
-	private static final byte[] WIFI_AP_ADDRESS_BYTES =
+	private final Context appContext;
 			{(byte) 192, (byte) 168, 43, 1};
 	private static final InetAddress WIFI_AP_ADDRESS;
 	static {
 		try {
 			WIFI_AP_ADDRESS = InetAddress.getByAddress(WIFI_AP_ADDRESS_BYTES);
 		} catch (UnknownHostException e) {
 			// Should only be thrown if the address has an illegal length
 			throw new AssertionError(e);
 		}
 	}
 	private final Executor connectionStatusExecutor;
 	private final ConnectivityManager connectivityManager;
 	@Nullable
-	private final WifiManager wifiManager;
+	private volatile BroadcastReceiver networkStateReceiver = null;
-	private volatile SocketFactory socketFactory;
+	AndroidLanTcpPlugin(Executor ioExecutor, Backoff backoff,
-
+			Context appContext, DuplexPluginCallback callback, int maxLatency,
 	AndroidLanTcpPlugin(Executor ioExecutor, Context appContext,
 			Backoff backoff, PluginCallback callback, int maxLatency,
 			int maxIdleTime) {
 		super(ioExecutor, backoff, callback, maxLatency, maxIdleTime);
-		// Don't execute more than one connection status check at a time
+		this.appContext = appContext;
 		connectionStatusExecutor =
 				new PoliteExecutor("AndroidLanTcpPlugin", ioExecutor, 1);
 		ConnectivityManager connectivityManager = (ConnectivityManager)
 				appContext.getSystemService(CONNECTIVITY_SERVICE);
 		if (connectivityManager == null) throw new AssertionError();
 		this.connectivityManager = connectivityManager;
 		wifiManager = (WifiManager) appContext.getApplicationContext()
 				.getSystemService(WIFI_SERVICE);
 		socketFactory = SocketFactory.getDefault();
 	}
 	@Override
 	public void start() {
 		if (used.getAndSet(true)) throw new IllegalStateException();
 		running = true;
-		updateConnectionStatus();
+		// Register to receive network status events
 		networkStateReceiver = new NetworkStateReceiver();
 		IntentFilter filter = new IntentFilter();
 		filter.addAction(CONNECTIVITY_ACTION);
 		filter.addAction(WIFI_AP_STATE_ACTION);
 		appContext.registerReceiver(networkStateReceiver, filter);
 		if (LOG.isLoggable(INFO)) logNetworkState(appContext, LOG);
 	}
 	@Override
 	public void stop() {
 		running = false;
 		if (networkStateReceiver != null)
 			appContext.unregisterReceiver(networkStateReceiver);
 		tryToClose(socket);
 	}
-	@Override
+	private class NetworkStateReceiver extends BroadcastReceiver {
 	protected Socket createSocket() throws IOException {
 		return socketFactory.createSocket();
 	}
-	@Override
+		@Override
-	protected Collection<InetAddress> getLocalIpAddresses() {
+		public void onReceive(Context ctx, Intent i) {
 		// If the device doesn't have wifi, don't open any sockets
 		if (wifiManager == null) return emptyList();
 		// If we're connected to a wifi network, use that network
 		WifiInfo info = wifiManager.getConnectionInfo();
 		if (info != null && info.getIpAddress() != 0)
 			return singletonList(intToInetAddress(info.getIpAddress()));
 		// If we're running an access point, return its address
 		if (super.getLocalIpAddresses().contains(WIFI_AP_ADDRESS))
 			return singletonList(WIFI_AP_ADDRESS);
 		// No suitable addresses
 		return emptyList();
 	}
 	private InetAddress intToInetAddress(int ip) {
 		byte[] ipBytes = new byte[4];
 		ipBytes[0] = (byte) (ip & 0xFF);
 		ipBytes[1] = (byte) ((ip >> 8) & 0xFF);
 		ipBytes[2] = (byte) ((ip >> 16) & 0xFF);
 		ipBytes[3] = (byte) ((ip >> 24) & 0xFF);
 		try {
 			return InetAddress.getByAddress(ipBytes);
 		} catch (UnknownHostException e) {
 			// Should only be thrown if address has illegal length
 			throw new AssertionError(e);
 		}
 	}
 	// On API 21 and later, a socket that is not created with the wifi
 	// network's socket factory may try to connect via another network
 	private SocketFactory getSocketFactory() {
 		if (SDK_INT < 21) return SocketFactory.getDefault();
 		for (Network net : connectivityManager.getAllNetworks()) {
 			NetworkInfo info = connectivityManager.getNetworkInfo(net);
 			if (info != null && info.getType() == TYPE_WIFI)
 				return net.getSocketFactory();
 		}
 		LOG.warning("Could not find suitable socket factory");
 		return SocketFactory.getDefault();
 	}
 	@Override
 	public void eventOccurred(Event e) {
 		if (e instanceof NetworkStatusEvent) updateConnectionStatus();
 	}
 	private void updateConnectionStatus() {
 		connectionStatusExecutor.execute(() -> {
 			if (!running) return;
-			Collection<InetAddress> addrs = getLocalIpAddresses();
+			if (LOG.isLoggable(INFO)) {
-			if (addrs.contains(WIFI_AP_ADDRESS)) {
+				if (CONNECTIVITY_ACTION.equals(i.getAction())) {
-				LOG.info("Providing wifi hotspot");
+					LOG.info("Connectivity change");
-				// There's no corresponding Network object and thus no way
+					Bundle extras = i.getExtras();
-				// to get a suitable socket factory, so we won't be able to
+					if (extras != null) {
-				// make outgoing connections on API 21+ if another network
+						LOG.info("Extras:");
-				// has internet access
+						for (String key : extras.keySet())
-				socketFactory = SocketFactory.getDefault();
+							LOG.info("\t" + key + ": " + extras.get(key));
-				if (socket == null || socket.isClosed()) bind();
+					}
-			} else if (addrs.isEmpty()) {
+				} else if (WIFI_AP_STATE_ACTION.equals(i.getAction())) {
-				LOG.info("Not connected to wifi");
+					int state = i.getIntExtra(EXTRA_WIFI_STATE, 0);
-				socketFactory = SocketFactory.getDefault();
+					if (state == 13) LOG.info("Wifi AP enabled");
-				tryToClose(socket);
+					else LOG.info("Wifi AP state " + state);
-			} else {
+				}
-				LOG.info("Connected to wifi");
+				logNetworkState(appContext, LOG);
 				socketFactory = getSocketFactory();
 				if (socket == null || socket.isClosed()) bind();
 			}
-		});
+			Object o = ctx.getSystemService(CONNECTIVITY_SERVICE);
 			ConnectivityManager cm = (ConnectivityManager) o;
 			NetworkInfo net = cm.getActiveNetworkInfo();
 			if (net != null && net.getType() == TYPE_WIFI
 					&& net.isConnected()) {
 				LOG.info("Connected to Wi-Fi");
 				if (socket == null || socket.isClosed()) bind();
 			} else {
 				LOG.info("Not connected to Wi-Fi");
 				tryToClose(socket);
 			}
 		}
 	}
 }
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPluginFactory.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPluginFactory.java
@@ -2,13 +2,12 @@ package org.briarproject.bramble.plugin.tcp;
 import android.content.Context;
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.BackoffFactory;
 import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
 import java.util.concurrent.Executor;
@@ -28,14 +27,12 @@ public class AndroidLanTcpPluginFactory implements DuplexPluginFactory {
 	private static final double BACKOFF_BASE = 1.2;
 	private final Executor ioExecutor;
 	private final EventBus eventBus;
 	private final BackoffFactory backoffFactory;
 	private final Context appContext;
-	public AndroidLanTcpPluginFactory(Executor ioExecutor, EventBus eventBus,
+	public AndroidLanTcpPluginFactory(Executor ioExecutor,
 			BackoffFactory backoffFactory, Context appContext) {
 		this.ioExecutor = ioExecutor;
 		this.eventBus = eventBus;
 		this.backoffFactory = backoffFactory;
 		this.appContext = appContext;
 	}
@@ -51,12 +48,10 @@ public class AndroidLanTcpPluginFactory implements DuplexPluginFactory {
 	}
 	@Override
-	public DuplexPlugin createPlugin(PluginCallback callback) {
+	public DuplexPlugin createPlugin(DuplexPluginCallback callback) {
 		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
 				MAX_POLLING_INTERVAL, BACKOFF_BASE);
-		AndroidLanTcpPlugin plugin = new AndroidLanTcpPlugin(ioExecutor,
+		return new AndroidLanTcpPlugin(ioExecutor, backoff, appContext,
-				appContext, backoff, callback, MAX_LATENCY, MAX_IDLE_TIME);
+				callback, MAX_LATENCY, MAX_IDLE_TIME);
 		eventBus.addListener(plugin);
 		return plugin;
 	}
 }
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPlugin.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPlugin.java
@@ -1,101 +0,0 @@
 package org.briarproject.bramble.plugin.tor;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.PowerManager;
 import org.briarproject.bramble.api.battery.BatteryManager;
 import org.briarproject.bramble.api.network.NetworkManager;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.api.system.LocationUtils;
 import org.briarproject.bramble.api.system.ResourceProvider;
 import org.briarproject.bramble.util.RenewableWakeLock;
 import java.io.IOException;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledExecutorService;
 import javax.net.SocketFactory;
 import static android.content.Context.MODE_PRIVATE;
 import static android.content.Context.POWER_SERVICE;
 import static android.os.PowerManager.PARTIAL_WAKE_LOCK;
 import static java.util.concurrent.TimeUnit.MINUTES;
@MethodsNotNullByDefault
@ParametersNotNullByDefault
 class AndroidTorPlugin extends TorPlugin {
 	private final Context appContext;
 	private final RenewableWakeLock wakeLock;
 	AndroidTorPlugin(Executor ioExecutor, ScheduledExecutorService scheduler,
 			Context appContext, NetworkManager networkManager,
 			LocationUtils locationUtils, SocketFactory torSocketFactory,
 			Clock clock, ResourceProvider resourceProvider,
 			CircumventionProvider circumventionProvider,
 			BatteryManager batteryManager, Backoff backoff,
 			TorRendezvousCrypto torRendezvousCrypto,
 			PluginCallback callback, String architecture, int maxLatency,
 			int maxIdleTime) {
 		super(ioExecutor, networkManager, locationUtils, torSocketFactory,
 				clock, resourceProvider, circumventionProvider, batteryManager,
 				backoff, torRendezvousCrypto, callback, architecture, maxLatency, maxIdleTime,
 				appContext.getDir("tor", MODE_PRIVATE));
 		this.appContext = appContext;
 		PowerManager pm = (PowerManager)
 				appContext.getSystemService(POWER_SERVICE);
 		if (pm == null) throw new AssertionError();
 		wakeLock = new RenewableWakeLock(pm, scheduler, PARTIAL_WAKE_LOCK,
 				getWakeLockTag(), 1, MINUTES);
 	}
 	@Override
 	protected int getProcessId() {
 		return android.os.Process.myPid();
 	}
 	@Override
 	protected long getLastUpdateTime() {
 		try {
 			PackageManager pm = appContext.getPackageManager();
 			PackageInfo pi = pm.getPackageInfo(appContext.getPackageName(), 0);
 			return pi.lastUpdateTime;
 		} catch (NameNotFoundException e) {
 			throw new AssertionError(e);
 		}
 	}
 	@Override
 	protected void enableNetwork(boolean enable) throws IOException {
 		if (!running) return;
 		if (enable) wakeLock.acquire();
 		super.enableNetwork(enable);
 		if (!enable) wakeLock.release();
 	}
 	@Override
 	public void stop() {
 		super.stop();
 		wakeLock.release();
 	}
 	private String getWakeLockTag() {
 		PackageManager pm = appContext.getPackageManager();
 		for (PackageInfo info : pm.getInstalledPackages(0)) {
 			String name = info.packageName.toLowerCase();
 			if (name.startsWith("com.huawei.powergenie")) {
 				return "LocationManagerService";
 			} else if (name.startsWith("com.evenwell.powermonitor")) {
 				return "AudioIn";
 			}
 		}
 		return getClass().getSimpleName();
 	}
 }
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorNetworkMetadata.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorNetworkMetadata.java
@@ -0,0 +1,18 @@
 package org.briarproject.bramble.plugin.tor;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 class TorNetworkMetadata {
 	// See https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
 	// and https://trac.torproject.org/projects/tor/wiki/doc/OONI/censorshipwiki
 	// TODO: get a more complete list
 	private static final Set<String> BLOCKED_IN_COUNTRIES =
 			new HashSet<>(Arrays.asList("CN", "IR", "SY", "ZZ"));
 	static boolean isTorProbablyBlocked(String countryCode) {
 		return BLOCKED_IN_COUNTRIES.contains(countryCode);
 	}
 }
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
@@ -0,0 +1,797 @@
 package org.briarproject.bramble.plugin.tor;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Resources;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.FileObserver;
 import android.os.PowerManager;
 import net.freehaven.tor.control.EventHandler;
 import net.freehaven.tor.control.TorControlConnection;
 import org.briarproject.bramble.api.contact.ContactId;
 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.KeyAgreementListener;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.PluginException;
 import org.briarproject.bramble.api.plugin.TorConstants;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
 import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
 import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.api.reporting.DevReporter;
 import org.briarproject.bramble.api.settings.Settings;
 import org.briarproject.bramble.api.settings.event.SettingsUpdatedEvent;
 import org.briarproject.bramble.api.system.LocationUtils;
 import org.briarproject.bramble.util.AndroidUtils;
 import org.briarproject.bramble.util.IoUtils;
 import org.briarproject.bramble.util.StringUtils;
 import java.io.Closeable;
 import java.io.EOFException;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Scanner;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
 import java.util.zip.ZipInputStream;
 import javax.annotation.Nullable;
 import javax.net.SocketFactory;
 import static android.content.Context.CONNECTIVITY_SERVICE;
 import static android.content.Context.MODE_PRIVATE;
 import static android.content.Context.POWER_SERVICE;
 import static android.content.Intent.ACTION_SCREEN_OFF;
 import static android.content.Intent.ACTION_SCREEN_ON;
 import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;
 import static android.net.ConnectivityManager.TYPE_WIFI;
 import static android.os.Build.VERSION.SDK_INT;
 import static android.os.PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED;
 import static android.os.PowerManager.PARTIAL_WAKE_LOCK;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static net.freehaven.tor.control.TorControlCommands.HS_ADDRESS;
 import static net.freehaven.tor.control.TorControlCommands.HS_PRIVKEY;
 import static org.briarproject.bramble.api.plugin.TorConstants.CONTROL_PORT;
 import static org.briarproject.bramble.api.plugin.TorConstants.ID;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_ALWAYS;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_NEVER;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_WIFI;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_PORT;
 import static org.briarproject.bramble.api.plugin.TorConstants.PROP_ONION;
 import static org.briarproject.bramble.util.PrivacyUtils.scrubOnion;
@MethodsNotNullByDefault
@ParametersNotNullByDefault
 class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	private static final String[] EVENTS = {
 			"CIRC", "ORCONN", "HS_DESC", "NOTICE", "WARN", "ERR"
 	};
 	private static final String OWNER = "__OwningControllerProcess";
 	private static final int COOKIE_TIMEOUT = 3000; // Milliseconds
 	private static final Pattern ONION = Pattern.compile("[a-z2-7]{16}");
 	private static final Logger LOG =
 			Logger.getLogger(TorPlugin.class.getName());
 	private final Executor ioExecutor;
 	private final ScheduledExecutorService scheduler;
 	private final Context appContext;
 	private final LocationUtils locationUtils;
 	private final DevReporter reporter;
 	private final SocketFactory torSocketFactory;
 	private final Backoff backoff;
 	private final DuplexPluginCallback callback;
 	private final String architecture;
 	private final int maxLatency, maxIdleTime, socketTimeout;
 	private final ConnectionStatus connectionStatus;
 	private final File torDirectory, torFile, geoIpFile, configFile;
 	private final File doneFile, cookieFile;
 	private final PowerManager.WakeLock wakeLock;
 	private final Lock connectionStatusLock;
 	private final AtomicReference<Future<?>> connectivityCheck =
 			new AtomicReference<>();
 	private final AtomicBoolean used = new AtomicBoolean(false);
 	private volatile boolean running = false;
 	private volatile ServerSocket socket = null;
 	private volatile Socket controlSocket = null;
 	private volatile TorControlConnection controlConnection = null;
 	private volatile BroadcastReceiver networkStateReceiver = null;
 	TorPlugin(Executor ioExecutor, ScheduledExecutorService scheduler,
 			Context appContext, LocationUtils locationUtils,
 			DevReporter reporter, SocketFactory torSocketFactory,
 			Backoff backoff, DuplexPluginCallback callback,
 			String architecture, int maxLatency, int maxIdleTime) {
 		this.ioExecutor = ioExecutor;
 		this.scheduler = scheduler;
 		this.appContext = appContext;
 		this.locationUtils = locationUtils;
 		this.reporter = reporter;
 		this.torSocketFactory = torSocketFactory;
 		this.backoff = backoff;
 		this.callback = callback;
 		this.architecture = architecture;
 		this.maxLatency = maxLatency;
 		this.maxIdleTime = maxIdleTime;
 		if (maxIdleTime > Integer.MAX_VALUE / 2)
 			socketTimeout = Integer.MAX_VALUE;
 		else socketTimeout = maxIdleTime * 2;
 		connectionStatus = new ConnectionStatus();
 		torDirectory = appContext.getDir("tor", MODE_PRIVATE);
 		torFile = new File(torDirectory, "tor");
 		geoIpFile = new File(torDirectory, "geoip");
 		configFile = new File(torDirectory, "torrc");
 		doneFile = new File(torDirectory, "done");
 		cookieFile = new File(torDirectory, ".tor/control_auth_cookie");
 		Object o = appContext.getSystemService(POWER_SERVICE);
 		PowerManager pm = (PowerManager) o;
 		// This tag will prevent Huawei's powermanager from killing us.
 		wakeLock = pm.newWakeLock(PARTIAL_WAKE_LOCK, "LocationManagerService");
 		wakeLock.setReferenceCounted(false);
 		connectionStatusLock = new ReentrantLock();
 	}
 	@Override
 	public TransportId getId() {
 		return TorConstants.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();
 		// Install or update the assets if necessary
 		if (!assetsAreUpToDate()) installAssets();
 		LOG.info("Starting Tor");
 		// Watch for the auth cookie file being updated
 		try {
 			cookieFile.getParentFile().mkdirs();
 			cookieFile.createNewFile();
 		} catch (IOException e) {
 			throw new PluginException(e);
 		}
 		CountDownLatch latch = new CountDownLatch(1);
 		FileObserver obs = new WriteObserver(cookieFile, latch);
 		obs.startWatching();
 		// Start a new Tor process
 		String torPath = torFile.getAbsolutePath();
 		String configPath = configFile.getAbsolutePath();
 		String pid = String.valueOf(android.os.Process.myPid());
 		Process torProcess;
 		ProcessBuilder pb =
 				new ProcessBuilder(torPath, "-f", configPath, OWNER, pid);
 		Map<String, String> env = pb.environment();
 		env.put("HOME", torDirectory.getAbsolutePath());
 		pb.directory(torDirectory);
 		try {
 			torProcess = pb.start();
 		} catch (SecurityException | IOException e) {
 			throw new PluginException(e);
 		}
 		// Log the process's standard output until it detaches
 		if (LOG.isLoggable(INFO)) {
 			Scanner stdout = new Scanner(torProcess.getInputStream());
 			Scanner stderr = new Scanner(torProcess.getErrorStream());
 			while (stdout.hasNextLine() || stderr.hasNextLine()) {
 				if (stdout.hasNextLine()) {
 					LOG.info(stdout.nextLine());
 				}
 				if (stderr.hasNextLine()) {
 					LOG.info(stderr.nextLine());
 				}
 			}
 			stdout.close();
 			stderr.close();
 		}
 		try {
 			// Wait for the process to detach or exit
 			int exit = torProcess.waitFor();
 			if (exit != 0) {
 				if (LOG.isLoggable(WARNING))
 					LOG.warning("Tor exited with value " + exit);
 				throw new PluginException();
 			}
 			// Wait for the auth cookie file to be created/updated
 			if (!latch.await(COOKIE_TIMEOUT, MILLISECONDS)) {
 				LOG.warning("Auth cookie not created");
 				if (LOG.isLoggable(INFO)) listFiles(torDirectory);
 				throw new PluginException();
 			}
 		} catch (InterruptedException e) {
 			LOG.warning("Interrupted while starting Tor");
 			Thread.currentThread().interrupt();
 			throw new PluginException();
 		}
 		try {
 			// Open a control connection and authenticate using the cookie file
 			controlSocket = new Socket("127.0.0.1", CONTROL_PORT);
 			controlConnection = new TorControlConnection(controlSocket);
 			controlConnection.authenticate(read(cookieFile));
 			// Tell Tor to exit when the control connection is closed
 			controlConnection.takeOwnership();
 			controlConnection.resetConf(Collections.singletonList(OWNER));
 			running = true;
 			// Register to receive events from the Tor process
 			controlConnection.setEventHandler(this);
 			controlConnection.setEvents(Arrays.asList(EVENTS));
 			// Check whether Tor has already bootstrapped
 			String phase = controlConnection.getInfo("status/bootstrap-phase");
 			if (phase != null && phase.contains("PROGRESS=100")) {
 				LOG.info("Tor has already bootstrapped");
 				connectionStatus.setBootstrapped();
 			}
 		} catch (IOException e) {
 			throw new PluginException(e);
 		}
 		// Register to receive network status events
 		networkStateReceiver = new NetworkStateReceiver();
 		IntentFilter filter = new IntentFilter();
 		filter.addAction(CONNECTIVITY_ACTION);
 		filter.addAction(ACTION_SCREEN_ON);
 		filter.addAction(ACTION_SCREEN_OFF);
 		if (SDK_INT >= 23) filter.addAction(ACTION_DEVICE_IDLE_MODE_CHANGED);
 		appContext.registerReceiver(networkStateReceiver, filter);
 		// Bind a server socket to receive incoming hidden service connections
 		bind();
 	}
 	private boolean assetsAreUpToDate() {
 		try {
 			PackageManager pm = appContext.getPackageManager();
 			PackageInfo pi = pm.getPackageInfo(appContext.getPackageName(), 0);
 			return doneFile.lastModified() > pi.lastUpdateTime;
 		} catch (NameNotFoundException e) {
 			throw new RuntimeException(e);
 		}
 	}
 	private void installAssets() throws PluginException {
 		InputStream in = null;
 		OutputStream out = null;
 		try {
 			doneFile.delete();
 			// Unzip the Tor binary to the filesystem
 			in = getTorInputStream();
 			out = new FileOutputStream(torFile);
 			IoUtils.copyAndClose(in, out);
 			// Make the Tor binary executable
 			if (!torFile.setExecutable(true, true)) throw new IOException();
 			// Unzip the GeoIP database to the filesystem
 			in = getGeoIpInputStream();
 			out = new FileOutputStream(geoIpFile);
 			IoUtils.copyAndClose(in, out);
 			// Copy the config file to the filesystem
 			in = getConfigInputStream();
 			out = new FileOutputStream(configFile);
 			IoUtils.copyAndClose(in, out);
 			doneFile.createNewFile();
 		} catch (IOException e) {
 			tryToClose(in);
 			tryToClose(out);
 			throw new PluginException(e);
 		}
 	}
 	private InputStream getTorInputStream() throws IOException {
 		if (LOG.isLoggable(INFO))
 			LOG.info("Installing Tor binary for " + architecture);
 		int resId = getResourceId("tor_" + architecture);
 		InputStream in = appContext.getResources().openRawResource(resId);
 		ZipInputStream zin = new ZipInputStream(in);
 		if (zin.getNextEntry() == null) throw new IOException();
 		return zin;
 	}
 	private InputStream getGeoIpInputStream() throws IOException {
 		int resId = getResourceId("geoip");
 		InputStream in = appContext.getResources().openRawResource(resId);
 		ZipInputStream zin = new ZipInputStream(in);
 		if (zin.getNextEntry() == null) throw new IOException();
 		return zin;
 	}
 	private InputStream getConfigInputStream() throws IOException {
 		int resId = getResourceId("torrc");
 		return appContext.getResources().openRawResource(resId);
 	}
 	private int getResourceId(String filename) {
 		Resources res = appContext.getResources();
 		return res.getIdentifier(filename, "raw", appContext.getPackageName());
 	}
 	private void tryToClose(@Nullable Closeable c) {
 		try {
 			if (c != null) c.close();
 		} catch (IOException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 		}
 	}
 	private void tryToClose(@Nullable Socket s) {
 		try {
 			if (s != null) s.close();
 		} catch (IOException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 		}
 	}
 	private void listFiles(File f) {
 		if (f.isDirectory()) {
 			File[] children = f.listFiles();
 			if (children != null) for (File child : children) listFiles(child);
 		} else {
 			LOG.info(f.getAbsolutePath());
 		}
 	}
 	private byte[] read(File f) throws IOException {
 		byte[] b = new byte[(int) f.length()];
 		FileInputStream in = new FileInputStream(f);
 		try {
 			int offset = 0;
 			while (offset < b.length) {
 				int read = in.read(b, offset, b.length - offset);
 				if (read == -1) throw new EOFException();
 				offset += read;
 			}
 			return b;
 		} finally {
 			tryToClose(in);
 		}
 	}
 	private void sendDevReports() {
 		ioExecutor.execute(() -> {
 			// TODO: Trigger this with a TransportEnabledEvent
 			File reportDir = AndroidUtils.getReportDir(appContext);
 			reporter.sendReports(reportDir);
 		});
 	}
 	private void bind() {
 		ioExecutor.execute(() -> {
 			// If there's already a port number stored in config, reuse it
 			String portString = callback.getSettings().get(PREF_TOR_PORT);
 			int port;
 			if (StringUtils.isNullOrEmpty(portString)) port = 0;
 			else port = Integer.parseInt(portString);
 			// Bind a server socket to receive connections from Tor
 			ServerSocket ss = null;
 			try {
 				ss = new ServerSocket();
 				ss.bind(new InetSocketAddress("127.0.0.1", port));
 			} catch (IOException e) {
 				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 				tryToClose(ss);
 				return;
 			}
 			if (!running) {
 				tryToClose(ss);
 				return;
 			}
 			socket = ss;
 			// Store the port number
 			String localPort = String.valueOf(ss.getLocalPort());
 			Settings s = new Settings();
 			s.put(PREF_TOR_PORT, localPort);
 			callback.mergeSettings(s);
 			// Create a hidden service if necessary
 			ioExecutor.execute(() -> publishHiddenService(localPort));
 			backoff.reset();
 			// Accept incoming hidden service connections from Tor
 			acceptContactConnections(ss);
 		});
 	}
 	private void tryToClose(@Nullable ServerSocket ss) {
 		try {
 			if (ss != null) ss.close();
 		} catch (IOException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 		} finally {
 			callback.transportDisabled();
 		}
 	}
 	private void publishHiddenService(String port) {
 		if (!running) return;
 		LOG.info("Creating hidden service");
 		String privKey = callback.getSettings().get(HS_PRIVKEY);
 		Map<Integer, String> portLines =
 				Collections.singletonMap(80, "127.0.0.1:" + port);
 		Map<String, String> response;
 		try {
 			// Use the control connection to set up the hidden service
 			if (privKey == null)
 				response = controlConnection.addOnion(portLines);
 			else response = controlConnection.addOnion(privKey, portLines);
 		} catch (IOException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 			return;
 		}
 		if (!response.containsKey(HS_ADDRESS)) {
 			LOG.warning("Tor did not return a hidden service address");
 			return;
 		}
 		if (privKey == null && !response.containsKey(HS_PRIVKEY)) {
 			LOG.warning("Tor did not return a private key");
 			return;
 		}
 		// Publish the hidden service's onion hostname in transport properties
 		String hostname = response.get(HS_ADDRESS);
 		if (LOG.isLoggable(INFO))
 			LOG.info("Hidden service " + scrubOnion(hostname));
 		TransportProperties p = new TransportProperties();
 		p.put(PROP_ONION, hostname);
 		callback.mergeLocalProperties(p);
 		if (privKey == null) {
 			// Save the hidden service's private key for next time
 			Settings s = new Settings();
 			s.put(HS_PRIVKEY, response.get(HS_PRIVKEY));
 			callback.mergeSettings(s);
 		}
 	}
 	private void acceptContactConnections(ServerSocket ss) {
 		while (running) {
 			Socket s;
 			try {
 				s = ss.accept();
 				s.setSoTimeout(socketTimeout);
 			} catch (IOException e) {
 				// This is expected when the socket is closed
 				if (LOG.isLoggable(INFO)) LOG.info(e.toString());
 				return;
 			}
 			LOG.info("Connection received");
 			backoff.reset();
 			TorTransportConnection conn = new TorTransportConnection(this, s);
 			callback.incomingConnectionCreated(conn);
 		}
 	}
 	private void enableNetwork(boolean enable) throws IOException {
 		if (!running) return;
 		if (enable) wakeLock.acquire();
 		connectionStatus.enableNetwork(enable);
 		controlConnection.setConf("DisableNetwork", enable ? "0" : "1");
 		if (!enable) {
 			callback.transportDisabled();
 			wakeLock.release();
 		}
 	}
 	@Override
 	public void stop() throws PluginException {
 		running = false;
 		tryToClose(socket);
 		if (networkStateReceiver != null)
 			appContext.unregisterReceiver(networkStateReceiver);
 		if (controlSocket != null && controlConnection != null) {
 			try {
 				LOG.info("Stopping Tor");
 				controlConnection.setConf("DisableNetwork", "1");
 				controlConnection.shutdownTor("TERM");
 				controlSocket.close();
 			} catch (IOException e) {
 				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 			}
 		}
 		wakeLock.release();
 	}
 	@Override
 	public boolean isRunning() {
 		return running && connectionStatus.isConnected();
 	}
 	@Override
 	public boolean shouldPoll() {
 		return true;
 	}
 	@Override
 	public int getPollingInterval() {
 		return backoff.getPollingInterval();
 	}
 	@Override
 	public void poll(Collection<ContactId> connected) {
 		if (!isRunning()) return;
 		backoff.increment();
 		Map<ContactId, TransportProperties> remote =
 				callback.getRemoteProperties();
 		for (Entry<ContactId, TransportProperties> e : remote.entrySet()) {
 			ContactId c = e.getKey();
 			if (!connected.contains(c)) connectAndCallBack(c, e.getValue());
 		}
 	}
 	private void connectAndCallBack(ContactId c, TransportProperties p) {
 		ioExecutor.execute(() -> {
 			if (!isRunning()) return;
 			DuplexTransportConnection d = createConnection(p);
 			if (d != null) {
 				backoff.reset();
 				callback.outgoingConnectionCreated(c, d);
 			}
 		});
 	}
 	@Override
 	public DuplexTransportConnection createConnection(ContactId c) {
 		if (!isRunning()) return null;
 		return createConnection(callback.getRemoteProperties(c));
 	}
 	@Nullable
 	private DuplexTransportConnection createConnection(TransportProperties p) {
 		String onion = p.get(PROP_ONION);
 		if (StringUtils.isNullOrEmpty(onion)) return null;
 		if (!ONION.matcher(onion).matches()) {
 			// not scrubbing this address, so we are able to find the problem
 			if (LOG.isLoggable(INFO)) LOG.info("Invalid hostname: " + onion);
 			return null;
 		}
 		Socket s = null;
 		try {
 			if (LOG.isLoggable(INFO))
 				LOG.info("Connecting to " + scrubOnion(onion));
 			controlConnection.forgetHiddenService(onion);
 			s = torSocketFactory.createSocket(onion + ".onion", 80);
 			s.setSoTimeout(socketTimeout);
 			if (LOG.isLoggable(INFO))
 				LOG.info("Connected to " + scrubOnion(onion));
 			return new TorTransportConnection(this, s);
 		} catch (IOException e) {
 			if (LOG.isLoggable(INFO)) {
 				LOG.info("Could not connect to " + scrubOnion(onion) + ": " +
 						e.toString());
 			}
 			tryToClose(s);
 			return null;
 		}
 	}
 	@Override
 	public boolean supportsKeyAgreement() {
 		return false;
 	}
 	@Override
 	public KeyAgreementListener createKeyAgreementListener(byte[] commitment) {
 		throw new UnsupportedOperationException();
 	}
 	@Override
 	public DuplexTransportConnection createKeyAgreementConnection(
 			byte[] commitment, BdfList descriptor) {
 		throw new UnsupportedOperationException();
 	}
 	@Override
 	public void circuitStatus(String status, String id, String path) {
 		if (status.equals("BUILT") &&
 				connectionStatus.getAndSetCircuitBuilt()) {
 			LOG.info("First circuit built");
 			backoff.reset();
 			if (isRunning()) {
 				sendDevReports();
 				callback.transportEnabled();
 			}
 		}
 	}
 	@Override
 	public void streamStatus(String status, String id, String target) {
 	}
 	@Override
 	public void orConnStatus(String status, String orName) {
 		if (LOG.isLoggable(INFO)) LOG.info("OR connection " + status);
 		if (status.equals("CLOSED") || status.equals("FAILED"))
 			updateConnectionStatus(); // Check whether we've lost connectivity
 	}
 	@Override
 	public void bandwidthUsed(long read, long written) {
 	}
 	@Override
 	public void newDescriptors(List<String> orList) {
 	}
 	@Override
 	public void message(String severity, String msg) {
 		if (LOG.isLoggable(INFO)) LOG.info(severity + " " + msg);
 		if (severity.equals("NOTICE") && msg.startsWith("Bootstrapped 100%")) {
 			connectionStatus.setBootstrapped();
 			backoff.reset();
 			if (isRunning()) {
 				sendDevReports();
 				callback.transportEnabled();
 			}
 		}
 	}
 	@Override
 	public void unrecognized(String type, String msg) {
 		if (type.equals("HS_DESC") && msg.startsWith("UPLOADED"))
 			LOG.info("Descriptor uploaded");
 	}
 	private static class WriteObserver extends FileObserver {
 		private final CountDownLatch latch;
 		private WriteObserver(File file, CountDownLatch latch) {
 			super(file.getAbsolutePath(), CLOSE_WRITE);
 			this.latch = latch;
 		}
 		@Override
 		public void onEvent(int event, @Nullable String path) {
 			stopWatching();
 			latch.countDown();
 		}
 	}
 	@Override
 	public void eventOccurred(Event e) {
 		if (e instanceof SettingsUpdatedEvent) {
 			SettingsUpdatedEvent s = (SettingsUpdatedEvent) e;
 			if (s.getNamespace().equals(ID.getString())) {
 				LOG.info("Tor settings updated");
 				updateConnectionStatus();
 			}
 		}
 	}
 	private void updateConnectionStatus() {
 		ioExecutor.execute(() -> {
 			if (!running) return;
 			try {
 				connectionStatusLock.lock();
 				updateConnectionStatusLocked();
 			} finally {
 				connectionStatusLock.unlock();
 			}
 		});
 	}
 	// Locking: connectionStatusLock
 	private void updateConnectionStatusLocked() {
 		Object o = appContext.getSystemService(CONNECTIVITY_SERVICE);
 		ConnectivityManager cm = (ConnectivityManager) o;
 		NetworkInfo net = cm.getActiveNetworkInfo();
 		boolean online = net != null && net.isConnected();
 		boolean wifi = online && net.getType() == TYPE_WIFI;
 		String country = locationUtils.getCurrentCountry();
 		boolean blocked = TorNetworkMetadata.isTorProbablyBlocked(country);
 		Settings s = callback.getSettings();
 		int network = s.getInt(PREF_TOR_NETWORK, PREF_TOR_NETWORK_ALWAYS);
 		if (LOG.isLoggable(INFO)) {
 			LOG.info("Online: " + online + ", wifi: " + wifi);
 			if ("".equals(country)) LOG.info("Country code unknown");
 			else LOG.info("Country code: " + country);
 		}
 		try {
 			if (!online) {
 				LOG.info("Disabling network, device is offline");
 				enableNetwork(false);
 			} else if (blocked) {
 				LOG.info("Disabling network, country is blocked");
 				enableNetwork(false);
 			} else if (network == PREF_TOR_NETWORK_NEVER
 					|| (network == PREF_TOR_NETWORK_WIFI && !wifi)) {
 				LOG.info("Disabling network due to data setting");
 				enableNetwork(false);
 			} else {
 				LOG.info("Enabling network");
 				enableNetwork(true);
 			}
 		} catch (IOException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 		}
 	}
 	private void scheduleConnectionStatusUpdate() {
 		Future<?> newConnectivityCheck =
 				scheduler.schedule(this::updateConnectionStatus, 1, MINUTES);
 		Future<?> oldConnectivityCheck =
 				connectivityCheck.getAndSet(newConnectivityCheck);
 		if (oldConnectivityCheck != null) oldConnectivityCheck.cancel(false);
 	}
 	private class NetworkStateReceiver extends BroadcastReceiver {
 		@Override
 		public void onReceive(Context ctx, Intent i) {
 			if (!running) return;
 			String action = i.getAction();
 			if (LOG.isLoggable(INFO)) LOG.info("Received broadcast " + action);
 			updateConnectionStatus();
 			if (ACTION_SCREEN_ON.equals(action)
 					|| ACTION_SCREEN_OFF.equals(action)) {
 				scheduleConnectionStatusUpdate();
 			}
 		}
 	}
 	private static class ConnectionStatus {
 		// All of the following are locking: this
 		private boolean networkEnabled = false;
 		private boolean bootstrapped = false, circuitBuilt = false;
 		private synchronized void setBootstrapped() {
 			bootstrapped = true;
 		}
 		private synchronized boolean getAndSetCircuitBuilt() {
 			boolean firstCircuit = !circuitBuilt;
 			circuitBuilt = true;
 			return firstCircuit;
 		}
 		private synchronized void enableNetwork(boolean enable) {
 			networkEnabled = enable;
 			circuitBuilt = false;
 		}
 		private synchronized boolean isConnected() {
 			return networkEnabled && bootstrapped && circuitBuilt;
 		}
 	}
 }
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPluginFactory.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPluginFactory.java
@@ -3,20 +3,17 @@ package org.briarproject.bramble.plugin.tor;
 import android.content.Context;
 import android.os.Build;
 import org.briarproject.bramble.api.battery.BatteryManager;
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.network.NetworkManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.BackoffFactory;
 import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.plugin.TorConstants;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
-import org.briarproject.bramble.api.system.Clock;
+import org.briarproject.bramble.api.reporting.DevReporter;
 import org.briarproject.bramble.api.system.LocationUtils;
 import org.briarproject.bramble.api.system.ResourceProvider;
 import org.briarproject.bramble.util.AndroidUtils;
 import java.util.concurrent.Executor;
@@ -28,10 +25,10 @@ import javax.net.SocketFactory;
@Immutable
@NotNullByDefault
-public class AndroidTorPluginFactory implements DuplexPluginFactory {
+public class TorPluginFactory implements DuplexPluginFactory {
 	private static final Logger LOG =
-			Logger.getLogger(AndroidTorPluginFactory.class.getName());
+			Logger.getLogger(TorPluginFactory.class.getName());
 	private static final int MAX_LATENCY = 30 * 1000; // 30 seconds
 	private static final int MAX_IDLE_TIME = 30 * 1000; // 30 seconds
@@ -42,35 +39,25 @@ public class AndroidTorPluginFactory implements DuplexPluginFactory {
 	private final Executor ioExecutor;
 	private final ScheduledExecutorService scheduler;
 	private final Context appContext;
 	private final NetworkManager networkManager;
 	private final LocationUtils locationUtils;
 	private final DevReporter reporter;
 	private final EventBus eventBus;
 	private final SocketFactory torSocketFactory;
 	private final BackoffFactory backoffFactory;
 	private final ResourceProvider resourceProvider;
 	private final CircumventionProvider circumventionProvider;
 	private final BatteryManager batteryManager;
 	private final Clock clock;
-	public AndroidTorPluginFactory(Executor ioExecutor,
+	public TorPluginFactory(Executor ioExecutor,
 			ScheduledExecutorService scheduler, Context appContext,
-			NetworkManager networkManager, LocationUtils locationUtils,
+			LocationUtils locationUtils, DevReporter reporter,
 			EventBus eventBus, SocketFactory torSocketFactory,
-			BackoffFactory backoffFactory, ResourceProvider resourceProvider,
+			BackoffFactory backoffFactory) {
 			CircumventionProvider circumventionProvider,
 			BatteryManager batteryManager, Clock clock) {
 		this.ioExecutor = ioExecutor;
 		this.scheduler = scheduler;
 		this.appContext = appContext;
 		this.networkManager = networkManager;
 		this.locationUtils = locationUtils;
 		this.reporter = reporter;
 		this.eventBus = eventBus;
 		this.torSocketFactory = torSocketFactory;
 		this.backoffFactory = backoffFactory;
 		this.resourceProvider = resourceProvider;
 		this.circumventionProvider = circumventionProvider;
 		this.batteryManager = batteryManager;
 		this.clock = clock;
 	}
 	@Override
@@ -84,7 +71,7 @@ public class AndroidTorPluginFactory implements DuplexPluginFactory {
 	}
 	@Override
-	public DuplexPlugin createPlugin(PluginCallback callback) {
+	public DuplexPlugin createPlugin(DuplexPluginCallback callback) {
 		// Check that we have a Tor binary for this architecture
 		String architecture = null;
@@ -106,12 +93,9 @@ public class AndroidTorPluginFactory implements DuplexPluginFactory {
 		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
 				MAX_POLLING_INTERVAL, BACKOFF_BASE);
-		TorRendezvousCrypto torRendezvousCrypto = new TorRendezvousCryptoImpl();
+		TorPlugin plugin = new TorPlugin(ioExecutor, scheduler, appContext,
-		AndroidTorPlugin plugin = new AndroidTorPlugin(ioExecutor, scheduler,
+				locationUtils, reporter, torSocketFactory, backoff, callback,
-				appContext, networkManager, locationUtils, torSocketFactory,
+				architecture, MAX_LATENCY, MAX_IDLE_TIME);
 				clock, resourceProvider, circumventionProvider, batteryManager,
 				backoff, torRendezvousCrypto, callback, architecture,
 				MAX_LATENCY, MAX_IDLE_TIME);
 		eventBus.addListener(plugin);
 		return plugin;
 	}
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorTransportConnection.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorTransportConnection.java
--- a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidResourceProvider.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidResourceProvider.java
@@ -1,32 +0,0 @@
 package org.briarproject.bramble.system;
 import android.app.Application;
 import android.content.Context;
 import android.content.res.Resources;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.system.ResourceProvider;
 import java.io.InputStream;
 import javax.inject.Inject;
@NotNullByDefault
 class AndroidResourceProvider implements ResourceProvider {
 	private final Context appContext;
 	@Inject
 	AndroidResourceProvider(Application app) {
 		this.appContext = app.getApplicationContext();
 	}
 	@Override
 	public InputStream getResourceInputStream(String name, String extension) {
 		Resources res = appContext.getResources();
 		// extension is ignored on Android, resources are retrieved without it
 		int resId =
 				res.getIdentifier(name, "raw", appContext.getPackageName());
 		return res.openRawResource(resId);
 	}
 }
--- a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSecureRandomProvider.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSecureRandomProvider.java
@@ -1,6 +1,5 @@
 package org.briarproject.bramble.system;
 import android.annotation.SuppressLint;
 import android.app.Application;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
@@ -10,7 +9,6 @@ import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.os.Parcel;
 import android.os.StrictMode;
 import android.provider.Settings;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@@ -27,7 +25,7 @@ import static android.provider.Settings.Secure.ANDROID_ID;
@Immutable
@NotNullByDefault
-class AndroidSecureRandomProvider extends UnixSecureRandomProvider {
+class AndroidSecureRandomProvider extends LinuxSecureRandomProvider {
 	private static final int SEED_LENGTH = 32;
@@ -38,7 +36,6 @@ class AndroidSecureRandomProvider extends UnixSecureRandomProvider {
 		appContext = app.getApplicationContext();
 	}
 	@SuppressLint("HardwareIds")
 	@Override
 	protected void writeToEntropyPool(DataOutputStream out) throws IOException {
 		super.writeToEntropyPool(out);
@@ -51,14 +48,12 @@ class AndroidSecureRandomProvider extends UnixSecureRandomProvider {
 		String id = Settings.Secure.getString(contentResolver, ANDROID_ID);
 		if (id != null) out.writeUTF(id);
 		Parcel parcel = Parcel.obtain();
-		WifiManager wm = (WifiManager) appContext.getApplicationContext()
+		WifiManager wm =
-				.getSystemService(WIFI_SERVICE);
+				(WifiManager) appContext.getSystemService(WIFI_SERVICE);
-		if (wm != null) {
+		List<WifiConfiguration> configs = wm.getConfiguredNetworks();
-			List<WifiConfiguration> configs = wm.getConfiguredNetworks();
+		if (configs != null) {
-			if (configs != null) {
+			for (WifiConfiguration config : configs)
-				for (WifiConfiguration config : configs)
+				parcel.writeParcelable(config, 0);
 					parcel.writeParcelable(config, 0);
 			}
 		}
 		BluetoothAdapter bt = BluetoothAdapter.getDefaultAdapter();
 		if (bt != null) {
@@ -71,23 +66,20 @@ class AndroidSecureRandomProvider extends UnixSecureRandomProvider {
 	@Override
 	protected void writeSeed() {
 		// Silence strict mode
 		StrictMode.ThreadPolicy tp = StrictMode.allowThreadDiskWrites();
 		super.writeSeed();
 		if (Build.VERSION.SDK_INT >= 16 && Build.VERSION.SDK_INT <= 18)
 			applyOpenSslFix();
 		StrictMode.setThreadPolicy(tp);
 	}
 	// Based on https://android-developers.googleblog.com/2013/08/some-securerandom-thoughts.html
 	private void applyOpenSslFix() {
-		byte[] seed = new UnixSecureRandomSpi().engineGenerateSeed(
+		byte[] seed = new LinuxSecureRandomSpi().engineGenerateSeed(
 				SEED_LENGTH);
 		try {
 			// Seed the OpenSSL PRNG
 			Class.forName("org.apache.harmony.xnet.provider.jsse.NativeCrypto")
 					.getMethod("RAND_seed", byte[].class)
-					.invoke(null, (Object) seed);
+					.invoke(null, seed);
 			// Mix the output of the Linux PRNG into the OpenSSL PRNG
 			int bytesRead = (Integer) Class.forName(
 					"org.apache.harmony.xnet.provider.jsse.NativeCrypto")
--- a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSystemModule.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSystemModule.java
@@ -1,13 +1,11 @@
 package org.briarproject.bramble.system;
-import org.briarproject.bramble.api.event.EventExecutor;
+import android.app.Application;
 import org.briarproject.bramble.api.system.AndroidExecutor;
 import org.briarproject.bramble.api.system.LocationUtils;
 import org.briarproject.bramble.api.system.ResourceProvider;
 import org.briarproject.bramble.api.system.SecureRandomProvider;
 import java.util.concurrent.Executor;
 import javax.inject.Singleton;
 import dagger.Module;
@@ -18,33 +16,18 @@ public class AndroidSystemModule {
 	@Provides
 	@Singleton
-	SecureRandomProvider provideSecureRandomProvider(
+	SecureRandomProvider provideSecureRandomProvider(Application app) {
-			AndroidSecureRandomProvider provider) {
+		return new AndroidSecureRandomProvider(app);
 		return provider;
 	}
 	@Provides
-	LocationUtils provideLocationUtils(AndroidLocationUtils locationUtils) {
+	LocationUtils provideLocationUtils(Application app) {
-		return locationUtils;
+		return new AndroidLocationUtils(app);
 	}
 	@Provides
 	@Singleton
-	AndroidExecutor provideAndroidExecutor(
+	AndroidExecutor provideAndroidExecutor(Application app) {
-			AndroidExecutorImpl androidExecutor) {
+		return new AndroidExecutorImpl(app);
 		return androidExecutor;
 	}
 	@Provides
 	@Singleton
 	@EventExecutor
 	Executor provideEventExecutor(AndroidExecutor androidExecutor) {
 		return androidExecutor::runOnUiThread;
 	}
 	@Provides
 	@Singleton
 	ResourceProvider provideResourceProvider(AndroidResourceProvider provider) {
 		return provider;
 	}
 }
--- a/bramble-android/src/main/java/org/briarproject/bramble/util/AndroidUtils.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/util/AndroidUtils.java
@@ -3,18 +3,39 @@ package org.briarproject.bramble.util;
 import android.annotation.SuppressLint;
 import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.Network;
 import android.net.NetworkInfo;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.provider.Settings;
 import java.io.File;
 import java.net.InetAddress;
 import java.net.InterfaceAddress;
 import java.net.NetworkInterface;
 import java.net.SocketException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.logging.Logger;
 import javax.annotation.Nullable;
 import static android.content.Context.CONNECTIVITY_SERVICE;
 import static android.content.Context.MODE_PRIVATE;
 import static android.content.Context.WIFI_SERVICE;
 import static android.os.Build.VERSION.SDK_INT;
 import static java.net.NetworkInterface.getNetworkInterfaces;
 import static java.util.Collections.list;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.util.StringUtils.ipToString;
 import static org.briarproject.bramble.util.StringUtils.toHexString;
@SuppressLint("HardwareIds")
 public class AndroidUtils {
 	// Fake Bluetooth address returned by BluetoothAdapter on API 23 and later
@@ -37,7 +58,6 @@ public class AndroidUtils {
 	public static String getBluetoothAddress(Context ctx,
 			BluetoothAdapter adapter) {
 		// Return the adapter's address if it's valid and not fake
 		@SuppressLint("HardwareIds")
 		String address = adapter.getAddress();
 		if (isValidBluetoothAddress(address)) return address;
 		// Return the address from settings if it's valid and not fake
@@ -54,7 +74,139 @@ public class AndroidUtils {
 				&& !address.equals(FAKE_BLUETOOTH_ADDRESS);
 	}
 	public static void deleteAppData(Context ctx) {
 		File dataDir = new File(ctx.getApplicationInfo().dataDir);
 		File[] children = dataDir.listFiles();
 		if (children != null) {
 			for (File child : children) {
 				if (!child.getName().equals("lib"))
 					IoUtils.deleteFileOrDir(child);
 			}
 		}
 		// Recreate the cache dir as some OpenGL drivers expect it to exist
 		new File(dataDir, "cache").mkdir();
 	}
 	public static File getReportDir(Context ctx) {
 		return ctx.getDir(STORED_REPORTS, MODE_PRIVATE);
 	}
 	public static void logNetworkState(Context ctx, Logger logger) {
 		if (!logger.isLoggable(INFO)) return;
 		Object o = ctx.getSystemService(CONNECTIVITY_SERVICE);
 		if (o == null) throw new AssertionError();
 		ConnectivityManager cm = (ConnectivityManager) o;
 		o = ctx.getApplicationContext().getSystemService(WIFI_SERVICE);
 		if (o == null) throw new AssertionError();
 		WifiManager wm = (WifiManager) o;
 		StringBuilder s = new StringBuilder();
 		logWifiInfo(s, wm.getConnectionInfo());
 		logNetworkInfo(s, cm.getActiveNetworkInfo(), true);
 		if (SDK_INT >= 21) {
 			for (Network network : cm.getAllNetworks())
 				logNetworkInfo(s, cm.getNetworkInfo(network), false);
 		} else {
 			for (NetworkInfo info : cm.getAllNetworkInfo())
 				logNetworkInfo(s, info, false);
 		}
 		try {
 			for (NetworkInterface iface : list(getNetworkInterfaces()))
 				logNetworkInterface(s, iface);
 		} catch (SocketException e) {
 			logger.log(WARNING, e.toString(), e);
 		}
 		logger.log(INFO, s.toString());
 	}
 	private static void logWifiInfo(StringBuilder s, @Nullable WifiInfo info) {
 		if (info == null) {
 			s.append("Wifi info: null\n");
 			return;
 		}
 		s.append("Wifi info:\n");
 		s.append("\tSSID: ").append(info.getSSID()).append("\n");
 		s.append("\tBSSID: ").append(info.getBSSID()).append("\n");
 		s.append("\tMAC address: ").append(info.getMacAddress()).append("\n");
 		s.append("\tIP address: ")
 				.append(ipToString(info.getIpAddress())).append("\n");
 		s.append("\tSupplicant state: ")
 				.append(info.getSupplicantState()).append("\n");
 		s.append("\tNetwork ID: ").append(info.getNetworkId()).append("\n");
 		s.append("\tLink speed: ").append(info.getLinkSpeed()).append("\n");
 		s.append("\tRSSI: ").append(info.getRssi()).append("\n");
 		if (info.getHiddenSSID()) s.append("\tHidden SSID\n");
 		if (SDK_INT >= 21)
 			s.append("\tFrequency: ").append(info.getFrequency()).append("\n");
 	}
 	private static void logNetworkInfo(StringBuilder s,
 			@Nullable NetworkInfo info, boolean active) {
 		if (info == null) {
 			if (active) s.append("Active network info: null\n");
 			else s.append("Network info: null\n");
 			return;
 		}
 		if (active) s.append("Active network info:\n");
 		else s.append("Network info:\n");
 		s.append("\tType: ").append(info.getTypeName())
 				.append(" (").append(info.getType()).append(")\n");
 		s.append("\tSubtype: ").append(info.getSubtypeName())
 				.append(" (").append(info.getSubtype()).append(")\n");
 		s.append("\tState: ").append(info.getState()).append("\n");
 		s.append("\tDetailed state: ")
 				.append(info.getDetailedState()).append("\n");
 		s.append("\tReason: ").append(info.getReason()).append("\n");
 		s.append("\tExtra info: ").append(info.getExtraInfo()).append("\n");
 		if (info.isAvailable()) s.append("\tAvailable\n");
 		if (info.isConnected()) s.append("\tConnected\n");
 		if (info.isConnectedOrConnecting())
 			s.append("\tConnected or connecting\n");
 		if (info.isFailover()) s.append("\tFailover\n");
 		if (info.isRoaming()) s.append("\tRoaming\n");
 	}
 	private static void logNetworkInterface(StringBuilder s,
 			NetworkInterface iface) throws SocketException {
 		s.append("Network interface:\n");
 		s.append("\tName: ").append(iface.getName()).append("\n");
 		s.append("\tDisplay name: ")
 				.append(iface.getDisplayName()).append("\n");
 		s.append("\tHardware address: ")
 				.append(hexOrNull(iface.getHardwareAddress())).append("\n");
 		if (iface.isLoopback()) s.append("\tLoopback\n");
 		if (iface.isPointToPoint()) s.append("\tPoint-to-point\n");
 		if (iface.isVirtual()) s.append("\tVirtual\n");
 		if (iface.isUp()) s.append("\tUp\n");
 		if (SDK_INT >= 19)
 			s.append("\tIndex: ").append(iface.getIndex()).append("\n");
 		for (InterfaceAddress addr : iface.getInterfaceAddresses()) {
 			s.append("\tInterface address:\n");
 			logInetAddress(s, addr.getAddress());
 			s.append("\t\tPrefix length: ")
 					.append(addr.getNetworkPrefixLength()).append("\n");
 		}
 	}
 	private static void logInetAddress(StringBuilder s, InetAddress addr) {
 		s.append("\t\tAddress: ")
 				.append(hexOrNull(addr.getAddress())).append("\n");
 		s.append("\t\tHost address: ")
 				.append(addr.getHostAddress()).append("\n");
 		if (addr.isLoopbackAddress()) s.append("\t\tLoopback\n");
 		if (addr.isLinkLocalAddress()) s.append("\t\tLink-local\n");
 		if (addr.isSiteLocalAddress()) s.append("\t\tSite-local\n");
 		if (addr.isAnyLocalAddress()) s.append("\t\tAny local (wildcard)\n");
 		if (addr.isMCNodeLocal()) s.append("\t\tMulticast node-local\n");
 		if (addr.isMCLinkLocal()) s.append("\t\tMulticast link-local\n");
 		if (addr.isMCSiteLocal()) s.append("\t\tMulticast site-local\n");
 		if (addr.isMCOrgLocal()) s.append("\t\tMulticast org-local\n");
 		if (addr.isMCGlobal()) s.append("\t\tMulticast global\n");
 	}
 	@Nullable
 	private static String hexOrNull(@Nullable byte[] b) {
 		return b == null ? null : toHexString(b);
 	}
 }
--- a/bramble-android/src/main/java/org/briarproject/bramble/util/RenewableWakeLock.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/util/RenewableWakeLock.java
@@ -1,100 +0,0 @@
 package org.briarproject.bramble.util;
 import android.os.PowerManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.logging.Level.INFO;
@ThreadSafe
@NotNullByDefault
 public class RenewableWakeLock {
 	private static final Logger LOG =
 			Logger.getLogger(RenewableWakeLock.class.getName());
 	/**
 	 * Automatically release the lock this many milliseconds after it's due
 	 * to have been replaced and released.
 	 */
 	private static final int SAFETY_MARGIN_MS = 10_000;
 	private final PowerManager powerManager;
 	private final ScheduledExecutorService scheduler;
 	private final int levelAndFlags;
 	private final String tag;
 	private final long durationMs;
 	private final Runnable renewTask;
 	private final Object lock = new Object();
 	@Nullable
 	private PowerManager.WakeLock wakeLock; // Locking: lock
 	@Nullable
 	private ScheduledFuture future; // Locking: lock
 	public RenewableWakeLock(PowerManager powerManager,
 			ScheduledExecutorService scheduler, int levelAndFlags, String tag,
 			long duration, TimeUnit timeUnit) {
 		this.powerManager = powerManager;
 		this.scheduler = scheduler;
 		this.levelAndFlags = levelAndFlags;
 		this.tag = tag;
 		durationMs = MILLISECONDS.convert(duration, timeUnit);
 		renewTask = this::renew;
 	}
 	public void acquire() {
 		if (LOG.isLoggable(INFO)) LOG.info("Acquiring wake lock " + tag);
 		synchronized (lock) {
 			if (wakeLock != null) {
 				LOG.info("Already acquired");
 				return;
 			}
 			wakeLock = powerManager.newWakeLock(levelAndFlags, tag);
 			wakeLock.setReferenceCounted(false);
 			wakeLock.acquire(durationMs + SAFETY_MARGIN_MS);
 			future = scheduler.schedule(renewTask, durationMs, MILLISECONDS);
 		}
 	}
 	private void renew() {
 		if (LOG.isLoggable(INFO)) LOG.info("Renewing wake lock " + tag);
 		synchronized (lock) {
 			if (wakeLock == null) {
 				LOG.info("Already released");
 				return;
 			}
 			PowerManager.WakeLock oldWakeLock = wakeLock;
 			wakeLock = powerManager.newWakeLock(levelAndFlags, tag);
 			wakeLock.setReferenceCounted(false);
 			wakeLock.acquire(durationMs + SAFETY_MARGIN_MS);
 			oldWakeLock.release();
 			future = scheduler.schedule(renewTask, durationMs, MILLISECONDS);
 		}
 	}
 	public void release() {
 		if (LOG.isLoggable(INFO)) LOG.info("Releasing wake lock " + tag);
 		synchronized (lock) {
 			if (wakeLock == null) {
 				LOG.info("Already released");
 				return;
 			}
 			if (future == null) throw new AssertionError();
 			future.cancel(false);
 			future = null;
 			wakeLock.release();
 			wakeLock = null;
 		}
 	}
 }
--- a/bramble-android/src/main/res/raw/torrc
+++ b/bramble-android/src/main/res/raw/torrc
--- a/bramble-android/src/test/java/org/briarproject/bramble/account/AndroidAccountManagerTest.java
+++ b/bramble-android/src/test/java/org/briarproject/bramble/account/AndroidAccountManagerTest.java
@@ -1,174 +0,0 @@
 package org.briarproject.bramble.account;
 import android.app.Application;
 import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.db.DatabaseConfig;
 import org.briarproject.bramble.api.identity.IdentityManager;
 import org.briarproject.bramble.test.BrambleMockTestCase;
 import org.jmock.Expectations;
 import org.jmock.lib.legacy.ClassImposteriser;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import java.io.File;
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertFalse;
 import static junit.framework.Assert.assertTrue;
 import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory;
 import static org.briarproject.bramble.test.TestUtils.getRandomBytes;
 import static org.briarproject.bramble.test.TestUtils.getTestDirectory;
 import static org.briarproject.bramble.util.StringUtils.toHexString;
 public class AndroidAccountManagerTest extends BrambleMockTestCase {
 	private final SharedPreferences prefs =
 			context.mock(SharedPreferences.class, "prefs");
 	private final SharedPreferences defaultPrefs =
 			context.mock(SharedPreferences.class, "defaultPrefs");
 	private final DatabaseConfig databaseConfig =
 			context.mock(DatabaseConfig.class);
 	private final CryptoComponent crypto = context.mock(CryptoComponent.class);
 	private final IdentityManager identityManager =
 			context.mock(IdentityManager.class);
 	private final SharedPreferences.Editor
 			editor = context.mock(SharedPreferences.Editor.class);
 	private final Application app;
 	private final ApplicationInfo applicationInfo;
 	private final String encryptedKeyHex = toHexString(getRandomBytes(123));
 	private final File testDir = getTestDirectory();
 	private final File keyDir = new File(testDir, "key");
 	private final File keyFile = new File(keyDir, "db.key");
 	private final File keyBackupFile = new File(keyDir, "db.key.bak");
 	private final File dbDir = new File(testDir, "db");
 	private AndroidAccountManager accountManager;
 	public AndroidAccountManagerTest() {
 		context.setImposteriser(ClassImposteriser.INSTANCE);
 		app = context.mock(Application.class);
 		applicationInfo = new ApplicationInfo();
 		applicationInfo.dataDir = testDir.getAbsolutePath();
 	}
 	@Before
 	public void setUp() {
 		context.checking(new Expectations() {{
 			allowing(databaseConfig).getDatabaseDirectory();
 			will(returnValue(dbDir));
 			allowing(databaseConfig).getDatabaseKeyDirectory();
 			will(returnValue(keyDir));
 			allowing(app).getApplicationContext();
 			will(returnValue(app));
 		}});
 		accountManager = new AndroidAccountManager(databaseConfig, crypto,
 				identityManager, prefs, app) {
 			@Override
 			SharedPreferences getDefaultSharedPreferences() {
 				return defaultPrefs;
 			}
 		};
 	}
 	@Test
 	public void testDbKeyIsMigratedFromPreferencesToFile() {
 		context.checking(new Expectations() {{
 			oneOf(prefs).getString("key", null);
 			will(returnValue(encryptedKeyHex));
 			oneOf(prefs).edit();
 			will(returnValue(editor));
 			oneOf(editor).remove("key");
 			will(returnValue(editor));
 			oneOf(editor).commit();
 			will(returnValue(true));
 		}});
 		assertFalse(keyFile.exists());
 		assertFalse(keyBackupFile.exists());
 		assertEquals(encryptedKeyHex,
 				accountManager.loadEncryptedDatabaseKey());
 		assertTrue(keyFile.exists());
 		assertTrue(keyBackupFile.exists());
 	}
 	@Test
 	public void testDeleteAccountClearsSharedPrefsAndDeletesFiles()
 			throws Exception {
 		// Directories 'lib' and 'shared_prefs' should be spared
 		File libDir = new File(testDir, "lib");
 		File libFile = new File(libDir, "file");
 		File sharedPrefsDir = new File(testDir, "shared_prefs");
 		File sharedPrefsFile = new File(sharedPrefsDir, "file");
 		// Directory 'cache' should be emptied
 		File cacheDir = new File(testDir, "cache");
 		File cacheFile = new File(cacheDir, "file");
 		// Other directories should be deleted
 		File potatoDir = new File(testDir, ".potato");
 		File potatoFile = new File(potatoDir, "file");
 		File filesDir = new File(testDir, "filesDir");
 		File externalCacheDir = new File(testDir, "externalCacheDir");
 		context.checking(new Expectations() {{
 			oneOf(prefs).edit();
 			will(returnValue(editor));
 			oneOf(editor).clear();
 			will(returnValue(editor));
 			oneOf(editor).commit();
 			will(returnValue(true));
 			oneOf(defaultPrefs).edit();
 			will(returnValue(editor));
 			oneOf(editor).clear();
 			will(returnValue(editor));
 			oneOf(editor).commit();
 			will(returnValue(true));
 			allowing(app).getApplicationInfo();
 			will(returnValue(applicationInfo));
 			oneOf(app).getFilesDir();
 			will(returnValue(filesDir));
 			oneOf(app).getCacheDir();
 			will(returnValue(cacheDir));
 			oneOf(app).getExternalCacheDir();
 			will(returnValue(externalCacheDir));
 		}});
 		assertTrue(dbDir.mkdirs());
 		assertTrue(keyDir.mkdirs());
 		assertTrue(libDir.mkdirs());
 		assertTrue(libFile.createNewFile());
 		assertTrue(sharedPrefsDir.mkdirs());
 		assertTrue(sharedPrefsFile.createNewFile());
 		assertTrue(cacheDir.mkdirs());
 		assertTrue(cacheFile.createNewFile());
 		assertTrue(potatoDir.mkdirs());
 		assertTrue(potatoFile.createNewFile());
 		assertTrue(filesDir.mkdirs());
 		assertTrue(externalCacheDir.mkdirs());
 		accountManager.deleteAccount();
 		assertFalse(dbDir.exists());
 		assertFalse(keyDir.exists());
 		assertTrue(libDir.exists());
 		assertTrue(libFile.exists());
 		assertTrue(sharedPrefsDir.exists());
 		assertTrue(sharedPrefsFile.exists());
 		assertTrue(cacheDir.exists());
 		assertFalse(cacheFile.exists());
 		assertFalse(potatoDir.exists());
 		assertFalse(potatoFile.exists());
 		assertFalse(filesDir.exists());
 		assertFalse(externalCacheDir.exists());
 	}
 	@After
 	public void tearDown() {
 		deleteTestDirectory(testDir);
 	}
 }
--- a/bramble-android/witness.gradle
+++ b/bramble-android/witness.gradle
@@ -1,100 +0,0 @@
 dependencyVerification {
    verify = [
        'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861',
        'com.android.tools.analytics-library:protos:26.4.0:protos-26.4.0.jar:ad760915586797d39319f402837b378bff3bb4ed583e3e0c48c965631fb2135f',
        'com.android.tools.analytics-library:shared:26.4.0:shared-26.4.0.jar:1332106a905d48909c81268c9e414946de3e83487db394c6073b0a9b5c3d0ed2',
        'com.android.tools.analytics-library:tracker:26.4.0:tracker-26.4.0.jar:d0020cfbfd4cd75935f2972d6a24089840d4a10df6f3ef2a796093217dd37796',
        'com.android.tools.build:apksig:3.4.0:apksig-3.4.0.jar:91d5a1866139c69756280355a6f61b4d619d0516841580114f45a10f2177327e',
        'com.android.tools.build:apkzlib:3.4.0:apkzlib-3.4.0.jar:8653c85f5fdf1dde840e8b8af7396aeb79c34b66e541b5860059616006535592',
        'com.android.tools.build:builder-model:3.4.0:builder-model-3.4.0.jar:a88f138124a9f016a70bcb4760359a502f65c7deed56507ee4014f4dd9ea853b',
        'com.android.tools.build:builder-test-api:3.4.0:builder-test-api-3.4.0.jar:31089ab1ec19ca7687a010867d2f3807513c805b8226979706f4247b5d4df26f',
        'com.android.tools.build:builder:3.4.0:builder-3.4.0.jar:476221b5203a7f50089bf185ed95000a34b6f5020ef0a17815afd58606922679',
        'com.android.tools.build:gradle-api:3.4.0:gradle-api-3.4.0.jar:215eca38f6719213c2f492b4d622cdd11676c66c9871f8a2aed0c66d00175628',
        'com.android.tools.build:manifest-merger:26.4.0:manifest-merger-26.4.0.jar:29e45e690dedd165035e97c21c2ca94d0bd4ec16b6b210daa26669a582b6f220',
        'com.android.tools.ddms:ddmlib:26.4.0:ddmlib-26.4.0.jar:93f56fe4630c3166adbd6c51d7bb602d96abb91b07ba5b1165fdcd071e88c940',
        'com.android.tools.external.com-intellij:intellij-core:26.4.0:intellij-core-26.4.0.jar:30cb0e879d4424de9677a50b537fb628636b4a50f5470af5e52437980c41421f',
        'com.android.tools.external.com-intellij:kotlin-compiler:26.4.0:kotlin-compiler-26.4.0.jar:dd1fe225c31a0e012dc025336363a5b783e2c5c20ffb69e77f8f57e89420d998',
        'com.android.tools.external.org-jetbrains:uast:26.4.0:uast-26.4.0.jar:f25f3285b775a983327583ff6584dea54e447813ef69e0ce08b05a45b5f4aab0',
        'com.android.tools.layoutlib:layoutlib-api:26.4.0:layoutlib-api-26.4.0.jar:52128f5cf293b224072be361919bfd416e59480ab7264ddcdbbf046b0d7a12e3',
        'com.android.tools.lint:lint-api:26.4.0:lint-api-26.4.0.jar:fdb8fca8ae4c254f438338d03d72605e00ed106f2d5550405af41ca1c8509401',
        'com.android.tools.lint:lint-checks:26.4.0:lint-checks-26.4.0.jar:4ff52d40488cd3e22b9c6b2eb67784e0c3269d0b42ef9d17689cd75a7b2bceb4',
        'com.android.tools.lint:lint-gradle-api:26.4.0:lint-gradle-api-26.4.0.jar:714b7a85c7d2aa10daeab16e969fe7530c659d0728a7f24021da456870418d0f',
        'com.android.tools.lint:lint-gradle:26.4.0:lint-gradle-26.4.0.jar:b8c130d273f522388734457e1b96790f41528fcec6fda9e8eaa4e4d95a07cfbb',
        'com.android.tools.lint:lint:26.4.0:lint-26.4.0.jar:83aa062fb0405b60ed358d858c8c2955e1bae44a455b498068c6a60988755f00',
        'com.android.tools:annotations:26.4.0:annotations-26.4.0.jar:a7955b8e19c3a2a861d6faa43a58b7c0d46ea9112188ee3e235c6f9f439ecc1a',
        'com.android.tools:common:26.4.0:common-26.4.0.jar:ea40b94b3c1284ea7700f011388e2906a8363a66abd902891722b3c557984852',
        'com.android.tools:dvlib:26.4.0:dvlib-26.4.0.jar:23af89c535b01ba36ceed1b6b309b672814eba624e643cd7dedf0519edad50cc',
        'com.android.tools:repository:26.4.0:repository-26.4.0.jar:3d1763ab46199374dc6d94129bba11c70f1d5857e2c81a3ac4898abca40b176b',
        'com.android.tools:sdk-common:26.4.0:sdk-common-26.4.0.jar:78a522525b30ffc6b7bf1299c831d24ce385f68a9f4878f8f752e9baefa31b0f',
        'com.android.tools:sdklib:26.4.0:sdklib-26.4.0.jar:b854c23892013a326d761cf071c72cf3e038ed0469d10f4a356829fa56e4c132',
        'com.google.code.findbugs:jsr305:1.3.9:jsr305-1.3.9.jar:905721a0eea90a81534abb7ee6ef4ea2e5e645fa1def0a5cd88402df1b46c9ed',
        'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
        'com.google.code.gson:gson:2.8.0:gson-2.8.0.jar:c6221763bd79c4f1c3dc7f750b5f29a0bb38b367b81314c4f71896e340c40825',
        'com.google.dagger:dagger-compiler:2.22.1:dagger-compiler-2.22.1.jar:e5f28302cbe70a79d3620cddebfb8ec0736814f3980ffe1e673bfe3342f507d3',
        'com.google.dagger:dagger-producers:2.22.1:dagger-producers-2.22.1.jar:f834a0082014213a68ff06a0f048d750178d02196c58b0b15beb367d32b97e35',
        'com.google.dagger:dagger-spi:2.22.1:dagger-spi-2.22.1.jar:4b0b922793b3bcb91b99fabb75dba77c68afd7ae4c5f0c4fd6ba681f0a291c7d',
        'com.google.dagger:dagger:2.22.1:dagger-2.22.1.jar:329d4340f24c4f5717af016c097e90668bfea2a5376e6aa9964b01cef3fd241a',
        'com.google.errorprone:error_prone_annotations:2.1.3:error_prone_annotations-2.1.3.jar:03d0329547c13da9e17c634d1049ea2ead093925e290567e1a364fd6b1fc7ff8',
        'com.google.errorprone:javac-shaded:9-dev-r4023-3:javac-shaded-9-dev-r4023-3.jar:65bfccf60986c47fbc17c9ebab0be626afc41741e0a6ec7109e0768817a36f30',
        'com.google.googlejavaformat:google-java-format:1.5:google-java-format-1.5.jar:aa19ad7850fb85178aa22f2fddb163b84d6ce4d0035872f30d4408195ca1144e',
        'com.google.guava:guava:25.0-jre:guava-25.0-jre.jar:3fd4341776428c7e0e5c18a7c10de129475b69ab9d30aeafbb5c277bb6074fa9',
        'com.google.guava:guava:26.0-jre:guava-26.0-jre.jar:a0e9cabad665bc20bcd2b01f108e5fc03f756e13aea80abaadb9f407033bea2c',
        'com.google.j2objc:j2objc-annotations:1.1:j2objc-annotations-1.1.jar:2994a7eb78f2710bd3d3bfb639b2c94e219cedac0d4d084d516e78c16dddecf6',
        'com.google.jimfs:jimfs:1.1:jimfs-1.1.jar:c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd',
        'com.google.protobuf:protobuf-java:3.4.0:protobuf-java-3.4.0.jar:dce7e66b32456a1b1198da0caff3a8acb71548658391e798c79369241e6490a4',
        'com.googlecode.json-simple:json-simple:1.1:json-simple-1.1.jar:2d9484f4c649f708f47f9a479465fc729770ee65617dca3011836602264f6439',
        'com.squareup:javapoet:1.11.1:javapoet-1.11.1.jar:9cbf2107be499ec6e95afd36b58e3ca122a24166cdd375732e51267d64058e90',
        'com.squareup:javawriter:2.5.0:javawriter-2.5.0.jar:fcfb09fb0ea0aa97d3cfe7ea792398081348e468f126b3603cb3803f240197f0',
        'com.sun.activation:javax.activation:1.2.0:javax.activation-1.2.0.jar:993302b16cd7056f21e779cc577d175a810bb4900ef73cd8fbf2b50f928ba9ce',
        'com.sun.istack:istack-commons-runtime:2.21:istack-commons-runtime-2.21.jar:c33e67a0807095f02a0e2da139412dd7c4f9cc1a4c054b3e434f96831ba950f4',
        'com.sun.xml.fastinfoset:FastInfoset:1.2.13:FastInfoset-1.2.13.jar:27a77db909f3c2833c0b1a37c55af1db06045118ad2eed96ce567b6632bce038',
        'commons-codec:commons-codec:1.10:commons-codec-1.10.jar:4241dfa94e711d435f29a4604a3e2de5c4aa3c165e23bd066be6fc1fc4309569',
        'commons-logging:commons-logging:1.2:commons-logging-1.2.jar:daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636',
        'it.unimi.dsi:fastutil:7.2.0:fastutil-7.2.0.jar:74fa208043740642f7e6eb09faba15965218ad2f50ce3020efb100136e4b591c',
        'javax.annotation:jsr250-api:1.0:jsr250-api-1.0.jar:a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f',
        'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
        'javax.xml.bind:jaxb-api:2.2.12-b140109.1041:jaxb-api-2.2.12-b140109.1041.jar:b5e60cd8b7b5ff01ce4a74c5dd008f4fbd14ced3495d0b47b85cfedc182211f2',
        'junit:junit:4.12:junit-4.12.jar:59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a',
        'net.sf.jopt-simple:jopt-simple:4.9:jopt-simple-4.9.jar:26c5856e954b5f864db76f13b86919b59c6eecf9fd930b96baa8884626baf2f5',
        'net.sf.kxml:kxml2:2.3.0:kxml2-2.3.0.jar:f264dd9f79a1fde10ce5ecc53221eff24be4c9331c830b7d52f2f08a7b633de2',
        '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.apache.commons:commons-compress:1.12:commons-compress-1.12.jar:2c1542faf343185b7cab9c3d55c8ae5471d6d095d3887a4adefdbdf2984dc0b6',
        'org.apache.httpcomponents:httpclient:4.5.6:httpclient-4.5.6.jar:c03f813195e7a80e3608d0ddd8da80b21696a4c92a6a2298865bf149071551c7',
        'org.apache.httpcomponents:httpcore:4.4.10:httpcore-4.4.10.jar:78ba1096561957db1b55200a159b648876430342d15d461277e62360da19f6fd',
        'org.apache.httpcomponents:httpmime:4.5.6:httpmime-4.5.6.jar:0b2b1102c18d3c7e05a77214b9b7501a6f6056174ae5604e0e256776eda7553e',
        '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.9:obfs4proxy-android-0.0.9.zip:9b7e9181535ea8d8bbe8ae6338e08cf4c5fc1e357a779393e0ce49586d459ae0',
        'org.briarproject:tor-android:0.3.5.8:tor-android-0.3.5.8.zip:42a13a6f185be1a62f42e3f30ce66a3c099ac5ec890a65e7593111b65b44a54a',
        '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.groovy:groovy-all:2.4.15:groovy-all-2.4.15.jar:51d6c4e71782e85674239189499854359d380fb75e1a703756e3aaa5b98a5af0',
        'org.codehaus.mojo:animal-sniffer-annotations:1.14:animal-sniffer-annotations-1.14.jar:2068320bd6bad744c3673ab048f67e30bef8f518996fa380033556600669905d',
        'org.glassfish.jaxb:jaxb-core:2.2.11:jaxb-core-2.2.11.jar:37bcaee8ebb04362c8352a5bf6221b86967ecdab5164c696b10b9a2bb587b2aa',
        'org.glassfish.jaxb:jaxb-runtime:2.2.11:jaxb-runtime-2.2.11.jar:a874f2351cfba8e2946be3002d10c18a6da8f21b52ba2acf52f2b85d5520ed70',
        'org.glassfish.jaxb:txw2:2.2.11:txw2-2.2.11.jar:272a3ccad45a4511351920cd2a8633c53cab8d5220c7a92954da5526bb5eafea',
        'org.hamcrest:hamcrest-core:1.3:hamcrest-core-1.3.jar:66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9',
        'org.hamcrest:hamcrest-library:1.3:hamcrest-library-1.3.jar:711d64522f9ec410983bd310934296da134be4254a125080a0416ec178dfad1c',
        'org.jetbrains.kotlin:kotlin-reflect:1.3.21:kotlin-reflect-1.3.21.jar:a3065c822633191e0a3e3ee12a29bec234fc4b2864a6bb87ef48cce3e9e0c26a',
        'org.jetbrains.kotlin:kotlin-stdlib-common:1.3.21:kotlin-stdlib-common-1.3.21.jar:cea61f7b611895e64f58569a9757fc0ab0d582f107211e1930e0ce2a0add52a7',
        'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.21:kotlin-stdlib-jdk7-1.3.21.jar:a87875604fd42140da6938ae4d35ee61081f4482536efc6d2615b8b626a198af',
        'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.21:kotlin-stdlib-jdk8-1.3.21.jar:5823ed66ac122a1c55442ebca5a209a843ccd87f562edc31a787f3d2e47f74d4',
        'org.jetbrains.kotlin:kotlin-stdlib:1.3.21:kotlin-stdlib-1.3.21.jar:38ba2370d9f06f50433e06b2ca775b94473c2e2785f410926079ab793c72b034',
        'org.jetbrains.trove4j:trove4j:20160824:trove4j-20160824.jar:1917871c8deb468307a584680c87a44572f5a8b0b98c6d397fc0f5f86596dbe7',
        'org.jetbrains:annotations:13.0:annotations-13.0.jar:ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478',
        'org.jmock:jmock-junit4:2.8.2:jmock-junit4-2.8.2.jar:f7ee4df4f7bd7b7f1cafad3b99eb74d579f109d5992ff625347352edb55e674c',
        'org.jmock:jmock-legacy:2.8.2:jmock-legacy-2.8.2.jar:f2b985a5c08a9edb7f37612330c058809da3f6a6d63ce792426ebf8ff0d6d31b',
        'org.jmock:jmock-testjar:2.8.2:jmock-testjar-2.8.2.jar:8900860f72c474e027cf97fe78dcbf154a1aa7fc62b6845c5fb4e4f3c7bc8760',
        'org.jmock:jmock:2.8.2:jmock-2.8.2.jar:6c73cb4a2e6dbfb61fd99c9a768539c170ab6568e57846bd60dbf19596b65b16',
        'org.jvnet.staxex:stax-ex:1.7.7:stax-ex-1.7.7.jar:a31ff7d77163c0deb09e7fee59ad35ae44c2cee2cc8552a116ccd1583d813fb4',
        'org.objenesis:objenesis:2.1:objenesis-2.1.jar:c74330cc6b806c804fd37e74487b4fe5d7c2750c5e15fbc6efa13bdee1bdef80',
        'org.ow2.asm:asm-analysis:6.0:asm-analysis-6.0.jar:2f1a6387219c3a6cc4856481f221b03bd9f2408a326d416af09af5d6f608c1f4',
        'org.ow2.asm:asm-commons:6.0:asm-commons-6.0.jar:f1bce5c648a96a017bdcd01fe5d59af9845297fd7b79b81c015a6fbbd9719abf',
        'org.ow2.asm:asm-tree:6.0:asm-tree-6.0.jar:887998fb69727c8759e4d253f856822801e33f9fd4caa566b3ac58ee92106215',
        'org.ow2.asm:asm-util:6.0:asm-util-6.0.jar:356afebdb0f870175262e5188f8709a3b17aa2a5a6a4b0340b04d4b449bca5f6',
        'org.ow2.asm:asm:5.0.4:asm-5.0.4.jar:896618ed8ae62702521a78bc7be42b7c491a08e6920a15f89a3ecdec31e9a220',
        'org.ow2.asm:asm:6.0:asm-6.0.jar:dd8971c74a4e697899a8e95caae4ea8760ea6c486dc6b97b1795e75760420461',
    ]
 }
--- a/bramble-api/build.gradle
+++ b/bramble-api/build.gradle
@@ -2,20 +2,39 @@ apply plugin: 'java-library'
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 apply plugin: 'ru.vyarus.animalsniffer'
 apply plugin: 'witness'
 apply from: 'witness.gradle'
 dependencies {
-	implementation "com.google.dagger:dagger:2.22.1"
+	implementation "com.google.dagger:dagger:2.0.2"
 	implementation 'com.google.code.findbugs:jsr305:3.0.2'
 	testImplementation 'junit:junit:4.12'
 	testImplementation "org.jmock:jmock:2.8.2"
 	testImplementation "org.jmock:jmock-junit4:2.8.2"
 	testImplementation "org.jmock:jmock-legacy:2.8.2"
 	testImplementation "org.hamcrest:hamcrest-library:1.3"
 	testImplementation "org.hamcrest:hamcrest-core:1.3"
 }
-	signature 'org.codehaus.mojo.signature:java16:1.1@signature'
+dependencyVerification {
 	verify = [
 			'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861',
 			'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
 			'com.google.dagger:dagger:2.0.2:dagger-2.0.2.jar:84c0282ed8be73a29e0475d639da030b55dee72369e58dd35ae7d4fe6243dcf9',
 			'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
 			'junit:junit:4.12:junit-4.12.jar:59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a',
 			'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.hamcrest:hamcrest-core:1.3:hamcrest-core-1.3.jar:66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9',
 			'org.hamcrest:hamcrest-library:1.3:hamcrest-library-1.3.jar:711d64522f9ec410983bd310934296da134be4254a125080a0416ec178dfad1c',
 			'org.jmock:jmock-junit4:2.8.2:jmock-junit4-2.8.2.jar:f7ee4df4f7bd7b7f1cafad3b99eb74d579f109d5992ff625347352edb55e674c',
 			'org.jmock:jmock-legacy:2.8.2:jmock-legacy-2.8.2.jar:f2b985a5c08a9edb7f37612330c058809da3f6a6d63ce792426ebf8ff0d6d31b',
 			'org.jmock:jmock-testjar:2.8.2:jmock-testjar-2.8.2.jar:8900860f72c474e027cf97fe78dcbf154a1aa7fc62b6845c5fb4e4f3c7bc8760',
 			'org.jmock:jmock:2.8.2:jmock-2.8.2.jar:6c73cb4a2e6dbfb61fd99c9a768539c170ab6568e57846bd60dbf19596b65b16',
 			'org.objenesis:objenesis:2.1:objenesis-2.1.jar:c74330cc6b806c804fd37e74487b4fe5d7c2750c5e15fbc6efa13bdee1bdef80',
 			'org.ow2.asm:asm:5.0.4:asm-5.0.4.jar:896618ed8ae62702521a78bc7be42b7c491a08e6920a15f89a3ecdec31e9a220',
 	]
 }
 // needed to make test output available to bramble-core and briar-core
@@ -29,3 +48,8 @@ task jarTest(type: Jar, dependsOn: testClasses) {
 artifacts {
 	testOutput jarTest
 }
 // If a Java 6 JRE is available, check we're not using any Java 7 or 8 APIs
 tasks.withType(JavaCompile) {
 	useJava6StandardLibrary(it)
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/Bytes.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/Bytes.java
@@ -4,8 +4,8 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.util.StringUtils;
 import java.util.Arrays;
 import java.util.Comparator;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 /**
@@ -15,6 +15,8 @@ import javax.annotation.concurrent.ThreadSafe;
@NotNullByDefault
 public class Bytes implements Comparable<Bytes> {
 	public static final BytesComparator COMPARATOR = new BytesComparator();
 	private final byte[] bytes;
 	private int hashCode = -1;
@@ -36,13 +38,20 @@ public class Bytes implements Comparable<Bytes> {
 	}
 	@Override
-	public boolean equals(@Nullable Object o) {
+	public boolean equals(Object o) {
 		return o instanceof Bytes && Arrays.equals(bytes, ((Bytes) o).bytes);
 	}
 	@Override
 	public int compareTo(Bytes other) {
-		return compare(bytes, other.bytes);
+		byte[] aBytes = bytes, bBytes = other.bytes;
 		int length = Math.min(aBytes.length, bBytes.length);
 		for (int i = 0; i < length; i++) {
 			int aUnsigned = aBytes[i] & 0xFF, bUnsigned = bBytes[i] & 0xFF;
 			if (aUnsigned < bUnsigned) return -1;
 			if (aUnsigned > bUnsigned) return 1;
 		}
 		return aBytes.length - bBytes.length;
 	}
 	@Override
@@ -51,13 +60,11 @@ public class Bytes implements Comparable<Bytes> {
 				"(" + StringUtils.toHexString(getBytes()) + ")";
 	}
-	public static int compare(byte[] a, byte[] b) {
+	public static class BytesComparator implements Comparator<Bytes> {
-		int length = Math.min(a.length, b.length);
+
-		for (int i = 0; i < length; i++) {
+		@Override
-			int aUnsigned = a[i] & 0xFF, bUnsigned = b[i] & 0xFF;
+		public int compare(Bytes a, Bytes b) {
-			if (aUnsigned < bUnsigned) return -1;
+			return a.compareTo(b);
 			if (aUnsigned > bUnsigned) return 1;
 		}
 		return a.length - b.length;
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/FeatureFlags.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/FeatureFlags.java
@@ -1,11 +0,0 @@
 package org.briarproject.bramble.api;
 /**
 * Interface for specifying which features are enabled in a build.
 */
 public interface FeatureFlags {
 	boolean shouldEnableImageAttachments();
 	boolean shouldEnableRemoteContacts();
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/Nameable.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/Nameable.java
@@ -1,10 +0,0 @@
 package org.briarproject.bramble.api;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@NotNullByDefault
 public interface Nameable {
 	String getName();
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/Pair.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/Pair.java
@@ -1,26 +0,0 @@
 package org.briarproject.bramble.api;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import javax.annotation.concurrent.Immutable;
@Immutable
@NotNullByDefault
 public class Pair<A, B> {
 	private final A first;
 	private final B second;
 	public Pair(A first, B second) {
 		this.first = first;
 		this.second = second;
 	}
 	public A getFirst() {
 		return first;
 	}
 	public B getSecond() {
 		return second;
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/Predicate.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/Predicate.java
@@ -1,9 +0,0 @@
 package org.briarproject.bramble.api;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@NotNullByDefault
 public interface Predicate<T> {
 	boolean test(T t);
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/StringMap.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/StringMap.java
@@ -38,18 +38,4 @@ public abstract class StringMap extends Hashtable<String, String> {
 	public void putInt(String key, int value) {
 		put(key, String.valueOf(value));
 	}
 	public long getLong(String key, long defaultValue) {
 		String s = get(key);
 		if (s == null) return defaultValue;
 		try {
 			return Long.valueOf(s);
 		} catch (NumberFormatException e) {
 			return defaultValue;
 		}
 	}
 	public void putLong(String key, long value) {
 		put(key, String.valueOf(value));
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/UnsupportedVersionException.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/UnsupportedVersionException.java
@@ -1,18 +1,9 @@
 package org.briarproject.bramble.api;
 import java.io.IOException;
 /**
- * Thrown when data being parsed uses a protocol or format version that is not
+ * An exception that indicates an unrecoverable version mismatch.
 * supported.
 */
-public class UnsupportedVersionException extends FormatException {
+public class UnsupportedVersionException extends IOException {
 	private final boolean tooOld;
 	public UnsupportedVersionException(boolean tooOld) {
 		this.tooOld = tooOld;
 	}
 	public boolean isTooOld() {
 		return tooOld;
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/account/AccountManager.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/account/AccountManager.java
@@ -1,70 +0,0 @@
 package org.briarproject.bramble.api.account;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.identity.IdentityManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import javax.annotation.Nullable;
@NotNullByDefault
 public interface AccountManager {
 	/**
 	 * Returns true if the manager has the database key. This will be false
 	 * before {@link #createAccount(String, String)} or {@link #signIn(String)}
 	 * has been called, and true after {@link #createAccount(String, String)}
 	 * or {@link #signIn(String)} has returned true, until the process exits.
 	 */
 	boolean hasDatabaseKey();
 	/**
 	 * Returns the database key if the manager has it. This will be null
 	 * before {@link #createAccount(String, String)} or {@link #signIn(String)}
 	 * has been called, and non-null after
 	 * {@link #createAccount(String, String)} or {@link #signIn(String)} has
 	 * returned true, until the process exits.
 	 */
 	@Nullable
 	SecretKey getDatabaseKey();
 	/**
 	 * Returns true if the encrypted database key can be loaded from disk, and
 	 * the database directory exists and is a directory.
 	 */
 	boolean accountExists();
 	/**
 	 * Creates an identity with the given name and registers it with the
 	 * {@link IdentityManager}. Creates a database key, encrypts it with the
 	 * given password and stores it on disk.
 	 * <p/>
 	 * This method does not create the database directory, so
 	 * {@link #accountExists()} will continue to return false until the
 	 * database directory is created.
 	 */
 	boolean createAccount(String name, String password);
 	/**
 	 * Deletes all account state from disk. {@link #accountExists()} will
 	 * return false after this method returns.
 	 */
 	void deleteAccount();
 	/**
 	 * Loads the encrypted database key from disk and decrypts it with the
 	 * given password.
 	 *
 	 * @return true if the database key was successfully loaded and decrypted.
 	 */
 	boolean signIn(String password);
 	/**
 	 * Loads the encrypted database key from disk, decrypts it with the old
 	 * password, encrypts it with the new password, and stores it on disk,
 	 * replacing the old key.
 	 *
 	 * @return true if the database key was successfully loaded, re-encrypted
 	 * and stored.
 	 */
 	boolean changePassword(String oldPassword, String newPassword);
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/battery/BatteryManager.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/battery/BatteryManager.java
@@ -1,6 +0,0 @@
 package org.briarproject.bramble.api.battery;
 public interface BatteryManager {
 	boolean isCharging();
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/battery/event/BatteryEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/battery/event/BatteryEvent.java
@@ -1,19 +0,0 @@
 package org.briarproject.bramble.api.battery.event;
 import org.briarproject.bramble.api.event.Event;
 /**
 * An event that is broadcast when the device starts or stops charging.
 */
 public class BatteryEvent extends Event {
 	private final boolean charging;
 	public BatteryEvent(boolean charging) {
 		this.charging = charging;
 	}
 	public boolean isCharging() {
 		return charging;
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/client/BdfMessageValidator.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/client/BdfMessageValidator.java
@@ -9,13 +9,14 @@ import org.briarproject.bramble.api.sync.Group;
 import org.briarproject.bramble.api.sync.InvalidMessageException;
 import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageContext;
-import org.briarproject.bramble.api.sync.validation.MessageValidator;
+import org.briarproject.bramble.api.sync.ValidationManager.MessageValidator;
 import org.briarproject.bramble.api.system.Clock;
 import java.util.logging.Logger;
 import javax.annotation.concurrent.Immutable;
 import static org.briarproject.bramble.api.sync.SyncConstants.MESSAGE_HEADER_LENGTH;
 import static org.briarproject.bramble.api.transport.TransportConstants.MAX_CLOCK_DIFFERENCE;
@Immutable
@@ -48,9 +49,14 @@ public abstract class BdfMessageValidator implements MessageValidator {
 			throw new InvalidMessageException(
 					"Timestamp is too far in the future");
 		}
 		byte[] raw = m.getRaw();
 		if (raw.length <= MESSAGE_HEADER_LENGTH) {
 			throw new InvalidMessageException("Message is too short");
 		}
 		try {
-			BdfList bodyList = clientHelper.toList(m.getBody());
+			BdfList body = clientHelper.toList(raw, MESSAGE_HEADER_LENGTH,
-			BdfMessageContext result = validateMessage(m, g, bodyList);
+					raw.length - MESSAGE_HEADER_LENGTH);
 			BdfMessageContext result = validateMessage(m, g, body);
 			Metadata meta = metadataEncoder.encode(result.getDictionary());
 			return new MessageContext(meta, result.getDependencies());
 		} catch (FormatException e) {
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/client/ClientHelper.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/client/ClientHelper.java
@@ -1,16 +1,12 @@
 package org.briarproject.bramble.api.client;
 import org.briarproject.bramble.api.FormatException;
 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.BdfList;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageId;
@@ -18,6 +14,8 @@ import org.briarproject.bramble.api.sync.MessageId;
 import java.security.GeneralSecurityException;
 import java.util.Map;
 import javax.annotation.Nullable;
@NotNullByDefault
 public interface ClientHelper {
@@ -25,22 +23,23 @@ public interface ClientHelper {
 			throws DbException, FormatException;
 	void addLocalMessage(Transaction txn, Message m, BdfDictionary metadata,
-			boolean shared, boolean temporary)
+			boolean shared) throws DbException, FormatException;
 			throws DbException, FormatException;
 	Message createMessage(GroupId g, long timestamp, byte[] body);
 	Message createMessage(GroupId g, long timestamp, BdfList body)
 			throws FormatException;
 	Message createMessageForStoringMetadata(GroupId g);
 	@Nullable
 	Message getMessage(MessageId m) throws DbException;
 	@Nullable
 	Message getMessage(Transaction txn, MessageId m) throws DbException;
 	@Nullable
 	BdfList getMessageAsList(MessageId m) throws DbException, FormatException;
 	@Nullable
 	BdfList getMessageAsList(Transaction txn, MessageId m) throws DbException,
 			FormatException;
@@ -89,10 +88,6 @@ public interface ClientHelper {
 	BdfDictionary toDictionary(byte[] b, int off, int len)
 			throws FormatException;
 	BdfDictionary toDictionary(TransportProperties transportProperties);
 	BdfDictionary toDictionary(Map<TransportId, TransportProperties> map);
 	BdfList toList(byte[] b, int off, int len) throws FormatException;
 	BdfList toList(byte[] b) throws FormatException;
@@ -101,22 +96,11 @@ public interface ClientHelper {
 	BdfList toList(Author a);
-	byte[] sign(String label, BdfList toSign, PrivateKey privateKey)
+	byte[] sign(String label, BdfList toSign, byte[] privateKey)
 			throws FormatException, GeneralSecurityException;
-	void verifySignature(byte[] signature, String label, BdfList signed,
+	void verifySignature(String label, byte[] sig, byte[] publicKey,
-			PublicKey publicKey)
+			BdfList signed) throws FormatException, GeneralSecurityException;
 			throws FormatException, GeneralSecurityException;
 	Author parseAndValidateAuthor(BdfList author) throws FormatException;
 	PublicKey parseAndValidateAgreementPublicKey(byte[] publicKeyBytes)
 			throws FormatException;
 	TransportProperties parseAndValidateTransportProperties(
 			BdfDictionary properties) throws FormatException;
 	Map<TransportId, TransportProperties> parseAndValidateTransportPropertiesMap(
 			BdfDictionary properties) throws FormatException;
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/client/ContactGroupFactory.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/client/ContactGroupFactory.java
@@ -12,19 +12,19 @@ public interface ContactGroupFactory {
 	/**
 	 * Creates a group that is not shared with any contacts.
 	 */
-	Group createLocalGroup(ClientId clientId, int majorVersion);
+	Group createLocalGroup(ClientId clientId, int clientVersion);
 	/**
 	 * Creates a group for the given client to share with the given contact.
 	 */
-	Group createContactGroup(ClientId clientId, int majorVersion,
+	Group createContactGroup(ClientId clientId, int clientVersion,
 			Contact contact);
 	/**
 	 * Creates a group for the given client to share between the given authors
 	 * identified by their AuthorIds.
 	 */
-	Group createContactGroup(ClientId clientId, int majorVersion,
+	Group createContactGroup(ClientId clientId, int clientVersion,
 			AuthorId authorId1, AuthorId authorId2);
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/Contact.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/Contact.java
@@ -1,16 +1,11 @@
 package org.briarproject.bramble.api.contact;
 import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorId;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
 import static org.briarproject.bramble.util.StringUtils.toUtf8;
@Immutable
@NotNullByDefault
 public class Contact {
@@ -18,26 +13,15 @@ public class Contact {
 	private final ContactId id;
 	private final Author author;
 	private final AuthorId localAuthorId;
-	@Nullable
+	private final boolean verified, active;
 	private final String alias;
 	@Nullable
 	private final PublicKey handshakePublicKey;
 	private final boolean verified;
 	public Contact(ContactId id, Author author, AuthorId localAuthorId,
-			@Nullable String alias, @Nullable PublicKey handshakePublicKey,
+			boolean verified, boolean active) {
 			boolean verified) {
 		if (alias != null) {
 			int aliasLength = toUtf8(alias).length;
 			if (aliasLength == 0 || aliasLength > MAX_AUTHOR_NAME_LENGTH)
 				throw new IllegalArgumentException();
 		}
 		this.id = id;
 		this.author = author;
 		this.localAuthorId = localAuthorId;
 		this.alias = alias;
 		this.handshakePublicKey = handshakePublicKey;
 		this.verified = verified;
 		this.active = active;
 	}
 	public ContactId getId() {
@@ -52,20 +36,14 @@ public class Contact {
 		return localAuthorId;
 	}
 	@Nullable
 	public String getAlias() {
 		return alias;
 	}
 	@Nullable
 	public PublicKey getHandshakePublicKey() {
 		return handshakePublicKey;
 	}
 	public boolean isVerified() {
 		return verified;
 	}
 	public boolean isActive() {
 		return active;
 	}
 	@Override
 	public int hashCode() {
 		return id.hashCode();
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactExchangeListener.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactExchangeListener.java
@@ -0,0 +1,20 @@
 package org.briarproject.bramble.api.contact;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@NotNullByDefault
 public interface ContactExchangeListener {
 	void contactExchangeSucceeded(Author remoteAuthor);
 	/**
 	 * The exchange failed because the contact already exists.
 	 */
 	void duplicateContact(Author remoteAuthor);
 	/**
 	 * A general failure.
 	 */
 	void contactExchangeFailed();
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactExchangeManager.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactExchangeManager.java
@@ -1,37 +0,0 @@
 package org.briarproject.bramble.api.contact;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.db.ContactExistsException;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
 import java.io.IOException;
@NotNullByDefault
 public interface ContactExchangeManager {
 	/**
 	 * Exchanges contact information with a remote peer and adds the peer
 	 * as a contact.
 	 *
 	 * @param alice Whether the local peer takes the role of Alice
 	 * @return The newly added contact
 	 * @throws ContactExistsException If the contact already exists
 	 */
 	Contact exchangeContacts(DuplexTransportConnection conn,
 			SecretKey masterKey, boolean alice, boolean verified)
 			throws IOException, DbException;
 	/**
 	 * Exchanges contact information with a remote peer and adds the peer
 	 * as a contact, replacing the given pending contact.
 	 *
 	 * @param alice Whether the local peer takes the role of Alice
 	 * @return The newly added contact
 	 * @throws ContactExistsException If the contact already exists
 	 */
 	Contact exchangeContacts(PendingContactId p, DuplexTransportConnection conn,
 			SecretKey masterKey, boolean alice, boolean verified)
 			throws IOException, DbException;
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactExchangeTask.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactExchangeTask.java
@@ -0,0 +1,48 @@
 package org.briarproject.bramble.api.contact;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.identity.LocalAuthor;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
 /**
 * A task for conducting a contact information exchange with a remote peer.
 */
@NotNullByDefault
 public interface ContactExchangeTask {
 	/**
 	 * The current version of the contact exchange protocol
 	 */
 	int PROTOCOL_VERSION = 0;
 	/**
 	 * Label for deriving Alice's header key from the master secret.
 	 */
 	String ALICE_KEY_LABEL =
 			"org.briarproject.bramble.contact/ALICE_HEADER_KEY";
 	/**
 	 * Label for deriving Bob's header key from the master secret.
 	 */
 	String BOB_KEY_LABEL = "org.briarproject.bramble.contact/BOB_HEADER_KEY";
 	/**
 	 * Label for deriving Alice's key binding nonce from the master secret.
 	 */
 	String ALICE_NONCE_LABEL = "org.briarproject.bramble.contact/ALICE_NONCE";
 	/**
 	 * Label for deriving Bob's key binding nonce from the master secret.
 	 */
 	String BOB_NONCE_LABEL = "org.briarproject.bramble.contact/BOB_NONCE";
 	/**
 	 * Exchanges contact information with a remote peer.
 	 */
 	void startExchange(ContactExchangeListener listener,
 			LocalAuthor localAuthor, SecretKey masterSecret,
 			DuplexTransportConnection conn, TransportId transportId,
 			boolean alice);
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactId.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactId.java
@@ -2,12 +2,11 @@ package org.briarproject.bramble.api.contact;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 /**
 * Type-safe wrapper for an integer that uniquely identifies a contact within
- * the scope of the local device.
+ * the scope of a single node.
 */
@Immutable
@NotNullByDefault
@@ -29,7 +28,7 @@ public class ContactId {
 	}
 	@Override
-	public boolean equals(@Nullable Object o) {
+	public boolean equals(Object o) {
 		return o instanceof ContactId && id == ((ContactId) o).id;
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactManager.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactManager.java
@@ -1,143 +1,42 @@
 package org.briarproject.bramble.api.contact;
 import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.Pair;
 import org.briarproject.bramble.api.UnsupportedVersionException;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.NoSuchContactException;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorId;
 import org.briarproject.bramble.api.identity.AuthorInfo;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import java.security.GeneralSecurityException;
 import java.util.Collection;
 import javax.annotation.Nullable;
@NotNullByDefault
 public interface ContactManager {
 	/**
-	 * Registers a hook to be called whenever a contact is added or removed.
+	 * Registers a hook to be called whenever a contact is added.
 	 * This method should be called before
 	 * {@link LifecycleManager#startServices(SecretKey)}.
 	 */
-	void registerContactHook(ContactHook hook);
+	void registerAddContactHook(AddContactHook hook);
 	/**
-	 * Stores a contact associated with the given local and remote pseudonyms,
+	 * Registers a hook to be called whenever a contact is removed.
-	 * derives and stores rotation mode transport keys for each transport, and
+	 */
-	 * returns an ID for the contact.
+	void registerRemoveContactHook(RemoveContactHook hook);
-	 *
+
-	 * @param rootKey The root key for a set of rotation mode transport keys
+	/**
-	 * @param timestamp The timestamp for deriving rotation mode transport
+	 * Stores a contact within the given transaction associated with the given
-	 * keys from the root key
+	 * local and remote pseudonyms, and returns an ID for the contact.
 	 * @param alice True if the local party is Alice
 	 * @param verified True if the contact's identity has been verified, which
 	 * is true if the contact was added in person or false if the contact was
 	 * introduced or added remotely
 	 * @param active True if the rotation mode transport keys can be used for
 	 * outgoing streams
 	 */
 	ContactId addContact(Transaction txn, Author remote, AuthorId local,
-			SecretKey rootKey, long timestamp, boolean alice, boolean verified,
+			SecretKey master, long timestamp, boolean alice, boolean verified,
 			boolean active) throws DbException;
 	/**
 	 * Stores a contact associated with the given local and remote pseudonyms,
 	 * replacing the given pending contact, derives and stores handshake mode
 	 * and rotation mode transport keys for each transport, and returns an ID
 	 * for the contact.
 	 *
 	 * @param rootKey The root key for a set of rotation mode transport keys
 	 * @param timestamp The timestamp for deriving rotation mode transport
 	 * keys from the root key
 	 * @param alice True if the local party is Alice
 	 * @param verified True if the contact's identity has been verified, which
 	 * is true if the contact was added in person or false if the contact was
 	 * introduced or added remotely
 	 * @param active True if the rotation mode transport keys can be used for
 	 * outgoing streams
 	 * @throws GeneralSecurityException If the pending contact's handshake
 	 * public key is invalid
 	 */
 	ContactId addContact(Transaction txn, PendingContactId p, Author remote,
 			AuthorId local, SecretKey rootKey, long timestamp, boolean alice,
 			boolean verified, boolean active)
 			throws DbException, GeneralSecurityException;
 	/**
 	 * Stores a contact associated with the given local and remote pseudonyms
 	 * and returns an ID for the contact.
 	 *
 	 * @param verified True if the contact's identity has been verified, which
 	 * is true if the contact was added in person or false if the contact was
 	 * introduced or added remotely
 	 */
-	ContactId addContact(Transaction txn, Author remote, AuthorId local,
+	ContactId addContact(Author remote, AuthorId local,
-			boolean verified) throws DbException;
+			SecretKey master, long timestamp, boolean alice, boolean verified,
-
+			boolean active) throws DbException;
 	/**
 	 * Stores a contact associated with the given local and remote pseudonyms,
 	 * derives and stores rotation mode transport keys for each transport, and
 	 * returns an ID for the contact.
 	 *
 	 * @param rootKey The root key for a set of rotation mode transport keys
 	 * @param timestamp The timestamp for deriving rotation mode transport
 	 * keys from the root key
 	 * @param alice True if the local party is Alice
 	 * @param verified True if the contact's identity has been verified, which
 	 * is true if the contact was added in person or false if the contact was
 	 * introduced or added remotely
 	 * @param active True if the rotation mode transport keys can be used for
 	 * outgoing streams
 	 */
 	ContactId addContact(Author remote, AuthorId local, SecretKey rootKey,
 			long timestamp, boolean alice, boolean verified, boolean active)
 			throws DbException;
 	/**
 	 * Returns the handshake link that needs to be sent to a contact we want
 	 * to add.
 	 */
 	String getHandshakeLink() throws DbException;
 	/**
 	 * Creates a {@link PendingContact} from the given handshake link and
 	 * alias, adds it to the database and returns it.
 	 *
 	 * @param link The handshake link received from the pending contact
 	 * @param alias The alias the user has given this pending contact
 	 * @throws UnsupportedVersionException If the link uses a format version
 	 * that is not supported
 	 * @throws FormatException If the link is invalid
 	 * @throws GeneralSecurityException If the pending contact's handshake
 	 * public key is invalid
 	 */
 	PendingContact addPendingContact(String link, String alias)
 			throws DbException, FormatException, GeneralSecurityException;
 	/**
 	 * Returns the pending contact with the given ID.
 	 */
 	PendingContact getPendingContact(Transaction txn, PendingContactId p)
 			throws DbException;
 	/**
 	 * Returns a list of {@link PendingContact PendingContacts} and their
 	 * {@link PendingContactState states}.
 	 */
 	Collection<Pair<PendingContact, PendingContactState>> getPendingContacts()
 			throws DbException;
 	/**
 	 * Removes a {@link PendingContact}.
 	 */
 	void removePendingContact(PendingContactId p) throws DbException;
 	/**
 	 * Returns the contact with the given ID.
@@ -145,32 +44,27 @@ public interface ContactManager {
 	Contact getContact(ContactId c) throws DbException;
 	/**
-	 * Returns the contact with the given ID.
+	 * Returns the contact with the given remoteAuthorId
-	 */
+	 * that was added by the LocalAuthor with the given localAuthorId
 	Contact getContact(Transaction txn, ContactId c) throws DbException;
 	/**
 	 * Returns the contact with the given {@code remoteAuthorId}
 	 * that belongs to the local pseudonym with the given {@code localAuthorId}.
 	 *
-	 * @throws NoSuchContactException If the contact is not in the database
+	 * @throws org.briarproject.bramble.api.db.NoSuchContactException
 	 */
 	Contact getContact(AuthorId remoteAuthorId, AuthorId localAuthorId)
 			throws DbException;
 	/**
-	 * Returns the contact with the given {@code remoteAuthorId}
+	 * Returns the contact with the given remoteAuthorId
-	 * that belongs to the local pseudonym with the given {@code localAuthorId}.
+	 * that was added by the LocalAuthor with the given localAuthorId
 	 *
-	 * @throws NoSuchContactException If the contact is not in the database
+	 * @throws org.briarproject.bramble.api.db.NoSuchContactException
 	 */
 	Contact getContact(Transaction txn, AuthorId remoteAuthorId,
 			AuthorId localAuthorId) throws DbException;
 	/**
-	 * Returns all contacts.
+	 * Returns all active contacts.
 	 */
-	Collection<Contact> getContacts() throws DbException;
+	Collection<Contact> getActiveContacts() throws DbException;
 	/**
 	 * Removes a contact and all associated state.
@@ -183,57 +77,28 @@ public interface ContactManager {
 	void removeContact(Transaction txn, ContactId c) throws DbException;
 	/**
-	 * Sets an alias for the contact or unsets it if {@code alias} is null.
+	 * Marks a contact as active or inactive.
 	 */
-	void setContactAlias(Transaction txn, ContactId c, @Nullable String alias)
+	void setContactActive(Transaction txn, ContactId c, boolean active)
 			throws DbException;
 	/**
-	 * Sets an alias for the contact or unsets it if {@code alias} is null.
+	 * Return true if a contact with this name and public key already exists
 	 */
 	void setContactAlias(ContactId c, @Nullable String alias)
 			throws DbException;
 	/**
 	 * Returns true if a contact with this {@code remoteAuthorId} belongs to
 	 * the local pseudonym with this {@code localAuthorId}.
 	 */
 	boolean contactExists(Transaction txn, AuthorId remoteAuthorId,
 			AuthorId localAuthorId) throws DbException;
 	/**
-	 * Returns true if a contact with this {@code remoteAuthorId} belongs to
+	 * Return true if a contact with this name and public key already exists
 	 * the local pseudonym with this {@code localAuthorId}.
 	 */
 	boolean contactExists(AuthorId remoteAuthorId, AuthorId localAuthorId)
 			throws DbException;
-	/**
+	interface AddContactHook {
 	 * Returns the {@link AuthorInfo} for the given author.
 	 */
 	AuthorInfo getAuthorInfo(AuthorId a) throws DbException;
 	/**
 	 * Returns the {@link AuthorInfo} for the given author.
 	 */
 	AuthorInfo getAuthorInfo(Transaction txn, AuthorId a) throws DbException;
 	interface ContactHook {
 		/**
 		 * Called when a contact is being added.
 		 *
 		 * @param txn A read-write transaction
 		 * @param c The contact that is being added
 		 */
 		void addingContact(Transaction txn, Contact c) throws DbException;
 	}
-		/**
+	interface RemoveContactHook {
 		 * Called when a contact is being removed
 		 *
 		 * @param txn A read-write transaction
 		 * @param c The contact that is being removed
 		 */
 		void removingContact(Transaction txn, Contact c) throws DbException;
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/HandshakeLinkConstants.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/HandshakeLinkConstants.java
@@ -1,34 +0,0 @@
 package org.briarproject.bramble.api.contact;
 import java.util.regex.Pattern;
 public interface HandshakeLinkConstants {
 	/**
 	 * The current version of the handshake link format.
 	 */
 	int FORMAT_VERSION = 0;
 	/**
 	 * The length of a base32-encoded handshake link in bytes, excluding the
 	 * 'briar://' prefix.
 	 */
 	int BASE32_LINK_BYTES = 53;
 	/**
 	 * The length of a raw handshake link in bytes, before base32 encoding.
 	 */
 	int RAW_LINK_BYTES = 33;
 	/**
 	 * Regular expression for matching handshake links, including or excluding
 	 * the 'briar://' prefix.
 	 */
 	Pattern LINK_REGEX =
 			Pattern.compile("(briar://)?([a-z2-7]{" + BASE32_LINK_BYTES + "})");
 	/**
 	 * Label for hashing handshake public keys to calculate their identifiers.
 	 */
 	String ID_LABEL = "org.briarproject.bramble/HANDSHAKE_KEY_ID";
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/HandshakeManager.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/HandshakeManager.java
@@ -1,45 +0,0 @@
 package org.briarproject.bramble.api.contact;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.transport.StreamWriter;
 import java.io.IOException;
 import java.io.InputStream;
@NotNullByDefault
 public interface HandshakeManager {
 	/**
 	 * Handshakes with the given pending contact. Returns an ephemeral master
 	 * key authenticated with both parties' handshake key pairs and a flag
 	 * indicating whether the local peer is Alice or Bob.
 	 *
 	 * @param in An incoming stream for the handshake, which must be secured in
 	 * handshake mode
 	 * @param out An outgoing stream for the handshake, which must be secured
 	 * in handshake mode
 	 */
 	HandshakeResult handshake(PendingContactId p, InputStream in,
 			StreamWriter out) throws DbException, IOException;
 	class HandshakeResult {
 		private final SecretKey masterKey;
 		private final boolean alice;
 		public HandshakeResult(SecretKey masterKey, boolean alice) {
 			this.masterKey = masterKey;
 			this.alice = alice;
 		}
 		public SecretKey getMasterKey() {
 			return masterKey;
 		}
 		public boolean isAlice() {
 			return alice;
 		}
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/PendingContact.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/PendingContact.java
@@ -1,51 +0,0 @@
 package org.briarproject.bramble.api.contact;
 import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import javax.annotation.concurrent.Immutable;
@Immutable
@NotNullByDefault
 public class PendingContact {
 	private final PendingContactId id;
 	private final PublicKey publicKey;
 	private final String alias;
 	private final long timestamp;
 	public PendingContact(PendingContactId id, PublicKey publicKey,
 			String alias, long timestamp) {
 		this.id = id;
 		this.publicKey = publicKey;
 		this.alias = alias;
 		this.timestamp = timestamp;
 	}
 	public PendingContactId getId() {
 		return id;
 	}
 	public PublicKey getPublicKey() {
 		return publicKey;
 	}
 	public String getAlias() {
 		return alias;
 	}
 	public long getTimestamp() {
 		return timestamp;
 	}
 	@Override
 	public int hashCode() {
 		return id.hashCode();
 	}
 	@Override
 	public boolean equals(Object o) {
 		return o instanceof PendingContact &&
 				id.equals(((PendingContact) o).id);
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/PendingContactId.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/PendingContactId.java
@@ -1,25 +0,0 @@
 package org.briarproject.bramble.api.contact;
 import org.briarproject.bramble.api.UniqueId;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 /**
 * Type-safe wrapper for a byte array that uniquely identifies a
 * {@link PendingContact}.
 */
@ThreadSafe
@NotNullByDefault
 public class PendingContactId extends UniqueId {
 	public PendingContactId(byte[] id) {
 		super(id);
 	}
 	@Override
 	public boolean equals(@Nullable Object o) {
 		return o instanceof PendingContactId && super.equals(o);
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/PendingContactState.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/PendingContactState.java
@@ -1,10 +0,0 @@
 package org.briarproject.bramble.api.contact;
 public enum PendingContactState {
 	WAITING_FOR_CONNECTION,
 	OFFLINE,
 	CONNECTING,
 	ADDING_CONTACT,
 	FAILED
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactAddedEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactAddedEvent.java
@@ -14,18 +14,18 @@ import javax.annotation.concurrent.Immutable;
 public class ContactAddedEvent extends Event {
 	private final ContactId contactId;
-	private final boolean verified;
+	private final boolean active;
-	public ContactAddedEvent(ContactId contactId, boolean verified) {
+	public ContactAddedEvent(ContactId contactId, boolean active) {
 		this.contactId = contactId;
-		this.verified = verified;
+		this.active = active;
 	}
 	public ContactId getContactId() {
 		return contactId;
 	}
-	public boolean isVerified() {
+	public boolean isActive() {
-		return verified;
+		return active;
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactStatusChangedEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactStatusChangedEvent.java
@@ -0,0 +1,31 @@
 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.concurrent.Immutable;
 /**
 * An event that is broadcast when a contact is marked active or inactive.
 */
@Immutable
@NotNullByDefault
 public class ContactStatusChangedEvent extends Event {
 	private final ContactId contactId;
 	private final boolean active;
 	public ContactStatusChangedEvent(ContactId contactId, boolean active) {
 		this.contactId = contactId;
 		this.active = active;
 	}
 	public ContactId getContactId() {
 		return contactId;
 	}
 	public boolean isActive() {
 		return active;
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/PendingContactAddedEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/PendingContactAddedEvent.java
@@ -1,25 +0,0 @@
 package org.briarproject.bramble.api.contact.event;
 import org.briarproject.bramble.api.contact.PendingContact;
 import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import javax.annotation.concurrent.Immutable;
 /**
 * An event that is broadcast when a pending contact is added.
 */
@Immutable
@NotNullByDefault
 public class PendingContactAddedEvent extends Event {
 	private final PendingContact pendingContact;
 	public PendingContactAddedEvent(PendingContact pendingContact) {
 		this.pendingContact = pendingContact;
 	}
 	public PendingContact getPendingContact() {
 		return pendingContact;
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/PendingContactRemovedEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/PendingContactRemovedEvent.java
@@ -1,26 +0,0 @@
 package org.briarproject.bramble.api.contact.event;
 import org.briarproject.bramble.api.contact.PendingContactId;
 import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import javax.annotation.concurrent.Immutable;
 /**
 * An event that is broadcast when a pending contact is removed.
 */
@Immutable
@NotNullByDefault
 public class PendingContactRemovedEvent extends Event {
 	private final PendingContactId id;
 	public PendingContactRemovedEvent(PendingContactId id) {
 		this.id = id;
 	}
 	public PendingContactId getId() {
 		return id;
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/PendingContactStateChangedEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/PendingContactStateChangedEvent.java
@@ -1,34 +0,0 @@
 package org.briarproject.bramble.api.contact.event;
 import org.briarproject.bramble.api.contact.PendingContactId;
 import org.briarproject.bramble.api.contact.PendingContactState;
 import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import javax.annotation.concurrent.Immutable;
 /**
 * An event that is broadcast when a pending contact's state is changed.
 */
@Immutable
@NotNullByDefault
 public class PendingContactStateChangedEvent extends Event {
 	private final PendingContactId id;
 	private final PendingContactState state;
 	public PendingContactStateChangedEvent(PendingContactId id,
 			PendingContactState state) {
 		this.id = id;
 		this.state = state;
 	}
 	public PendingContactId getId() {
 		return id;
 	}
 	public PendingContactState getPendingContactState() {
 		return state;
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/AgreementPrivateKey.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/AgreementPrivateKey.java
@@ -1,30 +0,0 @@
 package org.briarproject.bramble.api.crypto;
 import org.briarproject.bramble.api.Bytes;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import javax.annotation.concurrent.Immutable;
 import static org.briarproject.bramble.api.crypto.CryptoConstants.KEY_TYPE_AGREEMENT;
 /**
 * Type-safe wrapper for a private key used for key agreement.
 */
@Immutable
@NotNullByDefault
 public class AgreementPrivateKey extends Bytes implements PrivateKey {
 	public AgreementPrivateKey(byte[] encoded) {
 		super(encoded);
 	}
 	@Override
 	public String getKeyType() {
 		return KEY_TYPE_AGREEMENT;
 	}
 	@Override
 	public byte[] getEncoded() {
 		return getBytes();
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/AgreementPublicKey.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/AgreementPublicKey.java
@@ -1,35 +0,0 @@
 package org.briarproject.bramble.api.crypto;
 import org.briarproject.bramble.api.Bytes;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import javax.annotation.concurrent.Immutable;
 import static org.briarproject.bramble.api.crypto.CryptoConstants.KEY_TYPE_AGREEMENT;
 import static org.briarproject.bramble.api.crypto.CryptoConstants.MAX_AGREEMENT_PUBLIC_KEY_BYTES;
 /**
 * Type-safe wrapper for a public key used for key agreement.
 */
@Immutable
@NotNullByDefault
 public class AgreementPublicKey extends Bytes implements PublicKey {
 	public AgreementPublicKey(byte[] encoded) {
 		super(encoded);
 		if (encoded.length == 0 ||
 				encoded.length > MAX_AGREEMENT_PUBLIC_KEY_BYTES) {
 			throw new IllegalArgumentException();
 		}
 	}
 	@Override
 	public String getKeyType() {
 		return KEY_TYPE_AGREEMENT;
 	}
 	@Override
 	public byte[] getEncoded() {
 		return getBytes();
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/CryptoComponent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/CryptoComponent.java
@@ -27,78 +27,54 @@ public interface CryptoComponent {
 	/**
 	 * Derives another secret key from the given secret key.
 	 *
-	 * @param label A namespaced label indicating the purpose of the derived
+	 * @param label a namespaced label indicating the purpose of the derived
 	 * key, to prevent it from being repurposed or colliding with a key derived
 	 * for another purpose
 	 * @param inputs Additional inputs that will be included in the derivation
 	 * of the key
 	 */
 	SecretKey deriveKey(String label, SecretKey k, byte[]... inputs);
 	/**
-	 * Derives a shared secret from two key pairs.
+	 * Derives a common shared secret from two public keys and one of the
 	 * corresponding private keys.
 	 *
-	 * @param label A namespaced label indicating the purpose of this shared
+	 * @param label a namespaced label indicating the purpose of this shared
 	 * secret, to prevent it from being repurposed or colliding with a shared
 	 * secret derived for another purpose
-	 * @param theirPublicKey The public key of the remote party
+	 * @param theirPublicKey the public key of the remote party
-	 * @param ourKeyPair The key pair of the local party
+	 * @param ourKeyPair the key pair of the local party
-	 * @param inputs Additional inputs that will be included in the derivation
+	 * @return the shared secret
 	 * of the shared secret
 	 * @return The shared secret
 	 */
 	SecretKey deriveSharedSecret(String label, PublicKey theirPublicKey,
 			KeyPair ourKeyPair, byte[]... inputs)
 			throws GeneralSecurityException;
 	/**
 	 * Derives a shared secret from two static and two ephemeral key pairs.
 	 *
 	 * @param label A namespaced label indicating the purpose of this shared
 	 * secret, to prevent it from being repurposed or colliding with a shared
 	 * secret derived for another purpose
 	 * @param theirStaticPublicKey The static public key of the remote party
 	 * @param theirEphemeralPublicKey The ephemeral public key of the remote
 	 * party
 	 * @param ourStaticKeyPair The static key pair of the local party
 	 * @param ourEphemeralKeyPair The ephemeral key pair of the local party
 	 * @param alice True if the local party is Alice
 	 * @param inputs Additional inputs that will be included in the
 	 * derivation of the shared secret
 	 * @return The shared secret
 	 */
 	SecretKey deriveSharedSecret(String label, PublicKey theirStaticPublicKey,
 			PublicKey theirEphemeralPublicKey, KeyPair ourStaticKeyPair,
 			KeyPair ourEphemeralKeyPair, boolean alice, byte[]... inputs)
 			throws GeneralSecurityException;
 	/**
 	 * Signs the given byte[] with the given private key.
 	 *
-	 * @param label A namespaced label indicating the purpose of this
+	 * @param label a namespaced label indicating the purpose of this
 	 * signature, to prevent it from being repurposed or colliding with a
 	 * signature created for another purpose
 	 */
-	byte[] sign(String label, byte[] toSign, PrivateKey privateKey)
+	byte[] sign(String label, byte[] toSign, byte[] privateKey)
 			throws GeneralSecurityException;
 	/**
 	 * Verifies that the given signature is valid for the signed data
 	 * and the given public key.
 	 *
-	 * @param label A namespaced label indicating the purpose of this
+	 * @param label a namespaced label indicating the purpose of this
 	 * signature, to prevent it from being repurposed or colliding with a
 	 * signature created for another purpose
-	 * @return True if the signature was valid, false otherwise.
+	 * @return true if the signature was valid, false otherwise.
 	 */
-	boolean verifySignature(byte[] signature, String label, byte[] signed,
+	boolean verify(String label, byte[] signedData, byte[] publicKey,
-			PublicKey publicKey) throws GeneralSecurityException;
+			byte[] signature) throws GeneralSecurityException;
 	/**
 	 * Returns the hash of the given inputs. The inputs are unambiguously
 	 * combined by prefixing each input with its length.
 	 *
-	 * @param label A namespaced label indicating the purpose of this hash, to
+	 * @param label a namespaced label indicating the purpose of this hash, to
 	 * prevent it from being repurposed or colliding with a hash created for
 	 * another purpose
 	 */
@@ -109,24 +85,12 @@ public interface CryptoComponent {
 	 * given inputs. The inputs are unambiguously combined by prefixing each
 	 * input with its length.
 	 *
-	 * @param label A namespaced label indicating the purpose of this MAC, to
+	 * @param label a namespaced label indicating the purpose of this MAC, to
 	 * prevent it from being repurposed or colliding with a MAC created for
 	 * another purpose
 	 */
 	byte[] mac(String label, SecretKey macKey, byte[]... inputs);
 	/**
 	 * Verifies that the given message authentication code is valid for the
 	 * given secret key and inputs.
 	 *
 	 * @param label A namespaced label indicating the purpose of this MAC, to
 	 * prevent it from being repurposed or colliding with a MAC created for
 	 * another purpose
 	 * @return True if the MAC was valid, false otherwise.
 	 */
 	boolean verifyMac(byte[] mac, String label, SecretKey macKey,
 			byte[]... inputs);
 	/**
 	 * Encrypts and authenticates the given plaintext so it can be written to
 	 * storage. The encryption and authentication keys are derived from the
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/CryptoConstants.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/CryptoConstants.java
@@ -7,29 +7,13 @@ public interface CryptoConstants {
 	 */
 	int MAX_AGREEMENT_PUBLIC_KEY_BYTES = 32;
 	/**
 	 * The key type for agreement key pairs.
 	 */
 	String KEY_TYPE_AGREEMENT = "Curve25519";
 	/**
 	 * The maximum length of a signature public key in bytes.
 	 */
 	int MAX_SIGNATURE_PUBLIC_KEY_BYTES = 32;
 	/**
 	 * The key type for signature key pairs.
 	 */
 	String KEY_TYPE_SIGNATURE = "Ed25519";
 	/**
 	 * The maximum length of a signature in bytes.
 	 */
 	int MAX_SIGNATURE_BYTES = 64;
 	/**
 	 * The length of a MAC in bytes.
 	 */
 	int MAC_BYTES = SecretKey.LENGTH;
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/KeyAgreementCrypto.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/KeyAgreementCrypto.java
@@ -2,7 +2,7 @@ package org.briarproject.bramble.api.crypto;
 /**
 * Crypto operations for the key agreement protocol - see
- * https://code.briarproject.org/briar/briar-spec/blob/master/protocols/BQP.md
+ * https://code.briarproject.org/akwizgran/briar-spec/blob/master/protocols/BQP.md
 */
 public interface KeyAgreementCrypto {
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/KeyPair.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/KeyPair.java
@@ -5,7 +5,7 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import javax.annotation.concurrent.Immutable;
 /**
- * A key pair consisting of a {@link PublicKey} and a {@link PrivateKey}.
+ * A key pair consisting of a {@link PublicKey} and a {@link PrivateKey).
 */
@Immutable
@NotNullByDefault
@@ -15,8 +15,6 @@ public class KeyPair {
 	private final PrivateKey privateKey;
 	public KeyPair(PublicKey publicKey, PrivateKey privateKey) {
 		if (!publicKey.getKeyType().equals(privateKey.getKeyType()))
 			throw new IllegalArgumentException();
 		this.publicKey = publicKey;
 		this.privateKey = privateKey;
 	}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/PrivateKey.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/PrivateKey.java
@@ -8,11 +8,6 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@NotNullByDefault
 public interface PrivateKey {
 	/**
 	 * Returns the type of this key pair.
 	 */
 	String getKeyType();
 	/**
 	 * Returns the encoded representation of this key.
 	 */
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/PublicKey.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/PublicKey.java
@@ -8,11 +8,6 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@NotNullByDefault
 public interface PublicKey {
 	/**
 	 * Returns the type of this key pair.
 	 */
 	String getKeyType();
 	/**
 	 * Returns the encoded representation of this key.
 	 */
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/SignaturePrivateKey.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/SignaturePrivateKey.java
@@ -1,30 +0,0 @@
 package org.briarproject.bramble.api.crypto;
 import org.briarproject.bramble.api.Bytes;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import javax.annotation.concurrent.Immutable;
 import static org.briarproject.bramble.api.crypto.CryptoConstants.KEY_TYPE_SIGNATURE;
 /**
 * Type-safe wrapper for a public key used for signing.
 */
@Immutable
@NotNullByDefault
 public class SignaturePrivateKey extends Bytes implements PrivateKey {
 	public SignaturePrivateKey(byte[] bytes) {
 		super(bytes);
 	}
 	@Override
 	public String getKeyType() {
 		return KEY_TYPE_SIGNATURE;
 	}
 	@Override
 	public byte[] getEncoded() {
 		return getBytes();
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/SignaturePublicKey.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/SignaturePublicKey.java
@@ -1,35 +0,0 @@
 package org.briarproject.bramble.api.crypto;
 import org.briarproject.bramble.api.Bytes;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import javax.annotation.concurrent.Immutable;
 import static org.briarproject.bramble.api.crypto.CryptoConstants.KEY_TYPE_SIGNATURE;
 import static org.briarproject.bramble.api.crypto.CryptoConstants.MAX_SIGNATURE_PUBLIC_KEY_BYTES;
 /**
 * Type-safe wrapper for a public key used for verifying signatures.
 */
@Immutable
@NotNullByDefault
 public class SignaturePublicKey extends Bytes implements PublicKey {
 	public SignaturePublicKey(byte[] encoded) {
 		super(encoded);
 		if (encoded.length == 0 ||
 				encoded.length > MAX_SIGNATURE_PUBLIC_KEY_BYTES) {
 			throw new IllegalArgumentException();
 		}
 	}
 	@Override
 	public String getKeyType() {
 		return KEY_TYPE_SIGNATURE;
 	}
 	@Override
 	public byte[] getEncoded() {
 		return getBytes();
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/TransportCrypto.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/TransportCrypto.java
@@ -3,61 +3,26 @@ package org.briarproject.bramble.api.crypto;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.transport.TransportKeys;
 import java.security.GeneralSecurityException;
 /**
 * Crypto operations for the transport security protocol - see
- * https://code.briarproject.org/briar/briar-spec/blob/master/protocols/BTP.md
+ * https://code.briarproject.org/akwizgran/briar-spec/blob/master/protocols/BTP.md
 */
 public interface TransportCrypto {
 	/**
-	 * Returns true if the local peer is Alice.
+	 * Derives initial transport keys for the given transport in the given
-	 */
+	 * rotation period from the given master secret.
 	boolean isAlice(PublicKey theirHandshakePublicKey,
 			KeyPair ourHandshakeKeyPair);
 	/**
 	 * Derives the static master key shared with a contact or pending contact.
 	 */
 	SecretKey deriveStaticMasterKey(PublicKey theirHandshakePublicKey,
 			KeyPair ourHandshakeKeyPair) throws GeneralSecurityException;
 	/**
 	 * Derives the handshake mode root key from the static master key. To
 	 * prevent tag reuse, separate root keys are derived for contacts and
 	 * pending contacts.
 	 *
-	 * @param pendingContact Whether the static master key is shared with a
+	 * @param alice whether the keys are for use by Alice or Bob.
 	 * pending contact or a contact
 	 */
-	SecretKey deriveHandshakeRootKey(SecretKey staticMasterKey,
+	TransportKeys deriveTransportKeys(TransportId t, SecretKey master,
-			boolean pendingContact);
+			long rotationPeriod, boolean alice);
 	/**
-	 * Derives initial rotation mode transport keys for the given transport in
+	 * Rotates the given transport keys to the given rotation period. If the
-	 * the given time period from the given root key.
+	 * keys are for the given period or any later period they are not rotated.
 	 *
 	 * @param alice Whether the keys are for use by Alice or Bob
 	 * @param active Whether the keys are usable for outgoing streams
 	 */
-	TransportKeys deriveRotationKeys(TransportId t, SecretKey rootKey,
+	TransportKeys rotateTransportKeys(TransportKeys k, long rotationPeriod);
 			long timePeriod, boolean alice, boolean active);
 	/**
 	 * Derives handshake keys for the given transport in the given time period
 	 * from the given root key.
 	 *
 	 * @param alice Whether the keys are for use by Alice or Bob
 	 */
 	TransportKeys deriveHandshakeKeys(TransportId t, SecretKey rootKey,
 			long timePeriod, boolean alice);
 	/**
 	 * Updates the given transport keys to the given time period. If the keys
 	 * are for the given period or any later period they are not updated.
 	 */
 	TransportKeys updateTransportKeys(TransportKeys k, long timePeriod);
 	/**
 	 * Encodes the pseudo-random tag that is used to recognise a stream.
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfDictionary.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfDictionary.java
@@ -24,9 +24,9 @@ public class BdfDictionary extends TreeMap<String, Object> {
 	 * );
 	 * </pre>
 	 */
-	public static BdfDictionary of(Entry<String, ?>... entries) {
+	public static BdfDictionary of(Entry<String, Object>... entries) {
 		BdfDictionary d = new BdfDictionary();
-		for (Entry<String, ?> e : entries) d.put(e.getKey(), e.getValue());
+		for (Entry<String, Object> e : entries) d.put(e.getKey(), e.getValue());
 		return d;
 	}
@@ -34,7 +34,7 @@ public class BdfDictionary extends TreeMap<String, Object> {
 		super();
 	}
-	public BdfDictionary(Map<String, ?> m) {
+	public BdfDictionary(Map<String, Object> m) {
 		super(m);
 	}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfReader.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfReader.java
@@ -8,7 +8,6 @@ import java.io.IOException;
 public interface BdfReader {
 	int DEFAULT_NESTED_LIMIT = 5;
 	int DEFAULT_MAX_BUFFER_SIZE = 64 * 1024;
 	boolean eof() throws IOException;
@@ -40,13 +39,13 @@ public interface BdfReader {
 	boolean hasString() throws IOException;
-	String readString() throws IOException;
+	String readString(int maxLength) throws IOException;
 	void skipString() throws IOException;
 	boolean hasRaw() throws IOException;
-	byte[] readRaw() throws IOException;
+	byte[] readRaw(int maxLength) throws IOException;
 	void skipRaw() throws IOException;
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfReaderFactory.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfReaderFactory.java
@@ -9,6 +9,5 @@ public interface BdfReaderFactory {
 	BdfReader createReader(InputStream in);
-	BdfReader createReader(InputStream in, int nestedLimit,
+	BdfReader createReader(InputStream in, int nestedLimit);
 			int maxBufferSize);
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfStringUtils.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfStringUtils.java
@@ -1,71 +0,0 @@
 package org.briarproject.bramble.api.data;
 import org.briarproject.bramble.api.Bytes;
 import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import javax.annotation.Nullable;
 import static org.briarproject.bramble.api.data.BdfDictionary.NULL_VALUE;
 import static org.briarproject.bramble.util.StringUtils.toHexString;
@NotNullByDefault
 public class BdfStringUtils {
 	public static String toString(@Nullable Object o) throws FormatException {
 		return toString(o, 0);
 	}
 	private static String toString(@Nullable Object o, int indent)
 			throws FormatException {
 		if (o == null || o == NULL_VALUE) return "null";
 		if (o instanceof Boolean) return o.toString();
 		if (o instanceof Number) return o.toString();
 		if (o instanceof String) return "\"" + o + "\"";
 		if (o instanceof Bytes)
 			return "x" + toHexString(((Bytes) o).getBytes());
 		if (o instanceof byte[])
 			return "x" + toHexString((byte[]) o);
 		if (o instanceof List) {
 			List<?> list = (List) o;
 			StringBuilder sb = new StringBuilder();
 			sb.append("[\n");
 			int i = 0, size = list.size();
 			for (Object e : list) {
 				indent(sb, indent + 1);
 				sb.append(toString(e, indent + 1));
 				if (i++ < size - 1) sb.append(',');
 				sb.append('\n');
 			}
 			indent(sb, indent);
 			sb.append(']');
 			return sb.toString();
 		}
 		if (o instanceof Map) {
 			Map<?, ?> map = (Map) o;
 			StringBuilder sb = new StringBuilder();
 			sb.append("{\n");
 			int i = 0, size = map.size();
 			for (Entry e : map.entrySet()) {
 				indent(sb, indent + 1);
 				sb.append(toString(e.getKey(), indent + 1));
 				sb.append(": ");
 				sb.append(toString(e.getValue(), indent + 1));
 				if (i++ < size - 1) sb.append(',');
 				sb.append('\n');
 			}
 			indent(sb, indent);
 			sb.append('}');
 			return sb.toString();
 		}
 		throw new FormatException();
 	}
 	private static void indent(StringBuilder sb, int indent) {
 		for (int i = 0; i < indent; i++) sb.append('\t');
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/CommitAction.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/CommitAction.java
@@ -1,20 +0,0 @@
 package org.briarproject.bramble.api.db;
 import org.briarproject.bramble.api.event.EventExecutor;
 /**
 * An action that's taken when a {@link Transaction} is committed.
 */
 public interface CommitAction {
 	void accept(Visitor visitor);
 	interface Visitor {
 		@EventExecutor
 		void visit(EventAction a);
 		@EventExecutor
 		void visit(TaskAction a);
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/ContactExistsException.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/ContactExistsException.java
@@ -1,27 +1,8 @@
 package org.briarproject.bramble.api.db;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorId;
 /**
 * Thrown when a duplicate contact is added to the database. This exception may
 * occur due to concurrent updates and does not indicate a database error.
 */
 public class ContactExistsException extends DbException {
 	private final AuthorId local;
 	private final Author remote;
 	public ContactExistsException(AuthorId local, Author remote) {
 		this.local = local;
 		this.remote = remote;
 	}
 	public AuthorId getLocalAuthorId() {
 		return local;
 	}
 	public Author getRemoteAuthor() {
 		return remote;
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseComponent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseComponent.java
@@ -2,14 +2,9 @@ package org.briarproject.bramble.api.db;
 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.crypto.PrivateKey;
 import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorId;
-import org.briarproject.bramble.api.identity.Identity;
+import org.briarproject.bramble.api.identity.LocalAuthor;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.settings.Settings;
@@ -23,23 +18,22 @@ import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.bramble.api.sync.MessageStatus;
 import org.briarproject.bramble.api.sync.Offer;
 import org.briarproject.bramble.api.sync.Request;
-import org.briarproject.bramble.api.sync.validation.MessageState;
+import org.briarproject.bramble.api.sync.ValidationManager;
 import org.briarproject.bramble.api.transport.KeySetId;
 import org.briarproject.bramble.api.transport.TransportKeySet;
 import org.briarproject.bramble.api.transport.TransportKeys;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Nullable;
 import static org.briarproject.bramble.api.sync.ValidationManager.State;
 /**
 * Encapsulates the database implementation and exposes high-level operations
 * to other components.
 */
@NotNullByDefault
-public interface DatabaseComponent extends TransactionManager {
+public interface DatabaseComponent {
 	/**
 	 * Opens the database and returns true if the database already existed.
@@ -49,20 +43,42 @@ public interface DatabaseComponent extends TransactionManager {
 	 * @throws DataTooOldException if the data uses an older schema than the
 	 * current code and cannot be migrated
 	 */
-	boolean open(SecretKey key, @Nullable MigrationListener listener)
+	boolean open(@Nullable MigrationListener listener) throws DbException;
 			throws DbException;
 	/**
 	 * Waits for any open transactions to finish and closes the database.
 	 */
 	void close() throws DbException;
 	/**
 	 * Starts a new transaction and returns an object representing it.
 	 * <p/>
 	 * This method acquires locks, so it must not be called while holding a
 	 * lock.
 	 *
 	 * @param readOnly true if the transaction will only be used for reading.
 	 */
 	Transaction startTransaction(boolean readOnly) throws DbException;
 	/**
 	 * Commits a transaction to the database.
 	 */
 	void commitTransaction(Transaction txn) throws DbException;
 	/**
 	 * Ends a transaction. If the transaction has not been committed,
 	 * it will be aborted. If the transaction has been committed,
 	 * any events attached to the transaction are broadcast.
 	 * The database lock will be released in either case.
 	 */
 	void endTransaction(Transaction txn);
 	/**
 	 * Stores a contact associated with the given local and remote pseudonyms,
 	 * and returns an ID for the contact.
 	 */
 	ContactId addContact(Transaction txn, Author remote, AuthorId local,
-			@Nullable PublicKey handshake, boolean verified) throws DbException;
+			boolean verified, boolean active) throws DbException;
 	/**
 	 * Stores a group.
@@ -70,21 +86,15 @@ public interface DatabaseComponent extends TransactionManager {
 	void addGroup(Transaction txn, Group g) throws DbException;
 	/**
-	 * Stores an identity.
+	 * Stores a local pseudonym.
 	 */
-	void addIdentity(Transaction txn, Identity i) throws DbException;
+	void addLocalAuthor(Transaction txn, LocalAuthor a) throws DbException;
 	/**
 	 * Stores a local message.
 	 */
 	void addLocalMessage(Transaction txn, Message m, Metadata meta,
-			boolean shared, boolean temporary) throws DbException;
+			boolean shared) throws DbException;
 	/**
 	 * Stores a pending contact.
 	 */
 	void addPendingContact(Transaction txn, PendingContact p)
 			throws DbException;
 	/**
 	 * Stores a transport.
@@ -93,55 +103,33 @@ public interface DatabaseComponent extends TransactionManager {
 			throws DbException;
 	/**
-	 * Stores the given transport keys for the given contact and returns a
+	 * Stores transport keys for a newly added contact.
 	 * key set ID.
 	 */
-	KeySetId addTransportKeys(Transaction txn, ContactId c, TransportKeys k)
+	void addTransportKeys(Transaction txn, ContactId c, TransportKeys k)
 			throws DbException;
 	/**
 	 * Stores the given transport keys for the given pending contact and
 	 * returns a key set ID.
 	 */
 	KeySetId addTransportKeys(Transaction txn, PendingContactId p,
 			TransportKeys k) throws DbException;
 	/**
 	 * Returns true if the database contains the given contact for the given
 	 * local pseudonym.
 	 * <p/>
 	 * Read-only.
 	 */
 	boolean containsContact(Transaction txn, AuthorId remote, AuthorId local)
 			throws DbException;
 	/**
 	 * Returns true if the database contains the given group.
 	 * <p/>
 	 * Read-only.
 	 */
 	boolean containsGroup(Transaction txn, GroupId g) throws DbException;
 	/**
-	 * Returns true if the database contains an identity for the given
+	 * Returns true if the database contains the given local author.
 	 * pseudonym.
 	 * <p/>
 	 * Read-only.
 	 */
-	boolean containsIdentity(Transaction txn, AuthorId a) throws DbException;
+	boolean containsLocalAuthor(Transaction txn, AuthorId local)
 	/**
 	 * Returns true if the database contains the given pending contact.
 	 * <p/>
 	 * Read-only.
 	 */
 	boolean containsPendingContact(Transaction txn, PendingContactId p)
 			throws DbException;
 	/**
 	 * Deletes the message with the given ID. Unlike
-	 * {@link #removeMessage(Transaction, MessageId)}, the message ID,
+	 * {@link #removeMessage(Transaction, MessageId)}, the message ID and any
-	 * dependencies, metadata, and any other associated state are not deleted.
+	 * other associated data are not deleted.
 	 */
 	void deleteMessage(Transaction txn, MessageId m) throws DbException;
@@ -159,13 +147,13 @@ public interface DatabaseComponent extends TransactionManager {
 			throws DbException;
 	/**
-	 * Returns a batch of messages for the given contact, with a total length
+	 * Returns a batch of raw messages for the given contact, with a total
-	 * less than or equal to the given length, for transmission over a
+	 * length less than or equal to the given length, for transmission over a
 	 * transport with the given maximum latency. Returns null if there are no
 	 * sendable messages that fit in the given length.
 	 */
 	@Nullable
-	Collection<Message> generateBatch(Transaction txn, ContactId c,
+	Collection<byte[]> generateBatch(Transaction txn, ContactId c,
 			int maxLength, int maxLatency) throws DbException;
 	/**
@@ -186,14 +174,14 @@ public interface DatabaseComponent extends TransactionManager {
 			throws DbException;
 	/**
-	 * Returns a batch of messages for the given contact, with a total length
+	 * Returns a batch of raw messages for the given contact, with a total
-	 * less than or equal to the given length, for transmission over a
+	 * length less than or equal to the given length, for transmission over a
 	 * transport with the given maximum latency. Only messages that have been
 	 * requested by the contact are returned. Returns null if there are no
 	 * sendable messages that fit in the given length.
 	 */
 	@Nullable
-	Collection<Message> generateRequestedBatch(Transaction txn, ContactId c,
+	Collection<byte[]> generateRequestedBatch(Transaction txn, ContactId c,
 			int maxLength, int maxLatency) throws DbException;
 	/**
@@ -223,7 +211,7 @@ public interface DatabaseComponent extends TransactionManager {
 	 * <p/>
 	 * Read-only.
 	 */
-	Collection<ContactId> getContacts(Transaction txn, AuthorId local)
+	Collection<ContactId> getContacts(Transaction txn, AuthorId a)
 			throws DbException;
 	/**
@@ -245,8 +233,7 @@ public interface DatabaseComponent extends TransactionManager {
 	 * <p/>
 	 * Read-only.
 	 */
-	Collection<Group> getGroups(Transaction txn, ClientId c, int majorVersion)
+	Collection<Group> getGroups(Transaction txn, ClientId c) throws DbException;
 			throws DbException;
 	/**
 	 * Returns the given group's visibility to the given contact, or
@@ -258,35 +245,18 @@ public interface DatabaseComponent extends TransactionManager {
 			throws DbException;
 	/**
-	 * Returns the identity for the local pseudonym with the given ID.
+	 * Returns the local pseudonym with the given ID.
 	 * <p/>
 	 * Read-only.
 	 */
-	Identity getIdentity(Transaction txn, AuthorId a) throws DbException;
+	LocalAuthor getLocalAuthor(Transaction txn, AuthorId a) throws DbException;
 	/**
-	 * Returns the identities for all local pseudonyms.
+	 * Returns all local pseudonyms.
 	 * <p/>
 	 * Read-only.
 	 */
-	Collection<Identity> getIdentities(Transaction txn) throws DbException;
+	Collection<LocalAuthor> getLocalAuthors(Transaction txn) throws DbException;
 	/**
 	 * Returns the message with the given ID.
 	 * <p/>
 	 * Read-only.
 	 *
 	 * @throws MessageDeletedException if the message has been deleted
 	 */
 	Message getMessage(Transaction txn, MessageId m) throws DbException;
 	/**
 	 * Returns the IDs of all delivered messages in the given group.
 	 * <p/>
 	 * Read-only.
 	 */
 	Collection<MessageId> getMessageIds(Transaction txn, GroupId g)
 			throws DbException;
 	/**
 	 * Returns the IDs of any messages that need to be validated.
@@ -314,6 +284,15 @@ public interface DatabaseComponent extends TransactionManager {
 	Collection<MessageId> getMessagesToShare(Transaction txn)
 			throws DbException;
 	/**
 	 * Returns the message with the given ID, in serialised form, or null if
 	 * the message has been deleted.
 	 * <p/>
 	 * Read-only.
 	 */
 	@Nullable
 	byte[] getRawMessage(Transaction txn, MessageId m) throws DbException;
 	/**
 	 * Returns the metadata for all delivered messages in the given group.
 	 * <p/>
@@ -323,9 +302,9 @@ public interface DatabaseComponent extends TransactionManager {
 			throws DbException;
 	/**
-	 * Returns the metadata for any delivered messages in the given group with
+	 * Returns the metadata for any messages in the given group with metadata
-	 * metadata that matches all entries in the given query. If the query is
+	 * that matches all entries in the given query. If the query is empty, the
-	 * empty, the metadata for all delivered messages is returned.
+	 * metadata for all messages is returned.
 	 * <p/>
 	 * Read-only.
 	 */
@@ -341,8 +320,8 @@ public interface DatabaseComponent extends TransactionManager {
 			throws DbException;
 	/**
-	 * Returns the metadata for the given delivered or pending message.
+	 * Returns the metadata for the given delivered and pending message.
-	 * This is only meant to be used by the ValidationManager.
+	 * This is meant to be only used by the ValidationManager
 	 * <p/>
 	 * Read-only.
 	 */
@@ -350,8 +329,8 @@ public interface DatabaseComponent extends TransactionManager {
 			throws DbException;
 	/**
-	 * Returns the status of all delivered messages in the given group with
+	 * Returns the status of all messages in the given group with respect to
-	 * respect to the given contact.
+	 * the given contact.
 	 * <p/>
 	 * Read-only.
 	 */
@@ -360,35 +339,38 @@ public interface DatabaseComponent extends TransactionManager {
 	/**
 	 * Returns the IDs and states of all dependencies of the given message.
-	 * For missing dependencies and dependencies in other groups, the state
+	 * Missing dependencies have the state
-	 * {@link MessageState UNKNOWN} is returned.
+	 * {@link ValidationManager.State UNKNOWN}.
 	 * Dependencies in other groups have the state
 	 * {@link ValidationManager.State INVALID}.
 	 * Note that these states are not set on the dependencies themselves; the
 	 * returned states should only be taken in the context of the given message.
 	 * <p/>
 	 * Read-only.
 	 */
-	Map<MessageId, MessageState> getMessageDependencies(Transaction txn,
+	Map<MessageId, State> getMessageDependencies(Transaction txn, MessageId m)
-			MessageId m) throws DbException;
+			throws DbException;
 	/**
-	 * Returns the IDs and states of all dependents of the given message.
+	 * Returns all IDs of messages that depend on the given message.
-	 * Dependents in other groups are not returned. If the given message is
+	 * Messages in other groups that declare a dependency on the given message
-	 * missing, no dependents are returned.
+	 * will be returned even though such dependencies are invalid.
 	 * <p/>
 	 * Read-only.
 	 */
-	Map<MessageId, MessageState> getMessageDependents(Transaction txn,
+	Map<MessageId, State> getMessageDependents(Transaction txn, MessageId m)
-			MessageId m) throws DbException;
+			throws DbException;
 	/**
 	 * Gets the validation and delivery state of the given message.
 	 * <p/>
 	 * Read-only.
 	 */
-	MessageState getMessageState(Transaction txn, MessageId m)
+	State getMessageState(Transaction txn, MessageId m) throws DbException;
 			throws DbException;
 	/**
-	 * Returns the status of the given delivered message with respect to the
+	 * Returns the status of the given message with respect to the given
-	 * given contact.
+	 * contact.
 	 * <p/>
 	 * Read-only.
 	 */
@@ -405,22 +387,6 @@ public interface DatabaseComponent extends TransactionManager {
 	 */
 	long getNextSendTime(Transaction txn, ContactId c) throws DbException;
 	/**
 	 * Returns the pending contact with the given ID.
 	 * <p/>
 	 * Read-only.
 	 */
 	PendingContact getPendingContact(Transaction txn, PendingContactId p)
 			throws DbException;
 	/**
 	 * Returns all pending contacts.
 	 * <p/>
 	 * Read-only.
 	 */
 	Collection<PendingContact> getPendingContacts(Transaction txn)
 			throws DbException;
 	/**
 	 * Returns all settings in the given namespace.
 	 * <p/>
@@ -428,26 +394,20 @@ public interface DatabaseComponent extends TransactionManager {
 	 */
 	Settings getSettings(Transaction txn, String namespace) throws DbException;
 	/**
 	 * Returns the versions of the sync protocol supported by the given contact.
 	 * <p/>
 	 * Read-only.
 	 */
 	List<Byte> getSyncVersions(Transaction txn, ContactId c) throws DbException;
 	/**
 	 * Returns all transport keys for the given transport.
 	 * <p/>
 	 * Read-only.
 	 */
-	Collection<TransportKeySet> getTransportKeys(Transaction txn, TransportId t)
+	Map<ContactId, TransportKeys> getTransportKeys(Transaction txn,
-			throws DbException;
+			TransportId t) throws DbException;
 	/**
-	 * Increments the outgoing stream counter for the given transport keys.
+	 * Increments the outgoing stream counter for the given contact and
 	 * transport in the given rotation period .
 	 */
-	void incrementStreamCounter(Transaction txn, TransportId t, KeySetId k)
+	void incrementStreamCounter(Transaction txn, ContactId c, TransportId t,
-			throws DbException;
+			long rotationPeriod) throws DbException;
 	/**
 	 * Merges the given metadata with the existing metadata for the given
@@ -503,47 +463,29 @@ public interface DatabaseComponent extends TransactionManager {
 	void removeGroup(Transaction txn, Group g) throws DbException;
 	/**
-	 * Removes an identity (and all associated state) from the database.
+	 * Removes a local pseudonym (and all associated state) from the database.
 	 */
-	void removeIdentity(Transaction txn, AuthorId a) throws DbException;
+	void removeLocalAuthor(Transaction txn, AuthorId a) throws DbException;
 	/**
 	 * Removes a message (and all associated state) from the database.
 	 */
 	void removeMessage(Transaction txn, MessageId m) throws DbException;
 	/**
 	 * Removes a pending contact (and all associated state) from the database.
 	 */
 	void removePendingContact(Transaction txn, PendingContactId p)
 			throws DbException;
 	/**
 	 * Removes all temporary messages (and all associated state) from the
 	 * database.
 	 */
 	void removeTemporaryMessages(Transaction txn) throws DbException;
 	/**
 	 * Removes a transport (and all associated state) from the database.
 	 */
 	void removeTransport(Transaction txn, TransportId t) throws DbException;
 	/**
 	 * Removes the given transport keys from the database.
 	 */
 	void removeTransportKeys(Transaction txn, TransportId t, KeySetId k)
 			throws DbException;
 	/**
 	 * Marks the given contact as verified.
 	 */
 	void setContactVerified(Transaction txn, ContactId c) throws DbException;
 	/**
-	 * Sets an alias name for the contact or unsets it if alias is null.
+	 * Marks the given contact as active or inactive.
 	 */
-	void setContactAlias(Transaction txn, ContactId c, @Nullable String alias)
+	void setContactActive(Transaction txn, ContactId c, boolean active)
 			throws DbException;
 	/**
@@ -552,11 +494,6 @@ public interface DatabaseComponent extends TransactionManager {
 	void setGroupVisibility(Transaction txn, ContactId c, GroupId g,
 			Visibility v) throws DbException;
 	/**
 	 * Marks the given message as permanent, i.e. not temporary.
 	 */
 	void setMessagePermanent(Transaction txn, MessageId m) throws DbException;
 	/**
 	 * Marks the given message as shared.
 	 */
@@ -565,7 +502,7 @@ public interface DatabaseComponent extends TransactionManager {
 	/**
 	 * Sets the validation and delivery state of the given message.
 	 */
-	void setMessageState(Transaction txn, MessageId m, MessageState state)
+	void setMessageState(Transaction txn, MessageId m, State state)
 			throws DbException;
 	/**
@@ -575,33 +512,15 @@ public interface DatabaseComponent extends TransactionManager {
 			Collection<MessageId> dependencies) throws DbException;
 	/**
-	 * Sets the handshake key pair for the identity with the given ID.
+	 * Sets the reordering window for the given contact and transport in the
 	 * given rotation period.
 	 */
-	void setHandshakeKeyPair(Transaction txn, AuthorId local,
+	void setReorderingWindow(Transaction txn, ContactId c, TransportId t,
-			PublicKey publicKey, PrivateKey privateKey) throws DbException;
+			long rotationPeriod, long base, byte[] bitmap) throws DbException;
 	/**
 	 * Sets the reordering window for the given transport keys in the given
 	 * time period.
 	 */
 	void setReorderingWindow(Transaction txn, KeySetId k, TransportId t,
 			long timePeriod, long base, byte[] bitmap) throws DbException;
 	/**
 	 * Sets the versions of the sync protocol supported by the given contact.
 	 */
 	void setSyncVersions(Transaction txn, ContactId c, List<Byte> supported)
 			throws DbException;
 	/**
 	 * Marks the given transport keys as usable for outgoing streams.
 	 */
 	void setTransportKeysActive(Transaction txn, TransportId t, KeySetId k)
 			throws DbException;
 	/**
 	 * Stores the given transport keys, deleting any keys they have replaced.
 	 */
-	void updateTransportKeys(Transaction txn, Collection<TransportKeySet> keys)
+	void updateTransportKeys(Transaction txn,
-			throws DbException;
+			Map<ContactId, TransportKeys> keys) throws DbException;
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseConfig.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseConfig.java
@@ -1,13 +1,28 @@
 package org.briarproject.bramble.api.db;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import java.io.File;
 import javax.annotation.Nullable;
@NotNullByDefault
 public interface DatabaseConfig {
 	boolean databaseExists();
 	File getDatabaseDirectory();
-	File getDatabaseKeyDirectory();
+	void setEncryptionKey(SecretKey key);
 	@Nullable
 	SecretKey getEncryptionKey();
 	void setLocalAuthorName(String nickname);
 	@Nullable
 	String getLocalAuthorName();
 	long getMaxSize();
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/DbCallable.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/DbCallable.java
@@ -1,9 +0,0 @@
 package org.briarproject.bramble.api.db;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@NotNullByDefault
 public interface DbCallable<R, E extends Exception> {
 	R call(Transaction txn) throws DbException, E;
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/DbRunnable.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/DbRunnable.java
@@ -1,9 +0,0 @@
 package org.briarproject.bramble.api.db;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@NotNullByDefault
 public interface DbRunnable<E extends Exception> {
 	void run(Transaction txn) throws DbException, E;
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/EventAction.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/EventAction.java
@@ -1,24 +0,0 @@
 package org.briarproject.bramble.api.db;
 import org.briarproject.bramble.api.event.Event;
 /**
 * A {@link CommitAction} that broadcasts an event.
 */
 public class EventAction implements CommitAction {
 	private final Event event;
 	EventAction(Event event) {
 		this.event = event;
 	}
 	public Event getEvent() {
 		return event;
 	}
 	@Override
 	public void accept(Visitor visitor) {
 		visitor.visit(this);
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/MessageDeletedException.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/MessageDeletedException.java
@@ -1,9 +0,0 @@
 package org.briarproject.bramble.api.db;
 /**
 * Thrown when a message that has been deleted is requested from the database.
 * This exception may occur due to concurrent updates and does not indicate a
 * database error.
 */
 public class MessageDeletedException extends DbException {
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/MigrationListener.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/MigrationListener.java
@@ -6,10 +6,6 @@ public interface MigrationListener {
 	 * This is called when a migration is started while opening the database.
 	 * It will be called once for each migration being applied.
 	 */
-	void onDatabaseMigration();
+	void onMigrationRun();
 	/**
 	 * This is called when compaction is started while opening the database.
 	 */
 	void onDatabaseCompaction();
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/NoSuchLocalAuthorException.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/NoSuchLocalAuthorException.java
@@ -1,9 +1,9 @@
 package org.briarproject.bramble.api.db;
 /**
- * Thrown when a database operation is attempted for an identity that is not in
+ * Thrown when a database operation is attempted for a pseudonym that is not in
 * the database. This exception may occur due to concurrent updates and does
 * not indicate a database error.
 */
-public class NoSuchIdentityException extends DbException {
+public class NoSuchLocalAuthorException extends DbException {
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/NoSuchPendingContactException.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/NoSuchPendingContactException.java
@@ -1,9 +0,0 @@
 package org.briarproject.bramble.api.db;
 /**
 * Thrown when a database operation is attempted for a pending contact that is
 * not in the database. This exception may occur due to concurrent updates and
 * does not indicate a database error.
 */
 public class NoSuchPendingContactException extends DbException {
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
akwizgran	f25b16e680	Listen for wifi AP state changes. We won't necessarily receive a connectivity change event when the wifi AP is enabled.	2018-03-26 17:19:17 +01:00
akwizgran	467fdb6468	Log active network info.	2018-03-26 11:49:03 +01:00
akwizgran	c0840dc332	Log a lot of information about the network state.	2018-03-22 17:41:07 +00:00