Bump version numbers for beta release.

This is a fix for a backporting mistake.

.gitignore

@@ -20,9 +20,7 @@ local.properties
 .idea/*
 !.idea/runConfigurations/
 !.idea/codeStyleSettings.xml
-!.idea/codeStyles
 .gradle
 build/
-captures
 *.iml
 projectFilesBackup/

.gitlab-ci.yml

@@ -1,27 +1,29 @@
-image: briar/ci-image-android:latest
+image: registry.gitlab.com/fdroid/ci-images-base:latest
+
+cache:
+  paths:
+    - .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:
-  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 --no-daemon -Djava.security.egd=file:/dev/urandom test
+    - ./gradlew test
 
-  after_script:
-    # these file change every time but should not be cached
+after_script:
+    # 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:
-  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

.idea/codeStyles/Project.xml

@@ -1,270 +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>
-    <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
-      <extensions>
-        <pair source="cpp" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
-    <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>

.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

.idea/runConfigurations/All_in_briar_headless.xml

@@ -1,20 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All in briar-headless" type="AndroidJUnit" factoryName="Android JUnit" nameIsGenerated="true">
-    <module name="briar-headless" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" />
-    <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" value="" />
-    <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/briar-headless" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="singleModule" />
-    </option>
-    <patterns />
-    <method />
-  </configuration>
-</component>

.idea/runConfigurations/All_tests.xml

@@ -21,10 +21,8 @@
     <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-java" 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 briar-core" run_configuration_type="AndroidJUnit" />
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All in briar-headless" run_configuration_type="AndroidJUnit" />
     </method>
   </configuration>
 </component>

.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>

.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>

.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>

.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">
-    <module name="bramble-java" />
+  <configuration default="false" name="All tests in bramble-j2se" type="AndroidJUnit" factoryName="Android JUnit">
+    <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>

.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>

.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>

.idea/runConfigurations/H2_Performance_Test.xml

@@ -1,20 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="H2 Performance Test" type="AndroidJUnit" factoryName="Android JUnit">
-    <module name="bramble-core" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" />
-    <option name="PACKAGE_NAME" value="org.briarproject.bramble.db" />
-    <option name="MAIN_CLASS_NAME" value="org.briarproject.bramble.db.H2DatabasePerformanceTest" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <option name="VM_PARAMETERS" value="-ea" />
-    <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="singleModule" />
-    </option>
-    <patterns />
-    <method />
-  </configuration>
-</component>

.idea/runConfigurations/HyperSQL_Performance_Test.xml

@@ -1,20 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="HyperSQL Performance Test" type="AndroidJUnit" factoryName="Android JUnit">
-    <module name="bramble-core" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" />
-    <option name="PACKAGE_NAME" value="org.briarproject.bramble.db" />
-    <option name="MAIN_CLASS_NAME" value="org.briarproject.bramble.db.HyperSqlDatabasePerformanceTest" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <option name="VM_PARAMETERS" value="-ea" />
-    <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="singleModule" />
-    </option>
-    <patterns />
-    <method />
-  </configuration>
-</component>

.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>

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
-	buildToolsVersion '28.0.3'
+	compileSdkVersion 27
+	buildToolsVersion '26.0.2'
 
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 26
-		versionCode 10105
-		versionName "1.1.5"
+		versionCode 1619
+		versionName "0.16.19"
 		consumerProguardFiles 'proguard-rules.txt'
-
-		testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 	}
 
 	compileOptions {
@@ -24,47 +23,73 @@ android {
 	}
 }
 
-configurations {
-	tor
-}
-
 dependencies {
 	implementation project(path: ':bramble-core', configuration: 'default')
-	tor 'org.briarproject:tor-android:0.3.4.8@zip'
-	tor 'org.briarproject:obfs4proxy-android:0.0.7@zip'
+	implementation fileTree(dir: 'libs', include: '*.jar')
 
-	annotationProcessor 'com.google.dagger:dagger-compiler:2.19'
+	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',
+			'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 {
-	doLast {
-		delete fileTree(torBinariesDir) { include '*.zip' }
+ext.torBinaryDir = 'src/main/res/raw'
+ext.torVersion = '0.2.9.14'
+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
-
-task unpackTorBinaries {
-	doLast {
-		copy {
-			from configurations.tor.collect { zipTree(it) }
-			into torBinariesDir
-		}
+def verifyBinary(name, chksum) {
+	return tasks.create([
+			name     : "verifyBinary${name}",
+			type     : Verify,
+			dependsOn: downloadBinary(name)]) {
+		src "${torBinaryDir}/${name}.zip"
+		algorithm 'SHA-256'
+		checksum chksum
 	}
-	dependsOn cleanTorBinaries
 }
 
-tasks.withType(MergeResources) {
-	inputs.dir torBinariesDir
-	dependsOn unpackTorBinaries
+project.afterEvaluate {
+	torBinaries.every { key, value ->
+		preBuild.dependsOn.add(verifyBinary(key, value))
+	}
 }

bramble-android/proguard-rules.txt

@@ -8,10 +8,6 @@
 -dontwarn dagger.**
 -dontnote dagger.**
 
--keep class net.i2p.crypto.eddsa.** { *; }
-
--keep class org.whispersystems.curve25519.** { *; }
-
 -dontwarn sun.misc.Unsafe
 -dontnote com.google.common.**
 

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

bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidModule.java

@@ -1,18 +1,13 @@
 package org.briarproject.bramble;
 
-import org.briarproject.bramble.battery.AndroidBatteryModule;
-import org.briarproject.bramble.network.AndroidNetworkModule;
-import org.briarproject.bramble.plugin.tor.CircumventionModule;
+import org.briarproject.bramble.plugin.AndroidPluginModule;
 import org.briarproject.bramble.system.AndroidSystemModule;
 
 import dagger.Module;
 
 @Module(includes = {
-		AndroidBatteryModule.class,
-		AndroidNetworkModule.class,
-		AndroidSystemModule.class,
-		CircumventionModule.class
+		AndroidPluginModule.class,
+		AndroidSystemModule.class
 })
 public class BrambleAndroidModule {
-
 }

bramble-android/src/main/java/org/briarproject/bramble/account/AndroidAccountManager.java

@@ -1,108 +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 org.briarproject.bramble.util.IoUtils;
-
-import java.io.File;
-import java.util.logging.Logger;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-
-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();
-	}
-
-	// 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) {
-			super.deleteAccount();
-			SharedPreferences defaultPrefs = getDefaultSharedPreferences();
-			deleteAppData(prefs, defaultPrefs);
-		}
-	}
-
-	// 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
-		File dataDir = new File(appContext.getApplicationInfo().dataDir);
-		File[] children = dataDir.listFiles();
-		if (children == null) {
-			LOG.warning("Could not list files in app data dir");
-		} else {
-			for (File child : children) {
-				String name = child.getName();
-				if (!name.equals("lib") && !name.equals("shared_prefs")) {
-					IoUtils.deleteFileOrDir(child);
-				}
-			}
-		}
-		// Recreate the cache dir as some OpenGL drivers expect it to exist
-		if (!new File(dataDir, "cache").mkdir())
-			LOG.warning("Could not recreate cache dir");
-	}
-}

bramble-android/src/main/java/org/briarproject/bramble/battery/AndroidBatteryManager.java

@@ -1,84 +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.BATTERY_STATUS_CHARGING;
-import static android.os.BatteryManager.BATTERY_STATUS_FULL;
-import static android.os.BatteryManager.EXTRA_STATUS;
-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_STATUS, -1);
-		return status == BATTERY_STATUS_CHARGING ||
-				status == BATTERY_STATUS_FULL;
-	}
-
-	@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));
-		}
-	}
-}

bramble-android/src/main/java/org/briarproject/bramble/battery/AndroidBatteryModule.java

@@ -1,21 +0,0 @@
-package org.briarproject.bramble.battery;
-
-import org.briarproject.bramble.api.battery.BatteryManager;
-import org.briarproject.bramble.api.lifecycle.LifecycleManager;
-
-import javax.inject.Singleton;
-
-import dagger.Module;
-import dagger.Provides;
-
-@Module
-public class AndroidBatteryModule {
-
-	@Provides
-	@Singleton
-	BatteryManager provideBatteryManager(LifecycleManager lifecycleManager,
-			AndroidBatteryManager batteryManager) {
-		lifecycleManager.registerService(batteryManager);
-		return batteryManager;
-	}
-}

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);
-		}
-	}
-}

bramble-android/src/main/java/org/briarproject/bramble/network/AndroidNetworkModule.java

@@ -1,21 +0,0 @@
-package org.briarproject.bramble.network;
-
-import org.briarproject.bramble.api.lifecycle.LifecycleManager;
-import org.briarproject.bramble.api.network.NetworkManager;
-
-import javax.inject.Singleton;
-
-import dagger.Module;
-import dagger.Provides;
-
-@Module
-public class AndroidNetworkModule {
-
-	@Provides
-	@Singleton
-	NetworkManager provideNetworkManager(LifecycleManager lifecycleManager,
-			AndroidNetworkManager networkManager) {
-		lifecycleManager.registerService(networkManager);
-		return networkManager;
-	}
-}

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;
+	}
+}

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

@@ -16,27 +16,18 @@ 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 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,13 +37,7 @@ 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 org.briarproject.bramble.util.LogUtils.logException;
-import static org.briarproject.bramble.util.PrivacyUtils.scrubMacAddress;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
@@ -61,11 +46,8 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
 	private static final Logger LOG =
 			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,
-			Executor ioExecutor, AndroidExecutor androidExecutor,
-			Context appContext, SecureRandom secureRandom, Clock clock,
-			Backoff backoff, DuplexPluginCallback callback, int maxLatency) {
-		super(connectionLimiter, ioExecutor, secureRandom, backoff, callback,
-				maxLatency);
+	AndroidBluetoothPlugin(Executor ioExecutor, AndroidExecutor androidExecutor,
+			Context appContext, SecureRandom secureRandom, Backoff backoff,
+			DuplexPluginCallback callback, int maxLatency) {
+		super(ioExecutor, secureRandom, backoff, callback, maxLatency);
 		this.androidExecutor = androidExecutor;
 		this.appContext = appContext;
-		this.clock = clock;
 	}
 
 	@Override
@@ -164,7 +143,7 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
 		try {
 			if (ss != null) ss.close();
 		} catch (IOException e) {
-			logException(LOG, WARNING, e);
+			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 		}
 	}
 
@@ -175,8 +154,7 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
 	}
 
 	private DuplexTransportConnection wrapSocket(BluetoothSocket s) {
-		return new AndroidBluetoothTransportConnection(this,
-				connectionLimiter, s);
+		return new AndroidBluetoothTransportConnection(this, s);
 	}
 
 	@Override
@@ -200,79 +178,11 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
 		}
 	}
 
-	@Override
-	@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()) {
-				long now = clock.currentTimeMillis();
-				long end = now + MAX_DISCOVERY_MS;
-				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 void tryToClose(@Nullable Closeable c) {
 		try {
 			if (c != null) c.close();
 		} catch (IOException e) {
-			logException(LOG, WARNING, e);
+			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 		}
 	}
 
@@ -293,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);
-		}
-	}
 }

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

@@ -11,7 +11,6 @@ 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;
 	}
 
@@ -62,13 +59,11 @@ public class AndroidBluetoothPluginFactory implements DuplexPluginFactory {
 
 	@Override
 	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(
-				connectionLimiter, ioExecutor, androidExecutor, appContext,
-				secureRandom, clock, backoff, callback, MAX_LATENCY);
+		AndroidBluetoothPlugin plugin = new AndroidBluetoothPlugin(ioExecutor,
+				androidExecutor, appContext, secureRandom, backoff, callback,
+				MAX_LATENCY);
 		eventBus.addListener(plugin);
 		return plugin;
 	}

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,
-			BluetoothConnectionLimiter connectionManager,
-			BluetoothSocket socket) {
+	AndroidBluetoothTransportConnection(Plugin plugin, 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();
-		} finally {
-			connectionManager.connectionClosed(this);
-		}
+		socket.close();
 	}
 }

bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPlugin.java

@@ -1,166 +1,76 @@
 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.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.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 java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
 
 @NotNullByDefault
-class AndroidLanTcpPlugin extends LanTcpPlugin implements EventListener {
-
-	private static final byte[] WIFI_AP_ADDRESS_BYTES =
-			{(byte) 192, (byte) 168, 43, 1};
-	private static final InetAddress WIFI_AP_ADDRESS;
+class AndroidLanTcpPlugin extends LanTcpPlugin {
 
 	private static final Logger LOG =
 			Logger.getLogger(AndroidLanTcpPlugin.class.getName());
 
-	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 Context appContext;
 
-	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, Context appContext,
-			Backoff backoff, DuplexPluginCallback callback, int maxLatency,
+	AndroidLanTcpPlugin(Executor ioExecutor, Backoff backoff,
+			Context appContext, DuplexPluginCallback callback, int maxLatency,
 			int maxIdleTime) {
 		super(ioExecutor, backoff, callback, maxLatency, maxIdleTime);
-		// Don't execute more than one connection status check at a time
-		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();
+		this.appContext = appContext;
 	}
 
 	@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(CONNECTIVITY_ACTION);
+		appContext.registerReceiver(networkStateReceiver, filter);
 	}
 
 	@Override
 	public void stop() {
 		running = false;
+		if (networkStateReceiver != null)
+			appContext.unregisterReceiver(networkStateReceiver);
 		tryToClose(socket);
 	}
 
-	@Override
-	protected Socket createSocket() throws IOException {
-		return socketFactory.createSocket();
-	}
+	private class NetworkStateReceiver extends BroadcastReceiver {
 
-	@Override
-	protected Collection<InetAddress> getLocalIpAddresses() {
-		// 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(() -> {
+		@Override
+		public void onReceive(Context ctx, Intent i) {
 			if (!running) return;
-			Collection<InetAddress> addrs = getLocalIpAddresses();
-			if (addrs.contains(WIFI_AP_ADDRESS)) {
-				LOG.info("Providing wifi hotspot");
-				// There's no corresponding Network object and thus no way
-				// to get a suitable socket factory, so we won't be able to
-				// make outgoing connections on API 21+ if another network
-				// has internet access
-				socketFactory = SocketFactory.getDefault();
+			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 if (addrs.isEmpty()) {
-				LOG.info("Not connected to wifi");
-				socketFactory = SocketFactory.getDefault();
-				tryToClose(socket);
 			} else {
-				LOG.info("Connected to wifi");
-				socketFactory = getSocketFactory();
-				if (socket == null || socket.isClosed()) bind();
+				LOG.info("Not connected to Wi-Fi");
+				tryToClose(socket);
 			}
-		});
+		}
 	}
-}
+}

bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPluginFactory.java

@@ -2,7 +2,6 @@ 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;
@@ -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;
 	}
@@ -54,9 +51,7 @@ public class AndroidLanTcpPluginFactory implements DuplexPluginFactory {
 	public DuplexPlugin createPlugin(DuplexPluginCallback callback) {
 		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
 				MAX_POLLING_INTERVAL, BACKOFF_BASE);
-		AndroidLanTcpPlugin plugin = new AndroidLanTcpPlugin(ioExecutor,
-				appContext, backoff, callback, MAX_LATENCY, MAX_IDLE_TIME);
-		eventBus.addListener(plugin);
-		return plugin;
+		return new AndroidLanTcpPlugin(ioExecutor, backoff, appContext,
+				callback, MAX_LATENCY, MAX_IDLE_TIME);
 	}
 }

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

@@ -1,90 +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.duplex.DuplexPluginCallback;
-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 {
-
-	// This tag may prevent Huawei's power manager from killing us
-	private static final String WAKE_LOCK_TAG = "LocationManagerService";
-
-	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,
-			DuplexPluginCallback callback, String architecture, int maxLatency,
-			int maxIdleTime) {
-		super(ioExecutor, networkManager, locationUtils, torSocketFactory,
-				clock, resourceProvider, circumventionProvider, batteryManager,
-				backoff, 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,
-				WAKE_LOCK_TAG, 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();
-	}
-}

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);
+	}
+}

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

@@ -1,19 +1,26 @@
 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.PoliteExecutor;
-import org.briarproject.bramble.api.battery.BatteryManager;
-import org.briarproject.bramble.api.battery.event.BatteryEvent;
 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.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.plugin.Backoff;
@@ -24,12 +31,13 @@ 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.Clock;
 import org.briarproject.bramble.api.system.LocationUtils;
-import org.briarproject.bramble.api.system.ResourceProvider;
+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;
@@ -42,7 +50,6 @@ import java.io.OutputStream;
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -50,8 +57,14 @@ 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;
@@ -59,83 +72,81 @@ 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_MOBILE;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK;
-import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_AUTOMATIC;
+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_WITH_BRIDGES;
+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_V2;
-import static org.briarproject.bramble.api.plugin.TorConstants.PROP_ONION_V3;
-import static org.briarproject.bramble.util.LogUtils.logException;
+import static org.briarproject.bramble.api.plugin.TorConstants.PROP_ONION;
 import static org.briarproject.bramble.util.PrivacyUtils.scrubOnion;
-import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
-abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
-
-	private static final Logger LOG =
-			Logger.getLogger(TorPlugin.class.getName());
+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_MS = 3000;
-	private static final int COOKIE_POLLING_INTERVAL_MS = 200;
-	private static final Pattern ONION_V2 = Pattern.compile("[a-z2-7]{16}");
-	private static final Pattern ONION_V3 = Pattern.compile("[a-z2-7]{56}");
+	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, connectionStatusExecutor;
-	private final NetworkManager networkManager;
+	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 Clock clock;
-	private final BatteryManager batteryManager;
 	private final Backoff backoff;
 	private final DuplexPluginCallback callback;
 	private final String architecture;
-	private final CircumventionProvider circumventionProvider;
-	private final ResourceProvider resourceProvider;
 	private final int maxLatency, maxIdleTime, socketTimeout;
-	private final File torDirectory, torFile, geoIpFile, obfs4File, configFile;
-	private final File doneFile, cookieFile;
 	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 Settings settings = null;
+	private volatile BroadcastReceiver networkStateReceiver = null;
 
-	protected volatile boolean running = false;
-
-	protected abstract int getProcessId();
-
-	protected abstract long getLastUpdateTime();
-
-	TorPlugin(Executor ioExecutor, NetworkManager networkManager,
-			LocationUtils locationUtils, SocketFactory torSocketFactory,
-			Clock clock, ResourceProvider resourceProvider,
-			CircumventionProvider circumventionProvider,
-			BatteryManager batteryManager, Backoff backoff,
-			DuplexPluginCallback callback, String architecture, int maxLatency,
-			int maxIdleTime, File torDirectory) {
+	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.networkManager = networkManager;
+		this.scheduler = scheduler;
+		this.appContext = appContext;
 		this.locationUtils = locationUtils;
+		this.reporter = reporter;
 		this.torSocketFactory = torSocketFactory;
-		this.clock = clock;
-		this.resourceProvider = resourceProvider;
-		this.circumventionProvider = circumventionProvider;
-		this.batteryManager = batteryManager;
 		this.backoff = backoff;
 		this.callback = callback;
 		this.architecture = architecture;
@@ -144,17 +155,19 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		if (maxIdleTime > Integer.MAX_VALUE / 2)
 			socketTimeout = Integer.MAX_VALUE;
 		else socketTimeout = maxIdleTime * 2;
-		this.torDirectory = torDirectory;
+		connectionStatus = new ConnectionStatus();
+		torDirectory = appContext.getDir("tor", MODE_PRIVATE);
 		torFile = new File(torDirectory, "tor");
 		geoIpFile = new File(torDirectory, "geoip");
-		obfs4File = new File(torDirectory, "obfs4proxy");
 		configFile = new File(torDirectory, "torrc");
 		doneFile = new File(torDirectory, "done");
 		cookieFile = new File(torDirectory, ".tor/control_auth_cookie");
-		connectionStatus = new ConnectionStatus();
-		// Don't execute more than one connection status check at a time
-		connectionStatusExecutor =
-				new PoliteExecutor("TorPlugin", ioExecutor, 1);
+		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
@@ -175,25 +188,23 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	@Override
 	public void start() throws PluginException {
 		if (used.getAndSet(true)) throw new IllegalStateException();
-		if (!torDirectory.exists()) {
-			if (!torDirectory.mkdirs()) {
-				LOG.warning("Could not create Tor directory.");
-				throw new PluginException();
-			}
-		}
-		// Load the settings
-		settings = callback.getSettings();
 		// Install or update the assets if necessary
 		if (!assetsAreUpToDate()) installAssets();
-		if (cookieFile.exists() && !cookieFile.delete())
-			LOG.warning("Old auth cookie not deleted");
-		// Migrate old settings before having a chance to stop
-		migrateSettings();
-		// Start a new Tor process
 		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(getProcessId());
+		String pid = String.valueOf(android.os.Process.myPid());
 		Process torProcess;
 		ProcessBuilder pb =
 				new ProcessBuilder(torPath, "-f", configPath, OWNER, pid);
@@ -229,16 +240,11 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 				throw new PluginException();
 			}
 			// Wait for the auth cookie file to be created/updated
-			long start = clock.currentTimeMillis();
-			while (cookieFile.length() < 32) {
-				if (clock.currentTimeMillis() - start > COOKIE_TIMEOUT_MS) {
-					LOG.warning("Auth cookie not created");
-					if (LOG.isLoggable(INFO)) listFiles(torDirectory);
-					throw new PluginException();
-				}
-				Thread.sleep(COOKIE_POLLING_INTERVAL_MS);
+			if (!latch.await(COOKIE_TIMEOUT, MILLISECONDS)) {
+				LOG.warning("Auth cookie not created");
+				if (LOG.isLoggable(INFO)) listFiles(torDirectory);
+				throw new PluginException();
 			}
-			LOG.info("Auth cookie created");
 		} catch (InterruptedException e) {
 			LOG.warning("Interrupted while starting Tor");
 			Thread.currentThread().interrupt();
@@ -265,15 +271,26 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		} catch (IOException e) {
 			throw new PluginException(e);
 		}
-		// Check whether we're online
-		updateConnectionStatus(networkManager.getNetworkStatus(),
-				batteryManager.isCharging());
+		// 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() {
-		return doneFile.lastModified() > getLastUpdateTime();
+		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 {
@@ -291,12 +308,6 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			in = getGeoIpInputStream();
 			out = new FileOutputStream(geoIpFile);
 			IoUtils.copyAndClose(in, out);
-			// Unzip the Obfs4 proxy to the filesystem
-			in = getObfs4InputStream();
-			out = new FileOutputStream(obfs4File);
-			IoUtils.copyAndClose(in, out);
-			// Make the Obfs4 proxy executable
-			if (!obfs4File.setExecutable(true, true)) throw new IOException();
 			// Copy the config file to the filesystem
 			in = getConfigInputStream();
 			out = new FileOutputStream(configFile);
@@ -312,40 +323,36 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	private InputStream getTorInputStream() throws IOException {
 		if (LOG.isLoggable(INFO))
 			LOG.info("Installing Tor binary for " + architecture);
-		InputStream in = resourceProvider
-				.getResourceInputStream("tor_" + architecture, ".zip");
+		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 {
-		InputStream in = resourceProvider.getResourceInputStream("geoip",
-				".zip");
+		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 getObfs4InputStream() throws IOException {
-		if (LOG.isLoggable(INFO))
-			LOG.info("Installing obfs4proxy binary for " + architecture);
-		InputStream in = resourceProvider
-				.getResourceInputStream("obfs4proxy_" + architecture, ".zip");
-		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 InputStream getConfigInputStream() {
-		return getClass().getClassLoader().getResourceAsStream("torrc");
+	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) {
-			logException(LOG, WARNING, e);
+			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 		}
 	}
 
@@ -353,7 +360,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		try {
 			if (s != null) s.close();
 		} catch (IOException e) {
-			logException(LOG, WARNING, e);
+			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 		}
 	}
 
@@ -362,7 +369,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			File[] children = f.listFiles();
 			if (children != null) for (File child : children) listFiles(child);
 		} else {
-			LOG.info(f.getAbsolutePath() + " " + f.length());
+			LOG.info(f.getAbsolutePath());
 		}
 	}
 
@@ -382,12 +389,20 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		}
 	}
 
+	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 = settings.get(PREF_TOR_PORT);
+			String portString = callback.getSettings().get(PREF_TOR_PORT);
 			int port;
-			if (isNullOrEmpty(portString)) port = 0;
+			if (StringUtils.isNullOrEmpty(portString)) port = 0;
 			else port = Integer.parseInt(portString);
 			// Bind a server socket to receive connections from Tor
 			ServerSocket ss = null;
@@ -395,7 +410,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 				ss = new ServerSocket();
 				ss.bind(new InetSocketAddress("127.0.0.1", port));
 			} catch (IOException e) {
-				logException(LOG, WARNING, e);
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 				tryToClose(ss);
 				return;
 			}
@@ -421,7 +436,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		try {
 			if (ss != null) ss.close();
 		} catch (IOException e) {
-			logException(LOG, WARNING, e);
+			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 		} finally {
 			callback.transportDisabled();
 		}
@@ -430,7 +445,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	private void publishHiddenService(String port) {
 		if (!running) return;
 		LOG.info("Creating hidden service");
-		String privKey = settings.get(HS_PRIVKEY);
+		String privKey = callback.getSettings().get(HS_PRIVKEY);
 		Map<Integer, String> portLines =
 				Collections.singletonMap(80, "127.0.0.1:" + port);
 		Map<String, String> response;
@@ -440,7 +455,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 				response = controlConnection.addOnion(portLines);
 			else response = controlConnection.addOnion(privKey, portLines);
 		} catch (IOException e) {
-			logException(LOG, WARNING, e);
+			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 			return;
 		}
 		if (!response.containsKey(HS_ADDRESS)) {
@@ -452,11 +467,11 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			return;
 		}
 		// Publish the hidden service's onion hostname in transport properties
-		String onion2 = response.get(HS_ADDRESS);
+		String hostname = response.get(HS_ADDRESS);
 		if (LOG.isLoggable(INFO))
-			LOG.info("Hidden service " + scrubOnion(onion2));
+			LOG.info("Hidden service " + scrubOnion(hostname));
 		TransportProperties p = new TransportProperties();
-		p.put(PROP_ONION_V2, onion2);
+		p.put(PROP_ONION, hostname);
 		callback.mergeLocalProperties(p);
 		if (privKey == null) {
 			// Save the hidden service's private key for next time
@@ -484,30 +499,23 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		}
 	}
 
-	protected void enableNetwork(boolean enable) throws IOException {
+	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();
-	}
-
-	private void enableBridges(boolean enable) throws IOException {
-		if (enable) {
-			Collection<String> conf = new ArrayList<>();
-			conf.add("UseBridges 1");
-			conf.add("ClientTransportPlugin obfs4 exec " +
-					obfs4File.getAbsolutePath());
-			conf.addAll(circumventionProvider.getBridges());
-			controlConnection.setConf(conf);
-		} else {
-			controlConnection.setConf("UseBridges", "0");
+		if (!enable) {
+			callback.transportDisabled();
+			wakeLock.release();
 		}
 	}
 
 	@Override
-	public void stop() {
+	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");
@@ -515,9 +523,10 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 				controlConnection.shutdownTor("TERM");
 				controlSocket.close();
 			} catch (IOException e) {
-				logException(LOG, WARNING, e);
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 			}
 		}
+		wakeLock.release();
 	}
 
 	@Override
@@ -536,16 +545,20 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	}
 
 	@Override
-	public void poll(Map<ContactId, TransportProperties> contacts) {
+	public void poll(Collection<ContactId> connected) {
 		if (!isRunning()) return;
 		backoff.increment();
-		for (Entry<ContactId, TransportProperties> e : contacts.entrySet()) {
-			connectAndCallBack(e.getKey(), e.getValue());
+		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();
@@ -555,43 +568,34 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	}
 
 	@Override
-	public DuplexTransportConnection createConnection(TransportProperties p) {
+	public DuplexTransportConnection createConnection(ContactId c) {
 		if (!isRunning()) return null;
-		String bestOnion = null;
-		String onion2 = p.get(PROP_ONION_V2);
-		String onion3 = p.get(PROP_ONION_V3);
-		if (!isNullOrEmpty(onion2)) {
-			if (ONION_V2.matcher(onion2).matches()) {
-				bestOnion = onion2;
-			} else {
-				// Don't scrub the address so we can find the problem
-				if (LOG.isLoggable(INFO))
-					LOG.info("Invalid v2 hostname: " + onion2);
-			}
+		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;
 		}
-		if (!isNullOrEmpty(onion3)) {
-			if (ONION_V3.matcher(onion3).matches()) {
-				bestOnion = onion3;
-			} else {
-				// Don't scrub the address so we can find the problem
-				if (LOG.isLoggable(INFO))
-					LOG.info("Invalid v3 hostname: " + onion3);
-			}
-		}
-		if (bestOnion == null) return null;
 		Socket s = null;
 		try {
 			if (LOG.isLoggable(INFO))
-				LOG.info("Connecting to " + scrubOnion(bestOnion));
-			s = torSocketFactory.createSocket(bestOnion + ".onion", 80);
+				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(bestOnion));
+				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(bestOnion)
-						+ ": " + e.toString());
+				LOG.info("Could not connect to " + scrubOnion(onion) + ": " +
+						e.toString());
 			}
 			tryToClose(s);
 			return null;
@@ -620,7 +624,10 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 				connectionStatus.getAndSetCircuitBuilt()) {
 			LOG.info("First circuit built");
 			backoff.reset();
-			if (isRunning()) callback.transportEnabled();
+			if (isRunning()) {
+				sendDevReports();
+				callback.transportEnabled();
+			}
 		}
 	}
 
@@ -630,13 +637,9 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 
 	@Override
 	public void orConnStatus(String status, String orName) {
-		if (LOG.isLoggable(INFO))
-			LOG.info("OR connection " + status + " " + orName);
-		if (status.equals("CLOSED") || status.equals("FAILED")) {
-			// Check whether we've lost connectivity
-			updateConnectionStatus(networkManager.getNetworkStatus(),
-					batteryManager.isCharging());
-		}
+		if (LOG.isLoggable(INFO)) LOG.info("OR connection " + status);
+		if (status.equals("CLOSED") || status.equals("FAILED"))
+			updateConnectionStatus(); // Check whether we've lost connectivity
 	}
 
 	@Override
@@ -653,7 +656,10 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		if (severity.equals("NOTICE") && msg.startsWith("Bootstrapped 100%")) {
 			connectionStatus.setBootstrapped();
 			backoff.reset();
-			if (isRunning()) callback.transportEnabled();
+			if (isRunning()) {
+				sendDevReports();
+				callback.transportEnabled();
+			}
 		}
 	}
 
@@ -663,112 +669,105 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			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");
-				settings = s.getSettings();
-				// Works around a bug introduced in Tor 0.3.4.8. Could be
-				// replaced with callback.transportDisabled() when fixed.
-				disableNetwork();
-				updateConnectionStatus(networkManager.getNetworkStatus(),
-						batteryManager.isCharging());
+				updateConnectionStatus();
 			}
-		} else if (e instanceof NetworkStatusEvent) {
-			updateConnectionStatus(((NetworkStatusEvent) e).getStatus(),
-					batteryManager.isCharging());
-		} else if (e instanceof BatteryEvent) {
-			updateConnectionStatus(networkManager.getNetworkStatus(),
-					((BatteryEvent) e).isCharging());
 		}
 	}
 
-	private void disableNetwork() {
-		connectionStatusExecutor.execute(() -> {
-			try {
-				enableNetwork(false);
-			} catch (IOException ex) {
-				logException(LOG, WARNING, ex);
-			}
-		});
-	}
-
-	private void updateConnectionStatus(NetworkStatus status,
-			boolean charging) {
-		connectionStatusExecutor.execute(() -> {
+	private void updateConnectionStatus() {
+		ioExecutor.execute(() -> {
 			if (!running) return;
-			boolean online = status.isConnected();
-			boolean wifi = status.isWifi();
-			String country = locationUtils.getCurrentCountry();
-			boolean blocked =
-					circumventionProvider.isTorProbablyBlocked(country);
-			int network = settings.getInt(PREF_TOR_NETWORK,
-					PREF_TOR_NETWORK_AUTOMATIC);
-			boolean useMobile = settings.getBoolean(PREF_TOR_MOBILE, true);
-			boolean bridgesWork = circumventionProvider.doBridgesWork(country);
-			boolean automatic = network == PREF_TOR_NETWORK_AUTOMATIC;
-
-			if (LOG.isLoggable(INFO)) {
-				LOG.info("Online: " + online + ", wifi: " + wifi);
-				if ("".equals(country)) LOG.info("Country code unknown");
-				else LOG.info("Country code: " + country);
-				LOG.info("Charging: " + charging);
-			}
-
 			try {
-				if (!online) {
-					LOG.info("Disabling network, device is offline");
-					enableNetwork(false);
-				} else if (network == PREF_TOR_NETWORK_NEVER ||
-						(!useMobile && !wifi)) {
-					LOG.info("Disabling network due to setting");
-					enableNetwork(false);
-				} else if (automatic && blocked && !bridgesWork) {
-					LOG.info("Disabling network, country is blocked");
-					enableNetwork(false);
-				} else if (network == PREF_TOR_NETWORK_WITH_BRIDGES ||
-						(automatic && bridgesWork)) {
-					LOG.info("Enabling network, using bridges");
-					enableBridges(true);
-					enableNetwork(true);
-				} else {
-					LOG.info("Enabling network, not using bridges");
-					enableBridges(false);
-					enableNetwork(true);
-				}
-				if (online && wifi && charging) {
-					LOG.info("Enabling connection padding");
-					enableConnectionPadding(true);
-				} else {
-					LOG.info("Disabling connection padding");
-					enableConnectionPadding(false);
-				}
-			} catch (IOException e) {
-				logException(LOG, WARNING, e);
+				connectionStatusLock.lock();
+				updateConnectionStatusLocked();
+			} finally {
+				connectionStatusLock.unlock();
 			}
 		});
 	}
 
-	private void enableConnectionPadding(boolean enable) throws IOException {
-		if (!running) return;
-		controlConnection.setConf("ConnectionPadding", enable ? "1" : "0");
+	// 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);
+		}
 	}
 
-	// TODO remove when sufficient time has passed. Added 2018-08-15
-	private void migrateSettings() {
-		Settings sOld = callback.getSettings();
-		int oldNetwork = sOld.getInt("network", -1);
-		if (oldNetwork == -1) return;
-		Settings s = new Settings();
-		if (oldNetwork == 0) {
-			s.putInt(PREF_TOR_NETWORK, PREF_TOR_NETWORK_NEVER);
-		} else if (oldNetwork == 1) {
-			s.putBoolean(PREF_TOR_MOBILE, false);
+	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();
+			}
 		}
-		s.putInt("network", -1);
-		callback.mergeSettings(s);
 	}
 
 	private static class ConnectionStatus {
@@ -789,7 +788,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 
 		private synchronized void enableNetwork(boolean enable) {
 			networkEnabled = enable;
-			if (!enable) circuitBuilt = false;
+			circuitBuilt = false;
 		}
 
 		private synchronized boolean isConnected() {

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

@@ -3,9 +3,7 @@ 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;
@@ -14,9 +12,8 @@ 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,
-			CircumventionProvider circumventionProvider,
-			BatteryManager batteryManager, Clock clock) {
+			BackoffFactory backoffFactory) {
 		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
@@ -106,10 +93,9 @@ public class AndroidTorPluginFactory implements DuplexPluginFactory {
 
 		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
 				MAX_POLLING_INTERVAL, BACKOFF_BASE);
-		AndroidTorPlugin plugin = new AndroidTorPlugin(ioExecutor, scheduler,
-				appContext, networkManager, locationUtils, torSocketFactory,
-				clock, resourceProvider, circumventionProvider, batteryManager,
-				backoff, callback, architecture, MAX_LATENCY, MAX_IDLE_TIME);
+		TorPlugin plugin = new TorPlugin(ioExecutor, scheduler, appContext,
+				locationUtils, reporter, torSocketFactory, backoff, callback,
+				architecture, MAX_LATENCY, MAX_IDLE_TIME);
 		eventBus.addListener(plugin);
 		return plugin;
 	}

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);
-	}
-}

bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSecureRandomProvider.java

@@ -9,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;
@@ -67,12 +66,9 @@ class AndroidSecureRandomProvider extends LinuxSecureRandomProvider {
 
 	@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

bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSystemModule.java

@@ -1,8 +1,9 @@
 package org.briarproject.bramble.system;
 
+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 javax.inject.Singleton;
@@ -15,26 +16,18 @@ public class AndroidSystemModule {
 
 	@Provides
 	@Singleton
-	SecureRandomProvider provideSecureRandomProvider(
-			AndroidSecureRandomProvider provider) {
-		return provider;
+	SecureRandomProvider provideSecureRandomProvider(Application app) {
+		return new AndroidSecureRandomProvider(app);
 	}
 
 	@Provides
-	LocationUtils provideLocationUtils(AndroidLocationUtils locationUtils) {
-		return locationUtils;
+	LocationUtils provideLocationUtils(Application app) {
+		return new AndroidLocationUtils(app);
 	}
 
 	@Provides
 	@Singleton
-	AndroidExecutor provideAndroidExecutor(
-			AndroidExecutorImpl androidExecutor) {
-		return androidExecutor;
-	}
-
-	@Provides
-	@Singleton
-	ResourceProvider provideResourceProvider(AndroidResourceProvider provider) {
-		return provider;
+	AndroidExecutor provideAndroidExecutor(Application app) {
+		return new AndroidExecutorImpl(app);
 	}
 }

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

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.util;
 
-import android.annotation.SuppressLint;
 import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
 import android.os.Build;
@@ -13,7 +12,6 @@ import java.util.Collection;
 import java.util.List;
 
 import static android.content.Context.MODE_PRIVATE;
-import static android.os.Build.VERSION.SDK_INT;
 
 public class AndroidUtils {
 
@@ -25,7 +23,7 @@ public class AndroidUtils {
 	@SuppressWarnings("deprecation")
 	public static Collection<String> getSupportedArchitectures() {
 		List<String> abis = new ArrayList<>();
-		if (SDK_INT >= 21) {
+		if (Build.VERSION.SDK_INT >= 21) {
 			abis.addAll(Arrays.asList(Build.SUPPORTED_ABIS));
 		} else {
 			abis.add(Build.CPU_ABI);
@@ -37,7 +35,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,6 +51,19 @@ 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);
 	}

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;
-		}
-	}
-}
-

bramble-android/src/test/java/org/briarproject/bramble/account/AndroidAccountManagerTest.java

@@ -1,162 +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");
-
-		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));
-			oneOf(app).getApplicationInfo();
-			will(returnValue(applicationInfo));
-		}});
-
-		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());
-
-		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());
-	}
-
-	@After
-	public void tearDown() {
-		deleteTestDirectory(testDir);
-	}
-}

bramble-android/witness.gradle

@@ -1,101 +0,0 @@
-dependencyVerification {
-    verify = [
-        'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861',
-        'com.android.tools.analytics-library:protos:26.2.1:protos-26.2.1.jar:2f371f5b1f551e85ab08be4d6a2873471b3d44afd1ebf6aa3298f3b796bf691f',
-        'com.android.tools.analytics-library:shared:26.2.1:shared-26.2.1.jar:4c1e4e705fa4d45f23aaea230557f6508155012d9c296337787c1d7b26a97f5a',
-        'com.android.tools.analytics-library:tracker:26.2.1:tracker-26.2.1.jar:4a624ecc976539f755ddb0bb8dfc2dd3d08326cfec59a098dbd70f701ca7fb75',
-        'com.android.tools.build:aapt2:3.2.1-4818971:aapt2-3.2.1-4818971-linux.jar:f431b6f96c91a2c155144b091a9c97d9805c589fe8efc9c930b6cd346cb60a1e',
-        'com.android.tools.build:apksig:3.2.1:apksig-3.2.1.jar:2b46f2feffea66037aab29e4261b2433c190194a6ef97b958511eb157f2ccba5',
-        'com.android.tools.build:apkzlib:3.2.1:apkzlib-3.2.1.jar:c39ad0313905932431fe81c8899c2cf39a4d92ad6c4edcaa4b25432f461452aa',
-        'com.android.tools.build:builder-model:3.2.1:builder-model-3.2.1.jar:a9f68e6abcec122f9cb5ad352d3f05a3eb03acbcdca95e4d25c16310c2c965ff',
-        'com.android.tools.build:builder-test-api:3.2.1:builder-test-api-3.2.1.jar:533ac6c2b5884bb54967a33791f2628dfdfac7981af39417a333b43d4379b6be',
-        'com.android.tools.build:builder:3.2.1:builder-3.2.1.jar:aedcbfd115dbe91d09b4113e66ef50589b558d0aa3b2f133b1d867c9b87fae83',
-        'com.android.tools.build:gradle-api:3.2.1:gradle-api-3.2.1.jar:57cf0ac5ac1dca8afdb3f62b94265e776e7dcfa641cc3844fb53a05193de208d',
-        'com.android.tools.build:manifest-merger:26.2.1:manifest-merger-26.2.1.jar:8830573263361035d38cfdcb51e2db94029c93865b21334f5fbf8a27984281a6',
-        'com.android.tools.ddms:ddmlib:26.2.1:ddmlib-26.2.1.jar:a4bf0a29a19980bf27269465cc782064656750b77c26728f82f9e148b705218b',
-        'com.android.tools.external.com-intellij:intellij-core:26.2.1:intellij-core-26.2.1.jar:4925ad1892c2687cb1a63427d440ef519c8c59215fefe0dc5d541d5d411fcafe',
-        'com.android.tools.external.com-intellij:kotlin-compiler:26.2.1:kotlin-compiler-26.2.1.jar:daa064fd708f340ee25fb9823c4c74104ac77f1370b76d907eb9ae6daec0a2ae',
-        'com.android.tools.external.org-jetbrains:uast:26.2.1:uast-26.2.1.jar:f10f7258d2ab9189562cc0f9ad838c0378fdba439229173390a99de02ebac75b',
-        'com.android.tools.layoutlib:layoutlib-api:26.2.1:layoutlib-api-26.2.1.jar:ddbf4fca123733fa011595b1cc1f4ac2937ed327b60990711fafc33c775c2ade',
-        'com.android.tools.lint:lint-api:26.2.1:lint-api-26.2.1.jar:3b57e739de567b98bc9ab56c2c0ee66fc026b4adf5843e8f9804ca0666a6f66e',
-        'com.android.tools.lint:lint-checks:26.2.1:lint-checks-26.2.1.jar:c86f4cc9aaee722ee4ad70062f7b5af91e9b041914af27adc09f545ab0fb3bc6',
-        'com.android.tools.lint:lint-gradle-api:26.2.1:lint-gradle-api-26.2.1.jar:2283e7af32e301565f2a797e531f0fc8c648077d457afb3ffdddbee638976c2f',
-        'com.android.tools.lint:lint-gradle:26.2.1:lint-gradle-26.2.1.jar:8fd90b2f3ec788cbb9801c07ab3e1ea2255aa31a6093157d7ea0ff13d0315ecb',
-        'com.android.tools.lint:lint-kotlin:26.2.1:lint-kotlin-26.2.1.jar:7a6a5d2b18f69cf1b900d857c2632b4c683713c533295933b8b759f8cab4a877',
-        'com.android.tools.lint:lint:26.2.1:lint-26.2.1.jar:7848b82ae988b90dee259ae7c7e86e05cbf52db6cd21c8bbd38ce7df08f3f8c5',
-        'com.android.tools:annotations:26.2.1:annotations-26.2.1.jar:7391c6a1e080174b96e64ceb078dadd31ce4d8a2d2fee0ec65be202126f90f24',
-        'com.android.tools:common:26.2.1:common-26.2.1.jar:a50aab2d6411ff68f4004a87c7e93d87d8e980a0ec3b352246549897ea2d78e5',
-        'com.android.tools:dvlib:26.2.1:dvlib-26.2.1.jar:72a83bf2839b1df9b1fbf67ba45d1bfb9f966cd774da4320c762b2be8f1688aa',
-        'com.android.tools:repository:26.2.1:repository-26.2.1.jar:fa74dae09103faef703df38550ad8fa244c5b6d1bf90d6198be932292b3d9cc1',
-        'com.android.tools:sdk-common:26.2.1:sdk-common-26.2.1.jar:759d4b292ca69a35cf961fca377b54158fc6c88108978006999442e80a011cf4',
-        'com.android.tools:sdklib:26.2.1:sdklib-26.2.1.jar:248df7ad5eac4aeb6f96c394c76760de4b7b89ac056e54d0c21a739368b91b45',
-        'com.google.code.findbugs:jsr305:1.3.9:jsr305-1.3.9.jar:905721a0eea90a81534abb7ee6ef4ea2e5e645fa1def0a5cd88402df1b46c9ed',
-        'com.google.code.gson:gson:2.8.0:gson-2.8.0.jar:c6221763bd79c4f1c3dc7f750b5f29a0bb38b367b81314c4f71896e340c40825',
-        'com.google.dagger:dagger-compiler:2.19:dagger-compiler-2.19.jar:27a4b202a2de908182edb261f8c0a264e08e5e4733d7514bc7fbf0d31da5c0fc',
-        'com.google.dagger:dagger-producers:2.19:dagger-producers-2.19.jar:a17663abe0fc38b676026950907d4c5f5e2bf338375415861eaff6e3bdb0b768',
-        'com.google.dagger:dagger-spi:2.19:dagger-spi-2.19.jar:e7a6379d82c841f6aac2866948ad1eed716528707814602842a8d844ce04e2e1',
-        'com.google.dagger:dagger:2.19:dagger-2.19.jar:514b6f1e0727c6572e1d65cb27e4ae668b7aeaeb93a29515182965265b609939',
-        'com.google.errorprone:error_prone_annotations:2.0.18:error_prone_annotations-2.0.18.jar:cb4cfad870bf563a07199f3ebea5763f0dec440fcda0b318640b1feaa788656b',
-        '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:23.0:guava-23.0.jar:7baa80df284117e5b945b19b98d367a85ea7b7801bd358ff657946c3bd1b6596',
-        'com.google.guava:guava:25.0-jre:guava-25.0-jre.jar:3fd4341776428c7e0e5c18a7c10de129475b69ab9d30aeafbb5c277bb6074fa9',
-        'com.google.j2objc:j2objc-annotations:1.1:j2objc-annotations-1.1.jar:40ceb7157feb263949e0f503fe5f71689333a621021aa20ce0d0acee3badaa0f',
-        '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.9:commons-codec-1.9.jar:ad19d2601c3abf0b946b5c3a4113e226a8c1e3305e395b90013b78dd94a723ce',
-        '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.2:httpclient-4.5.2.jar:0dffc621400d6c632f55787d996b8aeca36b30746a716e079a985f24d8074057',
-        'org.apache.httpcomponents:httpcore:4.4.5:httpcore-4.4.5.jar:64d5453874cab7e40a7065cb01a9a9ca1053845a9786b478878b679e0580cec3',
-        'org.apache.httpcomponents:httpmime:4.5.2:httpmime-4.5.2.jar:231a3f7e4962053db2be8461d5422e68fc458a3a7dd7d8ada803a348e21f8f07',
-        '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.7:obfs4proxy-android-0.0.7.zip:abdfb5d889d848de9bf214f9276abbf454808a505b870819eccc9a9e985bf617',
-        'org.briarproject:tor-android:0.3.4.8:tor-android-0.3.4.8.zip:989a0352d9d8d8172cd6c2137654e165e5d2beb10ed1211bab3814e224ad1926',
-        'org.checkerframework:checker-compat-qual:2.5.3:checker-compat-qual-2.5.3.jar:d76b9afea61c7c082908023f0cbc1427fab9abd2df915c8b8a3e7a509bccbc6d',
-        'org.codehaus.groovy:groovy-all:2.4.12:groovy-all-2.4.12.jar:6a56af4bd48903d56bec62821876cadefafd007360cc6bd0d8f7aa8d72b38be4',
-        '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.2.0:kotlin-reflect-1.2.0.jar:4f48a872bad6e4d9c053f4ad610d11e4012ad7e58dc19a03dd5eb811f36069dd',
-        'org.jetbrains.kotlin:kotlin-stdlib-common:1.2.71:kotlin-stdlib-common-1.2.71.jar:63999687ff2fce8a592dd180ffbbf8f1d21c26b4044c55cdc74ff3cf3b3cf328',
-        'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71:kotlin-stdlib-jdk7-1.2.71.jar:b136bd61b240e07d4d92ce00d3bd1dbf584400a7bf5f220c2f3cd22446858082',
-        'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.71:kotlin-stdlib-jdk8-1.2.71.jar:ac3c8abf47790b64b4f7e2509a53f0c145e061ac1612a597520535d199946ea9',
-        'org.jetbrains.kotlin:kotlin-stdlib:1.2.71:kotlin-stdlib-1.2.71.jar:4c895c270b87f5fec2a2796e1d89c15407ee821de961527c28588bb46afbc68b',
-        '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',
-    ]
-}

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.19"
+	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)
+}

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

@@ -1,101 +0,0 @@
-package org.briarproject.bramble.api;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
-
-import javax.annotation.concurrent.NotThreadSafe;
-
-@NotThreadSafe
-@NotNullByDefault
-public class Multiset<T> {
-
-	private final Map<T, Integer> map = new HashMap<>();
-
-	private int total = 0;
-
-	/**
-	 * Returns how many items the multiset contains in total.
-	 */
-	public int getTotal() {
-		return total;
-	}
-
-	/**
-	 * Returns how many unique items the multiset contains.
-	 */
-	public int getUnique() {
-		return map.size();
-	}
-
-	/**
-	 * Returns how many of the given item the multiset contains.
-	 */
-	public int getCount(T t) {
-		Integer count = map.get(t);
-		return count == null ? 0 : count;
-	}
-
-	/**
-	 * Adds the given item to the multiset and returns how many of the item
-	 * the multiset now contains.
-	 */
-	public int add(T t) {
-		Integer count = map.get(t);
-		if (count == null) count = 0;
-		map.put(t, count + 1);
-		total++;
-		return count + 1;
-	}
-
-	/**
-	 * Removes the given item from the multiset and returns how many of the
-	 * item the multiset now contains.
-	 * @throws NoSuchElementException if the item is not in the multiset.
-	 */
-	public int remove(T t) {
-		Integer count = map.get(t);
-		if (count == null) throw new NoSuchElementException();
-		if (count == 1) map.remove(t);
-		else map.put(t, count - 1);
-		total--;
-		return count - 1;
-	}
-
-	/**
-	 * Removes all occurrences of the given item from the multiset.
-	 */
-	public int removeAll(T t) {
-		Integer count = map.remove(t);
-		if (count == null) return 0;
-		total -= count;
-		return count;
-	}
-
-	/**
-	 * Returns true if the multiset contains any occurrences of the given item.
-	 */
-	public boolean contains(T t) {
-		return map.containsKey(t);
-	}
-
-	/**
-	 * Removes all items from the multiset.
-	 */
-	public void clear() {
-		map.clear();
-		total = 0;
-	}
-
-	/**
-	 * Returns the set of unique items the multiset contains. The returned set
-	 * is unmodifiable.
-	 */
-	public Set<T> keySet() {
-		return Collections.unmodifiableSet(map.keySet());
-	}
-}

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();
-
-}

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;
-	}
-}

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));
-	}
 }

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);
-}

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();
-}

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;
-	}
-}

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

