Merge branch '1081-share-app-via-wifi-hotspot' into offline-testing

# Conflicts:
#	bramble-api/src/main/java/org/briarproject/bramble/api/FeatureFlags.java
#	bramble-core/build.gradle
#	bramble-core/src/test/java/org/briarproject/bramble/test/BrambleCoreIntegrationTestModule.java
#	bramble-core/witness.gradle
#	bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPluginFactory.java
#	briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java
#	briar-android/src/main/java/org/briarproject/briar/android/AppModule.java
#	briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java
#	briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java
#	briar-android/src/main/res/values/strings.xml
#	briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt
#	briar-headless/src/test/java/org/briarproject/briar/headless/HeadlessTestModule.kt

.gitignore

@@ -18,9 +18,12 @@ local.properties
 
 # Android Studio
 .idea/*
+!.idea/inspectionProfiles/
 !.idea/runConfigurations/
 !.idea/codeStyleSettings.xml
+!.idea/codeStyles
 .gradle
 build/
+captures
 *.iml
 projectFilesBackup/

.gitlab-ci.yml

@@ -1,20 +1,118 @@
-image: registry.gitlab.com/fdroid/ci-images-base:latest
+image: briar/ci-image-android:latest
 
-cache:
+stages:
-  paths:
+  - test
-    - .gradle/wrapper
+  - optional_tests
-    - .gradle/caches
+  - check_reproducibility
 
-before_script:
+workflow:
-  - export GRADLE_USER_HOME=$PWD/.gradle
+  # when to create a CI pipeline
-#  - export ANDROID_COMPILE_SDK=`sed -n 's,.*compileSdkVersion\s*\([0-9][0-9]*\).*,\1,p' app/build.gradle`
+  rules:
-#  - echo y | android --silent update sdk --no-ui --filter android-${ANDROID_COMPILE_SDK}
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+    - if: '$CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS'
+      when: never # avoids duplicate jobs for branch and MR
+    - if: '$CI_COMMIT_BRANCH'
+    - if: '$CI_COMMIT_TAG'
 
-test:
+.base-test:
-  script:
+  before_script:
-    - ./gradlew test
+    - set -e
-
+    - export GRADLE_USER_HOME=$PWD/.gradle
-after_script:
+  cache:
-    # this file changes every time but should not be cached
+    key: "$CI_COMMIT_REF_SLUG"
+    paths:
+      - .gradle/wrapper
+      - .gradle/caches
+  after_script:
+    # these file change every time and should not be cached
     - rm -f $GRADLE_USER_HOME/caches/modules-2/modules-2.lock
     - rm -fr $GRADLE_USER_HOME/caches/*/plugin-resolution/
+
+test:
+  extends: .base-test
+  stage: test
+  script:
+    - ./gradlew --no-daemon -Djava.security.egd=file:/dev/urandom animalSnifferMain animalSnifferTest
+    - ./gradlew --no-daemon -Djava.security.egd=file:/dev/urandom check
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      when: always
+    - when: always
+
+android test:
+  extends: .base-test
+  stage: optional_tests
+  image: briar/ci-image-android-emulator:latest
+  script:
+    # start emulator first, so it can fail early
+    - start-emulator.sh
+    # run normal and screenshot tests together (exclude Large tests)
+    - ./gradlew -Djava.security.egd=file:/dev/urandom connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.package=org.briarproject.briar.android -Pandroid.testInstrumentationRunnerArguments.notAnnotation=androidx.test.filters.LargeTest
+  after_script:
+    - adb pull /sdcard/Pictures/screenshots
+  artifacts:
+    name: "${CI_PROJECT_PATH}_${CI_JOB_STAGE}_${CI_COMMIT_REF_NAME}_${CI_COMMIT_SHA}"
+    paths:
+      - kernel.log
+      - logcat.txt
+      - briar-android/build/reports/androidTests/connected/flavors/*
+      - screenshots
+    expire_in: 3 days
+    when: on_failure
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+      when: on_success
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      changes:
+        - briar-android/**/*
+      when: manual
+      allow_failure: true
+    - if: '$CI_COMMIT_TAG == null'
+      when: manual
+      allow_failure: true
+  retry:
+    max: 1
+  tags:
+    - kvm
+
+test_reproducible:
+  stage: check_reproducibility
+  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
+
+.optional_tests:
+  stage: optional_tests
+  before_script:
+    - set -e
+    - export GRADLE_USER_HOME=$PWD/.gradle
+
+  cache:
+    key: "$CI_COMMIT_REF_SLUG"
+    paths:
+      - .gradle/wrapper
+      - .gradle/caches
+
+  script:
+    - OPTIONAL_TESTS=org.briarproject.bramble.plugin.tor.BridgeTest ./gradlew --info bramble-java:test --tests BridgeTest
+
+  after_script:
+    # these file change every time but should not be cached
+    - rm -f $GRADLE_USER_HOME/caches/modules-2/modules-2.lock
+    - rm -fr $GRADLE_USER_HOME/caches/*/plugin-resolution/
+
+bridge test:
+  extends: .optional_tests
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+      when: on_success
+      allow_failure: true
+    - if: '$CI_COMMIT_TAG == null'
+      when: manual
+      allow_failure: true
+
+pre_release_tests:
+  extends: .optional_tests
+  only:
+    - tags

.idea/codeStyles/Project.xml

@@ -0,0 +1,205 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <JavaCodeStyleSettings>
+      <option name="ANNOTATION_PARAMETER_WRAP" value="1" />
+      <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="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value />
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
+    <XML>
+      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+    </XML>
+    <codeStyleSettings language="Groovy">
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+        <option name="SMART_TABS" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="JAVA">
+      <option name="RIGHT_MARGIN" value="80" />
+      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+      <option name="ALIGN_MULTILINE_RESOURCES" value="false" />
+      <option name="ALIGN_MULTILINE_FOR" value="false" />
+      <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
+      <option name="CALL_PARAMETERS_WRAP" value="1" />
+      <option name="METHOD_PARAMETERS_WRAP" value="1" />
+      <option name="RESOURCE_LIST_WRAP" value="1" />
+      <option name="EXTENDS_LIST_WRAP" value="1" />
+      <option name="THROWS_LIST_WRAP" value="1" />
+      <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+      <option name="THROWS_KEYWORD_WRAP" value="1" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+      <option name="BINARY_OPERATION_WRAP" value="1" />
+      <option name="TERNARY_OPERATION_WRAP" value="1" />
+      <option name="FOR_STATEMENT_WRAP" value="1" />
+      <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+      <option name="ASSIGNMENT_WRAP" value="1" />
+      <option name="ASSERT_STATEMENT_WRAP" value="1" />
+      <option name="PARAMETER_ANNOTATION_WRAP" value="1" />
+      <option name="VARIABLE_ANNOTATION_WRAP" value="1" />
+      <option name="ENUM_CONSTANTS_WRAP" value="1" />
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+        <option name="SMART_TABS" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="XML">
+      <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_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <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

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

.idea/dictionaries/briar.xml

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

.idea/inspectionProfiles/Project_Default.xml

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

.idea/runConfigurations/All_tests.xml

@@ -1,28 +1,21 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="All tests" type="AndroidJUnit" factoryName="Android JUnit">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+    <module name="briar.briar-android" />
-    <module name="briar-android" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" />
     <option name="PACKAGE_NAME" value="" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-ea" />
     <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/briar-android" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/briar-android" />
-    <option name="ENV_VARIABLES" />
+    <method v="2">
-    <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="singleModule" />
-    </option>
-    <envs />
-    <patterns />
-    <method>
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-api" run_configuration_type="AndroidJUnit" />
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-core" run_configuration_type="AndroidJUnit" />
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-j2se" 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 briar-api" run_configuration_type="AndroidJUnit" />
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in briar-core" run_configuration_type="AndroidJUnit" />
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in briar-headless" run_configuration_type="AndroidJUnit" />
     </method>
   </configuration>
 </component>

.idea/runConfigurations/All_tests_in_bramble_android.xml

@@ -0,0 +1,14 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="All tests in bramble-android" type="AndroidJUnit" factoryName="Android JUnit">
+    <module name="briar.bramble-android" />
+    <option name="PACKAGE_NAME" value="" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="package" />
+    <option name="PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-android" />
+    <method v="2">
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    </method>
+  </configuration>
+</component>

.idea/runConfigurations/All_tests_in_bramble_api.xml

@@ -1,23 +1,14 @@
 <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="briar.bramble-api" />
-    <module name="bramble-api" />
-    <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-api" />
-    <option name="ENV_VARIABLES" />
+    <method v="2">
-    <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
-    <option name="TEST_SEARCH_SCOPE">
+    </method>
-      <value defaultName="singleModule" />
-    </option>
-    <envs />
-    <patterns />
-    <method />
   </configuration>
 </component>

.idea/runConfigurations/All_tests_in_bramble_core.xml

@@ -1,23 +1,14 @@
 <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="briar.bramble-core" />
-    <module name="bramble-core" />
-    <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-core" />
-    <option name="ENV_VARIABLES" />
+    <method v="2">
-    <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
-    <option name="TEST_SEARCH_SCOPE">
+    </method>
-      <value defaultName="singleModule" />
-    </option>
-    <envs />
-    <patterns />
-    <method />
   </configuration>
 </component>

.idea/runConfigurations/All_tests_in_bramble_j2se.xml

@@ -1,23 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <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="" />
-    <option name="MAIN_CLASS_NAME" value="" />
-    <option name="METHOD_NAME" value="" />
-    <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-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>
-</component>

.idea/runConfigurations/All_tests_in_bramble_java.xml

@@ -0,0 +1,15 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="All tests in bramble-java" type="AndroidJUnit" factoryName="Android JUnit">
+    <module name="briar.bramble-java" />
+    <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 -Djava.library.path=libs" />
+    <option name="PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-java" />
+    <method v="2">
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    </method>
+  </configuration>
+</component>

.idea/runConfigurations/All_tests_in_briar_android.xml

@@ -1,23 +1,14 @@
 <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.briar-android" />
-    <module name="briar-android" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" />
     <option name="PACKAGE_NAME" value="" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-ea" />
     <option name="PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/briar-android" />
-    <option name="ENV_VARIABLES" />
+    <method v="2">
-    <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
-    <option name="TEST_SEARCH_SCOPE">
+    </method>
-      <value defaultName="singleModule" />
-    </option>
-    <envs />
-    <patterns />
-    <method />
   </configuration>
 </component>

.idea/runConfigurations/All_tests_in_briar_api.xml

@@ -0,0 +1,14 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="All tests in briar-api" type="AndroidJUnit" factoryName="Android JUnit">
+    <module name="briar.briar-api" />
+    <option name="PACKAGE_NAME" value="" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="package" />
+    <option name="PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/briar-api" />
+    <method v="2">
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    </method>
+  </configuration>
+</component>

.idea/runConfigurations/All_tests_in_briar_core.xml

@@ -1,23 +1,14 @@
 <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.briar-core" />
-    <module name="briar-core" />
-    <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$/briar-core" />
-    <option name="ENV_VARIABLES" />
+    <method v="2">
-    <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
-    <option name="TEST_SEARCH_SCOPE">
+    </method>
-      <value defaultName="singleModule" />
-    </option>
-    <envs />
-    <patterns />
-    <method />
   </configuration>
 </component>

.idea/runConfigurations/All_tests_in_briar_headless.xml

@@ -0,0 +1,15 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="All tests in briar-headless" type="AndroidJUnit" factoryName="Android JUnit">
+    <module name="briar.briar-headless" />
+    <option name="PACKAGE_NAME" value="org.briarproject.briar.headless" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="package" />
+    <option name="VM_PARAMETERS" />
+    <option name="PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/briar-headless" />
+    <method v="2">
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    </method>
+  </configuration>
+</component>

.idea/runConfigurations/BridgeTest.xml

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

.idea/runConfigurations/H2_Performance_Test.xml

@@ -0,0 +1,14 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="H2 Performance Test" type="AndroidJUnit" factoryName="Android JUnit">
+    <module name="briar.bramble-core" />
+    <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="PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="" />
+    <method v="2">
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    </method>
+  </configuration>
+</component>

.idea/runConfigurations/HyperSQL_Performance_Test.xml

@@ -0,0 +1,14 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="HyperSQL Performance Test" type="AndroidJUnit" factoryName="Android JUnit">
+    <module name="briar.bramble-core" />
+    <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="PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="" />
+    <method v="2">
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    </method>
+  </configuration>
+</component>

.idea/runConfigurations/Instrumentation_Tests__destroys_DB_.xml

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

.idea/runConfigurations/briar_headless.xml

@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="briar-headless" type="JetRunConfigurationType" singleton="true">
+    <module name="briar.briar-headless" />
+    <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="" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+      <option name="Gradle.BeforeRunTask" enabled="true" tasks="jar" externalProjectPath="$PROJECT_DIR$/briar-headless" vmOptions="" scriptParameters="" />
+    </method>
+  </configuration>
+</component>

TRANSLATION.md

@@ -0,0 +1,9 @@
+Translations for this project are managed through Transifex:
+
+https://transifex.com/otf/briar
+
+If you'd like to volunteer as a translator, please create a Transifex account and request to be
+added to the project's translation team. The Localization Lab has some instructions and advice for
+translators here:
+
+https://wiki.localizationlab.org/index.php/Briar

bramble-android/.gitignore

@@ -3,3 +3,4 @@ gen
 build
 .settings
 src/main/res/raw/*.zip
+src/main/jniLibs

bramble-android/build.gradle

@@ -1,104 +1,115 @@
-import de.undercouch.gradle.tasks.download.Download
+import com.android.build.gradle.tasks.MergeResources
-import de.undercouch.gradle.tasks.download.Verify
 
 apply plugin: 'com.android.library'
 apply plugin: 'witness'
-apply plugin: 'de.undercouch.download'
+apply from: 'witness.gradle'
 
 android {
-	compileSdkVersion 23
+	compileSdkVersion 30
-	buildToolsVersion "23.0.3"
+	buildToolsVersion '30.0.3'
+
+	packagingOptions {
+		doNotStrip '**/*.so'
+	}
 
 	defaultConfig {
-		minSdkVersion 14
+		minSdkVersion 16
-		targetSdkVersion 22
+		targetSdkVersion 30
-		versionCode 14
+		versionCode 10305
-		versionName "0.14"
+		versionName "1.3.5"
 		consumerProguardFiles 'proguard-rules.txt'
+
+		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 	}
 
 	compileOptions {
-		sourceCompatibility JavaVersion.VERSION_1_7
+		sourceCompatibility JavaVersion.VERSION_1_8
-		targetCompatibility JavaVersion.VERSION_1_7
+		targetCompatibility JavaVersion.VERSION_1_8
 	}
+
+	lintOptions {
+		// FIXME
+		warning "LintError"
+		warning "InvalidPackage"
+		warning "MissingPermission"
+		warning "InlinedApi", "ObsoleteSdkInt", "Override", "NewApi", "UnusedAttribute"
+	}
+}
+
+configurations {
+	tor
 }
 
 dependencies {
-	compile project(':bramble-core')
+	implementation project(path: ':bramble-core', configuration: 'default')
-	compile fileTree(dir: 'libs', include: '*.jar')
+	tor 'org.briarproject:tor-android:0.3.5.15'
-	provided 'javax.annotation:jsr250-api:1.0'
+	tor 'org.briarproject:obfs4proxy-android:0.0.12-dev-40245c4a@zip'
+
+	annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
+
+	compileOnly 'javax.annotation:jsr250-api:1.0'
+
+	testImplementation project(path: ':bramble-api', configuration: 'testOutput')
+	testImplementation "junit:junit:$junit_version"
+	testImplementation "org.jmock:jmock:$jmock_version"
+	testImplementation "org.jmock:jmock-junit4:$jmock_version"
+	testImplementation "org.jmock:jmock-legacy:$jmock_version"
 }
 
-def torBinaryDir = 'src/main/res/raw'
+def torBinariesDir = 'src/main/res/raw'
+def torLibsDir = 'src/main/jniLibs'
 
-task downloadTorGeoIp(type: Download) {
+task cleanTorBinaries {
-	src 'https://briarproject.org/build/geoip-2017-05-02.zip'
+	doLast {
-	dest "$torBinaryDir/geoip.zip"
+		delete fileTree(torBinariesDir) { include '*.zip' }
-	onlyIfNewer true
+		delete fileTree(torLibsDir) { include '**/*.so' }
-}
-
-task downloadTorBinaryArm(type: Download) {
-	src 'https://briarproject.org/build/tor-0.2.9.11-arm.zip'
-	dest "$torBinaryDir/tor_arm.zip"
-	onlyIfNewer true
-}
-
-task downloadTorBinaryArmPie(type: Download) {
-	src 'https://briarproject.org/build/tor-0.2.9.11-arm-pie.zip'
-	dest "$torBinaryDir/tor_arm_pie.zip"
-	onlyIfNewer true
-}
-
-task downloadTorBinaryX86(type: Download) {
-	src 'https://briarproject.org/build/tor-0.2.9.11-x86.zip'
-	dest "$torBinaryDir/tor_x86.zip"
-	onlyIfNewer true
-}
-
-task downloadTorBinaryX86Pie(type: Download) {
-	src 'https://briarproject.org/build/tor-0.2.9.11-x86-pie.zip'
-	dest "$torBinaryDir/tor_x86_pie.zip"
-	onlyIfNewer true
-}
-
-task verifyTorGeoIp(type: Verify, dependsOn: 'downloadTorGeoIp') {
-	src "$torBinaryDir/geoip.zip"
-	algorithm 'SHA-256'
-	checksum '51f4d1272fb867e1f3b36b67a584e2a33c40b40f62305457d799fd399cd77c9b'
-}
-
-task verifyTorBinaryArm(type: Verify, dependsOn: 'downloadTorBinaryArm') {
-	src "$torBinaryDir/tor_arm.zip"
-	algorithm 'SHA-256'
-	checksum '1da6008663a8ad98b349e62acbbf42c379f65ec504fa467cb119c187cd5a4c6b'
-}
-
-task verifyTorBinaryArmPie(type: Verify, dependsOn: 'downloadTorBinaryArmPie') {
-	src "$torBinaryDir/tor_arm_pie.zip"
-	algorithm 'SHA-256'
-	checksum 'eb061f880829e05f104690ac744848133f2dacef04759d425a2cff0df32c271e'
-}
-
-task verifyTorBinaryX86(type: Verify, dependsOn: 'downloadTorBinaryX86') {
-	src "$torBinaryDir/tor_x86.zip"
-	algorithm 'SHA-256'
-	checksum 'f5308aff8303daca082f82227d02b51ddedba4ab1d1420739ada0427ae5dbb41'
-}
-
-task verifyTorBinaryX86Pie(type: Verify, dependsOn: 'downloadTorBinaryX86Pie') {
-	src "$torBinaryDir/tor_x86_pie.zip"
-	algorithm 'SHA-256'
-	checksum '889a6c81ac73d05d35ed610ca5a913cee44d333e4ae1749c2a107f2f7dd8197b'
-}
-
-project.afterEvaluate {
-	preBuild.dependsOn {
-		[
-				'verifyTorGeoIp',
-				'verifyTorBinaryArm',
-				'verifyTorBinaryArmPie',
-				'verifyTorBinaryX86',
-				'verifyTorBinaryX86Pie'
-		]
 	}
 }
+
+clean.dependsOn cleanTorBinaries
+
+task unpackTorBinaries {
+	doLast {
+		copy {
+			from configurations.tor.collect { zipTree(it) }
+			into torBinariesDir
+			include 'geoip.zip'
+		}
+		configurations.tor.each { outer ->
+			zipTree(outer).each { inner ->
+				if (inner.name.endsWith('_arm_pie.zip')) {
+					copy {
+						from zipTree(inner)
+						into torLibsDir
+						rename '(.*)', 'armeabi-v7a/lib$1.so'
+					}
+				} else if (inner.name.endsWith('_arm64_pie.zip')) {
+					copy {
+						from zipTree(inner)
+						into torLibsDir
+						rename '(.*)', 'arm64-v8a/lib$1.so'
+					}
+				} else if (inner.name.endsWith('_x86_pie.zip')) {
+					copy {
+						from zipTree(inner)
+						into torLibsDir
+						rename '(.*)', 'x86/lib$1.so'
+					}
+				} else if (inner.name.endsWith('_x86_64_pie.zip')) {
+					copy {
+						from zipTree(inner)
+						into torLibsDir
+						rename '(.*)', 'x86_64/lib$1.so'
+					}
+				}
+			}
+		}
+	}
+	dependsOn cleanTorBinaries
+}
+
+tasks.withType(MergeResources) {
+	inputs.dir torBinariesDir
+	inputs.dir torLibsDir
+	dependsOn unpackTorBinaries
+}

bramble-android/proguard-rules.txt

@@ -8,6 +8,10 @@
 -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,23 +2,22 @@
 	package="org.briarproject.bramble"
 	xmlns:android="http://schemas.android.com/apk/res/android">
 
-	<uses-feature android:name="android.hardware.bluetooth"/>
+	<uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
 
 	<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"/>
-	<!-- Since API 23, this is needed to add contacts via Bluetooth -->
-	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
 
 	<application
 		android:allowBackup="false"
 		android:label="@string/app_name"
 		android:supportsRtl="true">
 
+		<receiver android:name=".system.AlarmReceiver" />
+
 	</application>
 
 </manifest>

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

@@ -0,0 +1,24 @@
+package org.briarproject.bramble;
+
+import org.briarproject.bramble.battery.AndroidBatteryModule;
+import org.briarproject.bramble.network.AndroidNetworkModule;
+import org.briarproject.bramble.reporting.ReportingModule;
+
+public interface BrambleAndroidEagerSingletons {
+
+	void inject(AndroidBatteryModule.EagerSingletons init);
+
+	void inject(AndroidNetworkModule.EagerSingletons init);
+
+	void inject(ReportingModule.EagerSingletons init);
+
+	class Helper {
+
+		public static void injectEagerSingletons(
+				BrambleAndroidEagerSingletons c) {
+			c.inject(new AndroidBatteryModule.EagerSingletons());
+			c.inject(new AndroidNetworkModule.EagerSingletons());
+			c.inject(new ReportingModule.EagerSingletons());
+		}
+	}
+}

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

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

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

@@ -0,0 +1,8 @@
+package org.briarproject.bramble;
+
+import org.briarproject.bramble.api.system.AlarmListener;
+
+public interface BrambleAppComponent {
+
+	AlarmListener alarmListener();
+}

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

@@ -0,0 +1,6 @@
+package org.briarproject.bramble;
+
+public interface BrambleApplication {
+
+	BrambleAppComponent getBrambleAppComponent();
+}

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

@@ -0,0 +1,137 @@
+package org.briarproject.bramble.account;
+
+import android.app.Application;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+
+import org.briarproject.bramble.api.account.AccountManager;
+import org.briarproject.bramble.api.crypto.CryptoComponent;
+import org.briarproject.bramble.api.db.DatabaseConfig;
+import org.briarproject.bramble.api.identity.IdentityManager;
+
+import java.io.File;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.logging.Logger;
+
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.GuardedBy;
+import javax.inject.Inject;
+
+import static android.os.Build.VERSION.SDK_INT;
+import static java.util.Arrays.asList;
+import static java.util.logging.Level.INFO;
+import static org.briarproject.bramble.util.IoUtils.deleteFileOrDir;
+import static org.briarproject.bramble.util.LogUtils.logFileOrDir;
+
+class AndroidAccountManager extends AccountManagerImpl
+		implements AccountManager {
+
+	private static final Logger LOG =
+			Logger.getLogger(AndroidAccountManager.class.getName());
+
+	/**
+	 * Directories that shouldn't be deleted when deleting the user's account.
+	 */
+	private static final List<String> PROTECTED_DIR_NAMES =
+			asList("cache", "code_cache", "lib", "shared_prefs");
+
+	protected final Context appContext;
+	private final SharedPreferences prefs;
+
+	@Inject
+	AndroidAccountManager(DatabaseConfig databaseConfig,
+			CryptoComponent crypto, IdentityManager identityManager,
+			SharedPreferences prefs, Application app) {
+		super(databaseConfig, crypto, identityManager);
+		this.prefs = prefs;
+		appContext = app.getApplicationContext();
+	}
+
+	@Override
+	public boolean accountExists() {
+		boolean exists = super.accountExists();
+		if (!exists && LOG.isLoggable(INFO)) {
+			LOG.info("Account does not exist. Contents of account directory:");
+			logFileOrDir(LOG, INFO, getDataDir());
+		}
+		return exists;
+	}
+
+	@Override
+	public void deleteAccount() {
+		synchronized (stateChangeLock) {
+			if (LOG.isLoggable(INFO)) {
+				LOG.info("Contents of account directory before deleting:");
+				logFileOrDir(LOG, INFO, getDataDir());
+			}
+			super.deleteAccount();
+			SharedPreferences defaultPrefs = getDefaultSharedPreferences();
+			deleteAppData(prefs, defaultPrefs);
+			if (LOG.isLoggable(INFO)) {
+				LOG.info("Contents of account directory after deleting:");
+				logFileOrDir(LOG, INFO, getDataDir());
+			}
+		}
+	}
+
+	// Package access for testing
+	SharedPreferences getDefaultSharedPreferences() {
+		return PreferenceManager.getDefaultSharedPreferences(appContext);
+	}
+
+	@GuardedBy("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 protected directories
+		Set<File> files = new HashSet<>();
+		File dataDir = getDataDir();
+		@Nullable
+		File[] fileArray = dataDir.listFiles();
+		if (fileArray == null) {
+			LOG.warning("Could not list files in app data dir");
+		} else {
+			for (File file : fileArray) {
+				if (!PROTECTED_DIR_NAMES.contains(file.getName())) {
+					files.add(file);
+				}
+			}
+		}
+		files.add(appContext.getFilesDir());
+		addIfNotNull(files, appContext.getExternalCacheDir());
+		if (SDK_INT >= 19) {
+			for (File file : appContext.getExternalCacheDirs()) {
+				addIfNotNull(files, file);
+			}
+		}
+		if (SDK_INT >= 21) {
+			for (File file : appContext.getExternalMediaDirs()) {
+				addIfNotNull(files, file);
+			}
+		}
+		// Clear the cache directory but don't delete it
+		File cacheDir = appContext.getCacheDir();
+		File[] children = cacheDir.listFiles();
+		if (children != null) files.addAll(asList(children));
+		for (File file : files) {
+			if (LOG.isLoggable(INFO)) {
+				LOG.info("Deleting " + file.getAbsolutePath());
+			}
+			deleteFileOrDir(file);
+		}
+	}
+
+	private File getDataDir() {
+		return new File(appContext.getApplicationInfo().dataDir);
+	}
+
+	private void addIfNotNull(Set<File> files, @Nullable File file) {
+		if (file != null) files.add(file);
+	}
+}

bramble-android/src/main/java/org/briarproject/bramble/api/system/AlarmListener.java

@@ -0,0 +1,11 @@
+package org.briarproject.bramble.api.system;
+
+import android.content.Intent;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+@NotNullByDefault
+public interface AlarmListener {
+
+	void onAlarm(Intent intent);
+}

bramble-android/src/main/java/org/briarproject/bramble/api/system/AndroidWakeLock.java

@@ -0,0 +1,19 @@
+package org.briarproject.bramble.api.system;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+@NotNullByDefault
+public interface AndroidWakeLock {
+
+	/**
+	 * Acquires the wake lock. This has no effect if the wake lock has already
+	 * been acquired.
+	 */
+	void acquire();
+
+	/**
+	 * Releases the wake lock. This has no effect if the wake lock has already
+	 * been released.
+	 */
+	void release();
+}

bramble-android/src/main/java/org/briarproject/bramble/api/system/AndroidWakeLockManager.java

@@ -0,0 +1,38 @@
+package org.briarproject.bramble.api.system;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+import java.util.concurrent.Executor;
+
+@NotNullByDefault
+public interface AndroidWakeLockManager {
+
+	/**
+	 * Creates a wake lock with the given tag. The tag is only used for
+	 * logging; the underlying OS wake lock will use its own tag.
+	 */
+	AndroidWakeLock createWakeLock(String tag);
+
+	/**
+	 * Runs the given task while holding a wake lock.
+	 */
+	void runWakefully(Runnable r, String tag);
+
+	/**
+	 * Submits the given task to the given executor while holding a wake lock.
+	 * The lock is released when the task completes, or if an exception is
+	 * thrown while submitting or running the task.
+	 */
+	void executeWakefully(Runnable r, Executor executor, String tag);
+
+	/**
+	 * Starts a dedicated thread to run the given task asynchronously. A wake
+	 * lock is acquired before starting the thread and released when the task
+	 * completes, or if an exception is thrown while starting the thread or
+	 * running the task.
+	 * <p>
+	 * This method should only be used for lifecycle management tasks that
+	 * can't be run on an executor.
+	 */
+	void executeWakefully(Runnable r, String tag);
+}

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

@@ -0,0 +1,81 @@
+package org.briarproject.bramble.battery;
+
+import android.app.Application;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+
+import org.briarproject.bramble.api.battery.BatteryManager;
+import org.briarproject.bramble.api.battery.event.BatteryEvent;
+import org.briarproject.bramble.api.event.EventBus;
+import org.briarproject.bramble.api.lifecycle.Service;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.logging.Logger;
+
+import javax.inject.Inject;
+
+import static android.content.Intent.ACTION_BATTERY_CHANGED;
+import static android.content.Intent.ACTION_POWER_CONNECTED;
+import static android.content.Intent.ACTION_POWER_DISCONNECTED;
+import static android.os.BatteryManager.EXTRA_PLUGGED;
+import static java.util.logging.Level.INFO;
+import static java.util.logging.Logger.getLogger;
+
+class AndroidBatteryManager implements BatteryManager, Service {
+
+	private static final Logger LOG =
+			getLogger(AndroidBatteryManager.class.getName());
+
+	private final Context appContext;
+	private final EventBus eventBus;
+	private final AtomicBoolean used = new AtomicBoolean(false);
+
+	private volatile BroadcastReceiver batteryReceiver = null;
+
+	@Inject
+	AndroidBatteryManager(Application app, EventBus eventBus) {
+		this.appContext = app.getApplicationContext();
+		this.eventBus = eventBus;
+	}
+
+	@Override
+	public boolean isCharging() {
+		// Get the sticky intent for ACTION_BATTERY_CHANGED
+		IntentFilter filter = new IntentFilter(ACTION_BATTERY_CHANGED);
+		Intent i = appContext.registerReceiver(null, filter);
+		if (i == null) return false;
+		int status = i.getIntExtra(EXTRA_PLUGGED, 0);
+		return status != 0;
+	}
+
+	@Override
+	public void startService() {
+		if (used.getAndSet(true)) throw new IllegalStateException();
+		batteryReceiver = new BatteryReceiver();
+		IntentFilter filter = new IntentFilter();
+		filter.addAction(ACTION_POWER_CONNECTED);
+		filter.addAction(ACTION_POWER_DISCONNECTED);
+		appContext.registerReceiver(batteryReceiver, filter);
+	}
+
+	@Override
+	public void stopService() {
+		if (batteryReceiver != null)
+			appContext.unregisterReceiver(batteryReceiver);
+	}
+
+	private class BatteryReceiver extends BroadcastReceiver {
+
+		@Override
+		public void onReceive(Context ctx, Intent i) {
+			String action = i.getAction();
+			if (LOG.isLoggable(INFO)) LOG.info("Received broadcast " + action);
+			if (ACTION_POWER_CONNECTED.equals(action))
+				eventBus.broadcast(new BatteryEvent(true));
+			else if (ACTION_POWER_DISCONNECTED.equals(action))
+				eventBus.broadcast(new BatteryEvent(false));
+		}
+	}
+}

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

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

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

@@ -0,0 +1,224 @@
+package org.briarproject.bramble.network;
+
+import android.annotation.TargetApi;
+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.LinkAddress;
+import android.net.LinkProperties;
+import android.net.Network;
+import android.net.NetworkInfo;
+
+import org.briarproject.bramble.api.event.EventBus;
+import org.briarproject.bramble.api.event.EventExecutor;
+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.TaskScheduler;
+import org.briarproject.bramble.api.system.TaskScheduler.Cancellable;
+
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.util.Enumeration;
+import java.util.concurrent.Executor;
+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.net.wifi.p2p.WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION;
+import static android.os.Build.VERSION.SDK_INT;
+import static android.os.PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED;
+import static java.net.NetworkInterface.getNetworkInterfaces;
+import static java.util.Collections.list;
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static java.util.logging.Level.INFO;
+import static java.util.logging.Level.WARNING;
+import static java.util.logging.Logger.getLogger;
+import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
+import static org.briarproject.bramble.util.LogUtils.logException;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+class AndroidNetworkManager implements NetworkManager, Service {
+
+	private static final Logger LOG =
+			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 TaskScheduler scheduler;
+	private final EventBus eventBus;
+	private final Executor eventExecutor;
+	private final Application app;
+	private final ConnectivityManager connectivityManager;
+	private final AtomicReference<Cancellable> connectivityCheck =
+			new AtomicReference<>();
+	private final AtomicBoolean used = new AtomicBoolean(false);
+
+	private volatile BroadcastReceiver networkStateReceiver = null;
+
+	@Inject
+	AndroidNetworkManager(TaskScheduler scheduler, EventBus eventBus,
+			@EventExecutor Executor eventExecutor, Application app) {
+		this.scheduler = scheduler;
+		this.eventBus = eventBus;
+		this.eventExecutor = eventExecutor;
+		this.app = app;
+		connectivityManager = (ConnectivityManager)
+				requireNonNull(app.getSystemService(CONNECTIVITY_SERVICE));
+	}
+
+	@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);
+		filter.addAction(WIFI_P2P_THIS_DEVICE_CHANGED_ACTION);
+		if (SDK_INT >= 23) filter.addAction(ACTION_DEVICE_IDLE_MODE_CHANGED);
+		app.registerReceiver(networkStateReceiver, filter);
+	}
+
+	@Override
+	public void stopService() {
+		if (networkStateReceiver != null)
+			app.unregisterReceiver(networkStateReceiver);
+	}
+
+	@Override
+	public NetworkStatus getNetworkStatus() {
+		NetworkInfo net = connectivityManager.getActiveNetworkInfo();
+		boolean connected = net != null && net.isConnected();
+		boolean wifi = false, ipv6Only = false;
+		if (connected) {
+			wifi = net.getType() == TYPE_WIFI;
+			if (SDK_INT >= 23) ipv6Only = isActiveNetworkIpv6Only();
+			else ipv6Only = areAllAvailableNetworksIpv6Only();
+		}
+		return new NetworkStatus(connected, wifi, ipv6Only);
+	}
+
+	/**
+	 * Returns true if the
+	 * {@link ConnectivityManager#getActiveNetwork() active network} has an
+	 * IPv6 unicast address and no IPv4 addresses. The active network is
+	 * assumed not to be a loopback interface.
+	 */
+	@TargetApi(23)
+	private boolean isActiveNetworkIpv6Only() {
+		Network net = connectivityManager.getActiveNetwork();
+		if (net == null) {
+			LOG.info("No active network");
+			return false;
+		}
+		LinkProperties props = connectivityManager.getLinkProperties(net);
+		if (props == null) {
+			LOG.info("No link properties for active network");
+			return false;
+		}
+		boolean hasIpv6Unicast = false;
+		for (LinkAddress linkAddress : props.getLinkAddresses()) {
+			InetAddress addr = linkAddress.getAddress();
+			if (addr instanceof Inet4Address) return false;
+			if (!addr.isMulticastAddress()) hasIpv6Unicast = true;
+		}
+		return hasIpv6Unicast;
+	}
+
+	/**
+	 * Returns true if the device has at least one network interface with an
+	 * IPv6 unicast address and no interfaces with IPv4 addresses, excluding
+	 * loopback interfaces and interfaces that are
+	 * {@link NetworkInterface#isUp() down}. If this method returns true and
+	 * the device has internet access then it's via IPv6 only.
+	 */
+	private boolean areAllAvailableNetworksIpv6Only() {
+		try {
+			Enumeration<NetworkInterface> interfaces = getNetworkInterfaces();
+			if (interfaces == null) {
+				LOG.info("No network interfaces");
+				return false;
+			}
+			boolean hasIpv6Unicast = false;
+			for (NetworkInterface i : list(interfaces)) {
+				if (i.isLoopback() || !i.isUp()) continue;
+				for (InetAddress addr : list(i.getInetAddresses())) {
+					if (addr instanceof Inet4Address) return false;
+					if (!addr.isMulticastAddress()) hasIpv6Unicast = true;
+				}
+			}
+			return hasIpv6Unicast;
+		} catch (SocketException e) {
+			logException(LOG, WARNING, e);
+			return false;
+		}
+	}
+
+	private void updateConnectionStatus() {
+		eventBus.broadcast(new NetworkStatusEvent(getNetworkStatus()));
+	}
+
+	private void scheduleConnectionStatusUpdate(int delay, TimeUnit unit) {
+		Cancellable newConnectivityCheck =
+				scheduler.schedule(this::updateConnectionStatus, eventExecutor,
+						delay, unit);
+		Cancellable oldConnectivityCheck =
+				connectivityCheck.getAndSet(newConnectivityCheck);
+		if (oldConnectivityCheck != null) oldConnectivityCheck.cancel();
+	}
+
+	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) ||
+					WIFI_P2P_THIS_DEVICE_CHANGED_ACTION.equals(action);
+		}
+	}
+}

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

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