@@ -16,6 +16,7 @@ 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());
-			BdfMessageContext result = validateMessage(m, g, bodyList);
+			BdfList body = clientHelper.toList(raw, MESSAGE_HEADER_LENGTH,
+					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) {

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

@@ -5,10 +5,7 @@ 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;
@@ -16,6 +13,8 @@ import org.briarproject.bramble.api.sync.MessageId;
 import java.security.GeneralSecurityException;
 import java.util.Map;
 
+import javax.annotation.Nullable;
+
 @NotNullByDefault
 public interface ClientHelper {
 
@@ -30,12 +29,16 @@ public interface ClientHelper {
 
 	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;
 
@@ -84,30 +87,16 @@ 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;
 
 	BdfList toList(Message m) throws FormatException;
 
-	BdfList toList(Author a);
-
 	byte[] sign(String label, BdfList toSign, byte[] privateKey)
 			throws FormatException, GeneralSecurityException;
 
-	void verifySignature(byte[] signature, String label, BdfList signed,
-			byte[] publicKey) throws FormatException, GeneralSecurityException;
-
-	Author parseAndValidateAuthor(BdfList author) throws FormatException;
-
-	TransportProperties parseAndValidateTransportProperties(
-			BdfDictionary properties) throws FormatException;
-
-	Map<TransportId, TransportProperties> parseAndValidateTransportPropertiesMap(
-			BdfDictionary properties) throws FormatException;
+	void verifySignature(String label, byte[] sig, byte[] publicKey,
+			BdfList signed) throws FormatException, GeneralSecurityException;
 
 }

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

@@ -12,19 +12,18 @@ public interface ContactGroupFactory {
 	/**
 	 * Creates a group that is not shared with any contacts.
 	 */
-	Group createLocalGroup(ClientId clientId, int majorVersion);
+	Group createLocalGroup(ClientId clientId);
 
 	/**
 	 * Creates a group for the given client to share with the given contact.
 	 */
-	Group createContactGroup(ClientId clientId, int majorVersion,
-			Contact contact);
+	Group createContactGroup(ClientId clientId, 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,
-			AuthorId authorId1, AuthorId authorId2);
+	Group createContactGroup(ClientId clientId, AuthorId authorId1,
+			AuthorId authorId2);
 
 }

bramble-api/src/main/java/org/briarproject/bramble/api/contact/Contact.java

@@ -4,12 +4,8 @@ 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 {
@@ -17,21 +13,13 @@ public class Contact {
 	private final ContactId id;
 	private final Author author;
 	private final AuthorId localAuthorId;
-	@Nullable
-	private final String alias;
 	private final boolean verified, active;
 
 	public Contact(ContactId id, Author author, AuthorId localAuthorId,
-			@Nullable String alias, boolean verified, boolean active) {
-		if (alias != null) {
-			int aliasLength = toUtf8(alias).length;
-			if (aliasLength == 0 || aliasLength > MAX_AUTHOR_NAME_LENGTH)
-				throw new IllegalArgumentException();
-		}
+			boolean verified, boolean active) {
 		this.id = id;
 		this.author = author;
 		this.localAuthorId = localAuthorId;
-		this.alias = alias;
 		this.verified = verified;
 		this.active = active;
 	}
@@ -48,11 +36,6 @@ public class Contact {
 		return localAuthorId;
 	}
 
-	@Nullable
-	public String getAlias() {
-		return alias;
-	}
-
 	public boolean isVerified() {
 		return verified;
 	}

bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactExchangeTask.java

@@ -12,32 +12,6 @@ import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
 @NotNullByDefault
 public interface ContactExchangeTask {
 
-	/**
-	 * The current version of the contact exchange protocol.
-	 */
-	byte PROTOCOL_VERSION = 1;
-
-	/**
-	 * 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.
 	 */

bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactId.java

@@ -6,7 +6,7 @@ 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

bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactManager.java

@@ -5,52 +5,38 @@ 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.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.util.Collection;
 
-import javax.annotation.Nullable;
-
 @NotNullByDefault
 public interface ContactManager {
 
 	/**
-	 * Registers a hook to be called whenever a contact is added or removed.
-	 * This method should be called before
-	 * {@link LifecycleManager#startServices(SecretKey)}.
+	 * Registers a hook to be called whenever a contact is added.
 	 */
-	void registerContactHook(ContactHook hook);
+	void registerAddContactHook(AddContactHook hook);
 
 	/**
-	 * Stores a contact associated with the given local and remote pseudonyms,
-	 * derives and stores transport keys for each transport, and returns an ID
-	 * for the contact.
-	 *
-	 * @param alice true if the local party is Alice
+	 * Registers a hook to be called whenever a contact is removed.
+	 */
+	void registerRemoveContactHook(RemoveContactHook hook);
+
+	/**
+	 * Stores a contact within the given transaction associated with the given
+	 * local and remote pseudonyms, and returns an ID for the contact.
 	 */
 	ContactId addContact(Transaction txn, Author remote, AuthorId local,
 			SecretKey master, long timestamp, boolean alice, boolean verified,
 			boolean active) throws DbException;
 
 	/**
-	 * Stores a contact associated with the given local and remote pseudonyms
+	 * 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,
-			boolean verified, boolean active) throws DbException;
-
-	/**
-	 * Stores a contact associated with the given local and remote pseudonyms,
-	 * derives and stores transport keys for each transport, and returns an ID
-	 * for the contact.
-	 *
-	 * @param alice true if the local party is Alice
-	 */
-	ContactId addContact(Author remote, AuthorId local, SecretKey master,
-			long timestamp, boolean alice, boolean verified, boolean active)
-			throws DbException;
+	ContactId addContact(Author remote, AuthorId local,
+			SecretKey master, long timestamp, boolean alice, boolean verified,
+			boolean active) throws DbException;
 
 	/**
 	 * Returns the contact with the given ID.
@@ -96,18 +82,6 @@ public interface ContactManager {
 	void setContactActive(Transaction txn, ContactId c, boolean active)
 			throws DbException;
 
-	/**
-	 * Sets an alias name for the contact or unsets it if alias is null.
-	 */
-	void setContactAlias(Transaction txn, ContactId c, @Nullable String alias)
-			throws DbException;
-
-	/**
-	 * Sets an alias name for the contact or unsets it if alias is null.
-	 */
-	void setContactAlias(ContactId c, @Nullable String alias)
-			throws DbException;
-
 	/**
 	 * Return true if a contact with this name and public key already exists
 	 */
@@ -120,20 +94,11 @@ public interface ContactManager {
 	boolean contactExists(AuthorId remoteAuthorId, AuthorId localAuthorId)
 			throws DbException;
 
-	/**
-	 * 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 {
-
+	interface AddContactHook {
 		void addingContact(Transaction txn, Contact c) throws DbException;
+	}
 
+	interface RemoveContactHook {
 		void removingContact(Transaction txn, Contact c) throws DbException;
 	}
 }

bramble-api/src/main/java/org/briarproject/bramble/api/contact/RecordTypes.java

@@ -1,9 +0,0 @@
-package org.briarproject.bramble.api.contact;
-
-/**
- * Record types for the contact exchange protocol.
- */
-public interface RecordTypes {
-
-	byte CONTACT_INFO = 0;
-}

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

@@ -1,13 +1,11 @@
 package org.briarproject.bramble.api.crypto;
 
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.plugin.TransportId;
+import org.briarproject.bramble.api.transport.TransportKeys;
 
 import java.security.GeneralSecurityException;
 import java.security.SecureRandom;
 
-import javax.annotation.Nullable;
-
-@NotNullByDefault
 public interface CryptoComponent {
 
 	SecretKey generateSecretKey();
@@ -25,83 +23,153 @@ public interface CryptoComponent {
 	KeyParser getMessageKeyParser();
 
 	/**
-	 * Derives another secret key from the given secret key.
-	 *
-	 * @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
+	 * Derives a stream header key from the given master secret.
+	 * @param alice whether the key is for use by Alice or Bob.
 	 */
-	SecretKey deriveKey(String label, SecretKey k, byte[]... inputs);
+	SecretKey deriveHeaderKey(SecretKey master, boolean alice);
+
+	/**
+	 * Derives a message authentication code key from the given master secret.
+	 * @param alice whether the key is for use by Alice or Bob.
+	 */
+	SecretKey deriveMacKey(SecretKey master, boolean alice);
+
+	/**
+	 * Derives a nonce from the given master secret for one of the parties to
+	 * sign.
+	 * @param alice whether the nonce is for use by Alice or Bob.
+	 */
+	byte[] deriveSignatureNonce(SecretKey master, boolean alice);
+
+	/**
+	 * Derives a commitment to the provided public key.
+	 * <p/>
+	 * Part of BQP.
+	 *
+	 * @param publicKey the public key
+	 * @return the commitment to the provided public key.
+	 */
+	byte[] deriveKeyCommitment(byte[] publicKey);
 
 	/**
 	 * Derives a common shared secret from two public keys and one of the
 	 * corresponding private keys.
+	 * <p/>
+	 * Part of BQP.
 	 *
-	 * @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 ourKeyPair the key pair of the local party
+	 * @param theirPublicKey the ephemeral public key of the remote party
+	 * @param ourKeyPair our ephemeral keypair
+	 * @param alice true if ourKeyPair belongs to Alice
 	 * @return the shared secret
+	 * @throws GeneralSecurityException
 	 */
-	SecretKey deriveSharedSecret(String label, PublicKey theirPublicKey,
-			KeyPair ourKeyPair, byte[]... inputs)
-			throws GeneralSecurityException;
+	SecretKey deriveSharedSecret(byte[] theirPublicKey, KeyPair ourKeyPair,
+			boolean alice) throws GeneralSecurityException;
 
 	/**
-	 * Signs the given byte[] with the given private key.
+	 * Derives the content of a confirmation record.
+	 * <p/>
+	 * Part of BQP.
 	 *
-	 * @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
+	 * @param sharedSecret the common shared secret
+	 * @param theirPayload the commit payload from the remote party
+	 * @param ourPayload the commit payload we sent
+	 * @param theirPublicKey the ephemeral public key of the remote party
+	 * @param ourKeyPair our ephemeral keypair
+	 * @param alice true if ourKeyPair belongs to Alice
+	 * @param aliceRecord true if the confirmation record is for use by Alice
+	 * @return the confirmation record
+	 */
+	byte[] deriveConfirmationRecord(SecretKey sharedSecret,
+			byte[] theirPayload, byte[] ourPayload,
+			byte[] theirPublicKey, KeyPair ourKeyPair,
+			boolean alice, boolean aliceRecord);
+
+	/**
+	 * Derives a master secret from the given shared secret.
+	 * <p/>
+	 * Part of BQP.
+	 *
+	 * @param sharedSecret the common shared secret
+	 * @return the master secret
+	 */
+	SecretKey deriveMasterSecret(SecretKey sharedSecret);
+
+	/**
+	 * Derives a master secret from two public keys and one of the corresponding
+	 * private keys.
+	 * <p/>
+	 * This is a helper method that calls
+	 * deriveMasterSecret(deriveSharedSecret(theirPublicKey, ourKeyPair, alice))
+	 *
+	 * @param theirPublicKey the ephemeral public key of the remote party
+	 * @param ourKeyPair our ephemeral keypair
+	 * @param alice true if ourKeyPair belongs to Alice
+	 * @return the shared secret
+	 * @throws GeneralSecurityException
+	 */
+	SecretKey deriveMasterSecret(byte[] theirPublicKey, KeyPair ourKeyPair,
+			boolean alice) throws GeneralSecurityException;
+
+	/**
+	 * Derives initial transport keys for the given transport in the given
+	 * rotation period from the given master secret.
+	 * @param alice whether the keys are for use by Alice or Bob.
+	 */
+	TransportKeys deriveTransportKeys(TransportId t, SecretKey master,
+			long rotationPeriod, boolean alice);
+
+	/**
+	 * Rotates the given transport keys to the given rotation period. If the
+	 * keys are for a future rotation period they are not rotated.
+	 */
+	TransportKeys rotateTransportKeys(TransportKeys k, long rotationPeriod);
+
+	/** Encodes the pseudo-random tag that is used to recognise a stream. */
+	void encodeTag(byte[] tag, SecretKey tagKey, int protocolVersion,
+			long streamNumber);
+
+	/**
+	 * Signs the given byte[] with the given PrivateKey.
+	 *
+	 * @param label A label specific to this signature
+	 *              to ensure that the signature cannot be repurposed
 	 */
 	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.
+	 * Verifies that the given signature is valid for the signedData
+	 * and the given publicKey.
 	 *
-	 * @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
+	 * @param label A label that was specific to this signature
+	 *              to ensure that the signature cannot be repurposed
 	 * @return true if the signature was valid, false otherwise.
 	 */
-	boolean verifySignature(byte[] signature, String label, byte[] signed,
-			byte[] publicKey) throws GeneralSecurityException;
+	boolean verify(String label, byte[] signedData, byte[] publicKey,
+			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
-	 * prevent it from being repurposed or colliding with a hash created for
-	 * another purpose
+	 * @param label A label specific to this hash to ensure that hashes
+	 *              calculated for distinct purposes don't collide.
 	 */
 	byte[] hash(String label, byte[]... inputs);
 
+	/**
+	 * Returns the length of hashes produced by
+	 * the {@link CryptoComponent#hash(String, byte[]...)} method.
+	 */
+	int getHashLength();
+
 	/**
 	 * Returns a message authentication code with the given key over 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 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);
+	byte[] mac(SecretKey macKey, byte[]... inputs);
 
 	/**
 	 * Encrypts and authenticates the given plaintext so it can be written to
@@ -117,7 +185,6 @@ public interface CryptoComponent {
 	 * given password. Returns null if the ciphertext cannot be decrypted and
 	 * authenticated (for example, if the password is wrong).
 	 */
-	@Nullable
 	byte[] decryptWithPassword(byte[] ciphertext, String password);
 
 	/**

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

@@ -1,25 +0,0 @@
-package org.briarproject.bramble.api.crypto;
-
-public interface CryptoConstants {
-
-	/**
-	 * The maximum length of an agreement public key in bytes.
-	 */
-	int MAX_AGREEMENT_PUBLIC_KEY_BYTES = 32;
-
-	/**
-	 * The maximum length of a signature public key in bytes.
-	 */
-	int MAX_SIGNATURE_PUBLIC_KEY_BYTES = 32;
-
-	/**
-	 * 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;
-
-}

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

@@ -1,50 +0,0 @@
-package org.briarproject.bramble.api.crypto;
-
-/**
- * Crypto operations for the key agreement protocol - see
- * https://code.briarproject.org/akwizgran/briar-spec/blob/master/protocols/BQP.md
- */
-public interface KeyAgreementCrypto {
-
-	/**
-	 * Hash label for public key commitment.
-	 */
-	String COMMIT_LABEL = "org.briarproject.bramble.keyagreement/COMMIT";
-
-	/**
-	 * Key derivation label for confirmation record.
-	 */
-	String CONFIRMATION_KEY_LABEL =
-			"org.briarproject.bramble.keyagreement/CONFIRMATION_KEY";
-
-	/**
-	 * MAC label for confirmation record.
-	 */
-	String CONFIRMATION_MAC_LABEL =
-			"org.briarproject.bramble.keyagreement/CONFIRMATION_MAC";
-
-	/**
-	 * Derives a commitment to the provided public key.
-	 *
-	 * @param publicKey the public key
-	 * @return the commitment to the provided public key.
-	 */
-	byte[] deriveKeyCommitment(PublicKey publicKey);
-
-	/**
-	 * Derives the content of a confirmation record.
-	 *
-	 * @param sharedSecret the common shared secret
-	 * @param theirPayload the key exchange payload of the remote party
-	 * @param ourPayload the key exchange payload of the local party
-	 * @param theirPublicKey the ephemeral public key of the remote party
-	 * @param ourKeyPair our ephemeral key pair of the local party
-	 * @param alice true if the local party is Alice
-	 * @param aliceRecord true if the confirmation record is for use by Alice
-	 * @return the confirmation record
-	 */
-	byte[] deriveConfirmationRecord(SecretKey sharedSecret,
-			byte[] theirPayload, byte[] ourPayload,
-			PublicKey theirPublicKey, KeyPair ourKeyPair,
-			boolean alice, boolean aliceRecord);
-}

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

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

@@ -1,33 +0,0 @@
-package org.briarproject.bramble.api.crypto;
-
-import org.briarproject.bramble.api.plugin.TransportId;
-import org.briarproject.bramble.api.transport.TransportKeys;
-
-/**
- * Crypto operations for the transport security protocol - see
- * https://code.briarproject.org/akwizgran/briar-spec/blob/master/protocols/BTP.md
- */
-public interface TransportCrypto {
-
-	/**
-	 * Derives initial transport keys for the given transport in the given
-	 * rotation period from the given master secret.
-	 *
-	 * @param alice whether the keys are for use by Alice or Bob.
-	 * @param active whether the keys are usable for outgoing streams.
-	 */
-	TransportKeys deriveTransportKeys(TransportId t, SecretKey master,
-			long rotationPeriod, boolean alice, boolean active);
-
-	/**
-	 * Rotates the given transport keys to the given rotation period. If the
-	 * keys are for the given period or any later period they are not rotated.
-	 */
-	TransportKeys rotateTransportKeys(TransportKeys k, long rotationPeriod);
-
-	/**
-	 * Encodes the pseudo-random tag that is used to recognise a stream.
-	 */
-	void encodeTag(byte[] tag, SecretKey tagKey, int protocolVersion,
-			long streamNumber);
-}

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);
 	}
 

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;
 

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,
-			int maxBufferSize);
+	BdfReader createReader(InputStream in, int nestedLimit);
 }

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');
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/data/ObjectReader.java

@@ -0,0 +1,11 @@
+package org.briarproject.bramble.api.data;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+import java.io.IOException;
+
+@NotNullByDefault
+public interface ObjectReader<T> {
+
+	T readObject(BdfReader r) throws IOException;
+}

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

@@ -2,7 +2,6 @@ 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.crypto.SecretKey;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorId;
 import org.briarproject.bramble.api.identity.LocalAuthor;
@@ -19,8 +18,7 @@ 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.transport.KeySet;
-import org.briarproject.bramble.api.transport.KeySetId;
+import org.briarproject.bramble.api.sync.ValidationManager;
 import org.briarproject.bramble.api.transport.TransportKeys;
 
 import java.util.Collection;
@@ -45,8 +43,7 @@ public interface DatabaseComponent {
 	 * @throws DataTooOldException if the data uses an older schema than the
 	 * current code and cannot be migrated
 	 */
-	boolean open(SecretKey key, @Nullable MigrationListener listener)
-			throws DbException;
+	boolean open(@Nullable MigrationListener listener) throws DbException;
 
 	/**
 	 * Waits for any open transactions to finish and closes the database.
@@ -76,27 +73,6 @@ public interface DatabaseComponent {
 	 */
 	void endTransaction(Transaction txn);
 
-	/**
-	 * Runs the given task within a transaction.
-	 */
-	<E extends Exception> void transaction(boolean readOnly,
-			DbRunnable<E> task) throws DbException, E;
-
-	/**
-	 * Runs the given task within a transaction and returns the result of the
-	 * task.
-	 */
-	<R, E extends Exception> R transactionWithResult(boolean readOnly,
-			DbCallable<R, E> task) throws DbException, E;
-
-	/**
-	 * Runs the given task within a transaction and returns the result of the
-	 * task, which may be null.
-	 */
-	@Nullable
-	<R, E extends Exception> R transactionWithNullableResult(boolean readOnly,
-			NullableDbCallable<R, E> task) throws DbException, E;
-
 	/**
 	 * Stores a contact associated with the given local and remote pseudonyms,
 	 * and returns an ID for the contact.
@@ -127,11 +103,10 @@ public interface DatabaseComponent {
 			throws DbException;
 
 	/**
-	 * Stores the given transport keys for the given contact and returns a
-	 * key set ID.
+	 * Stores transport keys for a newly added contact.
 	 */
-	KeySetId addTransportKeys(Transaction txn, ContactId c,
-			TransportKeys k) throws DbException;
+	void addTransportKeys(Transaction txn, ContactId c, TransportKeys k)
+			throws DbException;
 
 	/**
 	 * Returns true if the database contains the given contact for the given
@@ -153,8 +128,8 @@ public interface DatabaseComponent {
 
 	/**
 	 * Deletes the message with the given ID. Unlike
-	 * {@link #removeMessage(Transaction, MessageId)}, the message ID,
-	 * dependencies, metadata, and any other associated state are not deleted.
+	 * {@link #removeMessage(Transaction, MessageId)}, the message ID and any
+	 * other associated data are not deleted.
 	 */
 	void deleteMessage(Transaction txn, MessageId m) throws DbException;
 
@@ -172,13 +147,13 @@ public interface DatabaseComponent {
 			throws DbException;
 
 	/**
-	 * Returns a batch of messages for the given contact, with a total length
-	 * less than or equal to the given length, for transmission over a
+	 * Returns a batch of raw messages for the given contact, with a total
+	 * 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;
 
 	/**
@@ -199,14 +174,14 @@ public interface DatabaseComponent {
 			throws DbException;
 
 	/**
-	 * Returns a batch of messages for the given contact, with a total length
-	 * less than or equal to the given length, for transmission over a
+	 * Returns a batch of raw messages for the given contact, with a total
+	 * 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;
 
 	/**
@@ -258,8 +233,7 @@ public interface DatabaseComponent {
 	 * <p/>
 	 * Read-only.
 	 */
-	Collection<Group> getGroups(Transaction txn, ClientId c, int majorVersion)
-			throws DbException;
+	Collection<Group> getGroups(Transaction txn, ClientId c) throws DbException;
 
 	/**
 	 * Returns the given group's visibility to the given contact, or
@@ -285,47 +259,40 @@ public interface DatabaseComponent {
 	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.
+	 * Returns the IDs of any messages that need to be validated by the given
+	 * client.
 	 * <p/>
 	 * Read-only.
 	 */
-	Collection<MessageId> getMessageIds(Transaction txn, GroupId g)
+	Collection<MessageId> getMessagesToValidate(Transaction txn, ClientId c)
 			throws DbException;
 
 	/**
-	 * Returns the IDs of any messages that need to be validated.
+	 * Returns the IDs of any messages that are valid but pending delivery due
+	 * to dependencies on other messages for the given client.
 	 * <p/>
 	 * Read-only.
 	 */
-	Collection<MessageId> getMessagesToValidate(Transaction txn)
+	Collection<MessageId> getPendingMessages(Transaction txn, ClientId c)
 			throws DbException;
 
 	/**
-	 * Returns the IDs of any messages that are pending delivery due to
-	 * dependencies on other messages.
+	 * Returns the IDs of any messages from the given client
+	 * that have a shared dependent, but are still not shared themselves.
 	 * <p/>
 	 * Read-only.
 	 */
-	Collection<MessageId> getPendingMessages(Transaction txn)
-			throws DbException;
+	Collection<MessageId> getMessagesToShare(Transaction txn,
+			ClientId c) throws DbException;
 
 	/**
-	 * Returns the IDs of any messages that have shared dependents but have
-	 * not yet been shared themselves.
+	 * Returns the message with the given ID, in serialised form, or null if
+	 * the message has been deleted.
 	 * <p/>
 	 * Read-only.
 	 */
-	Collection<MessageId> getMessagesToShare(Transaction txn)
-			throws DbException;
+	@Nullable
+	byte[] getRawMessage(Transaction txn, MessageId m) throws DbException;
 
 	/**
 	 * Returns the metadata for all delivered messages in the given group.
@@ -336,9 +303,9 @@ public interface DatabaseComponent {
 			throws DbException;
 
 	/**
-	 * Returns the metadata for any delivered messages in the given group with
-	 * metadata that matches all entries in the given query. If the query is
-	 * empty, the metadata for all delivered messages is returned.
+	 * Returns the metadata for any messages in the given group with metadata
+	 * that matches all entries in the given query. If the query is empty, the
+	 * metadata for all messages is returned.
 	 * <p/>
 	 * Read-only.
 	 */
@@ -354,8 +321,8 @@ public interface DatabaseComponent {
 			throws DbException;
 
 	/**
-	 * Returns the metadata for the given delivered or pending message.
-	 * This is only meant to be used by the ValidationManager.
+	 * Returns the metadata for the given delivered and pending message.
+	 * This is meant to be only used by the ValidationManager
 	 * <p/>
 	 * Read-only.
 	 */
@@ -363,8 +330,8 @@ public interface DatabaseComponent {
 			throws DbException;
 
 	/**
-	 * Returns the status of all delivered messages in the given group with
-	 * respect to the given contact.
+	 * Returns the status of all messages in the given group with respect to
+	 * the given contact.
 	 * <p/>
 	 * Read-only.
 	 */
@@ -373,8 +340,12 @@ public interface DatabaseComponent {
 
 	/**
 	 * Returns the IDs and states of all dependencies of the given message.
-	 * For missing dependencies and dependencies in other groups, the state
-	 * {@link State UNKNOWN} is returned.
+	 * Missing dependencies have the state
+	 * {@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.
 	 */
@@ -382,9 +353,9 @@ public interface DatabaseComponent {
 			throws DbException;
 
 	/**
-	 * Returns the IDs and states of all dependents of the given message.
-	 * Dependents in other groups are not returned. If the given message is
-	 * missing, no dependents are returned.
+	 * Returns all IDs of messages that depend on the given message.
+	 * Messages in other groups that declare a dependency on the given message
+	 * will be returned even though such dependencies are invalid.
 	 * <p/>
 	 * Read-only.
 	 */
@@ -399,8 +370,8 @@ public interface DatabaseComponent {
 	State getMessageState(Transaction txn, MessageId m) throws DbException;
 
 	/**
-	 * Returns the status of the given delivered message with respect to the
-	 * given contact.
+	 * Returns the status of the given message with respect to the given
+	 * contact.
 	 * <p/>
 	 * Read-only.
 	 */
@@ -429,14 +400,15 @@ public interface DatabaseComponent {
 	 * <p/>
 	 * Read-only.
 	 */
-	Collection<KeySet> getTransportKeys(Transaction txn, TransportId t)
-			throws DbException;
+	Map<ContactId, TransportKeys> getTransportKeys(Transaction txn,
+			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)
-			throws DbException;
+	void incrementStreamCounter(Transaction txn, ContactId c, TransportId t,
+			long rotationPeriod) throws DbException;
 
 	/**
 	 * Merges the given metadata with the existing metadata for the given
@@ -506,12 +478,6 @@ public interface DatabaseComponent {
 	 */
 	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.
 	 */
@@ -523,12 +489,6 @@ public interface DatabaseComponent {
 	void setContactActive(Transaction txn, ContactId c, boolean active)
 			throws DbException;
 
-	/**
-	 * Sets an alias name for the contact or unsets it if alias is null.
-	 */
-	void setContactAlias(Transaction txn, ContactId c, @Nullable String alias)
-			throws DbException;
-
 	/**
 	 * Sets the given group's visibility to the given contact.
 	 */
@@ -553,21 +513,15 @@ public interface DatabaseComponent {
 			Collection<MessageId> dependencies) throws DbException;
 
 	/**
-	 * Sets the reordering window for the given key set and transport in the
+	 * Sets the reordering window for the given contact and transport in the
 	 * given rotation period.
 	 */
-	void setReorderingWindow(Transaction txn, KeySetId k, TransportId t,
+	void setReorderingWindow(Transaction txn, ContactId c, TransportId t,
 			long rotationPeriod, long base, byte[] bitmap) 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<KeySet> keys)
-			throws DbException;
+	void updateTransportKeys(Transaction txn,
+			Map<ContactId, TransportKeys> keys) throws DbException;
 }

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

@@ -1,15 +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();
 }

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;
-}

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;
-}

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 {
-}

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();
 }

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

@@ -1,12 +0,0 @@
-package org.briarproject.bramble.api.db;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.Nullable;
-
-@NotNullByDefault
-public interface NullableDbCallable<R, E extends Exception> {
-
-	@Nullable
-	R call(Transaction txn) throws DbException, E;
-}

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

@@ -1,40 +1,36 @@
 package org.briarproject.bramble.api.identity;
 
-import org.briarproject.bramble.api.Nameable;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.util.StringUtils;
+
+import java.io.UnsupportedEncodingException;
 
 import javax.annotation.concurrent.Immutable;
 
-import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
-import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
-
 /**
  * A pseudonym for a user.
  */
 @Immutable
 @NotNullByDefault
-public class Author implements Nameable {
+public class Author {
 
-	/**
-	 * The current version of the author structure.
-	 */
-	public static final int FORMAT_VERSION = 1;
+	public enum Status {
+		NONE, ANONYMOUS, UNKNOWN, UNVERIFIED, VERIFIED, OURSELVES
+	}
 
 	private final AuthorId id;
-	private final int formatVersion;
 	private final String name;
 	private final byte[] publicKey;
 
-	public Author(AuthorId id, int formatVersion, String name,
-			byte[] publicKey) {
-		int nameLength = StringUtils.toUtf8(name).length;
-		if (nameLength == 0 || nameLength > MAX_AUTHOR_NAME_LENGTH)
-			throw new IllegalArgumentException();
-		if (publicKey.length == 0 || publicKey.length > MAX_PUBLIC_KEY_LENGTH)
+	public Author(AuthorId id, String name, byte[] publicKey) {
+		int length;
+		try {
+			length = name.getBytes("UTF-8").length;
+		} catch (UnsupportedEncodingException e) {
+			throw new RuntimeException(e);
+		}
+		if (length == 0 || length > AuthorConstants.MAX_AUTHOR_NAME_LENGTH)
 			throw new IllegalArgumentException();
 		this.id = id;
-		this.formatVersion = formatVersion;
 		this.name = name;
 		this.publicKey = publicKey;
 	}
@@ -46,13 +42,6 @@ public class Author implements Nameable {
 		return id;
 	}
 
-	/**
-	 * Returns the version of the author structure used to create the author.
-	 */
-	public int getFormatVersion() {
-		return formatVersion;
-	}
-
 	/**
 	 * Returns the author's name.
 	 */

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

@@ -1,8 +1,5 @@
 package org.briarproject.bramble.api.identity;
 
-import static org.briarproject.bramble.api.crypto.CryptoConstants.MAX_SIGNATURE_BYTES;
-import static org.briarproject.bramble.api.crypto.CryptoConstants.MAX_SIGNATURE_PUBLIC_KEY_BYTES;
-
 public interface AuthorConstants {
 
 	/**
@@ -11,14 +8,26 @@ public interface AuthorConstants {
 	int MAX_AUTHOR_NAME_LENGTH = 50;
 
 	/**
-	 * The maximum length of a public key in bytes. This applies to the
-	 * signature algorithm used by the current {@link Author format version}.
+	 * The maximum length of a public key in bytes.
+	 * <p>
+	 * Public keys use SEC1 format: 0x04 x y, where x and y are unsigned
+	 * big-endian integers.
+	 * <p>
+	 * For a 256-bit elliptic curve, the maximum length is 2 * 256 / 8 + 1.
 	 */
-	int MAX_PUBLIC_KEY_LENGTH = MAX_SIGNATURE_PUBLIC_KEY_BYTES;
+	int MAX_PUBLIC_KEY_LENGTH = 65;
 
 	/**
-	 * The maximum length of a signature in bytes. This applies to the
-	 * signature algorithm used by the current {@link Author format version}.
+	 * The maximum length of a signature in bytes.
+	 * <p>
+	 * A signature is an ASN.1 DER sequence containing two integers, r and s.
+	 * The format is 0x30 len1 0x02 len2 r 0x02 len3 s, where len1 is
+	 * len(0x02 len2 r 0x02 len3 s) as a DER length, len2 is len(r) as a DER
+	 * length, len3 is len(s) as a DER length, and r and s are signed
+	 * big-endian integers of minimal length.
+	 * <p>
+	 * For a 256-bit elliptic curve, the lengths are one byte each, so the
+	 * maximum length is 2 * 256 / 8 + 8.
 	 */
-	int MAX_SIGNATURE_LENGTH = MAX_SIGNATURE_BYTES;
+	int MAX_SIGNATURE_LENGTH = 72;
 }

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

@@ -5,27 +5,8 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 @NotNullByDefault
 public interface AuthorFactory {
 
-	/**
-	 * Creates an author with the current format version and the given name and
-	 * public key.
-	 */
 	Author createAuthor(String name, byte[] publicKey);
 
-	/**
-	 * Creates an author with the given format version, name and public key.
-	 */
-	Author createAuthor(int formatVersion, String name, byte[] publicKey);
-
-	/**
-	 * Creates a local author with the current format version and the given
-	 * name and keys.
-	 */
 	LocalAuthor createLocalAuthor(String name, byte[] publicKey,
 			byte[] privateKey);
-
-	/**
-	 * Creates a local author with the given format version, name and keys.
-	 */
-	LocalAuthor createLocalAuthor(int formatVersion, String name,
-			byte[] publicKey, byte[] privateKey);
 }

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

@@ -16,7 +16,7 @@ public class AuthorId extends UniqueId {
 	/**
 	 * Label for hashing authors to calculate their identities.
 	 */
-	public static final String LABEL = "org.briarproject.bramble/AUTHOR_ID";
+	public static final String LABEL = "org.briarproject.bramble.AUTHOR_ID";
 
 	public AuthorId(byte[] id) {
 		super(id);

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

@@ -1,56 +0,0 @@
-package org.briarproject.bramble.api.identity;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
-@Immutable
-@NotNullByDefault
-public class AuthorInfo {
-
-	public enum Status {
-		NONE, ANONYMOUS, UNKNOWN, UNVERIFIED, VERIFIED, OURSELVES;
-
-		public boolean isContact() {
-			return this == UNVERIFIED || this == VERIFIED;
-		}
-	}
-
-	private final Status status;
-	@Nullable
-	private final String alias;
-
-	public AuthorInfo(Status status, @Nullable String alias) {
-		this.status = status;
-		this.alias = alias;
-	}
-
-	public AuthorInfo(Status status) {
-		this(status, null);
-	}
-
-	public Status getStatus() {
-		return status;
-	}
-
-	@Nullable
-	public String getAlias() {
-		return alias;
-	}
-
-	@Override
-	public int hashCode() {
-		int hashCode = status.ordinal();
-		if (alias != null) hashCode += alias.hashCode();
-		return hashCode;
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (!(o instanceof AuthorInfo)) return false;
-		AuthorInfo info = (AuthorInfo) o;
-		return status == info.status &&
-				(alias == null ? info.alias == null : alias.equals(info.alias));
-	}
-}

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

@@ -1,39 +1,38 @@
 package org.briarproject.bramble.api.identity;
 
-import org.briarproject.bramble.api.crypto.CryptoExecutor;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
+import org.briarproject.bramble.api.identity.Author.Status;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 @NotNullByDefault
 public interface IdentityManager {
 
 	/**
-	 * Creates a local identity with the given name.
+	 * Stores the local pseudonym.
 	 */
-	@CryptoExecutor
-	LocalAuthor createLocalAuthor(String name);
+	void registerLocalAuthor(LocalAuthor a) throws DbException;
 
 	/**
-	 * Registers the given local identity with the manager. The identity is
-	 * not stored until {@link #storeLocalAuthor()} is called.
-	 */
-	void registerLocalAuthor(LocalAuthor a);
-
-	/**
-	 * Stores the local identity registered with
-	 * {@link #registerLocalAuthor(LocalAuthor)}, if any.
-	 */
-	void storeLocalAuthor() throws DbException;
-
-	/**
-	 * Returns the cached local identity or loads it from the database.
+	 * Returns the cached main local identity, non-blocking, or loads it from
+	 * the db, blocking
 	 */
 	LocalAuthor getLocalAuthor() throws DbException;
 
 	/**
-	 * Returns the cached local identity or loads it from the database.
+	 * Returns the cached main local identity, non-blocking, or loads it from
+	 * the db, blocking, within the given Transaction.
 	 */
 	LocalAuthor getLocalAuthor(Transaction txn) throws DbException;
 
+	/**
+	 * Returns the trust-level status of the author
+	 */
+	Status getAuthorStatus(AuthorId a) throws DbException;
+
+	/**
+	 * Returns the trust-level status of the author
+	 */
+	Status getAuthorStatus(Transaction txn, AuthorId a) throws DbException;
+
 }

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

@@ -14,9 +14,9 @@ public class LocalAuthor extends Author {
 	private final byte[] privateKey;
 	private final long created;
 
-	public LocalAuthor(AuthorId id, int formatVersion, String name,
-			byte[] publicKey, byte[] privateKey, long created) {
-		super(id, formatVersion, name, publicKey);
+	public LocalAuthor(AuthorId id, String name, byte[] publicKey,
+			byte[] privateKey, long created) {
+		super(id, name, publicKey);
 		this.privateKey = privateKey;
 		this.created = created;
 	}

bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementConstants.java

@@ -2,26 +2,27 @@ package org.briarproject.bramble.api.keyagreement;
 
 public interface KeyAgreementConstants {
 
-	/**
-	 * The version of the BQP protocol used in beta releases. This version
-	 * number is reserved.
-	 */
-	byte BETA_PROTOCOL_VERSION = 89;
-
 	/**
 	 * The current version of the BQP protocol.
 	 */
-	byte PROTOCOL_VERSION = 4;
+	byte PROTOCOL_VERSION = 2;
+
+	/**
+	 * The length of the record header in bytes.
+	 */
+	int RECORD_HEADER_LENGTH = 4;
+
+	/**
+	 * The offset of the payload length in the record header, in bytes.
+	 */
+	int RECORD_HEADER_PAYLOAD_LENGTH_OFFSET = 2;
 
 	/**
 	 * The length of the BQP key commitment in bytes.
 	 */
 	int COMMIT_LENGTH = 16;
 
-	/**
-	 * The connection timeout in milliseconds.
-	 */
-	long CONNECTION_TIMEOUT = 60_000;
+	long CONNECTION_TIMEOUT = 20 * 1000; // Milliseconds
 
 	/**
 	 * The transport identifier for Bluetooth.
@@ -32,16 +33,4 @@ public interface KeyAgreementConstants {
 	 * The transport identifier for LAN.
 	 */
 	int TRANSPORT_ID_LAN = 1;
-
-	/**
-	 * Label for deriving the shared secret.
-	 */
-	String SHARED_SECRET_LABEL =
-			"org.briarproject.bramble.keyagreement/SHARED_SECRET";
-
-	/**
-	 * Label for deriving the master secret.
-	 */
-	String MASTER_SECRET_LABEL =
-			"org.briarproject.bramble.keyagreement/MASTER_SECRET";
 }

bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementTaskFactory.java

@@ -0,0 +1,15 @@
+package org.briarproject.bramble.api.keyagreement;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+/**
+ * Manages tasks for conducting key agreements with remote peers.
+ */
+@NotNullByDefault
+public interface KeyAgreementTaskFactory {
+
+	/**
+	 * Gets the current key agreement task.
+	 */
+	KeyAgreementTask createTask();
+}

bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/UnsupportedVersionException.java

@@ -1,20 +0,0 @@
-package org.briarproject.bramble.api.keyagreement;
-
-import java.io.IOException;
-
-/**
- * Thrown when a QR code that has been scanned uses a protocol version that is
- * not supported.
- */
-public class UnsupportedVersionException extends IOException {
-
-	private final boolean tooOld;
-
-	public UnsupportedVersionException(boolean tooOld) {
-		this.tooOld = tooOld;
-	}
-
-	public boolean isTooOld() {
-		return tooOld;
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementStoppedListeningEvent.java

@@ -1,9 +0,0 @@
-package org.briarproject.bramble.api.keyagreement.event;
-
-import org.briarproject.bramble.api.event.Event;
-
-/**
- * An event that is broadcast when a BQP task stops listening.
- */
-public class KeyAgreementStoppedListeningEvent extends Event {
-}

bramble-api/src/main/java/org/briarproject/bramble/api/lifecycle/IoExecutor.java

@@ -12,7 +12,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 /**
  * Annotation for injecting the executor for long-running IO tasks. Also used
- * for annotating methods that should run on the IO executor.
+ * for annotating methods that should run on the UI executor.
  * <p>
  * The contract of this executor is that tasks may be run concurrently, and
  * submitting a task will never block. Tasks may run indefinitely. Tasks

bramble-api/src/main/java/org/briarproject/bramble/api/lifecycle/LifecycleManager.java

@@ -1,12 +1,13 @@
 package org.briarproject.bramble.api.lifecycle;
 
-import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.db.DatabaseComponent;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.Client;
 
 import java.util.concurrent.ExecutorService;
 
+import javax.annotation.Nullable;
+
 /**
  * Manages the lifecycle of the app, starting {@link Client Clients}, starting
  * and stopping {@link Service Services}, shutting down
@@ -17,7 +18,7 @@ import java.util.concurrent.ExecutorService;
 public interface LifecycleManager {
 
 	/**
-	 * The result of calling {@link #startServices(SecretKey)}.
+	 * The result of calling {@link #startServices(String)}.
 	 */
 	enum StartResult {
 		ALREADY_RUNNING,
@@ -34,8 +35,7 @@ public interface LifecycleManager {
 	 */
 	enum LifecycleState {
 
-		STARTING, MIGRATING_DATABASE, COMPACTING_DATABASE, STARTING_SERVICES,
-		RUNNING, STOPPING;
+		STARTING, MIGRATING_DATABASE, STARTING_SERVICES, RUNNING, STOPPING;
 
 		public boolean isAfter(LifecycleState state) {
 			return ordinal() > state.ordinal();
@@ -43,28 +43,26 @@ public interface LifecycleManager {
 	}
 
 	/**
-	 * Registers a {@link Service} to be started and stopped. This method
-	 * should be called before {@link #startServices(SecretKey)}.
+	 * Registers a {@link Service} to be started and stopped.
 	 */
 	void registerService(Service s);
 
 	/**
-	 * Registers a {@link Client} to be started. This method should be called
-	 * before {@link #startServices(SecretKey)}.
+	 * Registers a {@link Client} to be started.
 	 */
 	void registerClient(Client c);
 
 	/**
-	 * Registers an {@link ExecutorService} to be shut down. This method
-	 * should be called before {@link #startServices(SecretKey)}.
+	 * Registers an {@link ExecutorService} to be shut down.
 	 */
 	void registerForShutdown(ExecutorService e);
 
 	/**
-	 * Opens the {@link DatabaseComponent} using the given key and starts any
-	 * registered {@link Client Clients} and {@link Service Services}.
+	 * Opens the {@link DatabaseComponent}, optionally creates a local author
+	 * with the provided nickname, and starts any registered
+	 * {@link Client Clients} and {@link Service Services}.
 	 */
-	StartResult startServices(SecretKey dbKey);
+	StartResult startServices(@Nullable String nickname);
 
 	/**
 	 * Stops any registered {@link Service Services}, shuts down any

bramble-api/src/main/java/org/briarproject/bramble/api/network/NetworkManager.java

@@ -1,9 +0,0 @@
-package org.briarproject.bramble.api.network;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public interface NetworkManager {
-
-	NetworkStatus getNetworkStatus();
-}

bramble-api/src/main/java/org/briarproject/bramble/api/network/NetworkStatus.java

@@ -1,25 +0,0 @@
-package org.briarproject.bramble.api.network;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-@Immutable
-@NotNullByDefault
-public class NetworkStatus {
-
-	private final boolean connected, wifi;
-
-	public NetworkStatus(boolean connected, boolean wifi) {
-		this.connected = connected;
-		this.wifi = wifi;
-	}
-
-	public boolean isConnected() {
-		return connected;
-	}
-
-	public boolean isWifi() {
-		return wifi;
-	}
-}

bramble-api/src/main/java/org/briarproject/bramble/api/network/event/NetworkStatusEvent.java

@@ -1,22 +0,0 @@
-package org.briarproject.bramble.api.network.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.network.NetworkStatus;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-@Immutable
-@NotNullByDefault
-public class NetworkStatusEvent extends Event {
-
-	private final NetworkStatus status;
-
-	public NetworkStatusEvent(NetworkStatus status) {
-		this.status = status;
-	}
-
-	public NetworkStatus getStatus() {
-		return status;
-	}
-}

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

@@ -1,6 +0,0 @@
-package org.briarproject.bramble.api.plugin;
-
-public interface FileConstants {
-
-	String PROP_PATH = "path";
-}

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

@@ -2,9 +2,8 @@ package org.briarproject.bramble.api.plugin;
 
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.properties.TransportProperties;
 
-import java.util.Map;
+import java.util.Collection;
 
 @NotNullByDefault
 public interface Plugin {
@@ -40,19 +39,21 @@ public interface Plugin {
 	boolean isRunning();
 
 	/**
-	 * Returns true if the plugin should be polled periodically to attempt to
-	 * establish connections.
+	 * Returns true if the plugin's {@link #poll(Collection)} method should be
+	 * called periodically to attempt to establish connections.
 	 */
 	boolean shouldPoll();
 
 	/**
-	 * Returns the desired interval in milliseconds between polling attempts.
+	 * Returns the desired interval in milliseconds between calls to the
+	 * plugin's {@link #poll(Collection)} method.
 	 */
 	int getPollingInterval();
 
 	/**
-	 * Attempts to establish connections to the given contacts, passing any
-	 * created connections to the callback.
+	 * Attempts to establish connections to contacts, passing any created
+	 * connections to the callback. To avoid creating redundant connections,
+	 * the plugin may exclude the given contacts from polling.
 	 */
-	void poll(Map<ContactId, TransportProperties> contacts);
+	void poll(Collection<ContactId> connected);
 }

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

@@ -1,9 +1,12 @@
 package org.briarproject.bramble.api.plugin;
 
+import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.api.settings.Settings;
 
+import java.util.Map;
+
 /**
  * An interface through which a transport plugin interacts with the rest of
  * the application.
@@ -22,7 +25,17 @@ public interface PluginCallback {
 	TransportProperties getLocalProperties();
 
 	/**
-	 * Merges the given settings with the plugin's settings
+	 * Returns the plugin's remote transport properties.
+	 */
+	Map<ContactId, TransportProperties> getRemoteProperties();
+
+	/**
+	 * Returns the plugin's remote transport properties for the given contact.
+	 */
+	TransportProperties getRemoteProperties(ContactId c);
+
+	/**
+	 * Merges the given settings with the namespaced settings
 	 */
 	void mergeSettings(Settings s);
 
@@ -32,12 +45,34 @@ public interface PluginCallback {
 	void mergeLocalProperties(TransportProperties p);
 
 	/**
-	 * Signals that the transport is enabled.
+	 * Presents the user with a choice among two or more named options and
+	 * returns the user's response. The message may consist of a translatable
+	 * format string and arguments.
+	 *
+	 * @return an index into the array of options indicating the user's choice,
+	 * or -1 if the user cancelled the choice.
+	 */
+	int showChoice(String[] options, String... message);
+
+	/**
+	 * Asks the user to confirm an action and returns the user's response. The
+	 * message may consist of a translatable format string and arguments.
+	 */
+	boolean showConfirmationMessage(String... message);
+
+	/**
+	 * Shows a message to the user. The message may consist of a translatable
+	 * format string and arguments.
+	 */
+	void showMessage(String... message);
+
+	/**
+	 * Signal that the transport got enabled.
 	 */
 	void transportEnabled();
 
 	/**
-	 * Signals that the transport is disabled.
+	 * Signal that the transport got disabled.
 	 */
 	void transportDisabled();
 }

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

@@ -12,6 +12,4 @@ public interface PluginConfig {
 	Collection<DuplexPluginFactory> getDuplexFactories();
 
 	Collection<SimplexPluginFactory> getSimplexFactories();
-
-	boolean shouldPoll();
 }

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

@@ -4,8 +4,7 @@ public interface TorConstants {
 
 	TransportId ID = new TransportId("org.briarproject.bramble.tor");
 
-	String PROP_ONION_V2 = "onion";
-	String PROP_ONION_V3 = "onion3";
+	String PROP_ONION = "onion";
 
 	int SOCKS_PORT = 59050;
 	int CONTROL_PORT = 59051;
@@ -13,13 +12,11 @@ public interface TorConstants {
 	int CONNECT_TO_PROXY_TIMEOUT = 5000; // Milliseconds
 	int EXTRA_SOCKET_TIMEOUT = 30000; // Milliseconds
 
-	String PREF_TOR_NETWORK = "network2";
+	String PREF_TOR_NETWORK = "network";
 	String PREF_TOR_PORT = "port";
-	String PREF_TOR_MOBILE = "useMobileData";
 
-	int PREF_TOR_NETWORK_AUTOMATIC = 0;
-	int PREF_TOR_NETWORK_WITHOUT_BRIDGES = 1;
-	int PREF_TOR_NETWORK_WITH_BRIDGES = 2;
-	int PREF_TOR_NETWORK_NEVER = 3;
+	int PREF_TOR_NETWORK_NEVER = 0;
+	int PREF_TOR_NETWORK_WIFI = 1;
+	int PREF_TOR_NETWORK_ALWAYS = 2;
 
 }

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

@@ -22,6 +22,11 @@ public interface TransportConnectionWriter {
 	 */
 	int getMaxIdleTime();
 
+	/**
+	 * Returns the capacity of the transport connection in bytes.
+	 */
+	long getCapacity();
+
 	/**
 	 * Returns an output stream for writing to the transport connection.
 	 */

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

@@ -1,23 +1,22 @@
 package org.briarproject.bramble.api.plugin;
 
-import org.briarproject.bramble.util.StringUtils;
+import java.nio.charset.Charset;
 
 /**
- * Type-safe wrapper for a namespaced string that uniquely identifies a
- * transport plugin.
+ * Type-safe wrapper for a string that uniquely identifies a transport plugin.
  */
 public class TransportId {
 
 	/**
-	 * The maximum length of a transport identifier in UTF-8 bytes.
+	 * The maximum length of transport identifier in UTF-8 bytes.
 	 */
-	public static int MAX_TRANSPORT_ID_LENGTH = 100;
+	public static int MAX_TRANSPORT_ID_LENGTH = 64;
 
 	private final String id;
 
 	public TransportId(String id) {
-		int length = StringUtils.toUtf8(id).length;
-		if (length == 0 || length > MAX_TRANSPORT_ID_LENGTH)
+		byte[] b = id.getBytes(Charset.forName("UTF-8"));
+		if (b.length == 0 || b.length > MAX_TRANSPORT_ID_LENGTH)
 			throw new IllegalArgumentException();
 		this.id = id;
 	}