bramble-android/src/main/java/org/briarproject/bramble/plugin/AndroidPluginModule.java

@@ -1,65 +0,0 @@
-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.plugin.droidtooth.DroidtoothPluginFactory;
-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 javax.net.SocketFactory;
-
-import dagger.Module;
-import dagger.Provides;
-
-@Module
-public class AndroidPluginModule {
-
-	@Provides
-	PluginConfig providePluginConfig(@IoExecutor Executor ioExecutor,
-			AndroidExecutor androidExecutor, SecureRandom random,
-			SocketFactory torSocketFactory, BackoffFactory backoffFactory,
-			Application app, LocationUtils locationUtils, DevReporter reporter,
-			EventBus eventBus) {
-		Context appContext = app.getApplicationContext();
-		DuplexPluginFactory bluetooth = new DroidtoothPluginFactory(ioExecutor,
-				androidExecutor, appContext, random, backoffFactory);
-		DuplexPluginFactory tor = new TorPluginFactory(ioExecutor, appContext,
-				locationUtils, reporter, eventBus, torSocketFactory,
-				backoffFactory);
-		DuplexPluginFactory lan = new AndroidLanTcpPluginFactory(ioExecutor,
-				backoffFactory, appContext);
-		final 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/AndroidBluetoothConnectionFactory.java

@@ -0,0 +1,36 @@
+package org.briarproject.bramble.plugin.bluetooth;
+
+import android.bluetooth.BluetoothSocket;
+
+import org.briarproject.bramble.api.io.TimeoutMonitor;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
+import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
+import org.briarproject.bramble.api.system.AndroidWakeLockManager;
+
+import java.io.IOException;
+
+@NotNullByDefault
+class AndroidBluetoothConnectionFactory
+		implements BluetoothConnectionFactory<BluetoothSocket> {
+
+	private final BluetoothConnectionLimiter connectionLimiter;
+	private final AndroidWakeLockManager wakeLockManager;
+	private final TimeoutMonitor timeoutMonitor;
+
+	AndroidBluetoothConnectionFactory(
+			BluetoothConnectionLimiter connectionLimiter,
+			AndroidWakeLockManager wakeLockManager,
+			TimeoutMonitor timeoutMonitor) {
+		this.connectionLimiter = connectionLimiter;
+		this.wakeLockManager = wakeLockManager;
+		this.timeoutMonitor = timeoutMonitor;
+	}
+
+	@Override
+	public DuplexTransportConnection wrapSocket(DuplexPlugin plugin,
+			BluetoothSocket s) throws IOException {
+		return new AndroidBluetoothTransportConnection(plugin,
+				connectionLimiter, wakeLockManager, timeoutMonitor, s);
+	}
+}

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

@@ -0,0 +1,308 @@
+package org.briarproject.bramble.plugin.bluetooth;
+
+import android.app.Application;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothServerSocket;
+import android.bluetooth.BluetoothSocket;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.bramble.api.plugin.Backoff;
+import org.briarproject.bramble.api.plugin.PluginCallback;
+import org.briarproject.bramble.api.plugin.PluginException;
+import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
+import org.briarproject.bramble.api.system.AndroidExecutor;
+import org.briarproject.bramble.api.system.Clock;
+import org.briarproject.bramble.util.AndroidUtils;
+import org.briarproject.bramble.util.IoUtils;
+
+import java.io.IOException;
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Collection;
+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;
+import static android.bluetooth.BluetoothAdapter.EXTRA_STATE;
+import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE;
+import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE;
+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.DEVICE_TYPE_LE;
+import static android.bluetooth.BluetoothDevice.EXTRA_DEVICE;
+import static android.os.Build.VERSION.SDK_INT;
+import static java.util.Collections.shuffle;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.logging.Level.INFO;
+import static java.util.logging.Level.WARNING;
+import static java.util.logging.Logger.getLogger;
+import static org.briarproject.bramble.util.PrivacyUtils.scrubMacAddress;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+class AndroidBluetoothPlugin extends
+		AbstractBluetoothPlugin<BluetoothSocket, BluetoothServerSocket> {
+
+	private static final Logger LOG =
+			getLogger(AndroidBluetoothPlugin.class.getName());
+
+	private static final int MAX_DISCOVERY_MS = 10_000;
+
+	private final AndroidExecutor androidExecutor;
+	private final Application app;
+	private final Clock clock;
+
+	private volatile BluetoothStateReceiver receiver = null;
+
+	// Non-null if the plugin started successfully
+	private volatile BluetoothAdapter adapter = null;
+	private volatile boolean stopDiscoverAndConnect;
+
+	AndroidBluetoothPlugin(BluetoothConnectionLimiter connectionLimiter,
+			BluetoothConnectionFactory<BluetoothSocket> connectionFactory,
+			Executor ioExecutor,
+			Executor wakefulIoExecutor,
+			SecureRandom secureRandom,
+			AndroidExecutor androidExecutor,
+			Application app,
+			Clock clock,
+			Backoff backoff,
+			PluginCallback callback,
+			long maxLatency,
+			int maxIdleTime) {
+		super(connectionLimiter, connectionFactory, ioExecutor,
+				wakefulIoExecutor, secureRandom, backoff, callback,
+				maxLatency, maxIdleTime);
+		this.androidExecutor = androidExecutor;
+		this.app = app;
+		this.clock = clock;
+	}
+
+	@Override
+	public void start() throws PluginException {
+		super.start();
+		// Listen for changes to the Bluetooth state
+		IntentFilter filter = new IntentFilter();
+		filter.addAction(ACTION_STATE_CHANGED);
+		filter.addAction(ACTION_SCAN_MODE_CHANGED);
+		receiver = new BluetoothStateReceiver();
+		app.registerReceiver(receiver, filter);
+	}
+
+	@Override
+	public void stop() {
+		super.stop();
+		if (receiver != null) app.unregisterReceiver(receiver);
+	}
+
+	@Override
+	void initialiseAdapter() throws IOException {
+		// BluetoothAdapter.getDefaultAdapter() must be called on a thread
+		// with a message queue, so submit it to the AndroidExecutor
+		try {
+			adapter = androidExecutor.runOnBackgroundThread(
+					BluetoothAdapter::getDefaultAdapter).get();
+		} catch (InterruptedException | ExecutionException e) {
+			throw new IOException(e);
+		}
+		if (adapter == null)
+			throw new IOException("Bluetooth is not supported");
+	}
+
+	@Override
+	boolean isAdapterEnabled() {
+		return adapter != null && adapter.isEnabled();
+	}
+
+	@Override
+	@Nullable
+	String getBluetoothAddress() {
+		if (adapter == null) return null;
+		String address = AndroidUtils.getBluetoothAddress(app, adapter);
+		return address.isEmpty() ? null : address;
+	}
+
+	@Override
+	BluetoothServerSocket openServerSocket(String uuid) throws IOException {
+		return adapter.listenUsingInsecureRfcommWithServiceRecord(
+				"RFCOMM", UUID.fromString(uuid));
+	}
+
+	@Override
+	void tryToClose(@Nullable BluetoothServerSocket ss) {
+		IoUtils.tryToClose(ss, LOG, WARNING);
+	}
+
+	@Override
+	DuplexTransportConnection acceptConnection(BluetoothServerSocket ss)
+			throws IOException {
+		return connectionFactory.wrapSocket(this, ss.accept());
+	}
+
+	@Override
+	boolean isValidAddress(String address) {
+		return BluetoothAdapter.checkBluetoothAddress(address);
+	}
+
+	@Override
+	DuplexTransportConnection connectTo(String address, String uuid)
+			throws IOException {
+		BluetoothDevice d = adapter.getRemoteDevice(address);
+		UUID u = UUID.fromString(uuid);
+		BluetoothSocket s = null;
+		try {
+			s = d.createInsecureRfcommSocketToServiceRecord(u);
+			s.connect();
+			return connectionFactory.wrapSocket(this, s);
+		} catch (IOException e) {
+			IoUtils.tryToClose(s, LOG, WARNING);
+			throw e;
+		} catch (NullPointerException e) {
+			// BluetoothSocket#connect() may throw an NPE under unknown
+			// circumstances
+			IoUtils.tryToClose(s, LOG, WARNING);
+			throw new IOException(e);
+		}
+	}
+
+	@Override
+	@Nullable
+	DuplexTransportConnection discoverAndConnect(String uuid) {
+		if (adapter == null) return null;
+		if (!discoverSemaphore.tryAcquire()) {
+			LOG.info("Discover already running");
+			return null;
+		}
+		try {
+			stopDiscoverAndConnect = false;
+			for (String address : discoverDevices()) {
+				if (stopDiscoverAndConnect) {
+					break;
+				}
+				try {
+					if (LOG.isLoggable(INFO))
+						LOG.info("Connecting to " + scrubMacAddress(address));
+					return connectTo(address, uuid);
+				} catch (IOException e) {
+					if (LOG.isLoggable(INFO)) {
+						LOG.info("Could not connect to "
+								+ scrubMacAddress(address));
+					}
+				}
+			}
+		} finally {
+			discoverSemaphore.release();
+		}
+		LOG.info("Could not connect to any devices");
+		return null;
+	}
+
+	@Override
+	public void stopDiscoverAndConnect() {
+		stopDiscoverAndConnect = true;
+		adapter.cancelDiscovery();
+	}
+
+	private Collection<String> discoverDevices() {
+		List<String> addresses = new ArrayList<>();
+		BlockingQueue<Intent> intents = new LinkedBlockingQueue<>();
+		DiscoveryReceiver receiver = new DiscoveryReceiver(intents);
+		IntentFilter filter = new IntentFilter();
+		filter.addAction(ACTION_DISCOVERY_STARTED);
+		filter.addAction(ACTION_DISCOVERY_FINISHED);
+		filter.addAction(ACTION_FOUND);
+		app.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);
+						// Ignore Bluetooth LE devices
+						if (SDK_INT < 18 || d.getType() != DEVICE_TYPE_LE) {
+							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();
+			app.unregisterReceiver(receiver);
+		}
+		// Shuffle the addresses so we don't always try the same one first
+		shuffle(addresses);
+		return addresses;
+	}
+
+	private class BluetoothStateReceiver extends BroadcastReceiver {
+
+		@Override
+		public void onReceive(Context ctx, Intent intent) {
+			int state = intent.getIntExtra(EXTRA_STATE, 0);
+			if (state == STATE_ON) onAdapterEnabled();
+			else if (state == STATE_OFF) onAdapterDisabled();
+			int scanMode = intent.getIntExtra(EXTRA_SCAN_MODE, 0);
+			if (scanMode == SCAN_MODE_NONE) {
+				LOG.info("Scan mode: None");
+			} else if (scanMode == SCAN_MODE_CONNECTABLE) {
+				LOG.info("Scan mode: Connectable");
+			} else if (scanMode == SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
+				LOG.info("Scan mode: Discoverable");
+			}
+		}
+	}
+
+	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

@@ -0,0 +1,98 @@
+package org.briarproject.bramble.plugin.bluetooth;
+
+import android.app.Application;
+import android.bluetooth.BluetoothSocket;
+
+import org.briarproject.bramble.api.event.EventBus;
+import org.briarproject.bramble.api.io.TimeoutMonitor;
+import org.briarproject.bramble.api.lifecycle.IoExecutor;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.plugin.Backoff;
+import org.briarproject.bramble.api.plugin.BackoffFactory;
+import org.briarproject.bramble.api.plugin.PluginCallback;
+import org.briarproject.bramble.api.plugin.TransportId;
+import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
+import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
+import org.briarproject.bramble.api.system.AndroidExecutor;
+import org.briarproject.bramble.api.system.AndroidWakeLockManager;
+import org.briarproject.bramble.api.system.Clock;
+import org.briarproject.bramble.api.system.WakefulIoExecutor;
+
+import java.security.SecureRandom;
+import java.util.concurrent.Executor;
+
+import javax.annotation.concurrent.Immutable;
+import javax.inject.Inject;
+
+import static org.briarproject.bramble.api.plugin.BluetoothConstants.ID;
+
+@Immutable
+@NotNullByDefault
+public class AndroidBluetoothPluginFactory implements DuplexPluginFactory {
+
+	private static final int MAX_LATENCY = 30 * 1000; // 30 seconds
+	private static final int MAX_IDLE_TIME = 30 * 1000; // 30 seconds
+	private static final int MIN_POLLING_INTERVAL = 60 * 1000; // 1 minute
+	private static final int MAX_POLLING_INTERVAL = 10 * 60 * 1000; // 10 mins
+	private static final double BACKOFF_BASE = 1.2;
+
+	private final Executor ioExecutor, wakefulIoExecutor;
+	private final AndroidExecutor androidExecutor;
+	private final AndroidWakeLockManager wakeLockManager;
+	private final Application app;
+	private final SecureRandom secureRandom;
+	private final EventBus eventBus;
+	private final Clock clock;
+	private final TimeoutMonitor timeoutMonitor;
+	private final BackoffFactory backoffFactory;
+
+	@Inject
+	AndroidBluetoothPluginFactory(@IoExecutor Executor ioExecutor,
+			@WakefulIoExecutor Executor wakefulIoExecutor,
+			AndroidExecutor androidExecutor,
+			AndroidWakeLockManager wakeLockManager,
+			Application app,
+			SecureRandom secureRandom,
+			EventBus eventBus,
+			Clock clock,
+			TimeoutMonitor timeoutMonitor,
+			BackoffFactory backoffFactory) {
+		this.ioExecutor = ioExecutor;
+		this.wakefulIoExecutor = wakefulIoExecutor;
+		this.androidExecutor = androidExecutor;
+		this.wakeLockManager = wakeLockManager;
+		this.app = app;
+		this.secureRandom = secureRandom;
+		this.eventBus = eventBus;
+		this.clock = clock;
+		this.timeoutMonitor = timeoutMonitor;
+		this.backoffFactory = backoffFactory;
+	}
+
+	@Override
+	public TransportId getId() {
+		return ID;
+	}
+
+	@Override
+	public long getMaxLatency() {
+		return MAX_LATENCY;
+	}
+
+	@Override
+	public DuplexPlugin createPlugin(PluginCallback callback) {
+		BluetoothConnectionLimiter connectionLimiter =
+				new BluetoothConnectionLimiterImpl(eventBus);
+		BluetoothConnectionFactory<BluetoothSocket> connectionFactory =
+				new AndroidBluetoothConnectionFactory(connectionLimiter,
+						wakeLockManager, timeoutMonitor);
+		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
+				MAX_POLLING_INTERVAL, BACKOFF_BASE);
+		AndroidBluetoothPlugin plugin = new AndroidBluetoothPlugin(
+				connectionLimiter, connectionFactory, ioExecutor,
+				wakefulIoExecutor, secureRandom, androidExecutor, app,
+				clock, backoff, callback, MAX_LATENCY, MAX_IDLE_TIME);
+		eventBus.addListener(plugin);
+		return plugin;
+	}
+}

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

@@ -0,0 +1,64 @@
+package org.briarproject.bramble.plugin.bluetooth;
+
+import android.bluetooth.BluetoothSocket;
+
+import org.briarproject.bramble.api.io.TimeoutMonitor;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.plugin.Plugin;
+import org.briarproject.bramble.api.plugin.duplex.AbstractDuplexTransportConnection;
+import org.briarproject.bramble.api.system.AndroidWakeLock;
+import org.briarproject.bramble.api.system.AndroidWakeLockManager;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import static org.briarproject.bramble.api.plugin.BluetoothConstants.PROP_ADDRESS;
+import static org.briarproject.bramble.util.AndroidUtils.isValidBluetoothAddress;
+
+@NotNullByDefault
+class AndroidBluetoothTransportConnection
+		extends AbstractDuplexTransportConnection {
+
+	private final BluetoothConnectionLimiter connectionLimiter;
+	private final BluetoothSocket socket;
+	private final InputStream in;
+	private final AndroidWakeLock wakeLock;
+
+	AndroidBluetoothTransportConnection(Plugin plugin,
+			BluetoothConnectionLimiter connectionLimiter,
+			AndroidWakeLockManager wakeLockManager,
+			TimeoutMonitor timeoutMonitor,
+			BluetoothSocket socket) throws IOException {
+		super(plugin);
+		this.connectionLimiter = connectionLimiter;
+		this.socket = socket;
+		in = timeoutMonitor.createTimeoutInputStream(
+				socket.getInputStream(), plugin.getMaxIdleTime() * 2);
+		wakeLock = wakeLockManager.createWakeLock("BluetoothConnection");
+		wakeLock.acquire();
+		String address = socket.getRemoteDevice().getAddress();
+		if (isValidBluetoothAddress(address)) remote.put(PROP_ADDRESS, address);
+	}
+
+	@Override
+	protected InputStream getInputStream() {
+		return in;
+	}
+
+	@Override
+	protected OutputStream getOutputStream() throws IOException {
+		return socket.getOutputStream();
+	}
+
+	@Override
+	protected void closeConnection(boolean exception) throws IOException {
+		try {
+			socket.close();
+			in.close();
+		} finally {
+			wakeLock.release();
+			connectionLimiter.connectionClosed(this);
+		}
+	}
+}

bramble-android/src/main/java/org/briarproject/bramble/plugin/droidtooth/DroidtoothPlugin.java

@@ -1,682 +0,0 @@
-package org.briarproject.bramble.plugin.droidtooth;
-
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothServerSocket;
-import android.bluetooth.BluetoothSocket;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-
-import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.crypto.PseudoRandom;
-import org.briarproject.bramble.api.data.BdfList;
-import org.briarproject.bramble.api.keyagreement.KeyAgreementConnection;
-import org.briarproject.bramble.api.keyagreement.KeyAgreementListener;
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
-import org.briarproject.bramble.api.plugin.Backoff;
-import org.briarproject.bramble.api.plugin.PluginException;
-import org.briarproject.bramble.api.plugin.TransportId;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
-import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
-import org.briarproject.bramble.api.properties.TransportProperties;
-import org.briarproject.bramble.api.system.AndroidExecutor;
-import org.briarproject.bramble.util.AndroidUtils;
-import org.briarproject.bramble.util.StringUtils;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CompletionService;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorCompletionService;
-import java.util.concurrent.Future;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.logging.Logger;
-
-import javax.annotation.Nullable;
-
-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;
-import static android.bluetooth.BluetoothAdapter.EXTRA_STATE;
-import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE;
-import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE;
-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.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.api.keyagreement.KeyAgreementConstants.TRANSPORT_ID_BLUETOOTH;
-import static org.briarproject.bramble.api.plugin.BluetoothConstants.ID;
-import static org.briarproject.bramble.api.plugin.BluetoothConstants.PREF_BT_ENABLE;
-import static org.briarproject.bramble.api.plugin.BluetoothConstants.PROP_ADDRESS;
-import static org.briarproject.bramble.api.plugin.BluetoothConstants.PROP_UUID;
-import static org.briarproject.bramble.api.plugin.BluetoothConstants.UUID_BYTES;
-import static org.briarproject.bramble.util.PrivacyUtils.scrubMacAddress;
-
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
-class DroidtoothPlugin implements DuplexPlugin {
-
-	private static final Logger LOG =
-			Logger.getLogger(DroidtoothPlugin.class.getName());
-	private static final String FOUND =
-			"android.bluetooth.device.action.FOUND";
-	private static final String DISCOVERY_FINISHED =
-			"android.bluetooth.adapter.action.DISCOVERY_FINISHED";
-
-	private final Executor ioExecutor;
-	private final AndroidExecutor androidExecutor;
-	private final Context appContext;
-	private final SecureRandom secureRandom;
-	private final Backoff backoff;
-	private final DuplexPluginCallback callback;
-	private final int maxLatency;
-	private final AtomicBoolean used = new AtomicBoolean(false);
-
-	private volatile boolean running = false;
-	private volatile boolean wasEnabledByUs = false;
-	private volatile BluetoothStateReceiver receiver = null;
-	private volatile BluetoothServerSocket socket = null;
-
-	// Non-null if the plugin started successfully
-	private volatile BluetoothAdapter adapter = null;
-
-	DroidtoothPlugin(Executor ioExecutor, AndroidExecutor androidExecutor,
-			Context appContext, SecureRandom secureRandom, Backoff backoff,
-			DuplexPluginCallback callback, int maxLatency) {
-		this.ioExecutor = ioExecutor;
-		this.androidExecutor = androidExecutor;
-		this.appContext = appContext;
-		this.secureRandom = secureRandom;
-		this.backoff = backoff;
-		this.callback = callback;
-		this.maxLatency = maxLatency;
-	}
-
-	@Override
-	public TransportId getId() {
-		return ID;
-	}
-
-	@Override
-	public int getMaxLatency() {
-		return maxLatency;
-	}
-
-	@Override
-	public int getMaxIdleTime() {
-		// Bluetooth detects dead connections so we don't need keepalives
-		return Integer.MAX_VALUE;
-	}
-
-	@Override
-	public void start() throws PluginException {
-		if (used.getAndSet(true)) throw new IllegalStateException();
-		// BluetoothAdapter.getDefaultAdapter() must be called on a thread
-		// with a message queue, so submit it to the AndroidExecutor
-		try {
-			adapter = androidExecutor.runOnBackgroundThread(
-					new Callable<BluetoothAdapter>() {
-						@Override
-						public BluetoothAdapter call() throws Exception {
-							return BluetoothAdapter.getDefaultAdapter();
-						}
-					}).get();
-		} catch (InterruptedException e) {
-			Thread.currentThread().interrupt();
-			LOG.warning("Interrupted while getting BluetoothAdapter");
-			throw new PluginException(e);
-		} catch (ExecutionException e) {
-			throw new PluginException(e);
-		}
-		if (adapter == null) {
-			LOG.info("Bluetooth is not supported");
-			throw new PluginException();
-		}
-		running = true;
-		// Listen for changes to the Bluetooth state
-		IntentFilter filter = new IntentFilter();
-		filter.addAction(ACTION_STATE_CHANGED);
-		filter.addAction(ACTION_SCAN_MODE_CHANGED);
-		receiver = new BluetoothStateReceiver();
-		appContext.registerReceiver(receiver, filter);
-		// If Bluetooth is enabled, bind a socket
-		if (adapter.isEnabled()) {
-			bind();
-		} else {
-			// Enable Bluetooth if settings allow
-			if (callback.getSettings().getBoolean(PREF_BT_ENABLE, false)) {
-				wasEnabledByUs = true;
-				if (adapter.enable()) LOG.info("Enabling Bluetooth");
-				else LOG.info("Could not enable Bluetooth");
-			} else {
-				LOG.info("Not enabling Bluetooth");
-			}
-		}
-	}
-
-	private void bind() {
-		ioExecutor.execute(new Runnable() {
-			@Override
-			public void run() {
-				if (!isRunning()) return;
-				String address = AndroidUtils.getBluetoothAddress(appContext,
-						adapter);
-				if (LOG.isLoggable(INFO))
-					LOG.info("Local address " + scrubMacAddress(address));
-				if (!StringUtils.isNullOrEmpty(address)) {
-					// Advertise the Bluetooth address to contacts
-					TransportProperties p = new TransportProperties();
-					p.put(PROP_ADDRESS, address);
-					callback.mergeLocalProperties(p);
-				}
-				// Bind a server socket to accept connections from contacts
-				BluetoothServerSocket ss;
-				try {
-					ss = adapter.listenUsingInsecureRfcommWithServiceRecord(
-							"RFCOMM", getUuid());
-				} catch (IOException e) {
-					if (LOG.isLoggable(WARNING))
-						LOG.log(WARNING, e.toString(), e);
-					return;
-				}
-				if (!isRunning()) {
-					tryToClose(ss);
-					return;
-				}
-				LOG.info("Socket bound");
-				socket = ss;
-				backoff.reset();
-				callback.transportEnabled();
-				acceptContactConnections();
-			}
-		});
-	}
-
-	private UUID getUuid() {
-		String uuid = callback.getLocalProperties().get(PROP_UUID);
-		if (uuid == null) {
-			byte[] random = new byte[UUID_BYTES];
-			secureRandom.nextBytes(random);
-			uuid = UUID.nameUUIDFromBytes(random).toString();
-			TransportProperties p = new TransportProperties();
-			p.put(PROP_UUID, uuid);
-			callback.mergeLocalProperties(p);
-		}
-		return UUID.fromString(uuid);
-	}
-
-	private void tryToClose(@Nullable BluetoothServerSocket ss) {
-		try {
-			if (ss != null) ss.close();
-		} catch (IOException e) {
-			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-		} finally {
-			callback.transportDisabled();
-		}
-	}
-
-	private void acceptContactConnections() {
-		while (isRunning()) {
-			BluetoothSocket s;
-			try {
-				s = socket.accept();
-			} catch (IOException e) {
-				// This is expected when the socket is closed
-				if (LOG.isLoggable(INFO)) LOG.info(e.toString());
-				return;
-			}
-			if (LOG.isLoggable(INFO)) {
-				String address = s.getRemoteDevice().getAddress();
-				LOG.info("Connection from " + scrubMacAddress(address));
-			}
-			backoff.reset();
-			callback.incomingConnectionCreated(wrapSocket(s));
-		}
-	}
-
-	private DuplexTransportConnection wrapSocket(BluetoothSocket s) {
-		return new DroidtoothTransportConnection(this, s);
-	}
-
-	@Override
-	public void stop() {
-		running = false;
-		if (receiver != null) appContext.unregisterReceiver(receiver);
-		tryToClose(socket);
-		// Disable Bluetooth if we enabled it and it's still enabled
-		if (wasEnabledByUs && adapter.isEnabled()) {
-			if (adapter.disable()) LOG.info("Disabling Bluetooth");
-			else LOG.info("Could not disable Bluetooth");
-		}
-	}
-
-	@Override
-	public boolean isRunning() {
-		return running && adapter != null && adapter.isEnabled();
-	}
-
-	@Override
-	public boolean shouldPoll() {
-		return true;
-	}
-
-	@Override
-	public int getPollingInterval() {
-		return backoff.getPollingInterval();
-	}
-
-	@Override
-	public void poll(Collection<ContactId> connected) {
-		if (!isRunning()) return;
-		backoff.increment();
-		// Try to connect to known devices in parallel
-		Map<ContactId, TransportProperties> remote =
-				callback.getRemoteProperties();
-		for (Entry<ContactId, TransportProperties> e : remote.entrySet()) {
-			final ContactId c = e.getKey();
-			if (connected.contains(c)) continue;
-			final String address = e.getValue().get(PROP_ADDRESS);
-			if (StringUtils.isNullOrEmpty(address)) continue;
-			final String uuid = e.getValue().get(PROP_UUID);
-			if (StringUtils.isNullOrEmpty(uuid)) continue;
-			ioExecutor.execute(new Runnable() {
-				@Override
-				public void run() {
-					if (!running) return;
-					BluetoothSocket s = connect(address, uuid);
-					if (s != null) {
-						backoff.reset();
-						callback.outgoingConnectionCreated(c, wrapSocket(s));
-					}
-				}
-			});
-		}
-	}
-
-	@Nullable
-	private BluetoothSocket connect(String address, String uuid) {
-		// Validate the address
-		if (!BluetoothAdapter.checkBluetoothAddress(address)) {
-			if (LOG.isLoggable(WARNING))
-				// not scrubbing here to be able to figure out the problem
-				LOG.warning("Invalid address " + address);
-			return null;
-		}
-		// Validate the UUID
-		UUID u;
-		try {
-			u = UUID.fromString(uuid);
-		} catch (IllegalArgumentException e) {
-			if (LOG.isLoggable(WARNING)) LOG.warning("Invalid UUID " + uuid);
-			return null;
-		}
-		// Try to connect
-		BluetoothDevice d = adapter.getRemoteDevice(address);
-		BluetoothSocket s = null;
-		try {
-			s = d.createInsecureRfcommSocketToServiceRecord(u);
-			if (LOG.isLoggable(INFO))
-				LOG.info("Connecting to " + scrubMacAddress(address));
-			s.connect();
-			if (LOG.isLoggable(INFO))
-				LOG.info("Connected to " + scrubMacAddress(address));
-			return s;
-		} catch (IOException e) {
-			if (LOG.isLoggable(INFO)) {
-				LOG.info("Failed to connect to " + scrubMacAddress(address)
-						+ ": " + e);
-			}
-			tryToClose(s);
-			return null;
-		}
-	}
-
-	private void tryToClose(@Nullable Closeable c) {
-		try {
-			if (c != null) c.close();
-		} catch (IOException e) {
-			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-		}
-	}
-
-	@Override
-	public DuplexTransportConnection createConnection(ContactId c) {
-		if (!isRunning()) return null;
-		TransportProperties p = callback.getRemoteProperties().get(c);
-		if (p == null) return null;
-		String address = p.get(PROP_ADDRESS);
-		if (StringUtils.isNullOrEmpty(address)) return null;
-		String uuid = p.get(PROP_UUID);
-		if (StringUtils.isNullOrEmpty(uuid)) return null;
-		BluetoothSocket s = connect(address, uuid);
-		if (s == null) return null;
-		return new DroidtoothTransportConnection(this, s);
-	}
-
-	@Override
-	public boolean supportsInvitations() {
-		return true;
-	}
-
-	@Override
-	public DuplexTransportConnection createInvitationConnection(PseudoRandom r,
-			long timeout, boolean alice) {
-		if (!isRunning()) return null;
-		// Use the invitation codes to generate the UUID
-		byte[] b = r.nextBytes(UUID_BYTES);
-		UUID uuid = UUID.nameUUIDFromBytes(b);
-		if (LOG.isLoggable(INFO)) LOG.info("Invitation UUID " + uuid);
-		// Bind a server socket for receiving invitation connections
-		BluetoothServerSocket ss;
-		try {
-			ss = adapter.listenUsingInsecureRfcommWithServiceRecord(
-					"RFCOMM", uuid);
-		} catch (IOException e) {
-			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-			return null;
-		}
-		// Create the background tasks
-		CompletionService<BluetoothSocket> complete =
-				new ExecutorCompletionService<>(ioExecutor);
-		List<Future<BluetoothSocket>> futures = new ArrayList<>();
-		if (alice) {
-			// Return the first connected socket
-			futures.add(complete.submit(new ListeningTask(ss)));
-			futures.add(complete.submit(new DiscoveryTask(uuid.toString())));
-		} else {
-			// Return the first socket with readable data
-			futures.add(complete.submit(new ReadableTask(
-					new ListeningTask(ss))));
-			futures.add(complete.submit(new ReadableTask(
-					new DiscoveryTask(uuid.toString()))));
-		}
-		BluetoothSocket chosen = null;
-		try {
-			Future<BluetoothSocket> f = complete.poll(timeout, MILLISECONDS);
-			if (f == null) return null; // No task completed within the timeout
-			chosen = f.get();
-			return new DroidtoothTransportConnection(this, chosen);
-		} catch (InterruptedException e) {
-			LOG.info("Interrupted while exchanging invitations");
-			Thread.currentThread().interrupt();
-			return null;
-		} catch (ExecutionException e) {
-			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-			return null;
-		} finally {
-			// Closing the socket will terminate the listener task
-			tryToClose(ss);
-			closeSockets(futures, chosen);
-		}
-	}
-
-	private void closeSockets(final List<Future<BluetoothSocket>> futures,
-			@Nullable final BluetoothSocket chosen) {
-		ioExecutor.execute(new Runnable() {
-			@Override
-			public void run() {
-				for (Future<BluetoothSocket> f : futures) {
-					try {
-						if (f.cancel(true)) {
-							LOG.info("Cancelled task");
-						} else {
-							BluetoothSocket s = f.get();
-							if (s != null && s != chosen) {
-								LOG.info("Closing unwanted socket");
-								s.close();
-							}
-						}
-					} catch (InterruptedException e) {
-						LOG.info("Interrupted while closing sockets");
-						return;
-					} catch (ExecutionException | IOException e) {
-						if (LOG.isLoggable(INFO)) LOG.info(e.toString());
-					}
-				}
-			}
-		});
-	}
-
-	@Override
-	public boolean supportsKeyAgreement() {
-		return true;
-	}
-
-	@Override
-	public KeyAgreementListener createKeyAgreementListener(byte[] commitment) {
-		if (!isRunning()) return null;
-		// There's no point listening if we can't discover our own address
-		String address = AndroidUtils.getBluetoothAddress(appContext, adapter);
-		if (address.isEmpty()) return null;
-		// No truncation necessary because COMMIT_LENGTH = 16
-		UUID uuid = UUID.nameUUIDFromBytes(commitment);
-		if (LOG.isLoggable(INFO)) LOG.info("Key agreement UUID " + uuid);
-		// Bind a server socket for receiving invitation connections
-		BluetoothServerSocket ss;
-		try {
-			ss = adapter.listenUsingInsecureRfcommWithServiceRecord(
-					"RFCOMM", uuid);
-		} catch (IOException e) {
-			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-			return null;
-		}
-		BdfList descriptor = new BdfList();
-		descriptor.add(TRANSPORT_ID_BLUETOOTH);
-		descriptor.add(StringUtils.macToBytes(address));
-		return new BluetoothKeyAgreementListener(descriptor, ss);
-	}
-
-	@Override
-	public DuplexTransportConnection createKeyAgreementConnection(
-			byte[] commitment, BdfList descriptor, long timeout) {
-		if (!isRunning()) return null;
-		String address;
-		try {
-			address = parseAddress(descriptor);
-		} catch (FormatException e) {
-			LOG.info("Invalid address in key agreement descriptor");
-			return null;
-		}
-		// No truncation necessary because COMMIT_LENGTH = 16
-		UUID uuid = UUID.nameUUIDFromBytes(commitment);
-		if (LOG.isLoggable(INFO))
-			LOG.info("Connecting to key agreement UUID " + uuid);
-		BluetoothSocket s = connect(address, uuid.toString());
-		if (s == null) return null;
-		return new DroidtoothTransportConnection(this, s);
-	}
-
-	private String parseAddress(BdfList descriptor) throws FormatException {
-		byte[] mac = descriptor.getRaw(1);
-		if (mac.length != 6) throw new FormatException();
-		return StringUtils.macToString(mac);
-	}
-
-	private class BluetoothStateReceiver extends BroadcastReceiver {
-
-		@Override
-		public void onReceive(Context ctx, Intent intent) {
-			int state = intent.getIntExtra(EXTRA_STATE, 0);
-			if (state == STATE_ON) {
-				LOG.info("Bluetooth enabled");
-				bind();
-			} else if (state == STATE_OFF) {
-				LOG.info("Bluetooth disabled");
-				tryToClose(socket);
-			}
-			int scanMode = intent.getIntExtra(EXTRA_SCAN_MODE, 0);
-			if (scanMode == SCAN_MODE_NONE) {
-				LOG.info("Scan mode: None");
-			} else if (scanMode == SCAN_MODE_CONNECTABLE) {
-				LOG.info("Scan mode: Connectable");
-			} else if (scanMode == SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
-				LOG.info("Scan mode: Discoverable");
-			}
-		}
-	}
-
-	private class DiscoveryTask implements Callable<BluetoothSocket> {
-
-		private final String uuid;
-
-		private DiscoveryTask(String uuid) {
-			this.uuid = uuid;
-		}
-
-		@Override
-		public BluetoothSocket call() throws Exception {
-			// Repeat discovery until we connect or get interrupted
-			while (true) {
-				// Discover nearby devices
-				LOG.info("Discovering nearby devices");
-				List<String> addresses = discoverDevices();
-				if (addresses.isEmpty()) {
-					LOG.info("No devices discovered");
-					continue;
-				}
-				// Connect to any device with the right UUID
-				for (String address : addresses) {
-					BluetoothSocket s = connect(address, uuid);
-					if (s != null) {
-						LOG.info("Outgoing connection");
-						return s;
-					}
-				}
-			}
-		}
-
-		private List<String> discoverDevices() throws InterruptedException {
-			IntentFilter filter = new IntentFilter();
-			filter.addAction(FOUND);
-			filter.addAction(DISCOVERY_FINISHED);
-			DiscoveryReceiver disco = new DiscoveryReceiver();
-			appContext.registerReceiver(disco, filter);
-			LOG.info("Starting discovery");
-			adapter.startDiscovery();
-			return disco.waitForAddresses();
-		}
-	}
-
-	private static class DiscoveryReceiver extends BroadcastReceiver {
-
-		private final CountDownLatch finished = new CountDownLatch(1);
-		private final List<String> addresses = new CopyOnWriteArrayList<>();
-
-		@Override
-		public void onReceive(Context ctx, Intent intent) {
-			String action = intent.getAction();
-			if (action.equals(DISCOVERY_FINISHED)) {
-				LOG.info("Discovery finished");
-				ctx.unregisterReceiver(this);
-				finished.countDown();
-			} else if (action.equals(FOUND)) {
-				BluetoothDevice d = intent.getParcelableExtra(EXTRA_DEVICE);
-				if (LOG.isLoggable(INFO)) {
-					LOG.info("Discovered device: " +
-							scrubMacAddress(d.getAddress()));
-				}
-				addresses.add(d.getAddress());
-			}
-		}
-
-		private List<String> waitForAddresses() throws InterruptedException {
-			finished.await();
-			List<String> shuffled = new ArrayList<>(addresses);
-			Collections.shuffle(shuffled);
-			return shuffled;
-		}
-	}
-
-	private static class ListeningTask implements Callable<BluetoothSocket> {
-
-		private final BluetoothServerSocket serverSocket;
-
-		private ListeningTask(BluetoothServerSocket serverSocket) {
-			this.serverSocket = serverSocket;
-		}
-
-		@Override
-		public BluetoothSocket call() throws IOException {
-			BluetoothSocket s = serverSocket.accept();
-			LOG.info("Incoming connection");
-			return s;
-		}
-	}
-
-	private static class ReadableTask implements Callable<BluetoothSocket> {
-
-		private final Callable<BluetoothSocket> connectionTask;
-
-		private ReadableTask(Callable<BluetoothSocket> connectionTask) {
-			this.connectionTask = connectionTask;
-		}
-
-		@Override
-		public BluetoothSocket call() throws Exception {
-			BluetoothSocket s = connectionTask.call();
-			InputStream in = s.getInputStream();
-			while (in.available() == 0) {
-				LOG.info("Waiting for data");
-				Thread.sleep(1000);
-			}
-			LOG.info("Data available");
-			return s;
-		}
-	}
-
-	private class BluetoothKeyAgreementListener extends KeyAgreementListener {
-
-		private final BluetoothServerSocket ss;
-
-		private BluetoothKeyAgreementListener(BdfList descriptor,
-				BluetoothServerSocket ss) {
-			super(descriptor);
-			this.ss = ss;
-		}
-
-		@Override
-		public Callable<KeyAgreementConnection> listen() {
-			return new Callable<KeyAgreementConnection>() {
-				@Override
-				public KeyAgreementConnection call() throws IOException {
-					BluetoothSocket s = ss.accept();
-					if (LOG.isLoggable(INFO))
-						LOG.info(ID.getString() + ": Incoming connection");
-					return new KeyAgreementConnection(
-							new DroidtoothTransportConnection(
-									DroidtoothPlugin.this, s), ID);
-				}
-			};
-		}
-
-		@Override
-		public void close() {
-			try {
-				ss.close();
-			} catch (IOException e) {
-				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-			}
-		}
-	}
-}

bramble-android/src/main/java/org/briarproject/bramble/plugin/droidtooth/DroidtoothPluginFactory.java

@@ -1,63 +0,0 @@
-package org.briarproject.bramble.plugin.droidtooth;
-
-import android.content.Context;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.Backoff;
-import org.briarproject.bramble.api.plugin.BackoffFactory;
-import org.briarproject.bramble.api.plugin.TransportId;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
-import org.briarproject.bramble.api.system.AndroidExecutor;
-
-import java.security.SecureRandom;
-import java.util.concurrent.Executor;
-
-import javax.annotation.concurrent.Immutable;
-
-import static org.briarproject.bramble.api.plugin.BluetoothConstants.ID;
-
-@Immutable
-@NotNullByDefault
-public class DroidtoothPluginFactory implements DuplexPluginFactory {
-
-	private static final int MAX_LATENCY = 30 * 1000; // 30 seconds
-	private static final int MIN_POLLING_INTERVAL = 60 * 1000; // 1 minute
-	private static final int MAX_POLLING_INTERVAL = 10 * 60 * 1000; // 10 mins
-	private static final double BACKOFF_BASE = 1.2;
-
-	private final Executor ioExecutor;
-	private final AndroidExecutor androidExecutor;
-	private final Context appContext;
-	private final SecureRandom secureRandom;
-	private final BackoffFactory backoffFactory;
-
-	public DroidtoothPluginFactory(Executor ioExecutor,
-			AndroidExecutor androidExecutor, Context appContext,
-			SecureRandom secureRandom, BackoffFactory backoffFactory) {
-		this.ioExecutor = ioExecutor;
-		this.androidExecutor = androidExecutor;
-		this.appContext = appContext;
-		this.secureRandom = secureRandom;
-		this.backoffFactory = backoffFactory;
-	}
-
-	@Override
-	public TransportId getId() {
-		return ID;
-	}
-
-	@Override
-	public int getMaxLatency() {
-		return MAX_LATENCY;
-	}
-
-	@Override
-	public DuplexPlugin createPlugin(DuplexPluginCallback callback) {
-		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
-				MAX_POLLING_INTERVAL, BACKOFF_BASE);
-		return new DroidtoothPlugin(ioExecutor, androidExecutor, appContext,
-				secureRandom, backoff, callback, MAX_LATENCY);
-	}
-}

bramble-android/src/main/java/org/briarproject/bramble/plugin/droidtooth/DroidtoothTransportConnection.java

@@ -1,37 +0,0 @@
-package org.briarproject.bramble.plugin.droidtooth;
-
-import android.bluetooth.BluetoothSocket;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.Plugin;
-import org.briarproject.bramble.api.plugin.duplex.AbstractDuplexTransportConnection;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-@NotNullByDefault
-class DroidtoothTransportConnection extends AbstractDuplexTransportConnection {
-
-	private final BluetoothSocket socket;
-
-	DroidtoothTransportConnection(Plugin plugin, BluetoothSocket socket) {
-		super(plugin);
-		this.socket = socket;
-	}
-
-	@Override
-	protected InputStream getInputStream() throws IOException {
-		return socket.getInputStream();
-	}
-
-	@Override
-	protected OutputStream getOutputStream() throws IOException {
-		return socket.getOutputStream();
-	}
-
-	@Override
-	protected void closeConnection(boolean exception) throws IOException {
-		socket.close();
-	}
-}

bramble-android/src/main/java/org/briarproject/bramble/plugin/file/AndroidRemovableDrivePlugin.java

@@ -0,0 +1,44 @@
+package org.briarproject.bramble.plugin.file;
+
+import android.app.Application;
+import android.net.Uri;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.plugin.PluginCallback;
+import org.briarproject.bramble.api.properties.TransportProperties;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import javax.annotation.concurrent.Immutable;
+
+import static org.briarproject.bramble.api.plugin.file.RemovableDriveConstants.PROP_URI;
+import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
+
+@Immutable
+@NotNullByDefault
+class AndroidRemovableDrivePlugin extends RemovableDrivePlugin {
+
+	private final Application app;
+
+	AndroidRemovableDrivePlugin(Application app, PluginCallback callback,
+			long maxLatency) {
+		super(callback, maxLatency);
+		this.app = app;
+	}
+
+	@Override
+	InputStream openInputStream(TransportProperties p) throws IOException {
+		String uri = p.get(PROP_URI);
+		if (isNullOrEmpty(uri)) throw new IllegalArgumentException();
+		return app.getContentResolver().openInputStream(Uri.parse(uri));
+	}
+
+	@Override
+	OutputStream openOutputStream(TransportProperties p) throws IOException {
+		String uri = p.get(PROP_URI);
+		if (isNullOrEmpty(uri)) throw new IllegalArgumentException();
+		return app.getContentResolver().openOutputStream(Uri.parse(uri));
+	}
+}

bramble-android/src/main/java/org/briarproject/bramble/plugin/file/AndroidRemovableDrivePluginFactory.java

@@ -0,0 +1,47 @@
+package org.briarproject.bramble.plugin.file;
+
+import android.app.Application;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.plugin.PluginCallback;
+import org.briarproject.bramble.api.plugin.TransportId;
+import org.briarproject.bramble.api.plugin.simplex.SimplexPlugin;
+import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory;
+
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.Immutable;
+import javax.inject.Inject;
+
+import static java.util.concurrent.TimeUnit.DAYS;
+import static org.briarproject.bramble.api.plugin.file.RemovableDriveConstants.ID;
+
+@Immutable
+@NotNullByDefault
+public class AndroidRemovableDrivePluginFactory implements
+		SimplexPluginFactory {
+
+	private static final int MAX_LATENCY = (int) DAYS.toMillis(14);
+
+	private final Application app;
+
+	@Inject
+	AndroidRemovableDrivePluginFactory(Application app) {
+		this.app = app;
+	}
+
+	@Override
+	public TransportId getId() {
+		return ID;
+	}
+
+	@Override
+	public long getMaxLatency() {
+		return MAX_LATENCY;
+	}
+
+	@Nullable
+	@Override
+	public SimplexPlugin createPlugin(PluginCallback callback) {
+		return new AndroidRemovableDrivePlugin(app, callback, MAX_LATENCY);
+	}
+}

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

@@ -1,76 +1,307 @@
 package org.briarproject.bramble.plugin.tcp;
 
-import android.content.BroadcastReceiver;
+import android.annotation.TargetApi;
-import android.content.Context;
+import android.app.Application;
-import android.content.Intent;
-import android.content.IntentFilter;
 import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
+import android.net.LinkAddress;
+import android.net.LinkProperties;
+import android.net.Network;
+import android.net.NetworkCapabilities;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
 
+import org.briarproject.bramble.PoliteExecutor;
+import org.briarproject.bramble.api.Pair;
+import org.briarproject.bramble.api.event.Event;
+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 org.briarproject.bramble.api.plugin.PluginCallback;
+import org.briarproject.bramble.api.settings.Settings;
 
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InterfaceAddress;
+import java.net.NetworkInterface;
+import java.net.Socket;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+import java.util.List;
 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.net.ConnectivityManager.CONNECTIVITY_ACTION;
+import static android.content.Context.WIFI_SERVICE;
-import static android.net.ConnectivityManager.TYPE_WIFI;
+import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
+import static android.os.Build.VERSION.SDK_INT;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.list;
+import static java.util.Collections.singletonList;
+import static java.util.logging.Level.WARNING;
+import static java.util.logging.Logger.getLogger;
+import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
+import static org.briarproject.bramble.api.plugin.LanTcpConstants.DEFAULT_PREF_PLUGIN_ENABLE;
+import static org.briarproject.bramble.api.plugin.Plugin.State.ACTIVE;
+import static org.briarproject.bramble.api.plugin.Plugin.State.INACTIVE;
+import static org.briarproject.bramble.util.IoUtils.tryToClose;
+import static org.briarproject.bramble.util.LogUtils.logException;
 
 @NotNullByDefault
 class AndroidLanTcpPlugin extends LanTcpPlugin {
 
 	private static final Logger LOG =
-			Logger.getLogger(AndroidLanTcpPlugin.class.getName());
+			getLogger(AndroidLanTcpPlugin.class.getName());
-
-	private final Context appContext;
 
+	private final Executor connectionStatusExecutor;
+	private final ConnectivityManager connectivityManager;
 	@Nullable
-	private volatile BroadcastReceiver networkStateReceiver = null;
+	private final WifiManager wifiManager;
 
-	AndroidLanTcpPlugin(Executor ioExecutor, Backoff backoff,
+	private volatile SocketFactory socketFactory;
-			Context appContext, DuplexPluginCallback callback, int maxLatency,
+
-			int maxIdleTime) {
+	AndroidLanTcpPlugin(Executor ioExecutor,
-		super(ioExecutor, backoff, callback, maxLatency, maxIdleTime);
+			Executor wakefulIoExecutor,
-		this.appContext = appContext;
+			Application app,
+			Backoff backoff,
+			PluginCallback callback,
+			long maxLatency,
+			int maxIdleTime,
+			int connectionTimeout) {
+		super(ioExecutor, wakefulIoExecutor, backoff, callback, maxLatency,
+				maxIdleTime, connectionTimeout);
+		// Don't execute more than one connection status check at a time
+		connectionStatusExecutor =
+				new PoliteExecutor("AndroidLanTcpPlugin", ioExecutor, 1);
+		connectivityManager = (ConnectivityManager)
+				requireNonNull(app.getSystemService(CONNECTIVITY_SERVICE));
+		wifiManager = (WifiManager) app.getSystemService(WIFI_SERVICE);
+		socketFactory = SocketFactory.getDefault();
 	}
 
 	@Override
 	public void start() {
 		if (used.getAndSet(true)) throw new IllegalStateException();
-		running = true;
+		initialisePortProperty();
-		// Register to receive network status events
+		Settings settings = callback.getSettings();
-		networkStateReceiver = new NetworkStateReceiver();
+		state.setStarted(settings.getBoolean(PREF_PLUGIN_ENABLE,
-		IntentFilter filter = new IntentFilter(CONNECTIVITY_ACTION);
+				DEFAULT_PREF_PLUGIN_ENABLE));
-		appContext.registerReceiver(networkStateReceiver, filter);
+		updateConnectionStatus();
 	}
 
 	@Override
-	public void stop() {
+	protected Socket createSocket() throws IOException {
-		running = false;
+		return socketFactory.createSocket();
-		if (networkStateReceiver != null)
-			appContext.unregisterReceiver(networkStateReceiver);
-		tryToClose(socket);
 	}
 
-	private class NetworkStateReceiver extends BroadcastReceiver {
+	@Override
+	protected List<InetAddress> getUsableLocalInetAddresses(boolean ipv4) {
+		InetAddress addr = getWifiAddress(ipv4);
+		return addr == null ? emptyList() : singletonList(addr);
+	}
 
-		@Override
+	@Nullable
-		public void onReceive(Context ctx, Intent i) {
+	private InetAddress getWifiAddress(boolean ipv4) {
-			if (!running) return;
+		Pair<InetAddress, Boolean> wifi = getWifiIpv4Address();
-			Object o = ctx.getSystemService(CONNECTIVITY_SERVICE);
+		if (ipv4) return wifi == null ? null : wifi.getFirst();
-			ConnectivityManager cm = (ConnectivityManager) o;
+		// If there's no wifi IPv4 address, we might be a client on an
-			NetworkInfo net = cm.getActiveNetworkInfo();
+		// IPv6-only wifi network. We can only detect this on API 21+
-			if (net != null && net.getType() == TYPE_WIFI && net.isConnected()) {
+		if (wifi == null) {
-				LOG.info("Connected to Wi-Fi");
+			return SDK_INT >= 21 ? getWifiClientIpv6Address() : null;
-				if (socket == null || socket.isClosed()) bind();
+		}
-			} else {
+		// Use the wifi IPv4 address to determine which interface's IPv6
-				LOG.info("Not connected to Wi-Fi");
+		// address we should return (if the interface has a suitable address)
-				tryToClose(socket);
+		return getIpv6AddressForInterface(wifi.getFirst());
+	}
+
+	/**
+	 * Returns a {@link Pair} where the first element is the IPv4 address of
+	 * the wifi interface and the second element is true if this device is
+	 * providing an access point, or false if this device is a client. Returns
+	 * null if this device isn't connected to wifi as an access point or client.
+	 */
+	@Nullable
+	private Pair<InetAddress, Boolean> getWifiIpv4Address() {
+		if (wifiManager == null) return null;
+		// If we're connected to a wifi network, return its address
+		WifiInfo info = wifiManager.getConnectionInfo();
+		if (info != null && info.getIpAddress() != 0) {
+			return new Pair<>(intToInetAddress(info.getIpAddress()), false);
+		}
+		List<InterfaceAddress> ifAddrs = getLocalInterfaceAddresses();
+		// If we're providing a normal access point, return its address
+		for (InterfaceAddress ifAddr : ifAddrs) {
+			if (isAndroidWifiApAddress(ifAddr)) {
+				return new Pair<>(ifAddr.getAddress(), true);
 			}
 		}
+		// If we're providing a wifi direct access point, return its address
+		for (InterfaceAddress ifAddr : ifAddrs) {
+			if (isAndroidWifiDirectApAddress(ifAddr)) {
+				return new Pair<>(ifAddr.getAddress(), true);
+			}
+		}
+		// Not connected to wifi
+		return null;
+	}
+
+	/**
+	 * Returns true if the given address belongs to a network provided by an
+	 * Android access point (including the access point's own address).
+	 * <p>
+	 * The access point's address is usually 192.168.43.1, but at least one
+	 * device (Honor 8A) may use other addresses in the range 192.168.43.0/24.
+	 */
+	private boolean isAndroidWifiApAddress(InterfaceAddress ifAddr) {
+		if (ifAddr.getNetworkPrefixLength() != 24) return false;
+		byte[] ip = ifAddr.getAddress().getAddress();
+		return ip.length == 4
+				&& ip[0] == (byte) 192
+				&& ip[1] == (byte) 168
+				&& ip[2] == (byte) 43;
+	}
+
+	/**
+	 * Returns true if the given address belongs to a network provided by an
+	 * Android wifi direct legacy mode access point (including the access
+	 * point's own address).
+	 */
+	private boolean isAndroidWifiDirectApAddress(InterfaceAddress ifAddr) {
+		if (ifAddr.getNetworkPrefixLength() != 24) return false;
+		byte[] ip = ifAddr.getAddress().getAddress();
+		return ip.length == 4
+				&& ip[0] == (byte) 192
+				&& ip[1] == (byte) 168
+				&& ip[2] == (byte) 49;
+	}
+
+	/**
+	 * Returns a link-local IPv6 address for the wifi client interface, or null
+	 * if there's no such interface or it doesn't have a suitable address.
+	 */
+	@TargetApi(21)
+	@Nullable
+	private InetAddress getWifiClientIpv6Address() {
+		for (Network net : connectivityManager.getAllNetworks()) {
+			NetworkCapabilities caps =
+					connectivityManager.getNetworkCapabilities(net);
+			if (caps == null || !caps.hasTransport(TRANSPORT_WIFI)) continue;
+			LinkProperties props = connectivityManager.getLinkProperties(net);
+			if (props == null) continue;
+			for (LinkAddress linkAddress : props.getLinkAddresses()) {
+				InetAddress addr = linkAddress.getAddress();
+				if (isIpv6LinkLocalAddress(addr)) return addr;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns a link-local IPv6 address for the interface with the given IPv4
+	 * address, or null if the interface doesn't have a suitable address.
+	 */
+	@Nullable
+	private InetAddress getIpv6AddressForInterface(InetAddress ipv4) {
+		try {
+			NetworkInterface iface = NetworkInterface.getByInetAddress(ipv4);
+			if (iface == null) return null;
+			for (InetAddress addr : list(iface.getInetAddresses())) {
+				if (isIpv6LinkLocalAddress(addr)) return addr;
+			}
+			// No suitable address
+			return null;
+		} catch (SocketException e) {
+			logException(LOG, WARNING, e);
+			return null;
+		}
+	}
+
+	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()) {
+			NetworkCapabilities caps =
+					connectivityManager.getNetworkCapabilities(net);
+			if (caps != null && caps.hasTransport(TRANSPORT_WIFI)) {
+				return net.getSocketFactory();
+			}
+		}
+		LOG.warning("Could not find suitable socket factory");
+		return SocketFactory.getDefault();
+	}
+
+	@Override
+	public void eventOccurred(Event e) {
+		super.eventOccurred(e);
+		if (e instanceof NetworkStatusEvent) updateConnectionStatus();
+	}
+
+	private void updateConnectionStatus() {
+		connectionStatusExecutor.execute(() -> {
+			State s = getState();
+			if (s != ACTIVE && s != INACTIVE) return;
+			Pair<InetAddress, Boolean> wifi = getPreferredWifiAddress();
+			if (wifi == null) {
+				LOG.info("Not connected to wifi");
+				socketFactory = SocketFactory.getDefault();
+				// Server sockets may not have been closed automatically when
+				// interface was taken down. If any sockets are open, closing
+				// them here will cause the sockets to be cleared and the state
+				// to be updated in acceptContactConnections()
+				if (s == ACTIVE) {
+					LOG.info("Closing server sockets");
+					tryToClose(state.getServerSocket(true), LOG, WARNING);
+					tryToClose(state.getServerSocket(false), LOG, WARNING);
+				}
+			} else if (wifi.getSecond()) {
+				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();
+				bind();
+			} else {
+				LOG.info("Connected to wifi");
+				socketFactory = getSocketFactory();
+				bind();
+			}
+		});
+	}
+
+	/**
+	 * Returns a {@link Pair} where the first element is an IP address (IPv4 if
+	 * available, otherwise IPv6) of the wifi interface and the second element
+	 * is true if this device is providing an access point, or false if this
+	 * device is a client. Returns null if this device isn't connected to wifi
+	 * as an access point or client.
+	 */
+	@Nullable
+	private Pair<InetAddress, Boolean> getPreferredWifiAddress() {
+		Pair<InetAddress, Boolean> wifi = getWifiIpv4Address();
+		// If there's no wifi IPv4 address, we might be a client on an
+		// IPv6-only wifi network. We can only detect this on API 21+
+		if (wifi == null && SDK_INT >= 21) {
+			InetAddress ipv6 = getWifiClientIpv6Address();
+			if (ipv6 != null) return new Pair<>(ipv6, false);
+		}
+		return wifi;
 	}
 }

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

@@ -1,18 +1,22 @@
 package org.briarproject.bramble.plugin.tcp;
 
-import android.content.Context;
+import android.app.Application;
 
+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.Backoff;
 import org.briarproject.bramble.api.plugin.BackoffFactory;
+import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
+import org.briarproject.bramble.api.system.WakefulIoExecutor;
 
 import java.util.concurrent.Executor;
 
 import javax.annotation.concurrent.Immutable;
+import javax.inject.Inject;
 
 import static org.briarproject.bramble.api.plugin.LanTcpConstants.ID;
 
@@ -20,21 +24,29 @@ import static org.briarproject.bramble.api.plugin.LanTcpConstants.ID;
 @NotNullByDefault
 public class AndroidLanTcpPluginFactory implements DuplexPluginFactory {
 
-	private static final int MAX_LATENCY = 30 * 1000; // 30 seconds
+	private static final int MAX_LATENCY = 30_000; // 30 seconds
-	private static final int MAX_IDLE_TIME = 30 * 1000; // 30 seconds
+	private static final int MAX_IDLE_TIME = 30_000; // 30 seconds
-	private static final int MIN_POLLING_INTERVAL = 60 * 1000; // 1 minute
+	private static final int CONNECTION_TIMEOUT = 3_000; // 3 seconds
-	private static final int MAX_POLLING_INTERVAL = 10 * 60 * 1000; // 10 mins
+	private static final int MIN_POLLING_INTERVAL = 60_000; // 1 minute
+	private static final int MAX_POLLING_INTERVAL = 600_000; // 10 mins
 	private static final double BACKOFF_BASE = 1.2;
 
-	private final Executor ioExecutor;
+	private final Executor ioExecutor, wakefulIoExecutor;
+	private final EventBus eventBus;
 	private final BackoffFactory backoffFactory;
-	private final Context appContext;
+	private final Application app;
 
-	public AndroidLanTcpPluginFactory(Executor ioExecutor,
+	@Inject
-			BackoffFactory backoffFactory, Context appContext) {
+	AndroidLanTcpPluginFactory(@IoExecutor Executor ioExecutor,
+			@WakefulIoExecutor Executor wakefulIoExecutor,
+			EventBus eventBus,
+			BackoffFactory backoffFactory,
+			Application app) {
 		this.ioExecutor = ioExecutor;
+		this.wakefulIoExecutor = wakefulIoExecutor;
+		this.eventBus = eventBus;
 		this.backoffFactory = backoffFactory;
-		this.appContext = appContext;
+		this.app = app;
 	}
 
 	@Override
@@ -43,15 +55,18 @@ public class AndroidLanTcpPluginFactory implements DuplexPluginFactory {
 	}
 
 	@Override
-	public int getMaxLatency() {
+	public long getMaxLatency() {
 		return MAX_LATENCY;
 	}
 
 	@Override
-	public DuplexPlugin createPlugin(DuplexPluginCallback callback) {
+	public DuplexPlugin createPlugin(PluginCallback callback) {
 		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
 				MAX_POLLING_INTERVAL, BACKOFF_BASE);
-		return new AndroidLanTcpPlugin(ioExecutor, backoff, appContext,
+		AndroidLanTcpPlugin plugin = new AndroidLanTcpPlugin(ioExecutor,
-				callback, MAX_LATENCY, MAX_IDLE_TIME);
+				wakefulIoExecutor, app, backoff, callback,
+				MAX_LATENCY, MAX_IDLE_TIME, CONNECTION_TIMEOUT);
+		eventBus.addListener(plugin);
+		return plugin;
 	}
 }

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

@@ -0,0 +1,222 @@
+package org.briarproject.bramble.plugin.tor;
+
+import android.app.Application;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+
+import org.briarproject.bramble.api.battery.BatteryManager;
+import org.briarproject.bramble.api.network.NetworkManager;
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.bramble.api.plugin.Backoff;
+import org.briarproject.bramble.api.plugin.PluginCallback;
+import org.briarproject.bramble.api.system.AndroidWakeLock;
+import org.briarproject.bramble.api.system.AndroidWakeLockManager;
+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 java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.logging.Logger;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+import javax.net.SocketFactory;
+
+import static android.os.Build.VERSION.SDK_INT;
+import static java.util.Arrays.asList;
+import static java.util.logging.Level.INFO;
+import static java.util.logging.Logger.getLogger;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+class AndroidTorPlugin extends TorPlugin {
+
+	private static final List<String> LIBRARY_ARCHITECTURES =
+			asList("armeabi-v7a", "arm64-v8a", "x86", "x86_64");
+
+	private static final String TOR_LIB_NAME = "libtor.so";
+	private static final String OBFS4_LIB_NAME = "libobfs4proxy.so";
+
+	private static final Logger LOG =
+			getLogger(AndroidTorPlugin.class.getName());
+
+	private final Application app;
+	private final AndroidWakeLock wakeLock;
+	private final File torLib, obfs4Lib;
+
+	AndroidTorPlugin(Executor ioExecutor,
+			Executor wakefulIoExecutor,
+			Application app,
+			NetworkManager networkManager,
+			LocationUtils locationUtils,
+			SocketFactory torSocketFactory,
+			Clock clock,
+			ResourceProvider resourceProvider,
+			CircumventionProvider circumventionProvider,
+			BatteryManager batteryManager,
+			AndroidWakeLockManager wakeLockManager,
+			Backoff backoff,
+			TorRendezvousCrypto torRendezvousCrypto,
+			PluginCallback callback,
+			String architecture,
+			long maxLatency,
+			int maxIdleTime,
+			File torDirectory) {
+		super(ioExecutor, wakefulIoExecutor, networkManager, locationUtils,
+				torSocketFactory, clock, resourceProvider,
+				circumventionProvider, batteryManager, backoff,
+				torRendezvousCrypto, callback, architecture, maxLatency,
+				maxIdleTime, torDirectory);
+		this.app = app;
+		wakeLock = wakeLockManager.createWakeLock("TorPlugin");
+		String nativeLibDir = app.getApplicationInfo().nativeLibraryDir;
+		torLib = new File(nativeLibDir, TOR_LIB_NAME);
+		obfs4Lib = new File(nativeLibDir, OBFS4_LIB_NAME);
+	}
+
+	@Override
+	protected int getProcessId() {
+		return android.os.Process.myPid();
+	}
+
+	@Override
+	protected long getLastUpdateTime() {
+		try {
+			PackageManager pm = app.getPackageManager();
+			PackageInfo pi = pm.getPackageInfo(app.getPackageName(), 0);
+			return pi.lastUpdateTime;
+		} catch (NameNotFoundException e) {
+			throw new AssertionError(e);
+		}
+	}
+
+	@Override
+	protected void enableNetwork(boolean enable) throws IOException {
+		if (enable) wakeLock.acquire();
+		super.enableNetwork(enable);
+		if (!enable) wakeLock.release();
+	}
+
+	@Override
+	public void stop() {
+		super.stop();
+		wakeLock.release();
+	}
+
+	@Override
+	protected File getTorExecutableFile() {
+		return torLib.exists() ? torLib : super.getTorExecutableFile();
+	}
+
+	@Override
+	protected File getObfs4ExecutableFile() {
+		return obfs4Lib.exists() ? obfs4Lib : super.getObfs4ExecutableFile();
+	}
+
+	@Override
+	protected void installTorExecutable() throws IOException {
+		File extracted = super.getTorExecutableFile();
+		if (torLib.exists()) {
+			// If an older version left behind a Tor binary, delete it
+			if (extracted.exists()) {
+				if (extracted.delete()) LOG.info("Deleted Tor binary");
+				else LOG.info("Failed to delete Tor binary");
+			}
+		} else if (SDK_INT < 29) {
+			// The binary wasn't extracted at install time. Try to extract it
+			extractLibraryFromApk(TOR_LIB_NAME, extracted);
+		} else {
+			// No point extracting the binary, we won't be allowed to execute it
+			throw new FileNotFoundException(torLib.getAbsolutePath());
+		}
+	}
+
+	@Override
+	protected void installObfs4Executable() throws IOException {
+		File extracted = super.getObfs4ExecutableFile();
+		if (obfs4Lib.exists()) {
+			// If an older version left behind an obfs4 binary, delete it
+			if (extracted.exists()) {
+				if (extracted.delete()) LOG.info("Deleted obfs4 binary");
+				else LOG.info("Failed to delete obfs4 binary");
+			}
+		} else if (SDK_INT < 29) {
+			// The binary wasn't extracted at install time. Try to extract it
+			extractLibraryFromApk(OBFS4_LIB_NAME, extracted);
+		} else {
+			// No point extracting the binary, we won't be allowed to execute it
+			throw new FileNotFoundException(obfs4Lib.getAbsolutePath());
+		}
+	}
+
+	private void extractLibraryFromApk(String libName, File dest)
+			throws IOException {
+		File sourceDir = new File(app.getApplicationInfo().sourceDir);
+		if (sourceDir.isFile()) {
+			// Look for other APK files in the same directory, if we're allowed
+			File parent = sourceDir.getParentFile();
+			if (parent != null) sourceDir = parent;
+		}
+		List<String> libPaths = getSupportedLibraryPaths(libName);
+		for (File apk : findApkFiles(sourceDir)) {
+			ZipInputStream zin = new ZipInputStream(new FileInputStream(apk));
+			for (ZipEntry e = zin.getNextEntry(); e != null;
+					e = zin.getNextEntry()) {
+				if (libPaths.contains(e.getName())) {
+					if (LOG.isLoggable(INFO)) {
+						LOG.info("Extracting " + e.getName()
+								+ " from " + apk.getAbsolutePath());
+					}
+					extract(zin, dest); // Zip input stream will be closed
+					return;
+				}
+			}
+			zin.close();
+		}
+		throw new FileNotFoundException(libName);
+	}
+
+	/**
+	 * Returns all files with the extension .apk or .APK under the given root.
+	 */
+	private List<File> findApkFiles(File root) {
+		List<File> files = new ArrayList<>();
+		findApkFiles(root, files);
+		return files;
+	}
+
+	private void findApkFiles(File f, List<File> files) {
+		if (f.isFile() && f.getName().toLowerCase().endsWith(".apk")) {
+			files.add(f);
+		} else if (f.isDirectory()) {
+			File[] children = f.listFiles();
+			if (children != null) {
+				for (File child : children) findApkFiles(child, files);
+			}
+		}
+	}
+
+	/**
+	 * Returns the paths at which libraries with the given name would be found
+	 * inside an APK file, for all architectures supported by the device, in
+	 * order of preference.
+	 */
+	private List<String> getSupportedLibraryPaths(String libName) {
+		List<String> architectures = new ArrayList<>();
+		for (String abi : AndroidUtils.getSupportedArchitectures()) {
+			if (LIBRARY_ARCHITECTURES.contains(abi)) {
+				architectures.add("lib/" + abi + "/" + libName);
+			}
+		}
+		return architectures;
+	}
+}

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

@@ -0,0 +1,140 @@
+package org.briarproject.bramble.plugin.tor;
+
+import android.app.Application;
+
+import org.briarproject.bramble.api.battery.BatteryManager;
+import org.briarproject.bramble.api.event.EventBus;
+import org.briarproject.bramble.api.lifecycle.IoExecutor;
+import org.briarproject.bramble.api.network.NetworkManager;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.plugin.Backoff;
+import org.briarproject.bramble.api.plugin.BackoffFactory;
+import org.briarproject.bramble.api.plugin.PluginCallback;
+import org.briarproject.bramble.api.plugin.TorConstants;
+import org.briarproject.bramble.api.plugin.TorDirectory;
+import org.briarproject.bramble.api.plugin.TransportId;
+import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
+import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
+import org.briarproject.bramble.api.system.AndroidWakeLockManager;
+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.api.system.WakefulIoExecutor;
+import org.briarproject.bramble.util.AndroidUtils;
+
+import java.io.File;
+import java.util.concurrent.Executor;
+import java.util.logging.Logger;
+
+import javax.annotation.concurrent.Immutable;
+import javax.inject.Inject;
+import javax.net.SocketFactory;
+
+@Immutable
+@NotNullByDefault
+public class AndroidTorPluginFactory implements DuplexPluginFactory {
+
+	private static final Logger LOG =
+			Logger.getLogger(AndroidTorPluginFactory.class.getName());
+
+	private static final int MAX_LATENCY = 30 * 1000; // 30 seconds
+	private static final int MAX_IDLE_TIME = 30 * 1000; // 30 seconds
+	private static final int MIN_POLLING_INTERVAL = 60 * 1000; // 1 minute
+	private static final int MAX_POLLING_INTERVAL = 10 * 60 * 1000; // 10 mins
+	private static final double BACKOFF_BASE = 1.2;
+
+	private final Executor ioExecutor, wakefulIoExecutor;
+	private final Application app;
+	private final NetworkManager networkManager;
+	private final LocationUtils locationUtils;
+	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 AndroidWakeLockManager wakeLockManager;
+	private final Clock clock;
+	private final File torDirectory;
+
+	@Inject
+	AndroidTorPluginFactory(@IoExecutor Executor ioExecutor,
+			@WakefulIoExecutor Executor wakefulIoExecutor,
+			Application app,
+			NetworkManager networkManager,
+			LocationUtils locationUtils,
+			EventBus eventBus,
+			SocketFactory torSocketFactory,
+			BackoffFactory backoffFactory,
+			ResourceProvider resourceProvider,
+			CircumventionProvider circumventionProvider,
+			BatteryManager batteryManager,
+			AndroidWakeLockManager wakeLockManager,
+			Clock clock,
+			@TorDirectory File torDirectory) {
+		this.ioExecutor = ioExecutor;
+		this.wakefulIoExecutor = wakefulIoExecutor;
+		this.app = app;
+		this.networkManager = networkManager;
+		this.locationUtils = locationUtils;
+		this.eventBus = eventBus;
+		this.torSocketFactory = torSocketFactory;
+		this.backoffFactory = backoffFactory;
+		this.resourceProvider = resourceProvider;
+		this.circumventionProvider = circumventionProvider;
+		this.batteryManager = batteryManager;
+		this.wakeLockManager = wakeLockManager;
+		this.clock = clock;
+		this.torDirectory = torDirectory;
+	}
+
+	@Override
+	public TransportId getId() {
+		return TorConstants.ID;
+	}
+
+	@Override
+	public long getMaxLatency() {
+		return MAX_LATENCY;
+	}
+
+	@Override
+	public DuplexPlugin createPlugin(PluginCallback callback) {
+
+		// Check that we have a Tor binary for this architecture
+		String architecture = null;
+		for (String abi : AndroidUtils.getSupportedArchitectures()) {
+			if (abi.startsWith("x86_64")) {
+				architecture = "x86_64";
+				break;
+			} else if (abi.startsWith("x86")) {
+				architecture = "x86";
+				break;
+			} else if (abi.startsWith("arm64")) {
+				architecture = "arm64";
+				break;
+			} else if (abi.startsWith("armeabi")) {
+				architecture = "arm";
+				break;
+			}
+		}
+		if (architecture == null) {
+			LOG.info("Tor is not supported on this architecture");
+			return null;
+		}
+		// Use position-independent executable
+		architecture += "_pie";
+
+		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
+				MAX_POLLING_INTERVAL, BACKOFF_BASE);
+		TorRendezvousCrypto torRendezvousCrypto = new TorRendezvousCryptoImpl();
+		AndroidTorPlugin plugin = new AndroidTorPlugin(ioExecutor,
+				wakefulIoExecutor, app, networkManager, locationUtils,
+				torSocketFactory, clock, resourceProvider,
+				circumventionProvider, batteryManager, wakeLockManager,
+				backoff, torRendezvousCrypto, callback, architecture,
+				MAX_LATENCY, MAX_IDLE_TIME, torDirectory);
+		eventBus.addListener(plugin);
+		return plugin;
+	}
+}

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

@@ -1,18 +0,0 @@
-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,779 +0,0 @@
-package org.briarproject.bramble.plugin.tor;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.res.Resources;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.os.FileObserver;
-import android.os.PowerManager;
-
-import net.freehaven.tor.control.EventHandler;
-import net.freehaven.tor.control.TorControlConnection;
-
-import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.crypto.PseudoRandom;
-import org.briarproject.bramble.api.data.BdfList;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.event.EventListener;
-import org.briarproject.bramble.api.keyagreement.KeyAgreementListener;
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
-import org.briarproject.bramble.api.plugin.Backoff;
-import org.briarproject.bramble.api.plugin.PluginException;
-import org.briarproject.bramble.api.plugin.TorConstants;
-import org.briarproject.bramble.api.plugin.TransportId;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
-import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
-import org.briarproject.bramble.api.properties.TransportProperties;
-import org.briarproject.bramble.api.reporting.DevReporter;
-import org.briarproject.bramble.api.settings.Settings;
-import org.briarproject.bramble.api.settings.event.SettingsUpdatedEvent;
-import org.briarproject.bramble.api.system.LocationUtils;
-import org.briarproject.bramble.util.AndroidUtils;
-import org.briarproject.bramble.util.IoUtils;
-import org.briarproject.bramble.util.StringUtils;
-
-import java.io.Closeable;
-import java.io.EOFException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.InetSocketAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Scanner;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Executor;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.logging.Logger;
-import java.util.regex.Pattern;
-import java.util.zip.ZipInputStream;
-
-import javax.annotation.Nullable;
-import javax.net.SocketFactory;
-
-import static android.content.Context.CONNECTIVITY_SERVICE;
-import static android.content.Context.MODE_PRIVATE;
-import static android.content.Context.POWER_SERVICE;
-import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;
-import static android.net.ConnectivityManager.TYPE_WIFI;
-import static android.os.PowerManager.PARTIAL_WAKE_LOCK;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.logging.Level.INFO;
-import static java.util.logging.Level.WARNING;
-import static net.freehaven.tor.control.TorControlCommands.HS_ADDRESS;
-import static net.freehaven.tor.control.TorControlCommands.HS_PRIVKEY;
-import static org.briarproject.bramble.api.plugin.TorConstants.CONTROL_PORT;
-import static org.briarproject.bramble.api.plugin.TorConstants.ID;
-import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK;
-import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_ALWAYS;
-import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_NEVER;
-import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_WIFI;
-import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_PORT;
-import static org.briarproject.bramble.util.PrivacyUtils.scrubOnion;
-
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
-class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
-
-	private static final String PROP_ONION = "onion";
-	private static final String[] EVENTS = {
-			"CIRC", "ORCONN", "HS_DESC", "NOTICE", "WARN", "ERR"
-	};
-	private static final String OWNER = "__OwningControllerProcess";
-	private static final int COOKIE_TIMEOUT = 3000; // Milliseconds
-	private static final Pattern ONION = Pattern.compile("[a-z2-7]{16}");
-	private static final Logger LOG =
-			Logger.getLogger(TorPlugin.class.getName());
-
-	private final Executor ioExecutor;
-	private final Context appContext;
-	private final LocationUtils locationUtils;
-	private final DevReporter reporter;
-	private final SocketFactory torSocketFactory;
-	private final Backoff backoff;
-	private final DuplexPluginCallback callback;
-	private final String architecture;
-	private final int maxLatency, maxIdleTime, socketTimeout;
-	private final ConnectionStatus connectionStatus;
-	private final File torDirectory, torFile, geoIpFile, configFile;
-	private final File doneFile, cookieFile;
-	private final PowerManager.WakeLock wakeLock;
-	private final AtomicBoolean used = new AtomicBoolean(false);
-
-	private volatile boolean running = false;
-	private volatile ServerSocket socket = null;
-	private volatile Socket controlSocket = null;
-	private volatile TorControlConnection controlConnection = null;
-	private volatile BroadcastReceiver networkStateReceiver = null;
-
-	TorPlugin(Executor ioExecutor, Context appContext,
-			LocationUtils locationUtils, DevReporter reporter,
-			SocketFactory torSocketFactory, Backoff backoff,
-			DuplexPluginCallback callback, String architecture, int maxLatency,
-			int maxIdleTime) {
-		this.ioExecutor = ioExecutor;
-		this.appContext = appContext;
-		this.locationUtils = locationUtils;
-		this.reporter = reporter;
-		this.torSocketFactory = torSocketFactory;
-		this.backoff = backoff;
-		this.callback = callback;
-		this.architecture = architecture;
-		this.maxLatency = maxLatency;
-		this.maxIdleTime = maxIdleTime;
-		if (maxIdleTime > Integer.MAX_VALUE / 2)
-			socketTimeout = Integer.MAX_VALUE;
-		else socketTimeout = maxIdleTime * 2;
-		connectionStatus = new ConnectionStatus();
-		torDirectory = appContext.getDir("tor", MODE_PRIVATE);
-		torFile = new File(torDirectory, "tor");
-		geoIpFile = new File(torDirectory, "geoip");
-		configFile = new File(torDirectory, "torrc");
-		doneFile = new File(torDirectory, "done");
-		cookieFile = new File(torDirectory, ".tor/control_auth_cookie");
-		Object o = appContext.getSystemService(POWER_SERVICE);
-		PowerManager pm = (PowerManager) o;
-		wakeLock = pm.newWakeLock(PARTIAL_WAKE_LOCK, "TorPlugin");
-		wakeLock.setReferenceCounted(false);
-	}
-
-	@Override
-	public TransportId getId() {
-		return TorConstants.ID;
-	}
-
-	@Override
-	public int getMaxLatency() {
-		return maxLatency;
-	}
-
-	@Override
-	public int getMaxIdleTime() {
-		return maxIdleTime;
-	}
-
-	@Override
-	public void start() throws PluginException {
-		if (used.getAndSet(true)) throw new IllegalStateException();
-		// Install or update the assets if necessary
-		if (!assetsAreUpToDate()) installAssets();
-		LOG.info("Starting Tor");
-		// Watch for the auth cookie file being updated
-		try {
-			cookieFile.getParentFile().mkdirs();
-			cookieFile.createNewFile();
-		} catch (IOException e) {
-			throw new PluginException(e);
-		}
-		CountDownLatch latch = new CountDownLatch(1);
-		FileObserver obs = new WriteObserver(cookieFile, latch);
-		obs.startWatching();
-		// Start a new Tor process
-		String torPath = torFile.getAbsolutePath();
-		String configPath = configFile.getAbsolutePath();
-		String pid = String.valueOf(android.os.Process.myPid());
-		Process torProcess;
-		ProcessBuilder pb =
-				new ProcessBuilder(torPath, "-f", configPath, OWNER, pid);
-		Map<String, String> env = pb.environment();
-		env.put("HOME", torDirectory.getAbsolutePath());
-		pb.directory(torDirectory);
-		try {
-			torProcess = pb.start();
-		} catch (SecurityException | IOException e) {
-			throw new PluginException(e);
-		}
-		// Log the process's standard output until it detaches
-		if (LOG.isLoggable(INFO)) {
-			Scanner stdout = new Scanner(torProcess.getInputStream());
-			Scanner stderr = new Scanner(torProcess.getErrorStream());
-			while (stdout.hasNextLine() || stderr.hasNextLine()){
-				if(stdout.hasNextLine()) {
-					LOG.info(stdout.nextLine());
-				}
-				if(stderr.hasNextLine()){
-					LOG.info(stderr.nextLine());
-				}
-			}
-			stdout.close();
-			stderr.close();
-		}
-		try {
-			// Wait for the process to detach or exit
-			int exit = torProcess.waitFor();
-			if (exit != 0) {
-				if (LOG.isLoggable(WARNING))
-					LOG.warning("Tor exited with value " + exit);
-				throw new PluginException();
-			}
-			// Wait for the auth cookie file to be created/updated
-			if (!latch.await(COOKIE_TIMEOUT, MILLISECONDS)) {
-				LOG.warning("Auth cookie not created");
-				if (LOG.isLoggable(INFO)) listFiles(torDirectory);
-				throw new PluginException();
-			}
-		} catch (InterruptedException e) {
-			LOG.warning("Interrupted while starting Tor");
-			Thread.currentThread().interrupt();
-			throw new PluginException();
-		}
-		try {
-			// Open a control connection and authenticate using the cookie file
-			controlSocket = new Socket("127.0.0.1", CONTROL_PORT);
-			controlConnection = new TorControlConnection(controlSocket);
-			controlConnection.authenticate(read(cookieFile));
-			// Tell Tor to exit when the control connection is closed
-			controlConnection.takeOwnership();
-			controlConnection.resetConf(Collections.singletonList(OWNER));
-			running = true;
-			// Register to receive events from the Tor process
-			controlConnection.setEventHandler(this);
-			controlConnection.setEvents(Arrays.asList(EVENTS));
-			// Check whether Tor has already bootstrapped
-			String phase = controlConnection.getInfo("status/bootstrap-phase");
-			if (phase != null && phase.contains("PROGRESS=100")) {
-				LOG.info("Tor has already bootstrapped");
-				connectionStatus.setBootstrapped();
-			}
-		} catch (IOException e) {
-			throw new PluginException(e);
-		}
-		// Register to receive network status events
-		networkStateReceiver = new NetworkStateReceiver();
-		IntentFilter filter = new IntentFilter(CONNECTIVITY_ACTION);
-		appContext.registerReceiver(networkStateReceiver, filter);
-		// Bind a server socket to receive incoming hidden service connections
-		bind();
-	}
-
-	private boolean assetsAreUpToDate() {
-		try {
-			PackageManager pm = appContext.getPackageManager();
-			PackageInfo pi = pm.getPackageInfo(appContext.getPackageName(), 0);
-			return doneFile.lastModified() > pi.lastUpdateTime;
-		} catch (NameNotFoundException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	private void installAssets() throws PluginException {
-		InputStream in = null;
-		OutputStream out = null;
-		try {
-			doneFile.delete();
-			// Unzip the Tor binary to the filesystem
-			in = getTorInputStream();
-			out = new FileOutputStream(torFile);
-			IoUtils.copyAndClose(in, out);
-			// Make the Tor binary executable
-			if (!torFile.setExecutable(true, true)) throw new IOException();
-			// Unzip the GeoIP database to the filesystem
-			in = getGeoIpInputStream();
-			out = new FileOutputStream(geoIpFile);
-			IoUtils.copyAndClose(in, out);
-			// Copy the config file to the filesystem
-			in = getConfigInputStream();
-			out = new FileOutputStream(configFile);
-			IoUtils.copyAndClose(in, out);
-			doneFile.createNewFile();
-		} catch (IOException e) {
-			tryToClose(in);
-			tryToClose(out);
-			throw new PluginException(e);
-		}
-	}
-
-	private InputStream getTorInputStream() throws IOException {
-		if (LOG.isLoggable(INFO))
-			LOG.info("Installing Tor binary for " + architecture);
-		int resId = getResourceId("tor_" + architecture);
-		InputStream in = appContext.getResources().openRawResource(resId);
-		ZipInputStream zin = new ZipInputStream(in);
-		if (zin.getNextEntry() == null) throw new IOException();
-		return zin;
-	}
-
-	private InputStream getGeoIpInputStream() throws IOException {
-		int resId = getResourceId("geoip");
-		InputStream in = appContext.getResources().openRawResource(resId);
-		ZipInputStream zin = new ZipInputStream(in);
-		if (zin.getNextEntry() == null) throw new IOException();
-		return zin;
-	}
-
-	private InputStream getConfigInputStream() throws IOException {
-		int resId = getResourceId("torrc");
-		return appContext.getResources().openRawResource(resId);
-	}
-
-	private int getResourceId(String filename) {
-		Resources res = appContext.getResources();
-		return res.getIdentifier(filename, "raw", appContext.getPackageName());
-	}
-
-	private void tryToClose(@Nullable Closeable c) {
-		try {
-			if (c != null) c.close();
-		} catch (IOException e) {
-			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-		}
-	}
-
-	private void tryToClose(@Nullable Socket s) {
-		try {
-			if (s != null) s.close();
-		} catch (IOException e) {
-			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-		}
-	}
-
-	private void listFiles(File f) {
-		if (f.isDirectory()) {
-			File[] children = f.listFiles();
-			if (children != null) for (File child : children) listFiles(child);
-		} else {
-			LOG.info(f.getAbsolutePath());
-		}
-	}
-
-	private byte[] read(File f) throws IOException {
-		byte[] b = new byte[(int) f.length()];
-		FileInputStream in = new FileInputStream(f);
-		try {
-			int offset = 0;
-			while (offset < b.length) {
-				int read = in.read(b, offset, b.length - offset);
-				if (read == -1) throw new EOFException();
-				offset += read;
-			}
-			return b;
-		} finally {
-			tryToClose(in);
-		}
-	}
-
-	private void sendDevReports() {
-		ioExecutor.execute(new Runnable() {
-			@Override
-			public void run() {
-				// TODO: Trigger this with a TransportEnabledEvent
-				File reportDir = AndroidUtils.getReportDir(appContext);
-				reporter.sendReports(reportDir);
-			}
-		});
-	}
-
-	private void bind() {
-		ioExecutor.execute(new Runnable() {
-			@Override
-			public void run() {
-				// If there's already a port number stored in config, reuse it
-				String portString = callback.getSettings().get(PREF_TOR_PORT);
-				int port;
-				if (StringUtils.isNullOrEmpty(portString)) port = 0;
-				else port = Integer.parseInt(portString);
-				// Bind a server socket to receive connections from Tor
-				ServerSocket ss = null;
-				try {
-					ss = new ServerSocket();
-					ss.bind(new InetSocketAddress("127.0.0.1", port));
-				} catch (IOException e) {
-					if (LOG.isLoggable(WARNING))
-						LOG.log(WARNING, e.toString(), e);
-					tryToClose(ss);
-					return;
-				}
-				if (!running) {
-					tryToClose(ss);
-					return;
-				}
-				socket = ss;
-				// Store the port number
-				final String localPort = String.valueOf(ss.getLocalPort());
-				Settings s = new Settings();
-				s.put(PREF_TOR_PORT, localPort);
-				callback.mergeSettings(s);
-				// Create a hidden service if necessary
-				ioExecutor.execute(new Runnable() {
-					@Override
-					public void run() {
-						publishHiddenService(localPort);
-					}
-				});
-				backoff.reset();
-				// Accept incoming hidden service connections from Tor
-				acceptContactConnections(ss);
-			}
-		});
-	}
-
-	private void tryToClose(@Nullable ServerSocket ss) {
-		try {
-			if (ss != null) ss.close();
-		} catch (IOException e) {
-			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-		} finally {
-			callback.transportDisabled();
-		}
-	}
-
-	private void publishHiddenService(String port) {
-		if (!running) return;
-		LOG.info("Creating hidden service");
-		String privKey = callback.getSettings().get(HS_PRIVKEY);
-		Map<Integer, String> portLines =
-				Collections.singletonMap(80, "127.0.0.1:" + port);
-		Map<String, String> response;
-		try {
-			// Use the control connection to set up the hidden service
-			if (privKey == null)
-				response = controlConnection.addOnion(portLines);
-			else response = controlConnection.addOnion(privKey, portLines);
-		} catch (IOException e) {
-			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-			return;
-		}
-		if (!response.containsKey(HS_ADDRESS)) {
-			LOG.warning("Tor did not return a hidden service address");
-			return;
-		}
-		if (privKey == null && !response.containsKey(HS_PRIVKEY)) {
-			LOG.warning("Tor did not return a private key");
-			return;
-		}
-		// Publish the hidden service's onion hostname in transport properties
-		String hostname = response.get(HS_ADDRESS);
-		if (LOG.isLoggable(INFO))
-			LOG.info("Hidden service " + scrubOnion(hostname));
-		TransportProperties p = new TransportProperties();
-		p.put(PROP_ONION, hostname);
-		callback.mergeLocalProperties(p);
-		if (privKey == null) {
-			// Save the hidden service's private key for next time
-			Settings s = new Settings();
-			s.put(HS_PRIVKEY, response.get(HS_PRIVKEY));
-			callback.mergeSettings(s);
-		}
-	}
-
-	private void acceptContactConnections(ServerSocket ss) {
-		while (running) {
-			Socket s;
-			try {
-				s = ss.accept();
-				s.setSoTimeout(socketTimeout);
-			} catch (IOException e) {
-				// This is expected when the socket is closed
-				if (LOG.isLoggable(INFO)) LOG.info(e.toString());
-				return;
-			}
-			LOG.info("Connection received");
-			backoff.reset();
-			TorTransportConnection conn = new TorTransportConnection(this, s);
-			callback.incomingConnectionCreated(conn);
-		}
-	}
-
-	private void enableNetwork(boolean enable) throws IOException {
-		if (!running) return;
-		if (enable) wakeLock.acquire();
-		connectionStatus.enableNetwork(enable);
-		controlConnection.setConf("DisableNetwork", enable ? "0" : "1");
-		if (!enable) {
-			callback.transportDisabled();
-			wakeLock.release();
-		}
-	}
-
-	@Override
-	public void stop() throws PluginException {
-		running = false;
-		tryToClose(socket);
-		if (networkStateReceiver != null)
-			appContext.unregisterReceiver(networkStateReceiver);
-		if (controlSocket != null && controlConnection != null) {
-			try {
-				LOG.info("Stopping Tor");
-				controlConnection.setConf("DisableNetwork", "1");
-				controlConnection.shutdownTor("TERM");
-				controlSocket.close();
-			} catch (IOException e) {
-				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-			}
-		}
-		wakeLock.release();
-	}
-
-	@Override
-	public boolean isRunning() {
-		return running && connectionStatus.isConnected();
-	}
-
-	@Override
-	public boolean shouldPoll() {
-		return true;
-	}
-
-	@Override
-	public int getPollingInterval() {
-		return backoff.getPollingInterval();
-	}
-
-	@Override
-	public void poll(Collection<ContactId> connected) {
-		if (!isRunning()) return;
-		backoff.increment();
-		// TODO: Pass properties to connectAndCallBack()
-		for (ContactId c : callback.getRemoteProperties().keySet())
-			if (!connected.contains(c)) connectAndCallBack(c);
-	}
-
-	private void connectAndCallBack(final ContactId c) {
-		ioExecutor.execute(new Runnable() {
-			@Override
-			public void run() {
-				DuplexTransportConnection d = createConnection(c);
-				if (d != null) {
-					backoff.reset();
-					callback.outgoingConnectionCreated(c, d);
-				}
-			}
-		});
-	}
-
-	@Override
-	public DuplexTransportConnection createConnection(ContactId c) {
-		if (!isRunning()) return null;
-		TransportProperties p = callback.getRemoteProperties().get(c);
-		if (p == null) return null;
-		String onion = p.get(PROP_ONION);
-		if (StringUtils.isNullOrEmpty(onion)) return null;
-		if (!ONION.matcher(onion).matches()) {
-			// not scrubbing this address, so we are able to find the problem
-			if (LOG.isLoggable(INFO)) LOG.info("Invalid hostname: " + onion);
-			return null;
-		}
-		Socket s = null;
-		try {
-			if (LOG.isLoggable(INFO))
-				LOG.info("Connecting to " + scrubOnion(onion));
-			controlConnection.forgetHiddenService(onion);
-			s = torSocketFactory.createSocket(onion + ".onion", 80);
-			s.setSoTimeout(socketTimeout);
-			if (LOG.isLoggable(INFO))
-				LOG.info("Connected to " + scrubOnion(onion));
-			return new TorTransportConnection(this, s);
-		} catch (IOException e) {
-			if (LOG.isLoggable(INFO)) {
-				LOG.info("Could not connect to " + scrubOnion(onion) + ": " +
-						e.toString());
-			}
-			tryToClose(s);
-			return null;
-		}
-	}
-
-	@Override
-	public boolean supportsInvitations() {
-		return false;
-	}
-
-	@Override
-	public DuplexTransportConnection createInvitationConnection(PseudoRandom r,
-			long timeout, boolean alice) {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public boolean supportsKeyAgreement() {
-		return false;
-	}
-
-	@Override
-	public KeyAgreementListener createKeyAgreementListener(byte[] commitment) {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public DuplexTransportConnection createKeyAgreementConnection(
-			byte[] commitment, BdfList descriptor, long timeout) {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public void circuitStatus(String status, String id, String path) {
-		if (status.equals("BUILT") &&
-				connectionStatus.getAndSetCircuitBuilt()) {
-			LOG.info("First circuit built");
-			backoff.reset();
-			if (isRunning()) {
-				sendDevReports();
-				callback.transportEnabled();
-			}
-		}
-	}
-
-	@Override
-	public void streamStatus(String status, String id, String target) {
-	}
-
-	@Override
-	public void orConnStatus(String status, String orName) {
-		if (LOG.isLoggable(INFO)) LOG.info("OR connection " + status);
-	}
-
-	@Override
-	public void bandwidthUsed(long read, long written) {
-	}
-
-	@Override
-	public void newDescriptors(List<String> orList) {
-	}
-
-	@Override
-	public void message(String severity, String msg) {
-		if (LOG.isLoggable(INFO)) LOG.info(severity + " " + msg);
-		if (severity.equals("NOTICE") && msg.startsWith("Bootstrapped 100%")) {
-			connectionStatus.setBootstrapped();
-			backoff.reset();
-			if (isRunning()) {
-				sendDevReports();
-				callback.transportEnabled();
-			}
-		}
-	}
-
-	@Override
-	public void unrecognized(String type, String msg) {
-		if (type.equals("HS_DESC") && msg.startsWith("UPLOADED"))
-			LOG.info("Descriptor uploaded");
-	}
-
-	private static class WriteObserver extends FileObserver {
-
-		private final CountDownLatch latch;
-
-		private WriteObserver(File file, CountDownLatch latch) {
-			super(file.getAbsolutePath(), CLOSE_WRITE);
-			this.latch = latch;
-		}
-
-		@Override
-		public void onEvent(int event, String path) {
-			stopWatching();
-			latch.countDown();
-		}
-	}
-
-	@Override
-	public void eventOccurred(Event e) {
-		if (e instanceof SettingsUpdatedEvent) {
-			SettingsUpdatedEvent s = (SettingsUpdatedEvent) e;
-			if (s.getNamespace().equals(ID.getString())) {
-				LOG.info("Tor settings updated");
-				updateConnectionStatus();
-			}
-		}
-	}
-
-	private void updateConnectionStatus() {
-		ioExecutor.execute(new Runnable() {
-			@Override
-			public void run() {
-				if (!running) return;
-
-				Object o = appContext.getSystemService(CONNECTIVITY_SERVICE);
-				ConnectivityManager cm = (ConnectivityManager) o;
-				NetworkInfo net = cm.getActiveNetworkInfo();
-				boolean online = net != null && net.isConnected();
-				boolean wifi = online && net.getType() == TYPE_WIFI;
-				String country = locationUtils.getCurrentCountry();
-				boolean blocked = TorNetworkMetadata.isTorProbablyBlocked(
-						country);
-				Settings s = callback.getSettings();
-				int network = s.getInt(PREF_TOR_NETWORK,
-						PREF_TOR_NETWORK_ALWAYS);
-
-				if (LOG.isLoggable(INFO)) {
-					LOG.info("Online: " + online + ", wifi: " + wifi);
-					if ("".equals(country)) LOG.info("Country code unknown");
-					else LOG.info("Country code: " + country);
-				}
-
-				try {
-					if (!online) {
-						LOG.info("Disabling network, device is offline");
-						enableNetwork(false);
-					} else if (blocked) {
-						LOG.info("Disabling network, country is blocked");
-						enableNetwork(false);
-					} else if (network == PREF_TOR_NETWORK_NEVER
-							|| (network == PREF_TOR_NETWORK_WIFI && !wifi)) {
-						LOG.info("Disabling network due to data setting");
-						enableNetwork(false);
-					} else {
-						LOG.info("Enabling network");
-						enableNetwork(true);
-					}
-				} catch (IOException e) {
-					if (LOG.isLoggable(WARNING))
-						LOG.log(WARNING, e.toString(), e);
-				}
-			}
-		});
-	}
-
-	private class NetworkStateReceiver extends BroadcastReceiver {
-
-		@Override
-		public void onReceive(Context ctx, Intent i) {
-			if (!running) return;
-			if (CONNECTIVITY_ACTION.equals(i.getAction())) {
-				LOG.info("Detected connectivity change");
-				updateConnectionStatus();
-			}
-		}
-	}
-
-	private static class ConnectionStatus {
-
-		// All of the following are locking: this
-		private boolean networkEnabled = false;
-		private boolean bootstrapped = false, circuitBuilt = false;
-
-		private synchronized void setBootstrapped() {
-			bootstrapped = true;
-		}
-
-		private synchronized boolean getAndSetCircuitBuilt() {
-			boolean firstCircuit = !circuitBuilt;
-			circuitBuilt = true;
-			return firstCircuit;
-		}
-
-		private synchronized void enableNetwork(boolean enable) {
-			networkEnabled = enable;
-			circuitBuilt = false;
-		}
-
-		private synchronized boolean isConnected() {
-			return networkEnabled && bootstrapped && circuitBuilt;
-		}
-	}
-}

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

@@ -1,98 +0,0 @@
-package org.briarproject.bramble.plugin.tor;
-
-import android.content.Context;
-import android.os.Build;
-
-import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.plugin.Backoff;
-import org.briarproject.bramble.api.plugin.BackoffFactory;
-import org.briarproject.bramble.api.plugin.TorConstants;
-import org.briarproject.bramble.api.plugin.TransportId;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
-import org.briarproject.bramble.api.reporting.DevReporter;
-import org.briarproject.bramble.api.system.LocationUtils;
-import org.briarproject.bramble.util.AndroidUtils;
-
-import java.util.concurrent.Executor;
-import java.util.logging.Logger;
-
-import javax.annotation.concurrent.Immutable;
-import javax.net.SocketFactory;
-
-@Immutable
-@NotNullByDefault
-public class TorPluginFactory implements DuplexPluginFactory {
-
-	private static final Logger LOG =
-			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
-	private static final int MIN_POLLING_INTERVAL = 60 * 1000; // 1 minute
-	private static final int MAX_POLLING_INTERVAL = 10 * 60 * 1000; // 10 mins
-	private static final double BACKOFF_BASE = 1.2;
-
-	private final Executor ioExecutor;
-	private final Context appContext;
-	private final LocationUtils locationUtils;
-	private final DevReporter reporter;
-	private final EventBus eventBus;
-	private final SocketFactory torSocketFactory;
-	private final BackoffFactory backoffFactory;
-
-	public TorPluginFactory(Executor ioExecutor, Context appContext,
-			LocationUtils locationUtils, DevReporter reporter,
-			EventBus eventBus, SocketFactory torSocketFactory,
-			BackoffFactory backoffFactory) {
-		this.ioExecutor = ioExecutor;
-		this.appContext = appContext;
-		this.locationUtils = locationUtils;
-		this.reporter = reporter;
-		this.eventBus = eventBus;
-		this.torSocketFactory = torSocketFactory;
-		this.backoffFactory = backoffFactory;
-	}
-
-	@Override
-	public TransportId getId() {
-		return TorConstants.ID;
-	}
-
-	@Override
-	public int getMaxLatency() {
-		return MAX_LATENCY;
-	}
-
-	@Override
-	public DuplexPlugin createPlugin(DuplexPluginCallback callback) {
-
-		// Check that we have a Tor binary for this architecture
-		String architecture = null;
-		for (String abi : AndroidUtils.getSupportedArchitectures()) {
-			if (abi.startsWith("x86")) {
-				architecture = "x86";
-				break;
-			} else if (abi.startsWith("armeabi")) {
-				architecture = "arm";
-				break;
-			}
-		}
-		if (architecture == null) {
-			LOG.info("Tor is not supported on this architecture");
-			return null;
-		}
-		// Use position-independent executable for SDK >= 16
-		if (Build.VERSION.SDK_INT >= 16) architecture += "_pie";
-
-		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
-				MAX_POLLING_INTERVAL, BACKOFF_BASE);
-		TorPlugin plugin = new TorPlugin(ioExecutor, 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/AlarmConstants.java

@@ -0,0 +1,18 @@
+package org.briarproject.bramble.system;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+@NotNullByDefault
+interface AlarmConstants {
+
+	/**
+	 * Request code for the broadcast intent attached to the periodic alarm.
+	 */
+	int REQUEST_ALARM = 1;
+
+	/**
+	 * Key for storing the process ID in the extras of the periodic alarm's
+	 * intent. This allows us to ignore alarms scheduled by dead processes.
+	 */
+	String EXTRA_PID = "org.briarproject.bramble.EXTRA_PID";
+}

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

@@ -0,0 +1,17 @@
+package org.briarproject.bramble.system;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import org.briarproject.bramble.BrambleApplication;
+
+public class AlarmReceiver extends BroadcastReceiver {
+
+	@Override
+	public void onReceive(Context ctx, Intent intent) {
+		BrambleApplication app =
+				(BrambleApplication) ctx.getApplicationContext();
+		app.getBrambleAppComponent().alarmListener().onAlarm(intent);
+	}
+}

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

@@ -27,14 +27,11 @@ class AndroidExecutorImpl implements AndroidExecutor {
 	@Inject
 	AndroidExecutorImpl(Application app) {
 		uiHandler = new Handler(app.getApplicationContext().getMainLooper());
-		loop = new Runnable() {
+		loop = () -> {
-			@Override
+			Looper.prepare();
-			public void run() {
+			backgroundHandler = new Handler();
-				Looper.prepare();
+			startLatch.countDown();
-				backgroundHandler = new Handler();
+			Looper.loop();
-				startLatch.countDown();
-				Looper.loop();
-			}
 		};
 	}
 

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

@@ -61,12 +61,12 @@ class AndroidLocationUtils implements LocationUtils {
 	private String getCountryFromPhoneNetwork() {
 		Object o = appContext.getSystemService(TELEPHONY_SERVICE);
 		TelephonyManager tm = (TelephonyManager) o;
-		return tm.getNetworkCountryIso();
+		return tm == null ? "" : tm.getNetworkCountryIso();
 	}
 
 	private String getCountryFromSimCard() {
 		Object o = appContext.getSystemService(TELEPHONY_SERVICE);
 		TelephonyManager tm = (TelephonyManager) o;
-		return tm.getSimCountryIso();
+		return tm == null ? "" : tm.getSimCountryIso();
 	}
 }

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

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

@@ -1,31 +1,30 @@
 package org.briarproject.bramble.system;
 
+import android.annotation.SuppressLint;
 import android.app.Application;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.content.ContentResolver;
 import android.content.Context;
-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;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.util.List;
 
 import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
 
-import static android.content.Context.WIFI_SERVICE;
+import static android.os.Build.VERSION.SDK_INT;
 import static android.provider.Settings.Secure.ANDROID_ID;
 
 @Immutable
 @NotNullByDefault
-class AndroidSecureRandomProvider extends LinuxSecureRandomProvider {
+class AndroidSecureRandomProvider extends UnixSecureRandomProvider {
 
 	private static final int SEED_LENGTH = 32;
 
@@ -36,6 +35,7 @@ class AndroidSecureRandomProvider extends LinuxSecureRandomProvider {
 		appContext = app.getApplicationContext();
 	}
 
+	@SuppressLint("HardwareIds")
 	@Override
 	protected void writeToEntropyPool(DataOutputStream out) throws IOException {
 		super.writeToEntropyPool(out);
@@ -48,13 +48,6 @@ class AndroidSecureRandomProvider extends LinuxSecureRandomProvider {
 		String id = Settings.Secure.getString(contentResolver, ANDROID_ID);
 		if (id != null) out.writeUTF(id);
 		Parcel parcel = Parcel.obtain();
-		WifiManager wm =
-				(WifiManager) appContext.getSystemService(WIFI_SERVICE);
-		List<WifiConfiguration> configs = wm.getConfiguredNetworks();
-		if (configs != null) {
-			for (WifiConfiguration config : configs)
-				parcel.writeParcelable(config, 0);
-		}
 		BluetoothAdapter bt = BluetoothAdapter.getDefaultAdapter();
 		if (bt != null) {
 			for (BluetoothDevice device : bt.getBondedDevices())
@@ -66,20 +59,22 @@ 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)
+		if (SDK_INT <= 18) applyOpenSslFix();
-			applyOpenSslFix();
+		StrictMode.setThreadPolicy(tp);
 	}
 
 	// Based on https://android-developers.googleblog.com/2013/08/some-securerandom-thoughts.html
 	private void applyOpenSslFix() {
-		byte[] seed = new LinuxSecureRandomSpi().engineGenerateSeed(
+		byte[] seed = new UnixSecureRandomSpi().engineGenerateSeed(
 				SEED_LENGTH);
 		try {
 			// Seed the OpenSSL PRNG
 			Class.forName("org.apache.harmony.xnet.provider.jsse.NativeCrypto")
 					.getMethod("RAND_seed", byte[].class)
-					.invoke(null, seed);
+					.invoke(null, (Object) seed);
 			// Mix the output of the Linux PRNG into the OpenSSL PRNG
 			int bytesRead = (Integer) Class.forName(
 					"org.apache.harmony.xnet.provider.jsse.NativeCrypto")

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

@@ -1,11 +1,18 @@
 package org.briarproject.bramble.system;
 
-import android.app.Application;
+import org.briarproject.bramble.api.event.EventExecutor;
-
+import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.system.AndroidExecutor;
+import org.briarproject.bramble.api.system.AndroidWakeLockManager;
 import org.briarproject.bramble.api.system.LocationUtils;
+import org.briarproject.bramble.api.system.ResourceProvider;
 import org.briarproject.bramble.api.system.SecureRandomProvider;
 
+import java.util.concurrent.Executor;
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+
 import javax.inject.Singleton;
 
 import dagger.Module;
@@ -14,20 +21,59 @@ import dagger.Provides;
 @Module
 public class AndroidSystemModule {
 
-	@Provides
+	private final ScheduledExecutorService scheduledExecutorService;
-	@Singleton
-	SecureRandomProvider provideSecureRandomProvider(Application app) {
-		return new AndroidSecureRandomProvider(app);
-	}
 
-	@Provides
+	public AndroidSystemModule() {
-	LocationUtils provideLocationUtils(Application app) {
+		// Discard tasks that are submitted during shutdown
-		return new AndroidLocationUtils(app);
+		RejectedExecutionHandler policy =
+				new ScheduledThreadPoolExecutor.DiscardPolicy();
+		scheduledExecutorService = new ScheduledThreadPoolExecutor(1, policy);
 	}
 
 	@Provides
 	@Singleton
-	AndroidExecutor provideAndroidExecutor(Application app) {
+	ScheduledExecutorService provideScheduledExecutorService(
-		return new AndroidExecutorImpl(app);
+			LifecycleManager lifecycleManager) {
+		lifecycleManager.registerForShutdown(scheduledExecutorService);
+		return scheduledExecutorService;
+	}
+
+	@Provides
+	@Singleton
+	SecureRandomProvider provideSecureRandomProvider(
+			AndroidSecureRandomProvider provider) {
+		return provider;
+	}
+
+	@Provides
+	LocationUtils provideLocationUtils(AndroidLocationUtils locationUtils) {
+		return locationUtils;
+	}
+
+	@Provides
+	@Singleton
+	AndroidExecutor provideAndroidExecutor(
+			AndroidExecutorImpl androidExecutor) {
+		return androidExecutor;
+	}
+
+	@Provides
+	@Singleton
+	@EventExecutor
+	Executor provideEventExecutor(AndroidExecutor androidExecutor) {
+		return androidExecutor::runOnUiThread;
+	}
+
+	@Provides
+	@Singleton
+	ResourceProvider provideResourceProvider(AndroidResourceProvider provider) {
+		return provider;
+	}
+
+	@Provides
+	@Singleton
+	AndroidWakeLockManager provideWakeLockManager(
+			AndroidWakeLockManagerImpl wakeLockManager) {
+		return wakeLockManager;
 	}
 }

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

@@ -0,0 +1,242 @@
+package org.briarproject.bramble.system;
+
+import android.annotation.TargetApi;
+import android.app.AlarmManager;
+import android.app.Application;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.os.Process;
+import android.os.SystemClock;
+
+import org.briarproject.bramble.api.lifecycle.Service;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.system.AlarmListener;
+import org.briarproject.bramble.api.system.AndroidWakeLockManager;
+import org.briarproject.bramble.api.system.TaskScheduler;
+import org.briarproject.bramble.api.system.Wakeful;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.PriorityQueue;
+import java.util.Queue;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.logging.Logger;
+
+import javax.annotation.concurrent.GuardedBy;
+import javax.annotation.concurrent.ThreadSafe;
+
+import static android.app.AlarmManager.ELAPSED_REALTIME_WAKEUP;
+import static android.app.AlarmManager.INTERVAL_FIFTEEN_MINUTES;
+import static android.app.PendingIntent.FLAG_CANCEL_CURRENT;
+import static android.content.Context.ALARM_SERVICE;
+import static android.os.Build.VERSION.SDK_INT;
+import static java.util.Objects.requireNonNull;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.logging.Level.INFO;
+import static java.util.logging.Logger.getLogger;
+import static org.briarproject.bramble.system.AlarmConstants.EXTRA_PID;
+import static org.briarproject.bramble.system.AlarmConstants.REQUEST_ALARM;
+
+@ThreadSafe
+@NotNullByDefault
+class AndroidTaskScheduler implements TaskScheduler, Service, AlarmListener {
+
+	private static final Logger LOG =
+			getLogger(AndroidTaskScheduler.class.getName());
+
+	private static final long ALARM_MS = INTERVAL_FIFTEEN_MINUTES;
+
+	private final Application app;
+	private final AndroidWakeLockManager wakeLockManager;
+	private final ScheduledExecutorService scheduledExecutorService;
+	private final AlarmManager alarmManager;
+
+	private final Object lock = new Object();
+	@GuardedBy("lock")
+	private final Queue<ScheduledTask> tasks = new PriorityQueue<>();
+
+	AndroidTaskScheduler(Application app,
+			AndroidWakeLockManager wakeLockManager,
+			ScheduledExecutorService scheduledExecutorService) {
+		this.app = app;
+		this.wakeLockManager = wakeLockManager;
+		this.scheduledExecutorService = scheduledExecutorService;
+		alarmManager = (AlarmManager)
+				requireNonNull(app.getSystemService(ALARM_SERVICE));
+	}
+
+	@Override
+	public void startService() {
+		scheduleAlarm();
+	}
+
+	@Override
+	public void stopService() {
+		cancelAlarm();
+	}
+
+	@Override
+	public Cancellable schedule(Runnable task, Executor executor, long delay,
+			TimeUnit unit) {
+		AtomicBoolean cancelled = new AtomicBoolean(false);
+		return schedule(task, executor, delay, unit, cancelled);
+	}
+
+	@Override
+	public Cancellable scheduleWithFixedDelay(Runnable task, Executor executor,
+			long delay, long interval, TimeUnit unit) {
+		AtomicBoolean cancelled = new AtomicBoolean(false);
+		return scheduleWithFixedDelay(task, executor, delay, interval, unit,
+				cancelled);
+	}
+
+	@Override
+	public void onAlarm(Intent intent) {
+		wakeLockManager.runWakefully(() -> {
+			int extraPid = intent.getIntExtra(EXTRA_PID, -1);
+			int currentPid = Process.myPid();
+			if (extraPid == currentPid) {
+				LOG.info("Alarm");
+				rescheduleAlarm();
+				runDueTasks();
+			} else if (LOG.isLoggable(INFO)) {
+				LOG.info("Ignoring alarm with PID " + extraPid
+						+ ", current PID is " + currentPid);
+			}
+		}, "TaskAlarm");
+	}
+
+	private Cancellable schedule(Runnable task, Executor executor, long delay,
+			TimeUnit unit, AtomicBoolean cancelled) {
+		long now = SystemClock.elapsedRealtime();
+		long dueMillis = now + MILLISECONDS.convert(delay, unit);
+		Runnable wakeful = () ->
+				wakeLockManager.executeWakefully(task, executor, "TaskHandoff");
+		Future<?> check = scheduleCheckForDueTasks(delay, unit);
+		ScheduledTask s = new ScheduledTask(wakeful, dueMillis, check,
+				cancelled);
+		synchronized (lock) {
+			tasks.add(s);
+		}
+		return s;
+	}
+
+	private Cancellable scheduleWithFixedDelay(Runnable task, Executor executor,
+			long delay, long interval, TimeUnit unit, AtomicBoolean cancelled) {
+		// All executions of this periodic task share a cancelled flag
+		Runnable wrapped = () -> {
+			task.run();
+			scheduleWithFixedDelay(task, executor, interval, interval, unit,
+					cancelled);
+		};
+		return schedule(wrapped, executor, delay, unit, cancelled);
+	}
+
+	private Future<?> scheduleCheckForDueTasks(long delay, TimeUnit unit) {
+		Runnable wakeful = () -> wakeLockManager.runWakefully(
+				this::runDueTasks, "TaskScheduler");
+		return scheduledExecutorService.schedule(wakeful, delay, unit);
+	}
+
+	@Wakeful
+	private void runDueTasks() {
+		long now = SystemClock.elapsedRealtime();
+		List<ScheduledTask> due = new ArrayList<>();
+		synchronized (lock) {
+			while (true) {
+				ScheduledTask s = tasks.peek();
+				if (s == null || s.dueMillis > now) break;
+				due.add(tasks.remove());
+			}
+		}
+		if (LOG.isLoggable(INFO)) {
+			LOG.info("Running " + due.size() + " due tasks");
+		}
+		for (ScheduledTask s : due) {
+			if (LOG.isLoggable(INFO)) {
+				LOG.info("Task is " + (now - s.dueMillis) + " ms overdue");
+			}
+			s.run();
+		}
+	}
+
+	private void scheduleAlarm() {
+		if (SDK_INT >= 23) scheduleIdleAlarm();
+		else scheduleInexactRepeatingAlarm();
+	}
+
+	private void rescheduleAlarm() {
+		// If SDK_INT < 23 the alarm repeats automatically
+		if (SDK_INT >= 23) scheduleIdleAlarm();
+	}
+
+	private void cancelAlarm() {
+		alarmManager.cancel(getAlarmPendingIntent());
+	}
+
+	private void scheduleInexactRepeatingAlarm() {
+		alarmManager.setInexactRepeating(ELAPSED_REALTIME_WAKEUP,
+				SystemClock.elapsedRealtime() + ALARM_MS, ALARM_MS,
+				getAlarmPendingIntent());
+	}
+
+	@TargetApi(23)
+	private void scheduleIdleAlarm() {
+		alarmManager.setAndAllowWhileIdle(ELAPSED_REALTIME_WAKEUP,
+				SystemClock.elapsedRealtime() + ALARM_MS,
+				getAlarmPendingIntent());
+	}
+
+	private PendingIntent getAlarmPendingIntent() {
+		Intent i = new Intent(app, AlarmReceiver.class);
+		i.putExtra(EXTRA_PID, android.os.Process.myPid());
+		return PendingIntent.getBroadcast(app, REQUEST_ALARM, i,
+				FLAG_CANCEL_CURRENT);
+	}
+
+	private class ScheduledTask
+			implements Runnable, Cancellable, Comparable<ScheduledTask> {
+
+		private final Runnable task;
+		private final long dueMillis;
+		private final Future<?> check;
+		private final AtomicBoolean cancelled;
+
+		public ScheduledTask(Runnable task, long dueMillis,
+				Future<?> check, AtomicBoolean cancelled) {
+			this.task = task;
+			this.dueMillis = dueMillis;
+			this.check = check;
+			this.cancelled = cancelled;
+		}
+
+		@Override
+		public void run() {
+			if (!cancelled.get()) task.run();
+		}
+
+		@Override
+		public void cancel() {
+			// Cancel any future executions of this task
+			cancelled.set(true);
+			// Cancel the scheduled check for due tasks
+			check.cancel(false);
+			// Remove the task from the queue
+			synchronized (lock) {
+				tasks.remove(this);
+			}
+		}
+
+		@Override
+		public int compareTo(ScheduledTask s) {
+			//noinspection UseCompareMethod
+			if (dueMillis < s.dueMillis) return -1;
+			if (dueMillis > s.dueMillis) return 1;
+			return 0;
+		}
+	}
+}

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

@@ -0,0 +1,49 @@
+package org.briarproject.bramble.system;
+
+import android.app.Application;
+
+import org.briarproject.bramble.api.lifecycle.LifecycleManager;
+import org.briarproject.bramble.api.system.AlarmListener;
+import org.briarproject.bramble.api.system.AndroidWakeLockManager;
+import org.briarproject.bramble.api.system.TaskScheduler;
+
+import java.util.concurrent.ScheduledExecutorService;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module
+public class AndroidTaskSchedulerModule {
+
+	public static class EagerSingletons {
+		@Inject
+		AndroidTaskScheduler scheduler;
+	}
+
+	@Provides
+	@Singleton
+	AndroidTaskScheduler provideAndroidTaskScheduler(
+			LifecycleManager lifecycleManager, Application app,
+			AndroidWakeLockManager wakeLockManager,
+			ScheduledExecutorService scheduledExecutorService) {
+		AndroidTaskScheduler scheduler = new AndroidTaskScheduler(app,
+				wakeLockManager, scheduledExecutorService);
+		lifecycleManager.registerService(scheduler);
+		return scheduler;
+	}
+
+	@Provides
+	@Singleton
+	AlarmListener provideAlarmListener(AndroidTaskScheduler scheduler) {
+		return scheduler;
+	}
+
+	@Provides
+	@Singleton
+	TaskScheduler provideTaskScheduler(AndroidTaskScheduler scheduler) {
+		return scheduler;
+	}
+}

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

@@ -0,0 +1,74 @@
+package org.briarproject.bramble.system;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.system.AndroidWakeLock;
+
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.logging.Logger;
+
+import javax.annotation.concurrent.GuardedBy;
+import javax.annotation.concurrent.ThreadSafe;
+
+import static java.util.logging.Level.FINE;
+import static java.util.logging.Logger.getLogger;
+
+/**
+ * A wrapper around a {@link SharedWakeLock} that provides the more convenient
+ * semantics of {@link AndroidWakeLock} (i.e. calls to acquire() and release()
+ * don't need to be balanced).
+ */
+@ThreadSafe
+@NotNullByDefault
+class AndroidWakeLockImpl implements AndroidWakeLock {
+
+	private static final Logger LOG =
+			getLogger(AndroidWakeLockImpl.class.getName());
+
+	private static final AtomicInteger INSTANCE_ID = new AtomicInteger(0);
+
+	private final SharedWakeLock sharedWakeLock;
+	private final String tag;
+
+	private final Object lock = new Object();
+	@GuardedBy("lock")
+	private boolean held = false;
+
+	AndroidWakeLockImpl(SharedWakeLock sharedWakeLock, String tag) {
+		this.sharedWakeLock = sharedWakeLock;
+		this.tag = tag + "_" + INSTANCE_ID.getAndIncrement();
+	}
+
+	@Override
+	public void acquire() {
+		synchronized (lock) {
+			if (held) {
+				if (LOG.isLoggable(FINE)) {
+					LOG.fine(tag + " already acquired");
+				}
+			} else {
+				if (LOG.isLoggable(FINE)) {
+					LOG.fine(tag + " acquiring shared wake lock");
+				}
+				held = true;
+				sharedWakeLock.acquire();
+			}
+		}
+	}
+
+	@Override
+	public void release() {
+		synchronized (lock) {
+			if (held) {
+				if (LOG.isLoggable(FINE)) {
+					LOG.fine(tag + " releasing shared wake lock");
+				}
+				held = false;
+				sharedWakeLock.release();
+			} else {
+				if (LOG.isLoggable(FINE)) {
+					LOG.fine(tag + " already released");
+				}
+			}
+		}
+	}
+}

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

@@ -0,0 +1,125 @@
+package org.briarproject.bramble.system;
+
+import android.app.Application;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.PowerManager;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.system.AndroidWakeLock;
+import org.briarproject.bramble.api.system.AndroidWakeLockManager;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.ScheduledExecutorService;
+
+import javax.inject.Inject;
+
+import static android.content.Context.POWER_SERVICE;
+import static android.os.PowerManager.PARTIAL_WAKE_LOCK;
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
+
+@NotNullByDefault
+class AndroidWakeLockManagerImpl implements AndroidWakeLockManager {
+
+	/**
+	 * How often to replace the wake lock.
+	 */
+	private static final long LOCK_DURATION_MS = MINUTES.toMillis(1);
+
+	/**
+	 * Automatically release the lock this many milliseconds after it's due
+	 * to have been replaced and released.
+	 */
+	private static final long SAFETY_MARGIN_MS = SECONDS.toMillis(30);
+
+	private final SharedWakeLock sharedWakeLock;
+
+	@Inject
+	AndroidWakeLockManagerImpl(Application app,
+			ScheduledExecutorService scheduledExecutorService) {
+		PowerManager powerManager = (PowerManager)
+				requireNonNull(app.getSystemService(POWER_SERVICE));
+		String tag = getWakeLockTag(app);
+		sharedWakeLock = new RenewableWakeLock(powerManager,
+				scheduledExecutorService, PARTIAL_WAKE_LOCK, tag,
+				LOCK_DURATION_MS, SAFETY_MARGIN_MS);
+	}
+
+	@Override
+	public AndroidWakeLock createWakeLock(String tag) {
+		return new AndroidWakeLockImpl(sharedWakeLock, tag);
+	}
+
+	@Override
+	public void runWakefully(Runnable r, String tag) {
+		AndroidWakeLock wakeLock = createWakeLock(tag);
+		wakeLock.acquire();
+		try {
+			r.run();
+		} finally {
+			wakeLock.release();
+		}
+	}
+
+	@Override
+	public void executeWakefully(Runnable r, Executor executor, String tag) {
+		AndroidWakeLock wakeLock = createWakeLock(tag);
+		wakeLock.acquire();
+		try {
+			executor.execute(() -> {
+				try {
+					r.run();
+				} finally {
+					// Release the wake lock if the task throws an exception
+					wakeLock.release();
+				}
+			});
+		} catch (Exception e) {
+			// Release the wake lock if the executor throws an exception when
+			// we submit the task (in which case the release() call above won't
+			// happen)
+			wakeLock.release();
+			throw e;
+		}
+	}
+
+	@Override
+	public void executeWakefully(Runnable r, String tag) {
+		AndroidWakeLock wakeLock = createWakeLock(tag);
+		wakeLock.acquire();
+		try {
+			new Thread(() -> {
+				try {
+					r.run();
+				} finally {
+					wakeLock.release();
+				}
+			}).start();
+		} catch (Exception e) {
+			wakeLock.release();
+			throw e;
+		}
+	}
+
+	private String getWakeLockTag(Context ctx) {
+		PackageManager pm = ctx.getPackageManager();
+		if (isInstalled(pm, "com.huawei.powergenie")) {
+			return "LocationManagerService";
+		} else if (isInstalled(pm, "com.evenwell.PowerMonitor")) {
+			return "AudioIn";
+		}
+		return ctx.getPackageName();
+	}
+
+	private boolean isInstalled(PackageManager pm, String packageName) {
+		try {
+			pm.getPackageInfo(packageName, 0);
+			return true;
+		} catch (PackageManager.NameNotFoundException e) {
+			return false;
+		}
+	}
+
+}

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

@@ -0,0 +1,23 @@
+package org.briarproject.bramble.system;
+
+import org.briarproject.bramble.api.lifecycle.IoExecutor;
+import org.briarproject.bramble.api.system.AndroidWakeLockManager;
+import org.briarproject.bramble.api.system.WakefulIoExecutor;
+
+import java.util.concurrent.Executor;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module
+public
+class AndroidWakefulIoExecutorModule {
+
+	@Provides
+	@WakefulIoExecutor
+	Executor provideWakefulIoExecutor(@IoExecutor Executor ioExecutor,
+			AndroidWakeLockManager wakeLockManager) {
+		return r -> wakeLockManager.executeWakefully(r, ioExecutor,
+				"WakefulIoExecutor");
+	}
+}

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

@@ -0,0 +1,130 @@
+package org.briarproject.bramble.system;
+
+import android.os.PowerManager;
+import android.os.PowerManager.WakeLock;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.logging.Logger;
+
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.GuardedBy;
+import javax.annotation.concurrent.ThreadSafe;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.logging.Level.FINE;
+import static java.util.logging.Level.INFO;
+import static java.util.logging.Level.WARNING;
+import static java.util.logging.Logger.getLogger;
+import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
+
+@ThreadSafe
+@NotNullByDefault
+class RenewableWakeLock implements SharedWakeLock {
+
+	private static final Logger LOG =
+			getLogger(RenewableWakeLock.class.getName());
+
+	private final PowerManager powerManager;
+	private final ScheduledExecutorService scheduledExecutorService;
+	private final int levelAndFlags;
+	private final String tag;
+	private final long durationMs, safetyMarginMs;
+
+	private final Object lock = new Object();
+	@GuardedBy("lock")
+	@Nullable
+	private WakeLock wakeLock;
+	@GuardedBy("lock")
+	@Nullable
+	private Future<?> future;
+	@GuardedBy("lock")
+	private int refCount = 0;
+	@GuardedBy("lock")
+	private long acquired = 0;
+
+	RenewableWakeLock(PowerManager powerManager,
+			ScheduledExecutorService scheduledExecutorService,
+			int levelAndFlags,
+			String tag,
+			long durationMs,
+			long safetyMarginMs) {
+		this.powerManager = powerManager;
+		this.scheduledExecutorService = scheduledExecutorService;
+		this.levelAndFlags = levelAndFlags;
+		this.tag = tag;
+		this.durationMs = durationMs;
+		this.safetyMarginMs = safetyMarginMs;
+	}
+
+	@Override
+	public void acquire() {
+		synchronized (lock) {
+			refCount++;
+			if (refCount == 1) {
+				if (LOG.isLoggable(INFO)) {
+					LOG.info("Acquiring wake lock " + tag);
+				}
+				wakeLock = powerManager.newWakeLock(levelAndFlags, tag);
+				// We do our own reference counting so we can replace the lock
+				// TODO: Check whether using a ref-counted wake lock affects
+				//  power management apps
+				wakeLock.setReferenceCounted(false);
+				wakeLock.acquire(durationMs + safetyMarginMs);
+				future = scheduledExecutorService.schedule(this::renew,
+						durationMs, MILLISECONDS);
+				acquired = android.os.SystemClock.elapsedRealtime();
+			} else if (LOG.isLoggable(FINE)) {
+				LOG.fine("Wake lock " + tag + " has " + refCount + " holders");
+			}
+		}
+	}
+
+	private void renew() {
+		if (LOG.isLoggable(INFO)) LOG.info("Renewing wake lock " + tag);
+		synchronized (lock) {
+			if (wakeLock == null) {
+				LOG.info("Already released");
+				return;
+			}
+			if (LOG.isLoggable(FINE)) {
+				LOG.fine("Wake lock " + tag + " has " + refCount + " holders");
+			}
+			long now = android.os.SystemClock.elapsedRealtime();
+			long expiry = acquired + durationMs + safetyMarginMs;
+			if (now > expiry && LOG.isLoggable(WARNING)) {
+				LOG.warning("Wake lock expired " + (now - expiry) + " ms ago");
+			}
+			WakeLock oldWakeLock = wakeLock;
+			wakeLock = powerManager.newWakeLock(levelAndFlags, tag);
+			wakeLock.setReferenceCounted(false);
+			wakeLock.acquire(durationMs + safetyMarginMs);
+			oldWakeLock.release();
+			future = scheduledExecutorService.schedule(this::renew, durationMs,
+					MILLISECONDS);
+			acquired = now;
+		}
+	}
+
+	@Override
+	public void release() {
+		synchronized (lock) {
+			refCount--;
+			if (refCount == 0) {
+				if (LOG.isLoggable(INFO)) {
+					LOG.info("Releasing wake lock " + tag);
+				}
+				requireNonNull(future).cancel(false);
+				future = null;
+				requireNonNull(wakeLock).release();
+				wakeLock = null;
+				acquired = 0;
+			} else if (LOG.isLoggable(FINE)) {
+				LOG.fine("Wake lock " + tag + " has " + refCount + " holders");
+			}
+		}
+	}
+}
+

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

@@ -0,0 +1,22 @@
+package org.briarproject.bramble.system;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.system.AndroidWakeLock;
+
+@NotNullByDefault
+interface SharedWakeLock {
+
+	/**
+	 * Acquires the wake lock. This increments the wake lock's reference count,
+	 * so unlike {@link AndroidWakeLock#acquire()} every call to this method
+	 * must be followed by a balancing call to {@link #release()}.
+	 */
+	void acquire();
+
+	/**
+	 * Releases the wake lock. This decrements the wake lock's reference count,
+	 * so unlike {@link AndroidWakeLock#release()} every call to this method
+	 * must follow a balancing call to {@link #acquire()}.
+	 */
+	void release();
+}

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

@@ -1,30 +1,45 @@
 package org.briarproject.bramble.util;
 
+import android.annotation.SuppressLint;
 import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
 import android.os.Build;
 import android.provider.Settings;
 
+import org.briarproject.bramble.api.Pair;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
 import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.Scanner;
+
+import javax.annotation.Nullable;
 
 import static android.content.Context.MODE_PRIVATE;
+import static android.os.Build.VERSION.SDK_INT;
+import static java.lang.Runtime.getRuntime;
+import static java.util.Arrays.asList;
+import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
 
+@NotNullByDefault
 public class AndroidUtils {
 
 	// Fake Bluetooth address returned by BluetoothAdapter on API 23 and later
 	private static final String FAKE_BLUETOOTH_ADDRESS = "02:00:00:00:00:00";
 
 	private static final String STORED_REPORTS = "dev-reports";
+	private static final String STORED_LOGCAT = "dev-logcat";
 
-	@SuppressWarnings("deprecation")
 	public static Collection<String> getSupportedArchitectures() {
 		List<String> abis = new ArrayList<>();
-		if (Build.VERSION.SDK_INT >= 21) {
+		if (SDK_INT >= 21) {
-			abis.addAll(Arrays.asList(Build.SUPPORTED_ABIS));
+			abis.addAll(asList(Build.SUPPORTED_ABIS));
 		} else {
 			abis.add(Build.CPU_ABI);
 			if (Build.CPU_ABI2 != null) abis.add(Build.CPU_ABI2);
@@ -34,37 +49,89 @@ public class AndroidUtils {
 
 	public static String getBluetoothAddress(Context ctx,
 			BluetoothAdapter adapter) {
+		return getBluetoothAddressAndMethod(ctx, adapter).getFirst();
+	}
+
+	public static Pair<String, String> getBluetoothAddressAndMethod(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;
+		if (isValidBluetoothAddress(address)) {
+			return new Pair<>(address, "adapter");
+		}
 		// Return the address from settings if it's valid and not fake
 		address = Settings.Secure.getString(ctx.getContentResolver(),
 				"bluetooth_address");
-		if (isValidBluetoothAddress(address)) return address;
+		if (isValidBluetoothAddress(address)) {
+			return new Pair<>(address, "settings");
+		}
+		// Try to get the address via reflection
+		address = getBluetoothAddressByReflection(adapter);
+		if (isValidBluetoothAddress(address)) {
+			return new Pair<>(requireNonNull(address), "reflection");
+		}
 		// Let the caller know we can't find the address
-		return "";
+		return new Pair<>("", "");
 	}
 
-	private static boolean isValidBluetoothAddress(String address) {
+	public static boolean isValidBluetoothAddress(@Nullable String address) {
 		return !StringUtils.isNullOrEmpty(address)
 				&& BluetoothAdapter.checkBluetoothAddress(address)
 				&& !address.equals(FAKE_BLUETOOTH_ADDRESS);
 	}
 
-	public static void deleteAppData(Context ctx) {
+	@Nullable
-		File dataDir = new File(ctx.getApplicationInfo().dataDir);
+	private static String getBluetoothAddressByReflection(
-		File[] children = dataDir.listFiles();
+			BluetoothAdapter adapter) {
-		if (children != null) {
+		try {
-			for (File child : children) {
+			Field mServiceField =
-				if (!child.getName().equals("lib"))
+					adapter.getClass().getDeclaredField("mService");
-					IoUtils.deleteFileOrDir(child);
+			mServiceField.setAccessible(true);
-			}
+			Object mService = mServiceField.get(adapter);
+			// mService may be null when Bluetooth is disabled
+			if (mService == null) throw new NoSuchFieldException();
+			Method getAddressMethod =
+					mService.getClass().getMethod("getAddress");
+			return (String) getAddressMethod.invoke(mService);
+		} catch (NoSuchFieldException e) {
+			return null;
+		} catch (IllegalAccessException e) {
+			return null;
+		} catch (NoSuchMethodException e) {
+			return null;
+		} catch (InvocationTargetException e) {
+			return null;
+		} catch (SecurityException e) {
+			return null;
 		}
-		// Recreate the cache dir as some OpenGL drivers expect it to exist
-		new File(dataDir, "cache").mkdir();
 	}
 
 	public static File getReportDir(Context ctx) {
 		return ctx.getDir(STORED_REPORTS, MODE_PRIVATE);
 	}
+
+	public static File getLogcatFile(Context ctx) {
+		return new File(ctx.getFilesDir(), STORED_LOGCAT);
+	}
+
+	/**
+	 * Returns an array of supported content types for image attachments.
+	 */
+	public static String[] getSupportedImageContentTypes() {
+		return new String[] {"image/jpeg", "image/png", "image/gif"};
+	}
+
+	@Nullable
+	public static String getSystemProperty(String propName) {
+		try {
+			Process p = getRuntime().exec("getprop " + propName);
+			Scanner s = new Scanner(p.getInputStream());
+			String line = s.nextLine();
+			s.close();
+			return line;
+		} catch (SecurityException | IOException e) {
+			return null;
+		}
+	}
 }

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

@@ -0,0 +1,151 @@
+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.assertFalse;
+import static junit.framework.Assert.assertTrue;
+import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory;
+import static org.briarproject.bramble.test.TestUtils.getTestDirectory;
+
+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 File testDir = getTestDirectory();
+	private final File keyDir = new File(testDir, "key");
+	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 testDeleteAccountClearsSharedPrefsAndDeletesFiles()
+			throws Exception {
+		// Directories 'code_cache', 'lib' and 'shared_prefs' should be spared
+		File codeCacheDir = new File(testDir, "code_cache");
+		File codeCacheFile = new File(codeCacheDir, "file");
+		File libDir = new File(testDir, "lib");
+		File libFile = new File(libDir, "file");
+		File sharedPrefsDir = new File(testDir, "shared_prefs");
+		File sharedPrefsFile = new File(sharedPrefsDir, "file");
+		// Directory 'cache' should be emptied
+		File cacheDir = new File(testDir, "cache");
+		File cacheFile = new File(cacheDir, "file");
+		// Other directories should be deleted
+		File potatoDir = new File(testDir, ".potato");
+		File potatoFile = new File(potatoDir, "file");
+		File filesDir = new File(testDir, "filesDir");
+		File externalCacheDir = new File(testDir, "externalCacheDir");
+
+		context.checking(new Expectations() {{
+			oneOf(prefs).edit();
+			will(returnValue(editor));
+			oneOf(editor).clear();
+			will(returnValue(editor));
+			oneOf(editor).commit();
+			will(returnValue(true));
+			oneOf(defaultPrefs).edit();
+			will(returnValue(editor));
+			oneOf(editor).clear();
+			will(returnValue(editor));
+			oneOf(editor).commit();
+			will(returnValue(true));
+			allowing(app).getApplicationInfo();
+			will(returnValue(applicationInfo));
+			oneOf(app).getFilesDir();
+			will(returnValue(filesDir));
+			oneOf(app).getCacheDir();
+			will(returnValue(cacheDir));
+			oneOf(app).getExternalCacheDir();
+			will(returnValue(externalCacheDir));
+		}});
+
+		assertTrue(dbDir.mkdirs());
+		assertTrue(keyDir.mkdirs());
+		assertTrue(codeCacheDir.mkdirs());
+		assertTrue(codeCacheFile.createNewFile());
+		assertTrue(libDir.mkdirs());
+		assertTrue(libFile.createNewFile());
+		assertTrue(sharedPrefsDir.mkdirs());
+		assertTrue(sharedPrefsFile.createNewFile());
+		assertTrue(cacheDir.mkdirs());
+		assertTrue(cacheFile.createNewFile());
+		assertTrue(potatoDir.mkdirs());
+		assertTrue(potatoFile.createNewFile());
+		assertTrue(filesDir.mkdirs());
+		assertTrue(externalCacheDir.mkdirs());
+
+		accountManager.deleteAccount();
+
+		assertFalse(dbDir.exists());
+		assertFalse(keyDir.exists());
+		assertTrue(codeCacheDir.exists());
+		assertTrue(codeCacheFile.exists());
+		assertTrue(libDir.exists());
+		assertTrue(libFile.exists());
+		assertTrue(sharedPrefsDir.exists());
+		assertTrue(sharedPrefsFile.exists());
+		assertTrue(cacheDir.exists());
+		assertFalse(cacheFile.exists());
+		assertFalse(potatoDir.exists());
+		assertFalse(potatoFile.exists());
+		assertFalse(filesDir.exists());
+		assertFalse(externalCacheDir.exists());
+	}
+
+	@After
+	public void tearDown() {
+		deleteTestDirectory(testDir);
+	}
+}

bramble-android/witness.gradle

@@ -0,0 +1,116 @@
+dependencyVerification {
+    verify = [
+        'cglib:cglib:3.2.8:cglib-3.2.8.jar:3f64de999ecc5595dc84ca8ff0879d8a34c8623f9ef3c517a53ed59023fcb9db',
+        'com.android.tools.analytics-library:protos:27.1.3:protos-27.1.3.jar:0d9e6cff60b318baac250b6f5bb076a8161103338bf2749cdf1db8a5a13a1f12',
+        'com.android.tools.analytics-library:shared:27.1.3:shared-27.1.3.jar:10d2a51d8f89ff4ac849888e5a9c60b10e879c30d78545ec1da4d3df7bd56ae4',
+        'com.android.tools.analytics-library:tracker:27.1.3:tracker-27.1.3.jar:589b355a2ba796cbc0a2b2295737de6661f078262e5f87cd6f540b8d011e5ebb',
+        'com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524:aapt2-proto-4.1.0-alpha01-6193524.jar:17e75523e1e92dd4f222c7368ee41df9e964a508232f591e265d0c499baf9dca',
+        'com.android.tools.build:apksig:4.1.3:apksig-4.1.3.jar:a851980c678ff7a6785388b9a9e8cc094788ce3c4a985ad2b19c2028fd3c631a',
+        'com.android.tools.build:apkzlib:4.1.3:apkzlib-4.1.3.jar:475903065e7e83a8c1ba78d267c97a54dc5a04d768b535093850423d7b11f2c8',
+        'com.android.tools.build:builder-model:4.1.3:builder-model-4.1.3.jar:2624a1436c3ab39dd91d3ecf9409a594b0f89ea5cab255f2e9ff11f5ee03d274',
+        'com.android.tools.build:builder-test-api:4.1.3:builder-test-api-4.1.3.jar:3d2af66726b06b53b8d6d497efcee39ff9f77eb2f8d2cce38b31502383a40d2c',
+        'com.android.tools.build:builder:4.1.3:builder-4.1.3.jar:a40426cd6d68f6a722ef4950058c075e4547025e8c2fd78e732ad89f15176f84',
+        'com.android.tools.build:gradle-api:4.1.3:gradle-api-4.1.3.jar:11b1fb9de658bdcf9290b1c1517060d0c4d93f2b27975934989ca4ac890bc077',
+        'com.android.tools.build:manifest-merger:27.1.3:manifest-merger-27.1.3.jar:ce8d4009b1f1584777a7ffa1da3b0551dc316bc8e08112e442c352af70f46f2d',
+        'com.android.tools.ddms:ddmlib:27.1.3:ddmlib-27.1.3.jar:8f76e8236d2b9eebf26378746dad025c4c7c056a02e133dae4ddef47b283c710',
+        'com.android.tools.external.com-intellij:intellij-core:27.1.3:intellij-core-27.1.3.jar:652814fa099b4746fb6f10e19718e476952e8b5bac24e17d914f90650ad21808',
+        'com.android.tools.external.com-intellij:kotlin-compiler:27.1.3:kotlin-compiler-27.1.3.jar:8d7a78d5efd213c5e467e42bd205582aad73ffc77ee5dc18eb1361c9af72f125',
+        'com.android.tools.external.org-jetbrains:uast:27.1.3:uast-27.1.3.jar:aea53944a1ac6a05f12297b55290e8cbecfe54c4166260cfba4405823bfe1c78',
+        'com.android.tools.layoutlib:layoutlib-api:27.1.3:layoutlib-api-27.1.3.jar:23875ce0a8429f33a4e86cc358f658faa0ba9c576f5f05760e544b453d67d04b',
+        'com.android.tools.lint:lint-api:27.1.3:lint-api-27.1.3.jar:97666be32bcadacd944416ea334a9575ef8f4ad0c8f333151491ff4a7df43e1c',
+        'com.android.tools.lint:lint-checks:27.1.3:lint-checks-27.1.3.jar:b2d71ae84a31490fe9ff26c706163fe245b2aea98e3eb747214c1085df444708',
+        'com.android.tools.lint:lint-gradle-api:27.1.3:lint-gradle-api-27.1.3.jar:e54131c287a2954e6ed78a3351e5e10e35a1da2f09ac443bf44b705c71b63a4d',
+        'com.android.tools.lint:lint-gradle:27.1.3:lint-gradle-27.1.3.jar:6a79e48943649d63665db7b17dbaff7af93e94ab9b15072f1a4d90486294ee9f',
+        'com.android.tools.lint:lint-model:27.1.3:lint-model-27.1.3.jar:acb9e792db7000e38e3c3ca21a9b14f2de6549d7a3fc92a97ffba3d06345e5bf',
+        'com.android.tools.lint:lint:27.1.3:lint-27.1.3.jar:5a2e69d0901a3a476a5b2d5001de755868113145f5f6aa557750cfad5389a44b',
+        'com.android.tools:annotations:27.1.3:annotations-27.1.3.jar:904dd771883496d5dfc86619ab2555968ea4e8a29d7a5f4f7cae6fbf5429f8f5',
+        'com.android.tools:common:27.1.3:common-27.1.3.jar:17ab4728e3ea50f047dd5937f0faf35f2c5416962ed74891057087ddc328bf96',
+        'com.android.tools:dvlib:27.1.3:dvlib-27.1.3.jar:cead1c0c356cbe43e6855b0330fe09ef4bec2c72e22bdb4c6e7cf7e6b1dfbc37',
+        'com.android.tools:repository:27.1.3:repository-27.1.3.jar:99de1a178855b56b8cd91a56296f1e0a9399c445e6acc51f1d2927947cc472cb',
+        'com.android.tools:sdk-common:27.1.3:sdk-common-27.1.3.jar:b591e2aa0f1be600795f5c9e2bf81cba9b052bee452fc86c3362b5dd9e427a14',
+        'com.android.tools:sdklib:27.1.3:sdklib-27.1.3.jar:ad6c08a45fe2904d05656bdddf9f623fa5c1d16bbd7b8d6a270a0734136ae02e',
+        'com.android:signflinger:4.1.3:signflinger-4.1.3.jar:f3103b55ccdc8dd9ee2517eb26af93b904d41303726594372d0df59d51156e5c',
+        'com.android:zipflinger:4.1.3:zipflinger-4.1.3.jar:48569896c0497268308a8014c66eb0f2bace2b9e2fc9390f3012823fb86387d5',
+        'com.google.code.findbugs:annotations:3.0.1:annotations-3.0.1.jar:6b47ff0a6de0ce17cbedc3abb0828ca5bce3009d53ea47b3723ff023c4742f79',
+        'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
+        'com.google.code.gson:gson:2.8.5:gson-2.8.5.jar:233a0149fc365c9f6edbd683cfe266b19bdc773be98eabdaf6b3c924b48e7d81',
+        'com.google.dagger:dagger-compiler:2.33:dagger-compiler-2.33.jar:aa8a0d8370c578fd6999802d0d90b9829377a46d2c1141e11b8f737970e7155e',
+        'com.google.dagger:dagger-producers:2.33:dagger-producers-2.33.jar:5897f0b6eef799c2adfe3ccacc58c0fb374d58acb063c3ebe5366c38a8bce5c8',
+        'com.google.dagger:dagger-spi:2.33:dagger-spi-2.33.jar:e2dcab2221b8afb9556ef0a1c83b0bd5f42552e254322a257330f754cdbbb9d4',
+        'com.google.dagger:dagger:2.33:dagger-2.33.jar:d8798c5b8cf6b125234e33af5c6293bb9f2208ce29b57924c35b8c0be7b6bdcb',
+        'com.google.errorprone:error_prone_annotations:2.2.0:error_prone_annotations-2.2.0.jar:6ebd22ca1b9d8ec06d41de8d64e0596981d9607b42035f9ed374f9de271a481a',
+        'com.google.errorprone:error_prone_annotations:2.3.2:error_prone_annotations-2.3.2.jar:357cd6cfb067c969226c442451502aee13800a24e950fdfde77bcdb4565a668d',
+        'com.google.errorprone:javac-shaded:9-dev-r4023-3:javac-shaded-9-dev-r4023-3.jar:65bfccf60986c47fbc17c9ebab0be626afc41741e0a6ec7109e0768817a36f30',
+        'com.google.googlejavaformat:google-java-format:1.5:google-java-format-1.5.jar:aa19ad7850fb85178aa22f2fddb163b84d6ce4d0035872f30d4408195ca1144e',
+        'com.google.guava:failureaccess:1.0.1:failureaccess-1.0.1.jar:a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26',
+        'com.google.guava:guava:27.1-jre:guava-27.1-jre.jar:4a5aa70cc968a4d137e599ad37553e5cfeed2265e8c193476d7119036c536fe7',
+        'com.google.guava:guava:28.1-jre:guava-28.1-jre.jar:30beb8b8527bd07c6e747e77f1a92122c2f29d57ce347461a4a55eb26e382da4',
+        'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava:listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar:b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99',
+        'com.google.j2objc:j2objc-annotations:1.1:j2objc-annotations-1.1.jar:2994a7eb78f2710bd3d3bfb639b2c94e219cedac0d4d084d516e78c16dddecf6',
+        'com.google.j2objc:j2objc-annotations:1.3:j2objc-annotations-1.3.jar:21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b',
+        'com.google.jimfs:jimfs:1.1:jimfs-1.1.jar:c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd',
+        'com.google.protobuf:protobuf-java:3.10.0:protobuf-java-3.10.0.jar:161d7d61a8cb3970891c299578702fd079646e032329d6c2cabf998d191437c9',
+        'com.googlecode.json-simple:json-simple:1.1:json-simple-1.1.jar:2d9484f4c649f708f47f9a479465fc729770ee65617dca3011836602264f6439',
+        'com.squareup:javapoet:1.13.0:javapoet-1.13.0.jar:4c7517e848a71b36d069d12bb3bf46a70fd4cda3105d822b0ed2e19c00b69291',
+        '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:3.0.7:istack-commons-runtime-3.0.7.jar:6443e10ba2e259fb821d9b6becf10db5316285fc30c53cec9d7b19a3877e7fdf',
+        'com.sun.xml.fastinfoset:FastInfoset:1.2.15:FastInfoset-1.2.15.jar:785861db11ca1bd0d1956682b974ad73eb19cd3e01a4b3fa82d62eca97210aec',
+        'commons-codec:commons-codec:1.10:commons-codec-1.10.jar:4241dfa94e711d435f29a4604a3e2de5c4aa3c165e23bd066be6fc1fc4309569',
+        'commons-logging:commons-logging:1.2:commons-logging-1.2.jar:daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636',
+        'it.unimi.dsi:fastutil:7.2.0:fastutil-7.2.0.jar:74fa208043740642f7e6eb09faba15965218ad2f50ce3020efb100136e4b591c',
+        'javax.activation:javax.activation-api:1.2.0:javax.activation-api-1.2.0.jar:43fdef0b5b6ceb31b0424b208b930c74ab58fac2ceeb7b3f6fd3aeb8b5ca4393',
+        '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.3.1:jaxb-api-2.3.1.jar:88b955a0df57880a26a74708bc34f74dcaf8ebf4e78843a28b50eae945732b06',
+        'junit:junit:4.13.2:junit-4.13.2.jar:8e495b634469d64fb8acfa3495a065cbacc8a0fff55ce1e31007be4c16dc57d3',
+        'net.bytebuddy:byte-buddy:1.9.12:byte-buddy-1.9.12.jar:3688c3d434bebc3edc5516296a2ed0f47b65e451071b4afecad84f902f0efc11',
+        'net.jcip:jcip-annotations:1.0:jcip-annotations-1.0.jar:be5805392060c71474bf6c9a67a099471274d30b83eef84bfc4e0889a4f1dcc0',
+        'net.ltgt.gradle.incap:incap:0.2:incap-0.2.jar:b625b9806b0f1e4bc7a2e3457119488de3cd57ea20feedd513db070a573a4ffd',
+        '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-extras.beanshell:bsh:2.0b6:bsh-2.0b6.jar:a17955976070c0573235ee662f2794a78082758b61accffce8d3f8aedcd91047',
+        'org.apache.commons:commons-compress:1.12:commons-compress-1.12.jar:2c1542faf343185b7cab9c3d55c8ae5471d6d095d3887a4adefdbdf2984dc0b6',
+        'org.apache.httpcomponents:httpclient:4.5.6:httpclient-4.5.6.jar:c03f813195e7a80e3608d0ddd8da80b21696a4c92a6a2298865bf149071551c7',
+        'org.apache.httpcomponents:httpcore:4.4.10:httpcore-4.4.10.jar:78ba1096561957db1b55200a159b648876430342d15d461277e62360da19f6fd',
+        'org.apache.httpcomponents:httpmime:4.5.6:httpmime-4.5.6.jar:0b2b1102c18d3c7e05a77214b9b7501a6f6056174ae5604e0e256776eda7553e',
+        'org.bouncycastle:bcpkix-jdk15on:1.56:bcpkix-jdk15on-1.56.jar:7043dee4e9e7175e93e0b36f45b1ec1ecb893c5f755667e8b916eb8dd201c6ca',
+        'org.bouncycastle:bcprov-jdk15on:1.56:bcprov-jdk15on-1.56.jar:963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349',
+        'org.briarproject:obfs4proxy-android:0.0.12-dev-40245c4a:obfs4proxy-android-0.0.12-dev-40245c4a.zip:8ab05a8f8391be2cb5ab2b665c281a06d9e3a756bd0f95a40a36ca927866ea82',
+        'org.briarproject:tor-android:0.3.5.15:tor-android-0.3.5.15.jar:560c5070166300b396cb2f28d82d9f639ee1fb5479096a3cef67da56d39937ad',
+        'org.checkerframework:checker-compat-qual:2.5.3:checker-compat-qual-2.5.3.jar:d76b9afea61c7c082908023f0cbc1427fab9abd2df915c8b8a3e7a509bccbc6d',
+        'org.checkerframework:checker-qual:2.5.2:checker-qual-2.5.2.jar:64b02691c8b9d4e7700f8ee2e742dce7ea2c6e81e662b7522c9ee3bf568c040a',
+        'org.checkerframework:checker-qual:2.8.1:checker-qual-2.8.1.jar:9103499008bcecd4e948da29b17864abb64304e15706444ae209d17ebe0575df',
+        'org.codehaus.groovy:groovy-all:2.4.15:groovy-all-2.4.15.jar:51d6c4e71782e85674239189499854359d380fb75e1a703756e3aaa5b98a5af0',
+        'org.codehaus.mojo:animal-sniffer-annotations:1.17:animal-sniffer-annotations-1.17.jar:92654f493ecfec52082e76354f0ebf87648dc3d5cec2e3c3cdb947c016747a53',
+        'org.codehaus.mojo:animal-sniffer-annotations:1.18:animal-sniffer-annotations-1.18.jar:47f05852b48ee9baefef80fa3d8cea60efa4753c0013121dd7fe5eef2e5c729d',
+        'org.glassfish.jaxb:jaxb-runtime:2.3.1:jaxb-runtime-2.3.1.jar:45fecfa5c8217ce1f3652ab95179790ec8cc0dec0384bca51cbeb94a293d9f2f',
+        'org.glassfish.jaxb:txw2:2.3.1:txw2-2.3.1.jar:34975dde1c6920f1a39791142235689bc3cd357e24d05edd8ff93b885bd68d60',
+        'org.hamcrest:hamcrest-core:2.1:hamcrest-core-2.1.jar:e09109e54a289d88506b9bfec987ddd199f4217c9464132668351b9a4f00bee9',
+        'org.hamcrest:hamcrest-library:2.1:hamcrest-library-2.1.jar:b7e2b6895b3b679f0e47b6380fda391b225e9b78505db9d8bdde8d3cc8d52a21',
+        'org.hamcrest:hamcrest:2.1:hamcrest-2.1.jar:ba93b2e3a562322ba432f0a1b53addcc55cb188253319a020ed77f824e692050',
+        'org.jetbrains.kotlin:kotlin-reflect:1.3.72:kotlin-reflect-1.3.72.jar:a188d9367de1c4ee9479db630985c0597b20709c83161b1430d24edb27e38c40',
+        'org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72:kotlin-stdlib-common-1.3.72.jar:5e7d1552863e480c1628b1cc39ce230ef829f5b7230106215a05acda5172203a',
+        'org.jetbrains.kotlin:kotlin-stdlib-common:1.4.20:kotlin-stdlib-common-1.4.20.jar:a7112c9b3cefee418286c9c9372f7af992bd1e6e030691d52f60cb36dbec8320',
+        'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72:kotlin-stdlib-jdk7-1.3.72.jar:40566c0c08d414b9413ba556ff7f8a0b04b98b9f0f424d122dd2088510efccc4',
+        'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72:kotlin-stdlib-jdk8-1.3.72.jar:133da70cfc07b56094282eac5c59bccd59f167ee2ead22e5282876d8bc10bf95',
+        'org.jetbrains.kotlin:kotlin-stdlib:1.3.72:kotlin-stdlib-1.3.72.jar:3856a7349ebacd6d1be6802b2fed9c4dc2c5a564ea92b6b945ac988243d4b16b',
+        'org.jetbrains.kotlin:kotlin-stdlib:1.4.20:kotlin-stdlib-1.4.20.jar:b8ab1da5cdc89cb084d41e1f28f20a42bd431538642a5741c52bbfae3fa3e656',
+        'org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.1.0:kotlinx-metadata-jvm-0.1.0.jar:9753bb39efef35957c5c15df9a3cb769aabf2cdfa74b47afcb7760e5146be3b5',
+        'org.jetbrains.trove4j:trove4j:20160824:trove4j-20160824.jar:1917871c8deb468307a584680c87a44572f5a8b0b98c6d397fc0f5f86596dbe7',
+        'org.jetbrains:annotations:13.0:annotations-13.0.jar:ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478',
+        'org.jmock:jmock-imposters:2.12.0:jmock-imposters-2.12.0.jar:3b836269745a137c9b2347e8d7c2104845b126ef04f012d6bfd94f1a7dea7b09',
+        'org.jmock:jmock-junit4:2.12.0:jmock-junit4-2.12.0.jar:3233062fc889637c151a24f1ee086bad04321ab7d8264fef279daff0fa27205b',
+        'org.jmock:jmock-legacy:2.12.0:jmock-legacy-2.12.0.jar:dea3a9cca653d082e2fe7e40232e982fe03a9984c7d67ceff24f3e03fe580dcd',
+        'org.jmock:jmock-testjar:2.12.0:jmock-testjar-2.12.0.jar:efefbcf6cd294d0e29f0c46eb2a3380d4ca4e1763ff719c69e2f2ac62f564a04',
+        'org.jmock:jmock:2.12.0:jmock-2.12.0.jar:266d07314c0cd343c46ff8a55601272de8cf406807caf55e6f313295f83d10be',
+        'org.jvnet.staxex:stax-ex:1.8:stax-ex-1.8.jar:95b05d9590af4154c6513b9c5dc1fb2e55b539972ba0a9ef28e9a0c01d83ad77',
+        'org.objenesis:objenesis:3.0.1:objenesis-3.0.1.jar:7a8ff780b9ff48415d7c705f60030b0acaa616e7f823c98eede3b63508d4e984',
+        'org.ow2.asm:asm-analysis:7.0:asm-analysis-7.0.jar:e981f8f650c4d900bb033650b18e122fa6b161eadd5f88978d08751f72ee8474',
+        'org.ow2.asm:asm-commons:7.0:asm-commons-7.0.jar:fed348ef05958e3e846a3ac074a12af5f7936ef3d21ce44a62c4fa08a771927d',
+        'org.ow2.asm:asm-tree:7.0:asm-tree-7.0.jar:cfd7a0874f9de36a999c127feeadfbfe6e04d4a71ee954d7af3d853f0be48a6c',
+        'org.ow2.asm:asm-util:7.0:asm-util-7.0.jar:75fbbca440ef463f41c2b0ab1a80abe67e910ac486da60a7863cbcb5bae7e145',
+        'org.ow2.asm:asm:7.0:asm-7.0.jar:b88ef66468b3c978ad0c97fd6e90979e56155b4ac69089ba7a44e9aa7ffe9acf',
+        'org.ow2.asm:asm:7.1:asm-7.1.jar:4ab2fa2b6d2cc9ccb1eaa05ea329c407b47b13ed2915f62f8c4b8cc96258d4de',
+    ]
+}

bramble-api/build.gradle

@@ -1,31 +1,21 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
-sourceCompatibility = 1.6
+sourceCompatibility = 1.8
-targetCompatibility = 1.6
+targetCompatibility = 1.8
 
+apply plugin: 'ru.vyarus.animalsniffer'
 apply plugin: 'witness'
+apply from: 'witness.gradle'
 
 dependencies {
-	compile "com.google.dagger:dagger:2.0.2"
+	implementation "com.google.dagger:dagger:$dagger_version"
-	compile 'com.google.dagger:dagger-compiler:2.0.2'
+	implementation 'com.google.code.findbugs:jsr305:3.0.2'
-	compile 'com.google.code.findbugs:jsr305:3.0.2'
 
-	testCompile 'junit:junit:4.12'
+	testImplementation "junit:junit:$junit_version"
-	testCompile "org.jmock:jmock:2.8.2"
+	testImplementation "org.jmock:jmock:$jmock_version"
-	testCompile "org.jmock:jmock-junit4:2.8.2"
+	testImplementation "org.jmock:jmock-junit4:$jmock_version"
-	testCompile "org.jmock:jmock-legacy:2.8.2"
+	testImplementation "org.jmock:jmock-legacy:$jmock_version"
-	testCompile "org.hamcrest:hamcrest-library:1.3"
-	testCompile "org.hamcrest:hamcrest-core:1.3"
-}
 
-dependencyVerification {
+	signature 'org.codehaus.mojo.signature:java16:1.1@signature'
-	verify = [
-			'com.google.dagger:dagger:84c0282ed8be73a29e0475d639da030b55dee72369e58dd35ae7d4fe6243dcf9',
-			'com.google.dagger:dagger-compiler:b74bc9de063dd4c6400b232231f2ef5056145b8fbecbf5382012007dd1c071b3',
-			'com.google.code.findbugs:jsr305:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
-			'javax.inject:javax.inject:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
-			'com.google.dagger:dagger-producers:99ec15e8a0507ba569e7655bc1165ee5e5ca5aa914b3c8f7e2c2458f724edd6b',
-			'com.google.guava:guava:d664fbfc03d2e5ce9cab2a44fb01f1d0bf9dfebeccc1a473b1f9ea31f79f6f99',
-	]
 }
 
 // needed to make test output available to bramble-core and briar-core

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

@@ -4,8 +4,8 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.util.StringUtils;
 
 import java.util.Arrays;
-import java.util.Comparator;
 
+import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 
 /**
@@ -15,8 +15,6 @@ import javax.annotation.concurrent.ThreadSafe;
 @NotNullByDefault
 public class Bytes implements Comparable<Bytes> {
 
-	public static final BytesComparator COMPARATOR = new BytesComparator();
-
 	private final byte[] bytes;
 
 	private int hashCode = -1;
@@ -38,20 +36,13 @@ public class Bytes implements Comparable<Bytes> {
 	}
 
 	@Override
-	public boolean equals(Object o) {
+	public boolean equals(@Nullable Object o) {
 		return o instanceof Bytes && Arrays.equals(bytes, ((Bytes) o).bytes);
 	}
 
 	@Override
 	public int compareTo(Bytes other) {
-		byte[] aBytes = bytes, bBytes = other.bytes;
+		return compare(bytes, other.bytes);
-		int length = Math.min(aBytes.length, bBytes.length);
-		for (int i = 0; i < length; i++) {
-			int aUnsigned = aBytes[i] & 0xFF, bUnsigned = bBytes[i] & 0xFF;
-			if (aUnsigned < bUnsigned) return -1;
-			if (aUnsigned > bUnsigned) return 1;
-		}
-		return aBytes.length - bBytes.length;
 	}
 
 	@Override
@@ -60,11 +51,13 @@ public class Bytes implements Comparable<Bytes> {
 				"(" + StringUtils.toHexString(getBytes()) + ")";
 	}
 
-	public static class BytesComparator implements Comparator<Bytes> {
+	public static int compare(byte[] a, byte[] b) {
-
+		int length = Math.min(a.length, b.length);
-		@Override
+		for (int i = 0; i < length; i++) {
-		public int compare(Bytes a, Bytes b) {
+			int aUnsigned = a[i] & 0xFF, bUnsigned = b[i] & 0xFF;
-			return a.compareTo(b);
+			if (aUnsigned < bUnsigned) return -1;
+			if (aUnsigned > bUnsigned) return 1;
 		}
+		return a.length - b.length;
 	}
 }

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

@@ -0,0 +1,9 @@
+package org.briarproject.bramble.api;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+@NotNullByDefault
+public interface Consumer<T> {
+
+	void accept(T t);
+}

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

@@ -0,0 +1,19 @@
+package org.briarproject.bramble.api;
+
+/**
+ * Interface for specifying which features are enabled in a build.
+ */
+public interface FeatureFlags {
+
+	boolean shouldEnableImageAttachments();
+
+	boolean shouldEnableProfilePictures();
+
+	boolean shouldEnableDisappearingMessages();
+
+	boolean shouldEnableConnectViaBluetooth();
+
+	boolean shouldEnableShareAppViaOfflineHotspot();
+
+	boolean shouldEnableTransferData();
+}

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

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

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

@@ -0,0 +1,26 @@
+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/Predicate.java

@@ -0,0 +1,9 @@
+package org.briarproject.bramble.api;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+@NotNullByDefault
+public interface Predicate<T> {
+
+	boolean test(T t);
+}

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

@@ -38,4 +38,18 @@ 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/UnsupportedVersionException.java

@@ -0,0 +1,18 @@
+package org.briarproject.bramble.api;
+
+/**
+ * Thrown when data being parsed uses a protocol or format version that is not
+ * supported.
+ */
+public class UnsupportedVersionException extends FormatException {
+
+	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/account/AccountManager.java

@@ -0,0 +1,71 @@
+package org.briarproject.bramble.api.account;
+
+import org.briarproject.bramble.api.crypto.DecryptionException;
+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
+	 * {@link #deleteAccount()} is called or 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 {@link #deleteAccount()} is called or the process
+	 * exits.
+	 */
+	@Nullable
+	SecretKey getDatabaseKey();
+
+	/**
+	 * Returns true if the encrypted database key can be loaded from disk.
+	 */
+	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. {@link #accountExists()} will
+	 * return true after this method returns true.
+	 */
+	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.
+	 *
+	 * @throws DecryptionException If the database key could not be loaded and
+	 * decrypted.
+	 */
+	void signIn(String password) throws DecryptionException;
+
+	/**
+	 * 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.
+	 *
+	 * @throws DecryptionException If the database key could not be loaded and
+	 * decrypted.
+	 */
+	void changePassword(String oldPassword, String newPassword)
+			throws DecryptionException;
+}

bramble-api/src/main/java/org/briarproject/bramble/api/battery/BatteryManager.java

@@ -0,0 +1,6 @@
+package org.briarproject.bramble.api.battery;
+
+public interface BatteryManager {
+
+	boolean isCharging();
+}

bramble-api/src/main/java/org/briarproject/bramble/api/battery/event/BatteryEvent.java

@@ -0,0 +1,19 @@
+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/cleanup/CleanupHook.java

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

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

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

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

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

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

@@ -0,0 +1,68 @@
+package org.briarproject.bramble.api.client;
+
+import org.briarproject.bramble.api.FormatException;
+import org.briarproject.bramble.api.data.BdfDictionary;
+import org.briarproject.bramble.api.data.BdfList;
+import org.briarproject.bramble.api.data.MetadataParser;
+import org.briarproject.bramble.api.db.DatabaseComponent;
+import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.db.Metadata;
+import org.briarproject.bramble.api.db.Transaction;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.sync.InvalidMessageException;
+import org.briarproject.bramble.api.sync.Message;
+import org.briarproject.bramble.api.sync.validation.IncomingMessageHook;
+
+import javax.annotation.concurrent.Immutable;
+
+@Immutable
+@NotNullByDefault
+public abstract class BdfIncomingMessageHook implements IncomingMessageHook {
+
+	protected final DatabaseComponent db;
+	protected final ClientHelper clientHelper;
+	protected final MetadataParser metadataParser;
+
+	protected BdfIncomingMessageHook(DatabaseComponent db,
+			ClientHelper clientHelper, MetadataParser metadataParser) {
+		this.db = db;
+		this.clientHelper = clientHelper;
+		this.metadataParser = metadataParser;
+	}
+
+	/**
+	 * Called once for each incoming message that passes validation.
+	 * <p>
+	 * If an unexpected exception occurs while handling data that is assumed
+	 * to be valid (e.g. locally created metadata), it may be sensible to
+	 * rethrow the unexpected exception as a DbException so that delivery is
+	 * attempted again at next startup. This will allow delivery to succeed if
+	 * the unexpected exception was caused by a bug that has subsequently been
+	 * fixed.
+	 *
+	 * @param txn A read-write transaction
+	 * @throws DbException if a database error occurs while delivering the
+	 * message. Delivery will be attempted again at next startup. Throwing
+	 * this exception has the same effect as returning
+	 * {@link DeliveryAction#DEFER}.
+	 * @throws FormatException if the message is invalid in the context of its
+	 * dependencies. The message and any dependents will be marked as invalid
+	 * and deleted along with their metadata. Throwing this exception has the
+	 * same effect as returning {@link DeliveryAction#REJECT}.
+	 */
+	protected abstract DeliveryAction incomingMessage(Transaction txn,
+			Message m, BdfList body, BdfDictionary meta)
+			throws DbException, FormatException;
+
+	@Override
+	public DeliveryAction incomingMessage(Transaction txn, Message m,
+			Metadata meta) throws DbException, InvalidMessageException {
+		try {
+			BdfList body = clientHelper.toList(m);
+			BdfDictionary metaDictionary = metadataParser.parse(meta);
+			return incomingMessage(txn, m, body, metaDictionary);
+		} catch (FormatException e) {
+			throw new InvalidMessageException(e);
+		}
+	}
+}

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

@@ -23,7 +23,7 @@ public class BdfMessageContext {
 	}
 
 	public BdfMessageContext(BdfDictionary dictionary) {
-		this(dictionary, Collections.<MessageId>emptyList());
+		this(dictionary, Collections.emptyList());
 	}
 
 	public BdfDictionary getDictionary() {

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

@@ -9,14 +9,13 @@ import org.briarproject.bramble.api.sync.Group;
 import org.briarproject.bramble.api.sync.InvalidMessageException;
 import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageContext;
-import org.briarproject.bramble.api.sync.ValidationManager.MessageValidator;
+import org.briarproject.bramble.api.sync.validation.MessageValidator;
 import org.briarproject.bramble.api.system.Clock;
 
 import java.util.logging.Logger;
 
 import javax.annotation.concurrent.Immutable;
 
-import static org.briarproject.bramble.api.sync.SyncConstants.MESSAGE_HEADER_LENGTH;
 import static org.briarproject.bramble.api.transport.TransportConstants.MAX_CLOCK_DIFFERENCE;
 
 @Immutable
@@ -49,14 +48,9 @@ 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 body = clientHelper.toList(raw, MESSAGE_HEADER_LENGTH,
+			BdfList bodyList = clientHelper.toList(m.getBody());
-					raw.length - MESSAGE_HEADER_LENGTH);
+			BdfMessageContext result = validateMessage(m, g, bodyList);
-			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

@@ -1,20 +1,25 @@
 package org.briarproject.bramble.api.client;
 
 import org.briarproject.bramble.api.FormatException;
+import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.crypto.PrivateKey;
+import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.data.BdfDictionary;
 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;
 
 import java.security.GeneralSecurityException;
+import java.util.Collection;
 import java.util.Map;
 
-import javax.annotation.Nullable;
-
 @NotNullByDefault
 public interface ClientHelper {
 
@@ -22,23 +27,22 @@ public interface ClientHelper {
 			throws DbException, FormatException;
 
 	void addLocalMessage(Transaction txn, Message m, BdfDictionary metadata,
-			boolean shared) throws DbException, FormatException;
+			boolean shared, boolean temporary)
+			throws DbException, FormatException;
+
+	Message createMessage(GroupId g, long timestamp, byte[] body);
 
 	Message createMessage(GroupId g, long timestamp, BdfList body)
 			throws FormatException;
 
 	Message createMessageForStoringMetadata(GroupId g);
 
-	@Nullable
 	Message getMessage(MessageId m) throws DbException;
 
-	@Nullable
 	Message getMessage(Transaction txn, MessageId m) throws DbException;
 
-	@Nullable
 	BdfList getMessageAsList(MessageId m) throws DbException, FormatException;
 
-	@Nullable
 	BdfList getMessageAsList(Transaction txn, MessageId m) throws DbException,
 			FormatException;
 
@@ -48,9 +52,11 @@ public interface ClientHelper {
 	BdfDictionary getGroupMetadataAsDictionary(Transaction txn, GroupId g)
 			throws DbException, FormatException;
 
+	Collection<MessageId> getMessageIds(Transaction txn, GroupId g,
+			BdfDictionary query) throws DbException, FormatException;
+
 	BdfDictionary getMessageMetadataAsDictionary(MessageId m)
-			throws DbException,
+			throws DbException, FormatException;
-			FormatException;
 
 	BdfDictionary getMessageMetadataAsDictionary(Transaction txn, MessageId m)
 			throws DbException, FormatException;
@@ -87,16 +93,47 @@ 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;
 
-	byte[] sign(String label, BdfList toSign, byte[] privateKey)
+	BdfList toList(Author a);
+
+	byte[] sign(String label, BdfList toSign, PrivateKey privateKey)
 			throws FormatException, GeneralSecurityException;
 
-	void verifySignature(String label, byte[] sig, byte[] publicKey,
+	void verifySignature(byte[] signature, String label, BdfList signed,
-			BdfList signed) throws FormatException, GeneralSecurityException;
+			PublicKey publicKey)
+			throws FormatException, GeneralSecurityException;
 
+	Author parseAndValidateAuthor(BdfList author) throws FormatException;
+
+	PublicKey parseAndValidateAgreementPublicKey(byte[] publicKeyBytes)
+			throws FormatException;
+
+	TransportProperties parseAndValidateTransportProperties(
+			BdfDictionary properties) throws FormatException;
+
+	Map<TransportId, TransportProperties> parseAndValidateTransportPropertiesMap(
+			BdfDictionary properties) throws FormatException;
+
+	/**
+	 * Retrieves the contact ID from the group metadata of the given contact
+	 * group.
+	 */
+	ContactId getContactId(Transaction txn, GroupId contactGroupId)
+			throws DbException, FormatException;
+
+	/**
+	 * Stores the given contact ID in the group metadata of the given contact
+	 * group.
+	 */
+	void setContactId(Transaction txn, GroupId contactGroupId, ContactId c)
+			throws DbException;
 }

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

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

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

@@ -12,18 +12,19 @@ public interface ContactGroupFactory {
 	/**
 	 * Creates a group that is not shared with any contacts.
 	 */
-	Group createLocalGroup(ClientId clientId);
+	Group createLocalGroup(ClientId clientId, int majorVersion);
 
 	/**
 	 * Creates a group for the given client to share with the given contact.
 	 */
-	Group createContactGroup(ClientId clientId, Contact contact);
+	Group createContactGroup(ClientId clientId, int majorVersion,
+			Contact contact);
 
 	/**
 	 * Creates a group for the given client to share between the given authors
 	 * identified by their AuthorIds.
 	 */
-	Group createContactGroup(ClientId clientId, AuthorId authorId1,
+	Group createContactGroup(ClientId clientId, int majorVersion,
-			AuthorId authorId2);
+			AuthorId authorId1, AuthorId authorId2);
 
 }

bramble-api/src/main/java/org/briarproject/bramble/api/connection/ConnectionManager.java

@@ -0,0 +1,49 @@
+package org.briarproject.bramble.api.connection;
+
+import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.contact.PendingContactId;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.plugin.TransportConnectionReader;
+import org.briarproject.bramble.api.plugin.TransportConnectionWriter;
+import org.briarproject.bramble.api.plugin.TransportId;
+import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
+
+@NotNullByDefault
+public interface ConnectionManager {
+
+	/**
+	 * Manages an incoming connection from a contact over a simplex transport.
+	 */
+	void manageIncomingConnection(TransportId t, TransportConnectionReader r);
+
+	/**
+	 * Manages an incoming connection from a contact over a duplex transport.
+	 */
+	void manageIncomingConnection(TransportId t, DuplexTransportConnection d);
+
+	/**
+	 * Manages an incoming handshake connection from a pending contact over a
+	 * duplex transport.
+	 */
+	void manageIncomingConnection(PendingContactId p, TransportId t,
+			DuplexTransportConnection d);
+
+	/**
+	 * Manages an outgoing connection to a contact over a simplex transport.
+	 */
+	void manageOutgoingConnection(ContactId c, TransportId t,
+			TransportConnectionWriter w);
+
+	/**
+	 * Manages an outgoing connection to a contact over a duplex transport.
+	 */
+	void manageOutgoingConnection(ContactId c, TransportId t,
+			DuplexTransportConnection d);
+
+	/**
+	 * Manages an outgoing handshake connection to a pending contact over a
+	 * duplex transport.
+	 */
+	void manageOutgoingConnection(PendingContactId p, TransportId t,
+			DuplexTransportConnection d);
+}

bramble-api/src/main/java/org/briarproject/bramble/api/connection/ConnectionRegistry.java

@@ -0,0 +1,130 @@
+package org.briarproject.bramble.api.connection;
+
+import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.contact.PendingContactId;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.plugin.PluginConfig;
+import org.briarproject.bramble.api.plugin.TransportId;
+import org.briarproject.bramble.api.plugin.event.ConnectionClosedEvent;
+import org.briarproject.bramble.api.plugin.event.ConnectionOpenedEvent;
+import org.briarproject.bramble.api.plugin.event.ContactConnectedEvent;
+import org.briarproject.bramble.api.plugin.event.ContactDisconnectedEvent;
+import org.briarproject.bramble.api.rendezvous.event.RendezvousConnectionClosedEvent;
+import org.briarproject.bramble.api.rendezvous.event.RendezvousConnectionOpenedEvent;
+import org.briarproject.bramble.api.sync.Priority;
+
+import java.util.Collection;
+
+/**
+ * Keeps track of which contacts are currently connected by which transports.
+ */
+@NotNullByDefault
+public interface ConnectionRegistry {
+
+	/**
+	 * Registers an incoming connection from the given contact over the given
+	 * transport. The connection's {@link Priority priority} can be set later
+	 * via {@link #setPriority(ContactId, TransportId, InterruptibleConnection,
+	 * Priority)} if a priority record is received from the contact.
+	 * <p>
+	 * Broadcasts {@link ConnectionOpenedEvent}. Also broadcasts
+	 * {@link ContactConnectedEvent} if this is the only connection with the
+	 * contact.
+	 */
+	void registerIncomingConnection(ContactId c, TransportId t,
+			InterruptibleConnection conn);
+
+	/**
+	 * Registers an outgoing connection to the given contact over the given
+	 * transport.
+	 * <p>
+	 * Broadcasts {@link ConnectionOpenedEvent}. Also broadcasts
+	 * {@link ContactConnectedEvent} if this is the only connection with the
+	 * contact.
+	 * <p>
+	 * If the registry has any "better" connections with the given contact, the
+	 * given connection will be interrupted. If the registry has any "worse"
+	 * connections with the given contact, those connections will be
+	 * interrupted.
+	 * <p>
+	 * Connection A is considered "better" than connection B if both
+	 * connections have had their priorities set, and either A's transport is
+	 * {@link PluginConfig#getTransportPreferences() preferred} to B's, or
+	 * they use the same transport and A has higher {@link Priority priority}
+	 * than B.
+	 * <p>
+	 * For backward compatibility, connections without priorities are not
+	 * considered better or worse than other connections.
+	 */
+	void registerOutgoingConnection(ContactId c, TransportId t,
+			InterruptibleConnection conn, Priority priority);
+
+	/**
+	 * Unregisters a connection with the given contact over the given transport.
+	 * <p>
+	 * Broadcasts {@link ConnectionClosedEvent}. Also broadcasts
+	 * {@link ContactDisconnectedEvent} if this is the only connection with
+	 * the contact.
+	 */
+	void unregisterConnection(ContactId c, TransportId t,
+			InterruptibleConnection conn, boolean incoming, boolean exception);
+
+	/**
+	 * Sets the {@link Priority priority} of a connection that was previously
+	 * registered via {@link #registerIncomingConnection(ContactId, TransportId,
+	 * InterruptibleConnection)}.
+	 * <p>
+	 * If the registry has any "better" connections with the given contact, the
+	 * given connection will be interrupted. If the registry has any "worse"
+	 * connections with the given contact, those connections will be
+	 * interrupted.
+	 * <p>
+	 * Connection A is considered "better" than connection B if both
+	 * connections have had their priorities set, and either A's transport is
+	 * {@link PluginConfig#getTransportPreferences() preferred} to B's, or
+	 * they use the same transport and A has higher {@link Priority priority}
+	 * than B.
+	 * <p>
+	 * For backward compatibility, connections without priorities are not
+	 * considered better or worse than other connections.
+	 */
+	void setPriority(ContactId c, TransportId t, InterruptibleConnection conn,
+			Priority priority);
+
+	/**
+	 * Returns any contacts that are connected via the given transport.
+	 */
+	Collection<ContactId> getConnectedContacts(TransportId t);
+
+	/**
+	 * Returns any contacts that are connected via the given transport or any
+	 * {@link PluginConfig#getTransportPreferences() better} transport.
+	 */
+	Collection<ContactId> getConnectedOrBetterContacts(TransportId t);
+
+	/**
+	 * Returns true if the given contact is connected via the given transport.
+	 */
+	boolean isConnected(ContactId c, TransportId t);
+
+	/**
+	 * Returns true if the given contact is connected via any transport.
+	 */
+	boolean isConnected(ContactId c);
+
+	/**
+	 * Registers a connection with the given pending contact. Broadcasts
+	 * {@link RendezvousConnectionOpenedEvent} if this is the only connection
+	 * with the pending contact.
+	 *
+	 * @return True if this is the only connection with the pending contact,
+	 * false if it is redundant and should be closed
+	 */
+	boolean registerConnection(PendingContactId p);
+
+	/**
+	 * Unregisters a connection with the given pending contact. Broadcasts
+	 * {@link RendezvousConnectionClosedEvent}.
+	 */
+	void unregisterConnection(PendingContactId p, boolean success);
+}

bramble-api/src/main/java/org/briarproject/bramble/api/connection/InterruptibleConnection.java

@@ -0,0 +1,19 @@
+package org.briarproject.bramble.api.connection;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+/**
+ * A duplex sync connection that can be closed by interrupting its outgoing
+ * sync session.
+ */
+@NotNullByDefault
+public interface InterruptibleConnection {
+
+	/**
+	 * Interrupts the connection's outgoing sync session. If the underlying
+	 * transport connection is alive and the remote peer is cooperative, this
+	 * should result in both sync sessions ending and the connection being
+	 * cleanly closed.
+	 */
+	void interruptOutgoingSession();
+}

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

@@ -1,11 +1,16 @@
 package org.briarproject.bramble.api.contact;
 
+import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorId;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
+import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
+import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
+import static org.briarproject.bramble.util.StringUtils.toUtf8;
+
 @Immutable
 @NotNullByDefault
 public class Contact {
@@ -13,15 +18,26 @@ public class Contact {
 	private final ContactId id;
 	private final Author author;
 	private final AuthorId localAuthorId;
-	private final boolean verified, active;
+	@Nullable
+	private final String alias;
+	@Nullable
+	private final PublicKey handshakePublicKey;
+	private final boolean verified;
 
 	public Contact(ContactId id, Author author, AuthorId localAuthorId,
-			boolean verified, boolean active) {
+			@Nullable String alias, @Nullable PublicKey handshakePublicKey,
+			boolean verified) {
+		if (alias != null) {
+			int aliasLength = toUtf8(alias).length;
+			if (aliasLength == 0 || aliasLength > MAX_AUTHOR_NAME_LENGTH)
+				throw new IllegalArgumentException();
+		}
 		this.id = id;
 		this.author = author;
 		this.localAuthorId = localAuthorId;
+		this.alias = alias;
+		this.handshakePublicKey = handshakePublicKey;
 		this.verified = verified;
-		this.active = active;
 	}
 
 	public ContactId getId() {
@@ -36,12 +52,18 @@ public class Contact {
 		return localAuthorId;
 	}
 
-	public boolean isVerified() {
+	@Nullable
-		return verified;
+	public String getAlias() {
+		return alias;
 	}
 
-	public boolean isActive() {
+	@Nullable
-		return active;
+	public PublicKey getHandshakePublicKey() {
+		return handshakePublicKey;
+	}
+
+	public boolean isVerified() {
+		return verified;
 	}
 
 	@Override

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

@@ -1,20 +0,0 @@
-package org.briarproject.bramble.api.contact;
-
-import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public interface ContactExchangeListener {
-
-	void contactExchangeSucceeded(Author remoteAuthor);
-
-	/**
-	 * The exchange failed because the contact already exists.
-	 */
-	void duplicateContact(Author remoteAuthor);
-
-	/**
-	 * A general failure.
-	 */
-	void contactExchangeFailed();
-}