Remove local author from contacts.

.gitignore

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

.gitlab-ci.yml

@@ -1,115 +1,27 @@
 image: briar/ci-image-android:latest
 
-stages:
+test:
-  - test
-  - optional_tests
-  - check_reproducibility
-
-variables:
-  GIT_SUBMODULE_STRATEGY: recursive
-
-workflow:
-  # when to create a CI pipeline
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-    - if: '$CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS'
-      when: never # avoids duplicate jobs for branch and MR
-    - if: '$CI_COMMIT_BRANCH'
-    - if: '$CI_COMMIT_TAG'
-
-.base-test:
   before_script:
     - set -e
     - export GRADLE_USER_HOME=$PWD/.gradle
+
   cache:
-    key: "$CI_COMMIT_REF_SLUG"
     paths:
       - .gradle/wrapper
       - .gradle/caches
+
+  script:
+    - ./gradlew --no-daemon -Djava.security.egd=file:/dev/urandom animalSnifferMain animalSnifferTest
+    - ./gradlew --no-daemon -Djava.security.egd=file:/dev/urandom test
+
   after_script:
-    # these file change every time and should not be cached
+    # these file change every time but should not be cached
     - rm -f $GRADLE_USER_HOME/caches/modules-2/modules-2.lock
     - rm -fr $GRADLE_USER_HOME/caches/*/plugin-resolution/
 
-test:
-  extends: .base-test
-  stage: test
-  script:
-    - git submodule update
-    - ./gradlew -Djava.security.egd=file:/dev/urandom animalSnifferMain animalSnifferTest
-    - ./gradlew -Djava.security.egd=file:/dev/urandom assembleOfficialDebug :briar-headless:linuxJars
-    - ./gradlew -Djava.security.egd=file:/dev/urandom compileOfficialDebugAndroidTestSources compileScreenshotDebugAndroidTestSources 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: manual
-    - 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[APP]='briar' -F variables[RELEASE_TAG]=${CI_COMMIT_REF_NAME} https://code.briarproject.org/api/v4/projects/61/trigger/pipeline"
+    - "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"
-    - "curl -X POST -F token=${RELEASE_JAR_CHECK_TOKEN} -F ref=main -F variables[APP]='briar-headless' -F variables[RELEASE_TAG]=${CI_COMMIT_REF_NAME} https://code.briarproject.org/api/v4/projects/307/trigger/pipeline"
   only:
     - tags
-
-mailbox integration test:
-  stage: optional_tests
-  extends: .base-test
-  rules:
-    - changes:
-        - mailbox-integration-tests/**/*
-      when: on_success
-      allow_failure: false
-    - if: '$CI_PIPELINE_SOURCE == "schedule"'
-      when: on_success
-    - if: '$CI_COMMIT_TAG == null'
-      when: manual
-      allow_failure: true # TODO figure out how not to allow failure while leaving this optional
-  script:
-    - (cd briar-mailbox; git fetch; git reset --hard origin/main)
-    - MAILBOX_INTEGRATION_TESTS=true ./gradlew --info mailbox-integration-tests:test
-
-db_performance_comparison_test:
-  extends: .base-test
-  stage: optional_tests
-  script:
-    - OPTIONAL_TESTS=org.briarproject.bramble.db.H2SqliteDatabasePerformanceComparisonTest ./gradlew --info -Djava.security.egd=file:/dev/urandom :bramble-core:test --tests H2SqliteDatabasePerformanceComparisonTest
-  rules:
-    - when: manual
-

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "briar-mailbox"]
-	path = briar-mailbox
-	url = https://code.briarproject.org/briar/briar-mailbox.git

.idea/codeStyles/Project.xml

@@ -1,7 +1,16 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <option name="RIGHT_MARGIN" value="100" />
+    <AndroidXmlCodeStyleSettings>
+      <option name="USE_CUSTOM_SETTINGS" value="true" />
+    </AndroidXmlCodeStyleSettings>
     <JavaCodeStyleSettings>
       <option name="ANNOTATION_PARAMETER_WRAP" value="1" />
+      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+      <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+        <value />
+      </option>
       <option name="IMPORT_LAYOUT_TABLE">
         <value>
           <package name="android" withSubpackages="true" static="false" />
@@ -28,13 +37,36 @@
       <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
     </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <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>
+    <Objective-C-extensions>
+      <file>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+      </file>
+      <class>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+      </class>
+      <extensions>
+        <pair source="cpp" header="h" fileNamingConvention="NONE" />
+        <pair source="c" header="h" fileNamingConvention="NONE" />
+      </extensions>
+    </Objective-C-extensions>
+    <XML>
+      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+    </XML>
     <codeStyleSettings language="Groovy">
       <indentOptions>
         <option name="USE_TAB_CHARACTER" value="true" />
@@ -70,6 +102,7 @@
       </indentOptions>
     </codeStyleSettings>
     <codeStyleSettings language="XML">
+      <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
         <option name="USE_TAB_CHARACTER" value="true" />
@@ -82,8 +115,7 @@
               <match>
                 <AND>
                   <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>Namespace:</XML_NAMESPACE>
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
             </rule>
@@ -93,8 +125,7 @@
               <match>
                 <AND>
                   <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>Namespace:</XML_NAMESPACE>
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
               <order>BY_NAME</order>
@@ -105,7 +136,6 @@
               <match>
                 <AND>
                   <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -116,7 +146,6 @@
               <match>
                 <AND>
                   <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                 </AND>
               </match>
@@ -127,7 +156,6 @@
               <match>
                 <AND>
                   <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -138,7 +166,6 @@
               <match>
                 <AND>
                   <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -149,7 +176,6 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>^$</XML_NAMESPACE>
                 </AND>
               </match>
@@ -160,12 +186,64 @@
             <rule>
               <match>
                 <AND>
-                  <NAME>.*</NAME>
+                  <NAME>.*:layout_width</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>.*:layout_height</NAME>
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:layout_.*</NAME>
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:width</NAME>
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:height</NAME>
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
             </rule>
           </section>
           <section>
@@ -173,7 +251,6 @@
               <match>
                 <AND>
                   <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
                   <XML_NAMESPACE>.*</XML_NAMESPACE>
                 </AND>
               </match>
@@ -185,9 +262,9 @@
     </codeStyleSettings>
     <codeStyleSettings language="kotlin">
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-      <indentOptions>
+      <option name="PARAMETER_ANNOTATION_WRAP" value="1" />
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      <option name="VARIABLE_ANNOTATION_WRAP" value="1" />
-      </indentOptions>
+      <option name="ENUM_CONSTANTS_WRAP" value="1" />
     </codeStyleSettings>
   </code_scheme>
 </component>

.idea/dictionaries/briar.xml

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

.idea/inspectionProfiles/Project_Default.xml

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

.idea/runConfigurations/All_in_briar_headless.xml

@@ -0,0 +1,20 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="All in briar-headless" type="AndroidJUnit" factoryName="Android JUnit" nameIsGenerated="true">
+    <module name="briar-headless" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" />
+    <option name="PACKAGE_NAME" value="org.briarproject.briar.headless" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="package" />
+    <option name="VM_PARAMETERS" value="" />
+    <option name="PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/briar-headless" />
+    <option name="PASS_PARENT_ENVS" value="true" />
+    <option name="TEST_SEARCH_SCOPE">
+      <value defaultName="singleModule" />
+    </option>
+    <patterns />
+    <method />
+  </configuration>
+</component>

.idea/runConfigurations/All_tests.xml

@@ -1,32 +1,30 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="All tests" type="AndroidJUnit" factoryName="Android JUnit">
-    <ExternalSystemSettings>
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="executionName" />
+    <module name="briar-android" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="externalSystemIdString" value="GRADLE" />
+    <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="scriptParameters" value="" />
+    <option name="PACKAGE_NAME" value="" />
-      <option name="taskDescriptions">
+    <option name="MAIN_CLASS_NAME" value="" />
-        <list />
+    <option name="METHOD_NAME" value="" />
-      </option>
+    <option name="TEST_OBJECT" value="package" />
-      <option name="taskNames">
+    <option name="VM_PARAMETERS" value="-ea" />
-        <list>
+    <option name="PARAMETERS" value="" />
-          <option value=":briar-android:testOfficialDebugUnitTest" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/briar-android" />
-          <option value=":briar-android:testScreenshotDebugUnitTest" />
+    <option name="ENV_VARIABLES" />
-        </list>
+    <option name="PASS_PARENT_ENVS" value="true" />
-      </option>
+    <option name="TEST_SEARCH_SCOPE">
-      <option name="vmOptions" value="" />
+      <value defaultName="singleModule" />
-    </ExternalSystemSettings>
+    </option>
-    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
+    <envs />
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <patterns />
-    <DebugAllEnabled>false</DebugAllEnabled>
+    <method>
-    <method v="2">
+      <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-api" run_configuration_type="GradleRunConfiguration" />
+      <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-core" run_configuration_type="GradleRunConfiguration" />
+      <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="GradleRunConfiguration" />
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-java" run_configuration_type="AndroidJUnit" />
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-android" run_configuration_type="GradleRunConfiguration" />
+      <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-api" run_configuration_type="GradleRunConfiguration" />
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All in briar-headless" run_configuration_type="AndroidJUnit" />
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in briar-core" run_configuration_type="GradleRunConfiguration" />
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in briar-headless" run_configuration_type="GradleRunConfiguration" />
     </method>
   </configuration>
 </component>

.idea/runConfigurations/All_tests_in_bramble_android.xml

@@ -1,23 +1,20 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests in bramble-android" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="All tests in bramble-android" type="AndroidJUnit" factoryName="Android JUnit">
-    <ExternalSystemSettings>
+    <module name="bramble-android" />
-      <option name="executionName" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+    <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="externalSystemIdString" value="GRADLE" />
+    <option name="PACKAGE_NAME" value="" />
-      <option name="scriptParameters" value="" />
+    <option name="MAIN_CLASS_NAME" value="" />
-      <option name="taskDescriptions">
+    <option name="METHOD_NAME" value="" />
-        <list />
+    <option name="TEST_OBJECT" value="package" />
-      </option>
+    <option name="VM_PARAMETERS" value="-ea" />
-      <option name="taskNames">
+    <option name="PARAMETERS" value="" />
-        <list>
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-android" />
-          <option value=":bramble-android:testDebugUnitTest" />
+    <option name="PASS_PARENT_ENVS" value="true" />
-        </list>
+    <option name="TEST_SEARCH_SCOPE">
-      </option>
+      <value defaultName="singleModule" />
-      <option name="vmOptions" value="" />
+    </option>
-    </ExternalSystemSettings>
+    <patterns />
-    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
+    <method />
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
   </configuration>
 </component>

.idea/runConfigurations/All_tests_in_bramble_api.xml

@@ -1,25 +1,20 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests in bramble-api" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="All tests in bramble-api" type="AndroidJUnit" factoryName="Android JUnit">
-    <ExternalSystemSettings>
+    <module name="bramble-api" />
-      <option name="executionName" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+    <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="externalSystemIdString" value="GRADLE" />
+    <option name="PACKAGE_NAME" value="" />
-      <option name="scriptParameters" value="" />
+    <option name="MAIN_CLASS_NAME" value="" />
-      <option name="taskDescriptions">
+    <option name="METHOD_NAME" value="" />
-        <list />
+    <option name="TEST_OBJECT" value="package" />
-      </option>
+    <option name="VM_PARAMETERS" value="-ea" />
-      <option name="taskNames">
+    <option name="PARAMETERS" value="" />
-        <list>
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-api" />
-          <option value=":bramble-api:animalSnifferMain" />
+    <option name="PASS_PARENT_ENVS" value="true" />
-          <option value=":bramble-api:animalSnifferTest" />
+    <option name="TEST_SEARCH_SCOPE">
-          <option value=":bramble-api:test" />
+      <value defaultName="singleModule" />
-        </list>
+    </option>
-      </option>
+    <patterns />
-      <option name="vmOptions" value="" />
+    <method />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
   </configuration>
 </component>

.idea/runConfigurations/All_tests_in_bramble_core.xml

@@ -1,25 +1,20 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests in bramble-core" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="All tests in bramble-core" type="AndroidJUnit" factoryName="Android JUnit">
-    <ExternalSystemSettings>
+    <module name="bramble-core" />
-      <option name="executionName" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+    <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="externalSystemIdString" value="GRADLE" />
+    <option name="PACKAGE_NAME" value="" />
-      <option name="scriptParameters" value="" />
+    <option name="MAIN_CLASS_NAME" value="" />
-      <option name="taskDescriptions">
+    <option name="METHOD_NAME" value="" />
-        <list />
+    <option name="TEST_OBJECT" value="package" />
-      </option>
+    <option name="VM_PARAMETERS" value="-ea" />
-      <option name="taskNames">
+    <option name="PARAMETERS" value="" />
-        <list>
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-core" />
-          <option value=":bramble-core:animalSnifferMain" />
+    <option name="PASS_PARENT_ENVS" value="true" />
-          <option value=":bramble-core:animalSnifferTest" />
+    <option name="TEST_SEARCH_SCOPE">
-          <option value=":bramble-core:test" />
+      <value defaultName="singleModule" />
-        </list>
+    </option>
-      </option>
+    <patterns />
-      <option name="vmOptions" value="" />
+    <method />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
   </configuration>
 </component>

.idea/runConfigurations/All_tests_in_bramble_java.xml

@@ -1,23 +1,20 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests in bramble-java" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="All tests in bramble-java" type="AndroidJUnit" factoryName="Android JUnit">
-    <ExternalSystemSettings>
+    <module name="bramble-java" />
-      <option name="executionName" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+    <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="externalSystemIdString" value="GRADLE" />
+    <option name="PACKAGE_NAME" value="" />
-      <option name="scriptParameters" value="" />
+    <option name="MAIN_CLASS_NAME" value="" />
-      <option name="taskDescriptions">
+    <option name="METHOD_NAME" value="" />
-        <list />
+    <option name="TEST_OBJECT" value="package" />
-      </option>
+    <option name="VM_PARAMETERS" value="-ea -Djava.library.path=libs" />
-      <option name="taskNames">
+    <option name="PARAMETERS" value="" />
-        <list>
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-java" />
-          <option value=":bramble-java:test" />
+    <option name="PASS_PARENT_ENVS" value="true" />
-        </list>
+    <option name="TEST_SEARCH_SCOPE">
-      </option>
+      <value defaultName="singleModule" />
-      <option name="vmOptions" value="" />
+    </option>
-    </ExternalSystemSettings>
+    <patterns />
-    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
+    <method />
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
   </configuration>
 </component>

.idea/runConfigurations/All_tests_in_briar_android.xml

@@ -1,24 +1,20 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests in briar-android" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="All tests in briar-android" type="AndroidJUnit" factoryName="Android JUnit">
-    <ExternalSystemSettings>
+    <module name="briar-android" />
-      <option name="executionName" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+    <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="externalSystemIdString" value="GRADLE" />
+    <option name="PACKAGE_NAME" value="" />
-      <option name="scriptParameters" value="" />
+    <option name="MAIN_CLASS_NAME" value="" />
-      <option name="taskDescriptions">
+    <option name="METHOD_NAME" value="" />
-        <list />
+    <option name="TEST_OBJECT" value="package" />
-      </option>
+    <option name="VM_PARAMETERS" value="-ea" />
-      <option name="taskNames">
+    <option name="PARAMETERS" value="" />
-        <list>
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/briar-android" />
-          <option value=":briar-android:testOfficialDebugUnitTest" />
+    <option name="PASS_PARENT_ENVS" value="true" />
-          <option value=":briar-android:testScreenshotDebugUnitTest" />
+    <option name="TEST_SEARCH_SCOPE">
-        </list>
+      <value defaultName="singleModule" />
-      </option>
+    </option>
-      <option name="vmOptions" value="" />
+    <patterns />
-    </ExternalSystemSettings>
+    <method />
-    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
   </configuration>
 </component>

.idea/runConfigurations/All_tests_in_briar_api.xml

@@ -1,25 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests in briar-api" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value=":briar-api:animalSnifferMain" />
-          <option value=":briar-api:animalSnifferTest" />
-          <option value=":briar-api:test" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
-  </configuration>
-</component>

.idea/runConfigurations/All_tests_in_briar_core.xml

@@ -1,25 +1,20 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests in briar-core" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="All tests in briar-core" type="AndroidJUnit" factoryName="Android JUnit">
-    <ExternalSystemSettings>
+    <module name="briar-core" />
-      <option name="executionName" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+    <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="externalSystemIdString" value="GRADLE" />
+    <option name="PACKAGE_NAME" value="" />
-      <option name="scriptParameters" value="" />
+    <option name="MAIN_CLASS_NAME" value="" />
-      <option name="taskDescriptions">
+    <option name="METHOD_NAME" value="" />
-        <list />
+    <option name="TEST_OBJECT" value="package" />
-      </option>
+    <option name="VM_PARAMETERS" value="-ea" />
-      <option name="taskNames">
+    <option name="PARAMETERS" value="" />
-        <list>
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/briar-core" />
-          <option value=":briar-core:animalSnifferMain" />
+    <option name="PASS_PARENT_ENVS" value="true" />
-          <option value=":briar-core:animalSnifferTest" />
+    <option name="TEST_SEARCH_SCOPE">
-          <option value=":briar-core:test" />
+      <value defaultName="singleModule" />
-        </list>
+    </option>
-      </option>
+    <patterns />
-      <option name="vmOptions" value="" />
+    <method />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
   </configuration>
 </component>

.idea/runConfigurations/All_tests_in_briar_headless.xml

@@ -1,23 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests in briar-headless" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value=":briar-headless:test" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
-  </configuration>
-</component>

.idea/runConfigurations/All_tests_in_mailbox_integration_tests.xml

@@ -1,29 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests in mailbox-integration-tests" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="env">
-        <map>
-          <entry key="MAILBOX_INTEGRATION_TESTS" value="true" />
-        </map>
-      </option>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value=":mailbox-integration-tests:test" />
-          <option value=":mailbox-integration-tests:cleanTest" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
-  </configuration>
-</component>

.idea/runConfigurations/H2_Performance_Test.xml

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

.idea/runConfigurations/HyperSQL_Performance_Test.xml

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

.idea/runConfigurations/Instrumentation_Tests__destroys_DB_.xml

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

.idea/runConfigurations/briar_headless.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="briar-headless" type="JetRunConfigurationType" singleton="true">
+  <configuration default="false" name="briar-headless" type="JetRunConfigurationType" factoryName="Kotlin" singleton="true">
-    <module name="briar.briar-headless" />
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <option name="VM_PARAMETERS" value="" />
     <option name="PROGRAM_PARAMETERS" value="-v" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -8,8 +8,9 @@
     <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">
+    <module name="briar-headless" />
-      <option name="Make" enabled="true" />
+    <envs />
+    <method>
       <option name="Gradle.BeforeRunTask" enabled="true" tasks="jar" externalProjectPath="$PROJECT_DIR$/briar-headless" vmOptions="" scriptParameters="" />
     </method>
   </configuration>

CONTRIBUTING.md

@@ -1,10 +0,0 @@
-Folder-Description:
-===================
-* `briar-*`: Specifically for the Briar app (Phone/Desktop/Headless)
-* `bramble-*`: The protocol stack - not necessarily Briar-dependent
-
----
-
-* `*-api`: public stuff that can be referenced from other packages and modules - mostly interfaces + a few utility classes
-* `*-core`: implementations of api that are portable across Android/Desktop/Headless
-* `*-java`: implementations of api that are specific to Desktop & Headless

README.md

@@ -1,39 +1 @@
-# Briar
+Briar is a messaging app designed for activists, journalists, and anyone else who needs a safe, easy and robust way to communicate. Unlike traditional messaging tools such as email, Twitter or Telegram, Briar doesn't rely on a central server - messages are synchronized directly between the users' devices. If the Internet's down, Briar can sync via Bluetooth or Wi-Fi, keeping the information flowing in a crisis. If the Internet's up, Briar can sync via the Tor network, protecting users and their relationships from surveillance.
-Briar is a messaging app designed for activists, journalists, and anyone else who needs a safe, easy and robust way to communicate.
-
-Unlike traditional messaging apps, Briar doesn't rely on a central server - messages are synchronized directly between the users' devices. 
-
-If the Internet's down, Briar can sync via Bluetooth or Wi-Fi, keeping information flowing in a crisis. If the Internet's up, Briar can sync via the Tor network, protecting users and their relationships from surveillance.
-
-## Download Briar
-
-[<img src="https://briarproject.org//img/fdroid_badge.png"  width="240">](https://briarproject.org/fdroid)
-[<img src="https://briarproject.org/img/google_play_badge_web_generic.png"  width="240">](https://play.google.com/store/apps/details?id=org.briarproject.briar.android)
-
-You can also [download the APK file](https://briarproject.org/apk) directly from
-our site.
-
-## Useful links
-[Project website](https://briarproject.org/)
-
-[Source code](https://code.briarproject.org/briar/briar/tree/master)
-
-[User manual](https://briarproject.org/manual/)
-
-[Wiki](https://code.briarproject.org/briar/briar/-/wikis/home)
-
-[Privacy policy](https://briarproject.org/privacy)
-
-## Reproducible builds
-
-We provide [docker images](https://code.briarproject.org/briar/briar-reproducer#briar-reproducer)
-to ease the task of verifying that the published APK binaries
-include nothing but our publicly available source code.
-
-You can either use those images or use them as a blueprint to build your own environment
-for reproduction.
-
-## Donate
-
-[![Donate using Liberapay](https://briarproject.org/img/liberapay.svg)](https://liberapay.com/Briar/donate)   
-Bitcoin and BCH: 1NZCKkUCtJV2U2Y9hDb9uq8S7ksFCFGR6K

TRANSLATION.md

@@ -1,9 +0,0 @@
-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,5 +3,3 @@ gen
 build
 .settings
 src/main/res/raw/*.zip
-src/main/jniLibs
-!src/main/jniLibs/.gitkeep

bramble-android/build.gradle

@@ -1,123 +1,70 @@
+import com.android.build.gradle.tasks.MergeResources
+
 apply plugin: 'com.android.library'
 apply plugin: 'witness'
 apply from: 'witness.gradle'
 
 android {
-	compileSdkVersion 33
+	compileSdkVersion 28
-	buildToolsVersion '33.0.0'
+	buildToolsVersion '28.0.3'
-
-	packagingOptions {
-		doNotStrip '**/*.so'
-	}
 
 	defaultConfig {
-		// FIXME: sqlite-jdbc-crypt uses __register_atfork which is only available on API >= 23.
+		minSdkVersion 14
-		//  We might be able to solve this by recompiling (or asking upstream to recompile)
+		targetSdkVersion 26
-		minSdkVersion 21
+		versionCode 10106
-		targetSdkVersion 33
+		versionName "1.1.6"
-		versionCode 10506
-		versionName "1.5.6"
 		consumerProguardFiles 'proguard-rules.txt'
 
-		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+		testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-		testInstrumentationRunnerArguments disableAnalytics: 'true'
 	}
 
 	compileOptions {
 		sourceCompatibility JavaVersion.VERSION_1_8
 		targetCompatibility JavaVersion.VERSION_1_8
 	}
-
-	lintOptions {
-		// FIXME
-		warning "LintError"
-		warning "InvalidPackage"
-		warning "MissingPermission"
-		warning "InlinedApi", "ObsoleteSdkInt", "Override", "NewApi", "UnusedAttribute"
-	}
 }
 
 configurations {
 	tor
-	sqliteJdbcCrypt
 }
 
 dependencies {
-	api 'org.briarproject:dont-kill-me-lib:0.2.7'
+	implementation project(path: ':bramble-core', configuration: 'default')
+	tor 'org.briarproject:tor-android:0.3.5.8@zip'
+	tor 'org.briarproject:obfs4proxy-android:0.0.9@zip'
 
-	// In theory this dependency shouldn't be needed, but without it Android Studio's linter will
+	annotationProcessor 'com.google.dagger:dagger-compiler:2.19'
-	// complain about unresolved symbols for bramble-api test classes in bramble-android tests,
-	// even though the bramble-api test classes are provided by the testImplementation dependency
-	// below and the compiler can find them
-	implementation project(':bramble-api')
-
-	implementation project(':bramble-core')
-
-	implementation 'androidx.annotation:annotation:1.5.0'
-	implementation "org.briarproject:onionwrapper-android:$onionwrapper_version"
-
-	tor "org.briarproject:tor-android:$tor_version"
-	tor "org.briarproject:obfs4proxy-android:$obfs4proxy_version"
-	tor "org.briarproject:snowflake-android:$snowflake_version"
-
-	sqliteJdbcCrypt "io.github.willena:sqlite-jdbc:$sqlite_jdbc_crypt_version"
-
-	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:4.12'
-	testImplementation "junit:junit:$junit_version"
+	testImplementation "org.jmock:jmock:2.8.2"
-	testImplementation "org.jmock:jmock:$jmock_version"
+	testImplementation "org.jmock:jmock-junit4:2.8.2"
-	testImplementation "org.jmock:jmock-junit4:$jmock_version"
+	testImplementation "org.jmock:jmock-legacy:2.8.2"
-	testImplementation "org.jmock:jmock-imposters:$jmock_version"
 }
 
-def jniLibsDir = 'src/main/jniLibs'
+def torBinariesDir = 'src/main/res/raw'
 
-task cleanJniLibs {
+task cleanTorBinaries {
-	inputs.dir jniLibsDir
-	outputs.dir jniLibsDir
 	doLast {
-		delete fileTree(jniLibsDir).filter { it.name.endsWith('.so') }
+		delete fileTree(torBinariesDir) { include '*.zip' }
 	}
 }
 
-clean.dependsOn cleanJniLibs
+clean.dependsOn cleanTorBinaries
 
-task unpackJniLibs {
+task unpackTorBinaries {
-	outputs.dir jniLibsDir
 	doLast {
-		// Tor
 		copy {
 			from configurations.tor.collect { zipTree(it) }
-			into jniLibsDir
+			into torBinariesDir
-		}
-		// sqlite-jdbc-crypt
-		def archMap = [
-				aarch64: 'arm64-v8a',
-				arm    : 'armeabi-v7a',
-				x86    : 'x86',
-				x86_64 : 'x86_64'
-		]
-		configurations.sqliteJdbcCrypt.collect { File artifact ->
-			zipTree(artifact).each { File f ->
-				for (String arch : archMap.keySet()) {
-					if (f.absolutePath.endsWith("/Linux-Android/$arch/libsqlitejdbc.so")) {
-						def archDir = new File(jniLibsDir, archMap.get(arch))
-						archDir.mkdirs()
-						copy {
-							from f
-							into archDir
-						}
-						break
-					}
-				}
-			}
 		}
 	}
-	dependsOn cleanJniLibs
+	dependsOn cleanTorBinaries
 }
 
-preBuild.dependsOn unpackJniLibs
+tasks.withType(MergeResources) {
+	inputs.dir torBinariesDir
+	dependsOn unpackTorBinaries
+}

bramble-android/proguard-rules.txt

@@ -1,14 +1,9 @@
-# Keep the H2 classes that are loaded via reflection
+-keep,includedescriptorclasses class org.briarproject.** { *; }
--keep class org.h2.Driver { *; }
+
--keep class org.h2.engine.Engine { *; }
+-keep class org.h2.** { *; }
--keep class org.h2.store.fs.** { *; }
-# Don't warn about unused dependencies of H2 classes
 -dontwarn org.h2.**
 -dontnote org.h2.**
 
-# Keep sqlite-jdbc-crypt classes that are loaded via reflection or accessed via JNI
--keep class org.sqlite.** { *; }
-
 -keep class dagger.** { *; }
 -dontwarn dagger.**
 -dontnote dagger.**
@@ -20,8 +15,5 @@
 -dontwarn sun.misc.Unsafe
 -dontnote com.google.common.**
 
--dontwarn com.fasterxml.jackson.databind.ext.Java7SupportImpl
+# UPnP library isn't used
-
+-dontwarn org.bitlet.weupnp.**
-# Keep all Jackson-serialisable classes and their members
--keep interface com.fasterxml.jackson.databind.annotation.JsonSerialize
--keep @com.fasterxml.jackson.databind.annotation.JsonSerialize class * { *; }

bramble-android/src/main/AndroidManifest.xml

@@ -1,36 +1,21 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest
-	xmlns:tools="http://schemas.android.com/tools"
+	package="org.briarproject.bramble"
-	package="org.briarproject.bramble">
+	xmlns:android="http://schemas.android.com/apk/res/android">
 
-	<uses-feature
+	<uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
-		android:name="android.hardware.bluetooth"
-		android:required="false" />
 
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-	<!-- The BLUETOOTH permission was supposed to be removed in API 31 but is still needed on some Xiaomi/Redmi/POCO devices running API 31 and Nubia devices running API 32 -->
+	<uses-permission android:name="android.permission.BLUETOOTH"/>
-	<uses-permission
+	<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
-		android:name="android.permission.BLUETOOTH"
+	<uses-permission android:name="android.permission.INTERNET"/>
-		android:maxSdkVersion="32" />
+	<uses-permission android:name="android.permission.WAKE_LOCK"/>
-	<uses-permission
-		android:name="android.permission.BLUETOOTH_ADMIN"
-		android:maxSdkVersion="30" />
-	<uses-permission
-		android:name="android.permission.BLUETOOTH_SCAN"
-		android:usesPermissionFlags="neverForLocation"
-		tools:targetApi="31" />
-	<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
-	<uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
-	<uses-permission android:name="android.permission.INTERNET" />
-	<uses-permission android:name="android.permission.WAKE_LOCK" />
 
 	<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

@@ -2,23 +2,10 @@ 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,16 +1,9 @@
 package org.briarproject.bramble;
 
 import org.briarproject.bramble.battery.AndroidBatteryModule;
-import org.briarproject.bramble.io.DnsModule;
 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.AndroidWakeLockModule;
-import org.briarproject.bramble.system.AndroidWakefulIoExecutorModule;
-import org.briarproject.bramble.system.DefaultThreadFactoryModule;
 
 import dagger.Module;
 
@@ -18,14 +11,12 @@ import dagger.Module;
 		AndroidBatteryModule.class,
 		AndroidNetworkModule.class,
 		AndroidSystemModule.class,
-		AndroidTaskSchedulerModule.class,
+		CircumventionModule.class
-		AndroidWakefulIoExecutorModule.class,
-		AndroidWakeLockModule.class,
-		DefaultThreadFactoryModule.class,
-		CircumventionModule.class,
-		DnsModule.class,
-		ReportingModule.class,
-		SocksModule.class
 })
 public class BrambleAndroidModule {
+
+	public static void initEagerSingletons(BrambleAndroidEagerSingletons c) {
+		c.inject(new AndroidBatteryModule.EagerSingletons());
+		c.inject(new AndroidNetworkModule.EagerSingletons());
+	}
 }

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

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

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

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

@@ -9,21 +9,17 @@ import org.briarproject.bramble.api.account.AccountManager;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.db.DatabaseConfig;
 import org.briarproject.bramble.api.identity.IdentityManager;
+import org.briarproject.bramble.util.IoUtils;
 
 import java.io.File;
 import java.util.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 java.util.Arrays.asList;
+import static android.os.Build.VERSION.SDK_INT;
-import static java.util.logging.Level.INFO;
-import static org.briarproject.bramble.util.IoUtils.deleteFileOrDir;
-import static org.briarproject.bramble.util.LogUtils.logFileOrDir;
 
 class AndroidAccountManager extends AccountManagerImpl
 		implements AccountManager {
@@ -31,11 +27,7 @@ class AndroidAccountManager extends AccountManagerImpl
 	private static final Logger LOG =
 			Logger.getLogger(AndroidAccountManager.class.getName());
 
-	/**
+	private static final String PREF_DB_KEY = "key";
-	 * 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;
@@ -49,30 +41,42 @@ class AndroidAccountManager extends AccountManagerImpl
 		appContext = app.getApplicationContext();
 	}
 
+	// Locking: stateChangeLock
 	@Override
-	public boolean accountExists() {
+	@Nullable
-		boolean exists = super.accountExists();
+	protected String loadEncryptedDatabaseKey() {
-		if (!exists && LOG.isLoggable(INFO)) {
+		String key = getDatabaseKeyFromPreferences();
-			LOG.info("Account does not exist. Contents of account directory:");
+		if (key == null) key = super.loadEncryptedDatabaseKey();
-			logFileOrDir(LOG, INFO, getDataDir());
+		else migrateDatabaseKeyToFile(key);
+		return key;
+	}
+
+	// Locking: stateChangeLock
+	@Nullable
+	private String getDatabaseKeyFromPreferences() {
+		String key = prefs.getString(PREF_DB_KEY, null);
+		if (key == null) LOG.info("No database key in preferences");
+		else LOG.info("Found database key in preferences");
+		return key;
+	}
+
+	// Locking: stateChangeLock
+	private void migrateDatabaseKeyToFile(String key) {
+		if (storeEncryptedDatabaseKey(key)) {
+			if (prefs.edit().remove(PREF_DB_KEY).commit())
+				LOG.info("Database key migrated to file");
+			else LOG.warning("Database key not removed from preferences");
+		} else {
+			LOG.warning("Database key not migrated to file");
 		}
-		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());
-			}
 		}
 	}
 
@@ -81,49 +85,47 @@ class AndroidAccountManager extends AccountManagerImpl
 		return PreferenceManager.getDefaultSharedPreferences(appContext);
 	}
 
-	@GuardedBy("stateChangeLock")
+	// Locking: stateChangeLock
 	private void deleteAppData(SharedPreferences... clear) {
 		// Clear and commit shared preferences
 		for (SharedPreferences prefs : clear) {
 			if (!prefs.edit().clear().commit())
 				LOG.warning("Could not clear shared preferences");
 		}
-		// Delete files, except protected directories
+		// Delete files, except lib and shared_prefs directories
 		Set<File> files = new HashSet<>();
-		File dataDir = getDataDir();
+		File dataDir = new File(appContext.getApplicationInfo().dataDir);
 		@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())) {
+				String name = file.getName();
+				if (!name.equals("lib") && !name.equals("shared_prefs")) {
 					files.add(file);
 				}
 			}
 		}
 		files.add(appContext.getFilesDir());
+		files.add(appContext.getCacheDir());
 		addIfNotNull(files, appContext.getExternalCacheDir());
-		for (File file : appContext.getExternalCacheDirs()) {
+		if (SDK_INT >= 19) {
-			addIfNotNull(files, file);
+			for (File file : appContext.getExternalCacheDirs()) {
-		}
+				addIfNotNull(files, file);
-		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);
 		}
-	}
+		if (SDK_INT >= 21) {
-
+			for (File file : appContext.getExternalMediaDirs()) {
-	private File getDataDir() {
+				addIfNotNull(files, file);
-		return new File(appContext.getApplicationInfo().dataDir);
+			}
+		}
+		for (File file : files) {
+			IoUtils.deleteFileOrDir(file);
+		}
+		// Recreate the cache dir as some OpenGL drivers expect it to exist
+		if (!new File(dataDir, "cache").mkdirs())
+			LOG.warning("Could not recreate cache dir");
 	}
 
 	private void addIfNotNull(Set<File> files, @Nullable File file) {

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

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

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

@@ -5,7 +5,6 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.os.PowerManager;
 
 import org.briarproject.bramble.api.battery.BatteryManager;
 import org.briarproject.bramble.api.battery.event.BatteryEvent;
@@ -17,17 +16,10 @@ import java.util.logging.Logger;
 
 import javax.inject.Inject;
 
-import androidx.annotation.RequiresApi;
-
 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 android.os.Build.VERSION.SDK_INT;
-import static android.os.PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED;
-import static android.os.PowerManager.ACTION_DEVICE_LIGHT_IDLE_MODE_CHANGED;
-import static android.os.PowerManager.ACTION_LOW_POWER_STANDBY_ENABLED_CHANGED;
-import static android.os.PowerManager.ACTION_POWER_SAVE_MODE_CHANGED;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Logger.getLogger;
 
@@ -65,12 +57,6 @@ class AndroidBatteryManager implements BatteryManager, Service {
 		IntentFilter filter = new IntentFilter();
 		filter.addAction(ACTION_POWER_CONNECTED);
 		filter.addAction(ACTION_POWER_DISCONNECTED);
-		filter.addAction(ACTION_POWER_SAVE_MODE_CHANGED);
-		if (SDK_INT >= 23) filter.addAction(ACTION_DEVICE_IDLE_MODE_CHANGED);
-		if (SDK_INT >= 33) {
-			filter.addAction(ACTION_LOW_POWER_STANDBY_ENABLED_CHANGED);
-			filter.addAction(ACTION_DEVICE_LIGHT_IDLE_MODE_CHANGED);
-		}
 		appContext.registerReceiver(batteryReceiver, filter);
 	}
 
@@ -90,33 +76,6 @@ class AndroidBatteryManager implements BatteryManager, Service {
 				eventBus.broadcast(new BatteryEvent(true));
 			else if (ACTION_POWER_DISCONNECTED.equals(action))
 				eventBus.broadcast(new BatteryEvent(false));
-			else if (SDK_INT >= 23 &&
-					ACTION_DEVICE_IDLE_MODE_CHANGED.equals(action) &&
-					LOG.isLoggable(INFO)) {
-				LOG.info("Device idle mode changed to: " +
-						getPowerManager(ctx).isDeviceIdleMode());
-			} else if (SDK_INT >= 23 &&
-					ACTION_POWER_SAVE_MODE_CHANGED.equals(action) &&
-					LOG.isLoggable(INFO)) {
-				LOG.info("Power save mode changed to: " +
-						getPowerManager(ctx).isPowerSaveMode());
-			} else if (SDK_INT >= 33 && LOG.isLoggable(INFO) &&
-					ACTION_LOW_POWER_STANDBY_ENABLED_CHANGED.equals(action)) {
-				PowerManager powerManager =
-						ctx.getSystemService(PowerManager.class);
-				LOG.info("Low power standby now is: " +
-						powerManager.isLowPowerStandbyEnabled());
-			} else if (SDK_INT >= 33 && LOG.isLoggable(INFO) &&
-					ACTION_DEVICE_LIGHT_IDLE_MODE_CHANGED.equals(action)) {
-				PowerManager powerManager = getPowerManager(ctx);
-				LOG.info("Light idle mode now is: " +
-						powerManager.isDeviceLightIdleMode());
-			}
 		}
 	}
-
-	@RequiresApi(api = 23)
-	private PowerManager getPowerManager(Context ctx) {
-		return ctx.getSystemService(PowerManager.class);
-	}
 }

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

@@ -1,36 +1,24 @@
 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 android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
 
-import org.briarproject.bramble.api.Cancellable;
 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.system.TaskScheduler;
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
-import org.briarproject.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.bramble.api.system.Scheduler;
 
-import java.net.Inet4Address;
+import java.util.concurrent.Future;
-import java.net.InetAddress;
+import java.util.concurrent.ScheduledExecutorService;
-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;
@@ -40,55 +28,42 @@ import javax.annotation.Nullable;
 import javax.inject.Inject;
 
 import static android.content.Context.CONNECTIVITY_SERVICE;
-import static android.content.Context.WIFI_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.util.LogUtils.logException;
-import static org.briarproject.nullsafety.NullSafety.requireNonNull;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
 class AndroidNetworkManager implements NetworkManager, Service {
 
 	private static final Logger LOG =
-			getLogger(AndroidNetworkManager.class.getName());
+			Logger.getLogger(AndroidNetworkManager.class.getName());
 
 	// See android.net.wifi.WifiManager
 	private static final String WIFI_AP_STATE_CHANGED_ACTION =
 			"android.net.wifi.WIFI_AP_STATE_CHANGED";
 
-	private final TaskScheduler scheduler;
+	private final ScheduledExecutorService scheduler;
 	private final EventBus eventBus;
-	private final Executor eventExecutor;
+	private final Context appContext;
-	private final Application app;
+	private final AtomicReference<Future<?>> connectivityCheck =
-	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,
+	AndroidNetworkManager(@Scheduler ScheduledExecutorService scheduler,
-			@EventExecutor Executor eventExecutor, Application app) {
+			EventBus eventBus, Application app) {
 		this.scheduler = scheduler;
 		this.eventBus = eventBus;
-		this.eventExecutor = eventExecutor;
+		this.appContext = app.getApplicationContext();
-		this.app = app;
-		connectivityManager = (ConnectivityManager)
-				requireNonNull(app.getSystemService(CONNECTIVITY_SERVICE));
 	}
 
 	@Override
@@ -101,117 +76,26 @@ class AndroidNetworkManager implements NetworkManager, Service {
 		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);
+		appContext.registerReceiver(networkStateReceiver, filter);
+
 	}
 
 	@Override
 	public void stopService() {
 		if (networkStateReceiver != null)
-			app.unregisterReceiver(networkStateReceiver);
+			appContext.unregisterReceiver(networkStateReceiver);
 	}
 
 	@Override
 	public NetworkStatus getNetworkStatus() {
-		// https://issuetracker.google.com/issues/175055271
+		ConnectivityManager cm = (ConnectivityManager)
-		try {
+				appContext.getSystemService(CONNECTIVITY_SERVICE);
-			NetworkInfo net = connectivityManager.getActiveNetworkInfo();
+		if (cm == null) throw new AssertionError();
-			boolean connected = net != null && net.isConnected();
+		NetworkInfo net = cm.getActiveNetworkInfo();
-			// Research into Android's behavior to check network connectivity
+		boolean connected = net != null && net.isConnected();
-			// (https://code.briarproject.org/briar/public-mesh-research/-/issues/19)
+		boolean wifi = connected && net.getType() == TYPE_WIFI;
-			// has shown that NetworkInfo#isConnected() returns true if the device
+		return new NetworkStatus(connected, wifi);
-			// is connected to any Wifi, independent of whether any specific IP
-			// address can be reached using it or any domain names can be resolved.
-			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);
-		} catch (SecurityException e) {
-			logException(LOG, WARNING, e);
-			// Without the ConnectivityManager we can't detect whether we have
-			// internet access. Assume we do, which is probably less harmful
-			// than assuming we don't. Likewise, assume the connection is
-			// IPv6-only. Fall back to the WifiManager to detect whether we
-			// have a wifi connection.
-			LOG.info("ConnectivityManager is broken, guessing connectivity");
-			boolean connected = true, wifi = false, ipv6Only = true;
-			WifiManager wm = (WifiManager) app.getSystemService(WIFI_SERVICE);
-			if (wm != null) {
-				WifiInfo info = wm.getConnectionInfo();
-				if (info != null && info.getIpAddress() != 0) {
-					LOG.info("Connected to wifi");
-					wifi = true;
-					ipv6Only = false;
-				}
-			}
-			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() {
-		// https://issuetracker.google.com/issues/175055271
-		try {
-			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;
-		} catch (SecurityException e) {
-			logException(LOG, WARNING, e);
-			return false;
-		}
-	}
-
-	/**
-	 * 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() {
@@ -219,12 +103,11 @@ class AndroidNetworkManager implements NetworkManager, Service {
 	}
 
 	private void scheduleConnectionStatusUpdate(int delay, TimeUnit unit) {
-		Cancellable newConnectivityCheck =
+		Future<?> newConnectivityCheck =
-				scheduler.schedule(this::updateConnectionStatus, eventExecutor,
+				scheduler.schedule(this::updateConnectionStatus, delay, unit);
-						delay, unit);
+		Future<?> oldConnectivityCheck =
-		Cancellable oldConnectivityCheck =
 				connectivityCheck.getAndSet(newConnectivityCheck);
-		if (oldConnectivityCheck != null) oldConnectivityCheck.cancel();
+		if (oldConnectivityCheck != null) oldConnectivityCheck.cancel(false);
 	}
 
 	private class NetworkStateReceiver extends BroadcastReceiver {
@@ -253,8 +136,7 @@ class AndroidNetworkManager implements NetworkManager, Service {
 		}
 
 		private boolean isApEvent(@Nullable String action) {
-			return WIFI_AP_STATE_CHANGED_ACTION.equals(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/plugin/bluetooth/AndroidBluetoothConnectionFactory.java

@@ -1,36 +0,0 @@
-package org.briarproject.bramble.plugin.bluetooth;
-
-import android.bluetooth.BluetoothSocket;
-
-import org.briarproject.android.dontkillmelib.wakelock.AndroidWakeLockManager;
-import org.briarproject.bramble.api.io.TimeoutMonitor;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
-import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
-import org.briarproject.nullsafety.NotNullByDefault;
-
-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

@@ -1,7 +1,5 @@
 package org.briarproject.bramble.plugin.bluetooth;
 
-import android.annotation.SuppressLint;
-import android.app.Application;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothServerSocket;
@@ -11,21 +9,22 @@ 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.DuplexPluginCallback;
 import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
 import org.briarproject.bramble.api.system.AndroidExecutor;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.util.AndroidUtils;
 import org.briarproject.bramble.util.IoUtils;
-import org.briarproject.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.nullsafety.ParametersNotNullByDefault;
 
 import java.io.IOException;
 import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.BlockingQueue;
@@ -48,62 +47,42 @@ 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 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.AndroidUtils.hasBtConnectPermission;
 import static org.briarproject.bramble.util.PrivacyUtils.scrubMacAddress;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
-@SuppressLint("MissingPermission")
+class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
-class AndroidBluetoothPlugin extends
-		AbstractBluetoothPlugin<BluetoothSocket, BluetoothServerSocket> {
 
 	private static final Logger LOG =
-			getLogger(AndroidBluetoothPlugin.class.getName());
+			Logger.getLogger(AndroidBluetoothPlugin.class.getName());
 
 	private static final int MAX_DISCOVERY_MS = 10_000;
 
 	private final AndroidExecutor androidExecutor;
-	private final Application app;
+	private final Context appContext;
 	private final Clock clock;
 
+	private volatile boolean wasEnabledByUs = false;
 	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, AndroidExecutor androidExecutor,
-			Executor ioExecutor,
+			Context appContext, SecureRandom secureRandom, Clock clock,
-			Executor wakefulIoExecutor,
+			Backoff backoff, DuplexPluginCallback callback, int maxLatency) {
-			SecureRandom secureRandom,
+		super(connectionLimiter, ioExecutor, secureRandom, backoff, callback,
-			AndroidExecutor androidExecutor,
+				maxLatency);
-			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.appContext = appContext;
 		this.clock = clock;
 	}
 
-	@Override
-	protected boolean isBluetoothAccessible() {
-		return hasBtConnectPermission(app);
-	}
-
 	@Override
 	public void start() throws PluginException {
 		super.start();
@@ -112,13 +91,13 @@ class AndroidBluetoothPlugin extends
 		filter.addAction(ACTION_STATE_CHANGED);
 		filter.addAction(ACTION_SCAN_MODE_CHANGED);
 		receiver = new BluetoothStateReceiver();
-		app.registerReceiver(receiver, filter);
+		appContext.registerReceiver(receiver, filter);
 	}
 
 	@Override
 	public void stop() {
 		super.stop();
-		if (receiver != null) app.unregisterReceiver(receiver);
+		if (receiver != null) appContext.unregisterReceiver(receiver);
 	}
 
 	@Override
@@ -140,11 +119,36 @@ class AndroidBluetoothPlugin extends
 		return adapter != null && adapter.isEnabled();
 	}
 
+	@Override
+	void enableAdapter() {
+		if (adapter != null && !adapter.isEnabled()) {
+			if (adapter.enable()) {
+				LOG.info("Enabling Bluetooth");
+				wasEnabledByUs = true;
+			} else {
+				LOG.info("Could not enable Bluetooth");
+			}
+		}
+	}
+
+	@Override
+	void disableAdapterIfEnabledByUs() {
+		if (isAdapterEnabled() && wasEnabledByUs) {
+			if (adapter.disable()) LOG.info("Disabling Bluetooth");
+			else LOG.info("Could not disable Bluetooth");
+			wasEnabledByUs = false;
+		}
+	}
+
+	@Override
+	void setEnabledByUs() {
+		wasEnabledByUs = true;
+	}
+
 	@Override
 	@Nullable
 	String getBluetoothAddress() {
-		if (adapter == null) return null;
+		String address = AndroidUtils.getBluetoothAddress(appContext, adapter);
-		String address = AndroidUtils.getBluetoothAddress(app, adapter);
 		return address.isEmpty() ? null : address;
 	}
 
@@ -162,7 +166,12 @@ class AndroidBluetoothPlugin extends
 	@Override
 	DuplexTransportConnection acceptConnection(BluetoothServerSocket ss)
 			throws IOException {
-		return connectionFactory.wrapSocket(this, ss.accept());
+		return wrapSocket(ss.accept());
+	}
+
+	private DuplexTransportConnection wrapSocket(BluetoothSocket s) {
+		return new AndroidBluetoothTransportConnection(this,
+				connectionLimiter, s);
 	}
 
 	@Override
@@ -179,15 +188,10 @@ class AndroidBluetoothPlugin extends
 		try {
 			s = d.createInsecureRfcommSocketToServiceRecord(u);
 			s.connect();
-			return connectionFactory.wrapSocket(this, s);
+			return wrapSocket(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);
 		}
 	}
 
@@ -195,40 +199,22 @@ class AndroidBluetoothPlugin extends
 	@Nullable
 	DuplexTransportConnection discoverAndConnect(String uuid) {
 		if (adapter == null) return null;
-		if (!discoverSemaphore.tryAcquire()) {
+		for (String address : discoverDevices()) {
-			LOG.info("Discover already running");
+			try {
-			return null;
+				if (LOG.isLoggable(INFO))
-		}
+					LOG.info("Connecting to " + scrubMacAddress(address));
-		try {
+				return connectTo(address, uuid);
-			stopDiscoverAndConnect = false;
+			} catch (IOException e) {
-			for (String address : discoverDevices()) {
+				if (LOG.isLoggable(INFO)) {
-				if (stopDiscoverAndConnect) {
+					LOG.info("Could not connect to "
-					break;
+							+ scrubMacAddress(address));
-				}
-				try {
-					if (LOG.isLoggable(INFO))
-						LOG.info("Connecting to " + scrubMacAddress(address));
-					return connectTo(address, uuid);
-				} catch (IOException e) {
-					if (LOG.isLoggable(INFO)) {
-						LOG.info("Could not connect to "
-								+ scrubMacAddress(address));
-					}
 				}
 			}
-		} finally {
-			discoverSemaphore.release();
 		}
 		LOG.info("Could not connect to any devices");
 		return null;
 	}
 
-	@Override
-	public void stopDiscoverAndConnect() {
-		stopDiscoverAndConnect = true;
-		adapter.cancelDiscovery();
-	}
-
 	private Collection<String> discoverDevices() {
 		List<String> addresses = new ArrayList<>();
 		BlockingQueue<Intent> intents = new LinkedBlockingQueue<>();
@@ -237,7 +223,7 @@ class AndroidBluetoothPlugin extends
 		filter.addAction(ACTION_DISCOVERY_STARTED);
 		filter.addAction(ACTION_DISCOVERY_FINISHED);
 		filter.addAction(ACTION_FOUND);
-		app.registerReceiver(receiver, filter);
+		appContext.registerReceiver(receiver, filter);
 		try {
 			if (adapter.startDiscovery()) {
 				long now = clock.currentTimeMillis();
@@ -253,15 +239,11 @@ class AndroidBluetoothPlugin extends
 						break;
 					} else if (ACTION_FOUND.equals(action)) {
 						BluetoothDevice d = i.getParcelableExtra(EXTRA_DEVICE);
-						// Ignore Bluetooth LE devices
+						String address = d.getAddress();
-						if (d.getType() != DEVICE_TYPE_LE) {
+						if (LOG.isLoggable(INFO))
-							String address = d.getAddress();
+							LOG.info("Discovered " + scrubMacAddress(address));
-							if (LOG.isLoggable(INFO))
+						if (!addresses.contains(address))
-								LOG.info("Discovered " +
+							addresses.add(address);
-										scrubMacAddress(address));
-							if (!addresses.contains(address))
-								addresses.add(address);
-						}
 					}
 					now = clock.currentTimeMillis();
 				}
@@ -274,10 +256,10 @@ class AndroidBluetoothPlugin extends
 		} finally {
 			LOG.info("Cancelling discovery");
 			adapter.cancelDiscovery();
-			app.unregisterReceiver(receiver);
+			appContext.unregisterReceiver(receiver);
 		}
 		// Shuffle the addresses so we don't always try the same one first
-		shuffle(addresses);
+		Collections.shuffle(addresses);
 		return addresses;
 	}
 

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

@@ -1,28 +1,22 @@
 package org.briarproject.bramble.plugin.bluetooth;
 
-import android.app.Application;
+import android.content.Context;
-import android.bluetooth.BluetoothSocket;
 
-import org.briarproject.android.dontkillmelib.wakelock.AndroidWakeLockManager;
 import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.io.TimeoutMonitor;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.lifecycle.IoExecutor;
 import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.BackoffFactory;
-import org.briarproject.bramble.api.plugin.PluginCallback;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
+import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
 import org.briarproject.bramble.api.system.AndroidExecutor;
 import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.api.system.WakefulIoExecutor;
-import org.briarproject.nullsafety.NotNullByDefault;
 
 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;
 
@@ -31,41 +25,28 @@ import static org.briarproject.bramble.api.plugin.BluetoothConstants.ID;
 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 Executor ioExecutor;
 	private final AndroidExecutor androidExecutor;
-	private final AndroidWakeLockManager wakeLockManager;
+	private final Context appContext;
-	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
+	public AndroidBluetoothPluginFactory(Executor ioExecutor,
-	AndroidBluetoothPluginFactory(@IoExecutor Executor ioExecutor,
+			AndroidExecutor androidExecutor, Context appContext,
-			@WakefulIoExecutor Executor wakefulIoExecutor,
+			SecureRandom secureRandom, EventBus eventBus, Clock clock,
-			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.appContext = appContext;
-		this.app = app;
 		this.secureRandom = secureRandom;
 		this.eventBus = eventBus;
 		this.clock = clock;
-		this.timeoutMonitor = timeoutMonitor;
 		this.backoffFactory = backoffFactory;
 	}
 
@@ -75,23 +56,19 @@ public class AndroidBluetoothPluginFactory implements DuplexPluginFactory {
 	}
 
 	@Override
-	public long getMaxLatency() {
+	public int getMaxLatency() {
 		return MAX_LATENCY;
 	}
 
 	@Override
-	public DuplexPlugin createPlugin(PluginCallback callback) {
+	public DuplexPlugin createPlugin(DuplexPluginCallback callback) {
 		BluetoothConnectionLimiter connectionLimiter =
-				new BluetoothConnectionLimiterImpl(eventBus);
+				new BluetoothConnectionLimiterImpl();
-		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,
+				connectionLimiter, ioExecutor, androidExecutor, appContext,
-				wakefulIoExecutor, secureRandom, androidExecutor, app,
+				secureRandom, clock, backoff, callback, MAX_LATENCY);
-				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

@@ -2,67 +2,45 @@ package org.briarproject.bramble.plugin.bluetooth;
 
 import android.bluetooth.BluetoothSocket;
 
-import org.briarproject.android.dontkillmelib.wakelock.AndroidWakeLock;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.android.dontkillmelib.wakelock.AndroidWakeLockManager;
-import org.briarproject.bramble.api.io.TimeoutMonitor;
 import org.briarproject.bramble.api.plugin.Plugin;
 import org.briarproject.bramble.api.plugin.duplex.AbstractDuplexTransportConnection;
-import org.briarproject.nullsafety.NotNullByDefault;
 
 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 BluetoothConnectionLimiter connectionManager;
 	private final BluetoothSocket socket;
-	private final InputStream in;
-	private final AndroidWakeLock wakeLock;
 
 	AndroidBluetoothTransportConnection(Plugin plugin,
-			BluetoothConnectionLimiter connectionLimiter,
+			BluetoothConnectionLimiter connectionManager,
-			AndroidWakeLockManager wakeLockManager,
+			BluetoothSocket socket) {
-			TimeoutMonitor timeoutMonitor,
-			BluetoothSocket socket) throws IOException {
 		super(plugin);
-		this.connectionLimiter = connectionLimiter;
+		this.connectionManager = connectionManager;
 		this.socket = socket;
-		InputStream socketIn = socket.getInputStream();
-		if (socketIn == null) throw new IOException();
-		in = timeoutMonitor.createTimeoutInputStream(socketIn,
-				plugin.getMaxIdleTime() * 2L);
-		wakeLock = wakeLockManager.createWakeLock("BluetoothConnection");
-		wakeLock.acquire();
-		String address = socket.getRemoteDevice().getAddress();
-		if (isValidBluetoothAddress(address)) remote.put(PROP_ADDRESS, address);
 	}
 
 	@Override
-	protected InputStream getInputStream() {
+	protected InputStream getInputStream() throws IOException {
-		return in;
+		return socket.getInputStream();
 	}
 
 	@Override
 	protected OutputStream getOutputStream() throws IOException {
-		OutputStream socketOut = socket.getOutputStream();
+		return socket.getOutputStream();
-		if (socketOut == null) throw new IOException();
-		return socketOut;
 	}
 
 	@Override
 	protected void closeConnection(boolean exception) throws IOException {
 		try {
 			socket.close();
-			in.close();
 		} finally {
-			wakeLock.release();
+			connectionManager.connectionClosed(this);
-			connectionLimiter.connectionClosed(this);
 		}
 	}
 }

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

@@ -1,53 +0,0 @@
-package org.briarproject.bramble.plugin.file;
-
-import android.app.Application;
-import android.net.Uri;
-
-import org.briarproject.bramble.api.plugin.PluginCallback;
-import org.briarproject.bramble.api.properties.TransportProperties;
-import org.briarproject.nullsafety.NotNullByDefault;
-
-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();
-		try {
-			return app.getContentResolver().openInputStream(Uri.parse(uri));
-		} catch (SecurityException e) {
-			throw new IOException(e);
-		}
-	}
-
-	@Override
-	OutputStream openOutputStream(TransportProperties p) throws IOException {
-		String uri = p.get(PROP_URI);
-		if (isNullOrEmpty(uri)) throw new IllegalArgumentException();
-		try {
-			return app.getContentResolver()
-					.openOutputStream(Uri.parse(uri), "wt");
-		} catch (SecurityException e) {
-			throw new IOException(e);
-		}
-	}
-}

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

@@ -1,47 +0,0 @@
-package org.briarproject.bramble.plugin.file;
-
-import android.app.Application;
-
-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 org.briarproject.nullsafety.NotNullByDefault;
-
-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 long MAX_LATENCY = DAYS.toMillis(28);
-
-	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,66 +1,56 @@
 package org.briarproject.bramble.plugin.tcp;
 
-import android.app.Application;
+import android.content.Context;
 import android.net.ConnectivityManager;
-import android.net.LinkAddress;
-import android.net.LinkProperties;
 import android.net.Network;
-import android.net.NetworkCapabilities;
+import android.net.NetworkInfo;
 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.event.EventListener;
 import org.briarproject.bramble.api.network.event.NetworkStatusEvent;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.Backoff;
-import org.briarproject.bramble.api.plugin.PluginCallback;
+import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
-import org.briarproject.bramble.api.settings.Settings;
-import org.briarproject.nullsafety.NotNullByDefault;
 
 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.Collection;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
-import java.util.regex.Pattern;
 
 import javax.annotation.Nullable;
 import javax.net.SocketFactory;
 
 import static android.content.Context.CONNECTIVITY_SERVICE;
 import static android.content.Context.WIFI_SERVICE;
-import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
+import static android.net.ConnectivityManager.TYPE_WIFI;
+import static android.os.Build.VERSION.SDK_INT;
 import static java.util.Collections.emptyList;
-import static java.util.Collections.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.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;
-import static org.briarproject.bramble.util.NetworkUtils.getNetworkInterfaces;
-import static org.briarproject.nullsafety.NullSafety.requireNonNull;
 
 @NotNullByDefault
-class AndroidLanTcpPlugin extends LanTcpPlugin {
+class AndroidLanTcpPlugin extends LanTcpPlugin implements EventListener {
+
+	private static final byte[] WIFI_AP_ADDRESS_BYTES =
+			{(byte) 192, (byte) 168, 43, 1};
+	private static final InetAddress WIFI_AP_ADDRESS;
 
 	private static final Logger LOG =
-			getLogger(AndroidLanTcpPlugin.class.getName());
+			Logger.getLogger(AndroidLanTcpPlugin.class.getName());
 
-	/**
+	static {
-	 * The interface name is used as a heuristic for deciding whether the
+		try {
-	 * device is providing a wifi access point.
+			WIFI_AP_ADDRESS = InetAddress.getByAddress(WIFI_AP_ADDRESS_BYTES);
-	 */
+		} catch (UnknownHostException e) {
-	private static final Pattern AP_INTERFACE_NAME =
+			// Should only be thrown if the address has an illegal length
-			Pattern.compile("^(wlan|ap|p2p)[-0-9]");
+			throw new AssertionError(e);
+		}
+	}
 
 	private final Executor connectionStatusExecutor;
 	private final ConnectivityManager connectivityManager;
@@ -69,149 +59,53 @@ class AndroidLanTcpPlugin extends LanTcpPlugin {
 
 	private volatile SocketFactory socketFactory;
 
-	AndroidLanTcpPlugin(Executor ioExecutor,
+	AndroidLanTcpPlugin(Executor ioExecutor, Context appContext,
-			Executor wakefulIoExecutor,
+			Backoff backoff, DuplexPluginCallback callback, int maxLatency,
-			Application app,
+			int maxIdleTime) {
-			Backoff backoff,
+		super(ioExecutor, backoff, callback, maxLatency, maxIdleTime);
-			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)
+		ConnectivityManager connectivityManager = (ConnectivityManager)
-				requireNonNull(app.getSystemService(CONNECTIVITY_SERVICE));
+				appContext.getSystemService(CONNECTIVITY_SERVICE);
-		wifiManager = (WifiManager) app.getSystemService(WIFI_SERVICE);
+		if (connectivityManager == null) throw new AssertionError();
+		this.connectivityManager = connectivityManager;
+		wifiManager = (WifiManager) appContext.getApplicationContext()
+				.getSystemService(WIFI_SERVICE);
 		socketFactory = SocketFactory.getDefault();
 	}
 
 	@Override
 	public void start() {
 		if (used.getAndSet(true)) throw new IllegalStateException();
-		initialisePortProperty();
+		running = true;
-		Settings settings = callback.getSettings();
-		state.setStarted(settings.getBoolean(PREF_PLUGIN_ENABLE,
-				DEFAULT_PREF_PLUGIN_ENABLE));
 		updateConnectionStatus();
 	}
 
+	@Override
+	public void stop() {
+		running = false;
+		tryToClose(socket);
+	}
+
 	@Override
 	protected Socket createSocket() throws IOException {
 		return socketFactory.createSocket();
 	}
 
 	@Override
-	protected List<InetAddress> getUsableLocalInetAddresses(boolean ipv4) {
+	protected Collection<InetAddress> getLocalIpAddresses() {
-		InetAddress addr = getWifiAddress(ipv4);
+		// If the device doesn't have wifi, don't open any sockets
-		return addr == null ? emptyList() : singletonList(addr);
+		if (wifiManager == null) return emptyList();
-	}
+		// If we're connected to a wifi network, use that network
-
-	@Nullable
-	private InetAddress getWifiAddress(boolean ipv4) {
-		Pair<InetAddress, Boolean> wifi = getWifiIpv4Address();
-		if (ipv4) return wifi == null ? null : wifi.getFirst();
-		// 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) {
-			return getWifiClientIpv6Address();
-		}
-		// Use the wifi IPv4 address to determine which interface's IPv6
-		// address we should return (if the interface has a suitable address)
-		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) {
+		if (info != null && info.getIpAddress() != 0)
-			return new Pair<>(intToInetAddress(info.getIpAddress()), false);
+			return singletonList(intToInetAddress(info.getIpAddress()));
-		}
+		// If we're running an access point, return its address
-		// If we're providing an access point, return its address
+		if (super.getLocalIpAddresses().contains(WIFI_AP_ADDRESS))
-		for (NetworkInterface iface : getNetworkInterfaces()) {
+			return singletonList(WIFI_AP_ADDRESS);
-			if (AP_INTERFACE_NAME.matcher(iface.getName()).find()) {
+		// No suitable addresses
-				for (InterfaceAddress ifAddr : iface.getInterfaceAddresses()) {
+		return emptyList();
-					if (isPossibleWifiApInterface(ifAddr)) {
-						return new Pair<>(ifAddr.getAddress(), true);
-					}
-				}
-			}
-		}
-		// Not connected to wifi
-		return null;
-	}
-
-	/**
-	 * Returns true if the given address may belong to an interface providing
-	 * a wifi access point (including wifi direct legacy mode access points).
-	 * <p>
-	 * This method may return true for wifi client interfaces as well, but
-	 * we've already checked for a wifi client connection above.
-	 */
-	private boolean isPossibleWifiApInterface(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;
-	}
-
-	/**
-	 * 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.
-	 */
-	@Nullable
-	private InetAddress getWifiClientIpv6Address() {
-		// https://issuetracker.google.com/issues/175055271
-		try {
-			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;
-				}
-			}
-		} catch (SecurityException e) {
-			logException(LOG, WARNING, e);
-		}
-		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) {
@@ -231,17 +125,11 @@ class AndroidLanTcpPlugin extends LanTcpPlugin {
 	// 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() {
-		// https://issuetracker.google.com/issues/175055271
+		if (SDK_INT < 21) return SocketFactory.getDefault();
-		try {
+		for (Network net : connectivityManager.getAllNetworks()) {
-			for (Network net : connectivityManager.getAllNetworks()) {
+			NetworkInfo info = connectivityManager.getNetworkInfo(net);
-				NetworkCapabilities caps =
+			if (info != null && info.getType() == TYPE_WIFI)
-						connectivityManager.getNetworkCapabilities(net);
+				return net.getSocketFactory();
-				if (caps != null && caps.hasTransport(TRANSPORT_WIFI)) {
-					return net.getSocketFactory();
-				}
-			}
-		} catch (SecurityException e) {
-			logException(LOG, WARNING, e);
 		}
 		LOG.warning("Could not find suitable socket factory");
 		return SocketFactory.getDefault();
@@ -249,59 +137,30 @@ class AndroidLanTcpPlugin extends LanTcpPlugin {
 
 	@Override
 	public void eventOccurred(Event e) {
-		super.eventOccurred(e);
 		if (e instanceof NetworkStatusEvent) updateConnectionStatus();
 	}
 
 	private void updateConnectionStatus() {
 		connectionStatusExecutor.execute(() -> {
-			State s = getState();
+			if (!running) return;
-			if (s != ACTIVE && s != INACTIVE) return;
+			Collection<InetAddress> addrs = getLocalIpAddresses();
-			Pair<InetAddress, Boolean> wifi = getPreferredWifiAddress();
+			if (addrs.contains(WIFI_AP_ADDRESS)) {
-			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();
+				if (socket == null || socket.isClosed()) bind();
+			} else if (addrs.isEmpty()) {
+				LOG.info("Not connected to wifi");
+				socketFactory = SocketFactory.getDefault();
+				tryToClose(socket);
 			} else {
 				LOG.info("Connected to wifi");
 				socketFactory = getSocketFactory();
-				bind();
+				if (socket == null || socket.isClosed()) 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) {
-			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,22 +1,19 @@
 package org.briarproject.bramble.plugin.tcp;
 
-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.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 org.briarproject.nullsafety.NotNullByDefault;
 
 import java.util.concurrent.Executor;
 
 import javax.annotation.concurrent.Immutable;
-import javax.inject.Inject;
 
 import static org.briarproject.bramble.api.plugin.LanTcpConstants.ID;
 
@@ -24,29 +21,23 @@ import static org.briarproject.bramble.api.plugin.LanTcpConstants.ID;
 @NotNullByDefault
 public class AndroidLanTcpPluginFactory implements DuplexPluginFactory {
 
-	private static final int MAX_LATENCY = 30_000; // 30 seconds
+	private static final int MAX_LATENCY = 30 * 1000; // 30 seconds
-	private static final int MAX_IDLE_TIME = 30_000; // 30 seconds
+	private static final int MAX_IDLE_TIME = 30 * 1000; // 30 seconds
-	private static final int CONNECTION_TIMEOUT = 3_000; // 3 seconds
+	private static final int MIN_POLLING_INTERVAL = 60 * 1000; // 1 minute
-	private static final int MIN_POLLING_INTERVAL = 60_000; // 1 minute
+	private static final int MAX_POLLING_INTERVAL = 10 * 60 * 1000; // 10 mins
-	private static final int MAX_POLLING_INTERVAL = 600_000; // 10 mins
 	private static final double BACKOFF_BASE = 1.2;
 
-	private final Executor ioExecutor, wakefulIoExecutor;
+	private final Executor ioExecutor;
 	private final EventBus eventBus;
 	private final BackoffFactory backoffFactory;
-	private final Application app;
+	private final Context appContext;
 
-	@Inject
+	public AndroidLanTcpPluginFactory(Executor ioExecutor, EventBus eventBus,
-	AndroidLanTcpPluginFactory(@IoExecutor Executor ioExecutor,
+			BackoffFactory backoffFactory, Context appContext) {
-			@WakefulIoExecutor Executor wakefulIoExecutor,
-			EventBus eventBus,
-			BackoffFactory backoffFactory,
-			Application app) {
 		this.ioExecutor = ioExecutor;
-		this.wakefulIoExecutor = wakefulIoExecutor;
 		this.eventBus = eventBus;
 		this.backoffFactory = backoffFactory;
-		this.app = app;
+		this.appContext = appContext;
 	}
 
 	@Override
@@ -55,17 +46,16 @@ public class AndroidLanTcpPluginFactory implements DuplexPluginFactory {
 	}
 
 	@Override
-	public long getMaxLatency() {
+	public int getMaxLatency() {
 		return MAX_LATENCY;
 	}
 
 	@Override
-	public DuplexPlugin createPlugin(PluginCallback callback) {
+	public DuplexPlugin createPlugin(DuplexPluginCallback callback) {
 		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
 				MAX_POLLING_INTERVAL, BACKOFF_BASE);
 		AndroidLanTcpPlugin plugin = new AndroidLanTcpPlugin(ioExecutor,
-				wakefulIoExecutor, app, backoff, callback,
+				appContext, backoff, callback, MAX_LATENCY, MAX_IDLE_TIME);
-				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,100 @@
+package org.briarproject.bramble.plugin.tor;
+
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.PowerManager;
+
+import org.briarproject.bramble.api.battery.BatteryManager;
+import org.briarproject.bramble.api.network.NetworkManager;
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.bramble.api.plugin.Backoff;
+import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
+import org.briarproject.bramble.api.system.Clock;
+import org.briarproject.bramble.api.system.LocationUtils;
+import org.briarproject.bramble.api.system.ResourceProvider;
+import org.briarproject.bramble.util.RenewableWakeLock;
+
+import java.io.IOException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ScheduledExecutorService;
+
+import javax.net.SocketFactory;
+
+import static android.content.Context.MODE_PRIVATE;
+import static android.content.Context.POWER_SERVICE;
+import static android.os.PowerManager.PARTIAL_WAKE_LOCK;
+import static java.util.concurrent.TimeUnit.MINUTES;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+class AndroidTorPlugin extends TorPlugin {
+
+	private final Context appContext;
+	private final RenewableWakeLock wakeLock;
+
+	AndroidTorPlugin(Executor ioExecutor, ScheduledExecutorService scheduler,
+			Context appContext, NetworkManager networkManager,
+			LocationUtils locationUtils, SocketFactory torSocketFactory,
+			Clock clock, ResourceProvider resourceProvider,
+			CircumventionProvider circumventionProvider,
+			BatteryManager batteryManager, Backoff backoff,
+			DuplexPluginCallback callback, String architecture, int maxLatency,
+			int maxIdleTime) {
+		super(ioExecutor, networkManager, locationUtils, torSocketFactory,
+				clock, resourceProvider, circumventionProvider, batteryManager,
+				backoff, callback, architecture, maxLatency, maxIdleTime,
+				appContext.getDir("tor", MODE_PRIVATE));
+		this.appContext = appContext;
+		PowerManager pm = (PowerManager)
+				appContext.getSystemService(POWER_SERVICE);
+		if (pm == null) throw new AssertionError();
+		wakeLock = new RenewableWakeLock(pm, scheduler, PARTIAL_WAKE_LOCK,
+				getWakeLockTag(), 1, MINUTES);
+	}
+
+	@Override
+	protected int getProcessId() {
+		return android.os.Process.myPid();
+	}
+
+	@Override
+	protected long getLastUpdateTime() {
+		try {
+			PackageManager pm = appContext.getPackageManager();
+			PackageInfo pi = pm.getPackageInfo(appContext.getPackageName(), 0);
+			return pi.lastUpdateTime;
+		} catch (NameNotFoundException e) {
+			throw new AssertionError(e);
+		}
+	}
+
+	@Override
+	protected void enableNetwork(boolean enable) throws IOException {
+		if (!running) return;
+		if (enable) wakeLock.acquire();
+		super.enableNetwork(enable);
+		if (!enable) wakeLock.release();
+	}
+
+	@Override
+	public void stop() {
+		super.stop();
+		wakeLock.release();
+	}
+
+	private String getWakeLockTag() {
+		PackageManager pm = appContext.getPackageManager();
+		for (PackageInfo info : pm.getInstalledPackages(0)) {
+			String name = info.packageName.toLowerCase();
+			if (name.startsWith("com.huawei.powergenie")) {
+				return "LocationManagerService";
+			} else if (name.startsWith("com.evenwell.powermonitor")) {
+				return "AudioIn";
+			}
+		}
+		return getClass().getSimpleName();
+	}
+}

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

@@ -1,100 +1,116 @@
 package org.briarproject.bramble.plugin.tor;
 
-import android.app.Application;
+import android.content.Context;
+import android.os.Build;
 
-import org.briarproject.android.dontkillmelib.wakelock.AndroidWakeLockManager;
 import org.briarproject.bramble.api.battery.BatteryManager;
-import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.event.EventExecutor;
-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.TorControlPort;
+import org.briarproject.bramble.api.plugin.TransportId;
-import org.briarproject.bramble.api.plugin.TorDirectory;
+import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
-import org.briarproject.bramble.api.plugin.TorSocksPort;
+import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
+import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
 import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.api.system.WakefulIoExecutor;
+import org.briarproject.bramble.api.system.LocationUtils;
-import org.briarproject.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.system.ResourceProvider;
-import org.briarproject.onionwrapper.AndroidTorWrapper;
+import org.briarproject.bramble.util.AndroidUtils;
-import org.briarproject.onionwrapper.CircumventionProvider;
-import org.briarproject.onionwrapper.LocationUtils;
-import org.briarproject.onionwrapper.TorWrapper;
 
-import java.io.File;
 import java.util.concurrent.Executor;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.logging.Logger;
 
-import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
-import javax.inject.Inject;
 import javax.net.SocketFactory;
 
-import static android.os.Build.VERSION.SDK_INT;
-import static org.briarproject.bramble.util.AndroidUtils.getSupportedArchitectures;
-
 @Immutable
 @NotNullByDefault
-public class AndroidTorPluginFactory extends TorPluginFactory {
+public class AndroidTorPluginFactory implements DuplexPluginFactory {
 
-	private final Application app;
+	private static final Logger LOG =
-	private final AndroidWakeLockManager wakeLockManager;
+			Logger.getLogger(AndroidTorPluginFactory.class.getName());
 
-	@Inject
+	private static final int MAX_LATENCY = 30 * 1000; // 30 seconds
-	AndroidTorPluginFactory(@IoExecutor Executor ioExecutor,
+	private static final int MAX_IDLE_TIME = 30 * 1000; // 30 seconds
-			@EventExecutor Executor eventExecutor,
+	private static final int MIN_POLLING_INTERVAL = 60 * 1000; // 1 minute
-			@WakefulIoExecutor Executor wakefulIoExecutor,
+	private static final int MAX_POLLING_INTERVAL = 10 * 60 * 1000; // 10 mins
-			NetworkManager networkManager,
+	private static final double BACKOFF_BASE = 1.2;
-			LocationUtils locationUtils,
+
-			EventBus eventBus,
+	private final Executor ioExecutor;
-			SocketFactory torSocketFactory,
+	private final ScheduledExecutorService scheduler;
-			BackoffFactory backoffFactory,
+	private final Context appContext;
+	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 Clock clock;
+
+	public AndroidTorPluginFactory(Executor ioExecutor,
+			ScheduledExecutorService scheduler, Context appContext,
+			NetworkManager networkManager, LocationUtils locationUtils,
+			EventBus eventBus, SocketFactory torSocketFactory,
+			BackoffFactory backoffFactory, ResourceProvider resourceProvider,
 			CircumventionProvider circumventionProvider,
-			BatteryManager batteryManager,
+			BatteryManager batteryManager, Clock clock) {
-			Clock clock,
+		this.ioExecutor = ioExecutor;
-			CryptoComponent crypto,
+		this.scheduler = scheduler;
-			@TorDirectory File torDirectory,
+		this.appContext = appContext;
-			@TorSocksPort int torSocksPort,
+		this.networkManager = networkManager;
-			@TorControlPort int torControlPort,
+		this.locationUtils = locationUtils;
-			Application app,
+		this.eventBus = eventBus;
-			AndroidWakeLockManager wakeLockManager) {
+		this.torSocketFactory = torSocketFactory;
-		super(ioExecutor, eventExecutor, wakefulIoExecutor, networkManager,
+		this.backoffFactory = backoffFactory;
-				locationUtils, eventBus, torSocketFactory, backoffFactory,
+		this.resourceProvider = resourceProvider;
-				circumventionProvider, batteryManager, clock, crypto,
+		this.circumventionProvider = circumventionProvider;
-				torDirectory, torSocksPort, torControlPort);
+		this.batteryManager = batteryManager;
-		this.app = app;
+		this.clock = clock;
-		this.wakeLockManager = wakeLockManager;
 	}
 
-	@Nullable
 	@Override
-	String getArchitectureForTorBinary() {
+	public TransportId getId() {
-		for (String abi : getSupportedArchitectures()) {
+		return TorConstants.ID;
-			if (abi.startsWith("x86_64")) return "x86_64_pie";
+	}
-			else if (abi.startsWith("x86")) return "x86_pie";
+
-			else if (abi.startsWith("arm64")) return "arm64_pie";
+	@Override
-			else if (abi.startsWith("armeabi")) return "arm_pie";
+	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;
+			}
 		}
-		return null;
+		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";
 
-	@Override
+		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
-	TorPlugin createPluginInstance(Backoff backoff,
+				MAX_POLLING_INTERVAL, BACKOFF_BASE);
-			TorRendezvousCrypto torRendezvousCrypto, PluginCallback callback,
+		AndroidTorPlugin plugin = new AndroidTorPlugin(ioExecutor, scheduler,
-			String architecture) {
+				appContext, networkManager, locationUtils, torSocketFactory,
-		TorWrapper tor = new AndroidTorWrapper(app, wakeLockManager,
+				clock, resourceProvider, circumventionProvider, batteryManager,
-				ioExecutor, eventExecutor, architecture, torDirectory,
+				backoff, callback, architecture, MAX_LATENCY, MAX_IDLE_TIME);
-				torSocksPort, torControlPort);
+		eventBus.addListener(plugin);
-		// Android versions 7.1 and newer can verify Let's Encrypt TLS certs
+		return plugin;
-		// signed with the IdentTrust DST Root X3 certificate. Older versions
-		// of Android consider the certificate to have expired at the end of
-		// September 2021.
-		boolean canVerifyLetsEncryptCerts = SDK_INT >= 25;
-		return new TorPlugin(ioExecutor, wakefulIoExecutor,
-				networkManager, locationUtils, torSocketFactory,
-				circumventionProvider, batteryManager, backoff,
-				torRendezvousCrypto, tor, callback, MAX_LATENCY,
-				MAX_IDLE_TIME, canVerifyLetsEncryptCerts);
 	}
 }

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

@@ -1,18 +0,0 @@
-package org.briarproject.bramble.system;
-
-import org.briarproject.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

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

@@ -0,0 +1,72 @@
+package org.briarproject.bramble.system;
+
+import android.annotation.SuppressLint;
+import android.app.Application;
+import android.content.Context;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.system.LocationUtils;
+
+import java.util.Locale;
+import java.util.logging.Logger;
+
+import javax.inject.Inject;
+
+import static android.content.Context.TELEPHONY_SERVICE;
+
+@NotNullByDefault
+class AndroidLocationUtils implements LocationUtils {
+
+	private static final Logger LOG =
+			Logger.getLogger(AndroidLocationUtils.class.getName());
+
+	private final Context appContext;
+
+	@Inject
+	AndroidLocationUtils(Application app) {
+		appContext = app.getApplicationContext();
+	}
+
+	/**
+	 * This guesses the current country from the first of these sources that
+	 * succeeds (also in order of likelihood of being correct):
+	 *
+	 * <ul>
+	 * <li>Phone network. This works even when no SIM card is inserted, or a
+	 *     foreign SIM card is inserted.</li>
+	 * <li>SIM card. This is only an heuristic and assumes the user is not
+	 *     roaming.</li>
+	 * <li>User locale. This is an even worse heuristic.</li>
+	 * </ul>
+	 *
+	 * Note: this is very similar to <a href="https://android.googlesource.com/platform/frameworks/base/+/cd92588%5E/location/java/android/location/CountryDetector.java">
+	 * this API</a> except it seems that Google doesn't want us to use it for
+	 * some reason - both that class and {@code Context.COUNTRY_CODE} are
+	 * annotated {@code @hide}.
+	 */
+	@Override
+	@SuppressLint("DefaultLocale")
+	public String getCurrentCountry() {
+		String countryCode = getCountryFromPhoneNetwork();
+		if (!TextUtils.isEmpty(countryCode)) return countryCode.toUpperCase();
+		LOG.info("Falling back to SIM card country");
+		countryCode = getCountryFromSimCard();
+		if (!TextUtils.isEmpty(countryCode)) return countryCode.toUpperCase();
+		LOG.info("Falling back to user-defined locale");
+		return Locale.getDefault().getCountry();
+	}
+
+	private String getCountryFromPhoneNetwork() {
+		Object o = appContext.getSystemService(TELEPHONY_SERVICE);
+		TelephonyManager tm = (TelephonyManager) o;
+		return tm.getNetworkCountryIso();
+	}
+
+	private String getCountryFromSimCard() {
+		Object o = appContext.getSystemService(TELEPHONY_SERVICE);
+		TelephonyManager tm = (TelephonyManager) o;
+		return tm.getSimCountryIso();
+	}
+}

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

@@ -4,8 +4,8 @@ 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 org.briarproject.nullsafety.NotNullByDefault;
 
 import java.io.InputStream;
 

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

@@ -6,31 +6,31 @@ 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.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.util.Set;
+import java.util.List;
 
 import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
 
-import static android.os.Build.FINGERPRINT;
+import static android.content.Context.WIFI_SERVICE;
-import static android.os.Build.SERIAL;
-import static android.os.Build.VERSION.SDK_INT;
-import static android.os.Process.myPid;
-import static android.os.Process.myTid;
-import static android.os.Process.myUid;
 import static android.provider.Settings.Secure.ANDROID_ID;
 
 @Immutable
 @NotNullByDefault
 class AndroidSecureRandomProvider extends UnixSecureRandomProvider {
 
+	private static final int SEED_LENGTH = 32;
+
 	private final Context appContext;
 
 	@Inject
@@ -42,27 +42,31 @@ class AndroidSecureRandomProvider extends UnixSecureRandomProvider {
 	@Override
 	protected void writeToEntropyPool(DataOutputStream out) throws IOException {
 		super.writeToEntropyPool(out);
-		out.writeInt(myPid());
+		out.writeInt(android.os.Process.myPid());
-		out.writeInt(myTid());
+		out.writeInt(android.os.Process.myTid());
-		out.writeInt(myUid());
+		out.writeInt(android.os.Process.myUid());
-		if (FINGERPRINT != null) out.writeUTF(FINGERPRINT);
+		if (Build.FINGERPRINT != null) out.writeUTF(Build.FINGERPRINT);
-		if (SERIAL != null) out.writeUTF(SERIAL);
+		if (Build.SERIAL != null) out.writeUTF(Build.SERIAL);
 		ContentResolver contentResolver = appContext.getContentResolver();
 		String id = Settings.Secure.getString(contentResolver, ANDROID_ID);
 		if (id != null) out.writeUTF(id);
-		// On API 31 and higher we need permission to access bonded devices
+		Parcel parcel = Parcel.obtain();
-		if (SDK_INT < 31) {
+		WifiManager wm = (WifiManager) appContext.getApplicationContext()
-			Parcel parcel = Parcel.obtain();
+				.getSystemService(WIFI_SERVICE);
-			BluetoothAdapter bt = BluetoothAdapter.getDefaultAdapter();
+		if (wm != null) {
-			if (bt != null) {
+			List<WifiConfiguration> configs = wm.getConfiguredNetworks();
-				@SuppressLint("MissingPermission")
+			if (configs != null) {
-				Set<BluetoothDevice> deviceSet = bt.getBondedDevices();
+				for (WifiConfiguration config : configs)
-				for (BluetoothDevice device : deviceSet)
+					parcel.writeParcelable(config, 0);
-					parcel.writeParcelable(device, 0);
 			}
-			out.write(parcel.marshall());
-			parcel.recycle();
 		}
+		BluetoothAdapter bt = BluetoothAdapter.getDefaultAdapter();
+		if (bt != null) {
+			for (BluetoothDevice device : bt.getBondedDevices())
+				parcel.writeParcelable(device, 0);
+		}
+		out.write(parcel.marshall());
+		parcel.recycle();
 	}
 
 	@Override
@@ -70,6 +74,28 @@ class AndroidSecureRandomProvider extends UnixSecureRandomProvider {
 		// Silence strict mode
 		StrictMode.ThreadPolicy tp = StrictMode.allowThreadDiskWrites();
 		super.writeSeed();
+		if (Build.VERSION.SDK_INT >= 16 && Build.VERSION.SDK_INT <= 18)
+			applyOpenSslFix();
 		StrictMode.setThreadPolicy(tp);
 	}
+
+	// Based on https://android-developers.googleblog.com/2013/08/some-securerandom-thoughts.html
+	private void applyOpenSslFix() {
+		byte[] seed = new UnixSecureRandomSpi().engineGenerateSeed(
+				SEED_LENGTH);
+		try {
+			// Seed the OpenSSL PRNG
+			Class.forName("org.apache.harmony.xnet.provider.jsse.NativeCrypto")
+					.getMethod("RAND_seed", byte[].class)
+					.invoke(null, (Object) seed);
+			// Mix the output of the Linux PRNG into the OpenSSL PRNG
+			int bytesRead = (Integer) Class.forName(
+					"org.apache.harmony.xnet.provider.jsse.NativeCrypto")
+					.getMethod("RAND_load_file", String.class, long.class)
+					.invoke(null, "/dev/urandom", 1024);
+			if (bytesRead != 1024) throw new IOException();
+		} catch (Exception e) {
+			throw new SecurityException(e);
+		}
+	}
 }

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

@@ -1,19 +1,12 @@
 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.LocationUtils;
 import org.briarproject.bramble.api.system.ResourceProvider;
 import org.briarproject.bramble.api.system.SecureRandomProvider;
-import org.briarproject.onionwrapper.AndroidLocationUtilsFactory;
-import org.briarproject.onionwrapper.LocationUtils;
 
 import java.util.concurrent.Executor;
-import java.util.concurrent.RejectedExecutionHandler;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
 
 import javax.inject.Singleton;
 
@@ -23,23 +16,6 @@ import dagger.Provides;
 @Module
 public class AndroidSystemModule {
 
-	private final ScheduledExecutorService scheduledExecutorService;
-
-	public AndroidSystemModule() {
-		// Discard tasks that are submitted during shutdown
-		RejectedExecutionHandler policy =
-				new ScheduledThreadPoolExecutor.DiscardPolicy();
-		scheduledExecutorService = new ScheduledThreadPoolExecutor(1, policy);
-	}
-
-	@Provides
-	@Singleton
-	ScheduledExecutorService provideScheduledExecutorService(
-			LifecycleManager lifecycleManager) {
-		lifecycleManager.registerForShutdown(scheduledExecutorService);
-		return scheduledExecutorService;
-	}
-
 	@Provides
 	@Singleton
 	SecureRandomProvider provideSecureRandomProvider(
@@ -48,9 +24,8 @@ public class AndroidSystemModule {
 	}
 
 	@Provides
-	@Singleton
+	LocationUtils provideLocationUtils(AndroidLocationUtils locationUtils) {
-	LocationUtils provideLocationUtils(Application app) {
+		return locationUtils;
-		return AndroidLocationUtilsFactory.createAndroidLocationUtils(app);
 	}
 
 	@Provides

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

@@ -1,247 +0,0 @@
-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.android.dontkillmelib.wakelock.AndroidWakeLockManager;
-import org.briarproject.bramble.api.Cancellable;
-import org.briarproject.bramble.api.lifecycle.Service;
-import org.briarproject.bramble.api.system.AlarmListener;
-import org.briarproject.bramble.api.system.TaskScheduler;
-import org.briarproject.bramble.api.system.Wakeful;
-import org.briarproject.nullsafety.NotNullByDefault;
-
-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;
-import static org.briarproject.bramble.util.AndroidUtils.getImmutableFlags;
-
-@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");
-		// Acquire the lock before scheduling the check to ensure the check
-		// doesn't access the task queue before the task has been added
-		ScheduledTask s;
-		synchronized (lock) {
-			Future<?> check = scheduleCheckForDueTasks(delay, unit);
-			s = new ScheduledTask(wakeful, dueMillis, check, cancelled);
-			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);
-	}
-
-	@GuardedBy("lock")
-	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,
-				getImmutableFlags(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;
-
-		private 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

@@ -1,49 +0,0 @@
-package org.briarproject.bramble.system;
-
-import android.app.Application;
-
-import org.briarproject.android.dontkillmelib.wakelock.AndroidWakeLockManager;
-import org.briarproject.bramble.api.lifecycle.LifecycleManager;
-import org.briarproject.bramble.api.system.AlarmListener;
-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/AndroidWakeLockModule.java

@@ -1,25 +0,0 @@
-package org.briarproject.bramble.system;
-
-import android.app.Application;
-
-import org.briarproject.android.dontkillmelib.wakelock.AndroidWakeLockManager;
-import org.briarproject.android.dontkillmelib.wakelock.AndroidWakeLockManagerFactory;
-
-import java.util.concurrent.ScheduledExecutorService;
-
-import javax.inject.Singleton;
-
-import dagger.Module;
-import dagger.Provides;
-
-@Module
-public class AndroidWakeLockModule {
-
-	@Provides
-	@Singleton
-	AndroidWakeLockManager provideWakeLockManager(Application app,
-			ScheduledExecutorService scheduledExecutorService) {
-		return AndroidWakeLockManagerFactory.createAndroidWakeLockManager(app,
-				scheduledExecutorService);
-	}
-}

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

@@ -1,23 +0,0 @@
-package org.briarproject.bramble.system;
-
-import org.briarproject.android.dontkillmelib.wakelock.AndroidWakeLockManager;
-import org.briarproject.bramble.api.lifecycle.IoExecutor;
-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/util/AndroidUtils.java

@@ -4,136 +4,57 @@ import android.annotation.SuppressLint;
 import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
 import android.os.Build;
-import android.os.Looper;
 import android.provider.Settings;
 
-import org.briarproject.bramble.api.Pair;
-import org.briarproject.nullsafety.NotNullByDefault;
-
 import java.io.File;
-import java.lang.reflect.Field;
+import java.util.ArrayList;
-import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
-import java.lang.reflect.Method;
 import java.util.Collection;
+import java.util.List;
 
-import javax.annotation.Nullable;
-
-import static android.Manifest.permission.BLUETOOTH_CONNECT;
-import static android.app.PendingIntent.FLAG_IMMUTABLE;
 import static android.content.Context.MODE_PRIVATE;
-import static android.content.pm.PackageManager.PERMISSION_GRANTED;
 import static android.os.Build.VERSION.SDK_INT;
-import static android.os.Process.myPid;
-import static android.os.Process.myUid;
-import static java.util.Arrays.asList;
-import static org.briarproject.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() {
-		return asList(Build.SUPPORTED_ABIS);
+		List<String> abis = new ArrayList<>();
-	}
+		if (SDK_INT >= 21) {
-
+			abis.addAll(Arrays.asList(Build.SUPPORTED_ABIS));
-	public static boolean hasBtConnectPermission(Context ctx) {
+		} else {
-		return SDK_INT < 31 || ctx.checkPermission(BLUETOOTH_CONNECT, myPid(),
+			abis.add(Build.CPU_ABI);
-				myUid()) == PERMISSION_GRANTED;
+			if (Build.CPU_ABI2 != null) abis.add(Build.CPU_ABI2);
+		}
+		return abis;
 	}
 
 	public static String getBluetoothAddress(Context ctx,
 			BluetoothAdapter adapter) {
-		return getBluetoothAddressAndMethod(ctx, adapter).getFirst();
-	}
-
-	public static Pair<String, String> getBluetoothAddressAndMethod(Context ctx,
-			BluetoothAdapter adapter) {
-		// If we don't have permission to access the adapter's address, let
-		// the caller know we can't find it
-		if (!hasBtConnectPermission(ctx)) return new Pair<>("", "");
 		// Return the adapter's address if it's valid and not fake
 		@SuppressLint("HardwareIds")
 		String address = adapter.getAddress();
-		if (isValidBluetoothAddress(address)) {
+		if (isValidBluetoothAddress(address)) return address;
-			return new Pair<>(address, "adapter");
-		}
 		// Return the address from settings if it's valid and not fake
-		if (SDK_INT < 33) {
+		address = Settings.Secure.getString(ctx.getContentResolver(),
-			address = Settings.Secure.getString(ctx.getContentResolver(),
+				"bluetooth_address");
-					"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 new Pair<>("", "");
+		return "";
 	}
 
-	public static boolean isValidBluetoothAddress(@Nullable String address) {
+	private static boolean isValidBluetoothAddress(String address) {
 		return !StringUtils.isNullOrEmpty(address)
 				&& BluetoothAdapter.checkBluetoothAddress(address)
 				&& !address.equals(FAKE_BLUETOOTH_ADDRESS);
 	}
 
-	@Nullable
-	private static String getBluetoothAddressByReflection(
-			BluetoothAdapter adapter) {
-		try {
-			Field mServiceField =
-					adapter.getClass().getDeclaredField("mService");
-			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;
-		}
-	}
-
 	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"};
-	}
-
-	public static boolean isUiThread() {
-		return Looper.myLooper() == Looper.getMainLooper();
-	}
-
-	public static int getImmutableFlags(int flags) {
-		if (SDK_INT >= 23) {
-			return FLAG_IMMUTABLE | flags;
-		}
-		return flags;
-	}
 }

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

@@ -0,0 +1,100 @@
+package org.briarproject.bramble.util;
+
+import android.os.PowerManager;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Logger;
+
+import javax.annotation.Nullable;
+import javax.annotation.concurrent.ThreadSafe;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.logging.Level.INFO;
+
+@ThreadSafe
+@NotNullByDefault
+public class RenewableWakeLock {
+
+	private static final Logger LOG =
+			Logger.getLogger(RenewableWakeLock.class.getName());
+
+	/**
+	 * Automatically release the lock this many milliseconds after it's due
+	 * to have been replaced and released.
+	 */
+	private static final int SAFETY_MARGIN_MS = 10_000;
+
+	private final PowerManager powerManager;
+	private final ScheduledExecutorService scheduler;
+	private final int levelAndFlags;
+	private final String tag;
+	private final long durationMs;
+	private final Runnable renewTask;
+
+	private final Object lock = new Object();
+	@Nullable
+	private PowerManager.WakeLock wakeLock; // Locking: lock
+	@Nullable
+	private ScheduledFuture future; // Locking: lock
+
+	public RenewableWakeLock(PowerManager powerManager,
+			ScheduledExecutorService scheduler, int levelAndFlags, String tag,
+			long duration, TimeUnit timeUnit) {
+		this.powerManager = powerManager;
+		this.scheduler = scheduler;
+		this.levelAndFlags = levelAndFlags;
+		this.tag = tag;
+		durationMs = MILLISECONDS.convert(duration, timeUnit);
+		renewTask = this::renew;
+	}
+
+	public void acquire() {
+		if (LOG.isLoggable(INFO)) LOG.info("Acquiring wake lock " + tag);
+		synchronized (lock) {
+			if (wakeLock != null) {
+				LOG.info("Already acquired");
+				return;
+			}
+			wakeLock = powerManager.newWakeLock(levelAndFlags, tag);
+			wakeLock.setReferenceCounted(false);
+			wakeLock.acquire(durationMs + SAFETY_MARGIN_MS);
+			future = scheduler.schedule(renewTask, durationMs, MILLISECONDS);
+		}
+	}
+
+	private void renew() {
+		if (LOG.isLoggable(INFO)) LOG.info("Renewing wake lock " + tag);
+		synchronized (lock) {
+			if (wakeLock == null) {
+				LOG.info("Already released");
+				return;
+			}
+			PowerManager.WakeLock oldWakeLock = wakeLock;
+			wakeLock = powerManager.newWakeLock(levelAndFlags, tag);
+			wakeLock.setReferenceCounted(false);
+			wakeLock.acquire(durationMs + SAFETY_MARGIN_MS);
+			oldWakeLock.release();
+			future = scheduler.schedule(renewTask, durationMs, MILLISECONDS);
+		}
+	}
+
+	public void release() {
+		if (LOG.isLoggable(INFO)) LOG.info("Releasing wake lock " + tag);
+		synchronized (lock) {
+			if (wakeLock == null) {
+				LOG.info("Already released");
+				return;
+			}
+			if (future == null) throw new AssertionError();
+			future.cancel(false);
+			future = null;
+			wakeLock.release();
+			wakeLock = null;
+		}
+	}
+}
+

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

@@ -9,17 +9,20 @@ 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.imposters.ByteBuddyClassImposteriser;
+import org.jmock.lib.legacy.ClassImposteriser;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.io.File;
 
+import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertFalse;
 import static junit.framework.Assert.assertTrue;
 import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory;
+import static org.briarproject.bramble.test.TestUtils.getRandomBytes;
 import static org.briarproject.bramble.test.TestUtils.getTestDirectory;
+import static org.briarproject.bramble.util.StringUtils.toHexString;
 
 public class AndroidAccountManagerTest extends BrambleMockTestCase {
 
@@ -37,14 +40,17 @@ public class AndroidAccountManagerTest extends BrambleMockTestCase {
 	private final Application app;
 	private final ApplicationInfo applicationInfo;
 
+	private final String encryptedKeyHex = toHexString(getRandomBytes(123));
 	private final File testDir = getTestDirectory();
 	private final File keyDir = new File(testDir, "key");
+	private final File keyFile = new File(keyDir, "db.key");
+	private final File keyBackupFile = new File(keyDir, "db.key.bak");
 	private final File dbDir = new File(testDir, "db");
 
 	private AndroidAccountManager accountManager;
 
 	public AndroidAccountManagerTest() {
-		context.setImposteriser(ByteBuddyClassImposteriser.INSTANCE);
+		context.setImposteriser(ClassImposteriser.INSTANCE);
 		app = context.mock(Application.class);
 		applicationInfo = new ApplicationInfo();
 		applicationInfo.dataDir = testDir.getAbsolutePath();
@@ -69,12 +75,33 @@ public class AndroidAccountManagerTest extends BrambleMockTestCase {
 		};
 	}
 
+	@Test
+	public void testDbKeyIsMigratedFromPreferencesToFile() {
+		context.checking(new Expectations() {{
+			oneOf(prefs).getString("key", null);
+			will(returnValue(encryptedKeyHex));
+			oneOf(prefs).edit();
+			will(returnValue(editor));
+			oneOf(editor).remove("key");
+			will(returnValue(editor));
+			oneOf(editor).commit();
+			will(returnValue(true));
+		}});
+
+		assertFalse(keyFile.exists());
+		assertFalse(keyBackupFile.exists());
+
+		assertEquals(encryptedKeyHex,
+				accountManager.loadEncryptedDatabaseKey());
+
+		assertTrue(keyFile.exists());
+		assertTrue(keyBackupFile.exists());
+	}
+
 	@Test
 	public void testDeleteAccountClearsSharedPrefsAndDeletesFiles()
 			throws Exception {
-		// Directories 'code_cache', 'lib' and 'shared_prefs' should be spared
+		// Directories '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");
@@ -87,10 +114,6 @@ public class AndroidAccountManagerTest extends BrambleMockTestCase {
 		File potatoFile = new File(potatoDir, "file");
 		File filesDir = new File(testDir, "filesDir");
 		File externalCacheDir = new File(testDir, "externalCacheDir");
-		File externalCacheDir1 = new File(testDir, "externalCacheDir1");
-		File externalCacheDir2 = new File(testDir, "externalCacheDir2");
-		File externalMediaDir1 = new File(testDir, "externalMediaDir1");
-		File externalMediaDir2 = new File(testDir, "externalMediaDir2");
 
 		context.checking(new Expectations() {{
 			oneOf(prefs).edit();
@@ -105,7 +128,7 @@ public class AndroidAccountManagerTest extends BrambleMockTestCase {
 			will(returnValue(editor));
 			oneOf(editor).commit();
 			will(returnValue(true));
-			allowing(app).getApplicationInfo();
+			oneOf(app).getApplicationInfo();
 			will(returnValue(applicationInfo));
 			oneOf(app).getFilesDir();
 			will(returnValue(filesDir));
@@ -113,18 +136,10 @@ public class AndroidAccountManagerTest extends BrambleMockTestCase {
 			will(returnValue(cacheDir));
 			oneOf(app).getExternalCacheDir();
 			will(returnValue(externalCacheDir));
-			oneOf(app).getExternalCacheDirs();
-			will(returnValue(
-					new File[] {externalCacheDir1, externalCacheDir2}));
-			oneOf(app).getExternalMediaDirs();
-			will(returnValue(
-					new File[] {externalMediaDir1, externalMediaDir2}));
 		}});
 
 		assertTrue(dbDir.mkdirs());
 		assertTrue(keyDir.mkdirs());
-		assertTrue(codeCacheDir.mkdirs());
-		assertTrue(codeCacheFile.createNewFile());
 		assertTrue(libDir.mkdirs());
 		assertTrue(libFile.createNewFile());
 		assertTrue(sharedPrefsDir.mkdirs());
@@ -135,17 +150,11 @@ public class AndroidAccountManagerTest extends BrambleMockTestCase {
 		assertTrue(potatoFile.createNewFile());
 		assertTrue(filesDir.mkdirs());
 		assertTrue(externalCacheDir.mkdirs());
-		assertTrue(externalCacheDir1.mkdirs());
-		assertTrue(externalCacheDir2.mkdirs());
-		assertTrue(externalMediaDir1.mkdirs());
-		assertTrue(externalMediaDir2.mkdirs());
 
 		accountManager.deleteAccount();
 
 		assertFalse(dbDir.exists());
 		assertFalse(keyDir.exists());
-		assertTrue(codeCacheDir.exists());
-		assertTrue(codeCacheFile.exists());
 		assertTrue(libDir.exists());
 		assertTrue(libFile.exists());
 		assertTrue(sharedPrefsDir.exists());
@@ -156,10 +165,6 @@ public class AndroidAccountManagerTest extends BrambleMockTestCase {
 		assertFalse(potatoFile.exists());
 		assertFalse(filesDir.exists());
 		assertFalse(externalCacheDir.exists());
-		assertFalse(externalCacheDir1.exists());
-		assertFalse(externalCacheDir2.exists());
-		assertFalse(externalMediaDir1.exists());
-		assertFalse(externalMediaDir2.exists());
 	}
 
 	@After

bramble-android/witness.gradle

@@ -1,68 +1,100 @@
 dependencyVerification {
     verify = [
-            'androidx.annotation:annotation:1.5.0:annotation-1.5.0.jar:261fb7c0210858500bab66d34354972a75166ab4182add283780b05513d6ec4a',
+        'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861',
-            'cglib:cglib:3.2.8:cglib-3.2.8.jar:3f64de999ecc5595dc84ca8ff0879d8a34c8623f9ef3c517a53ed59023fcb9db',
+        'com.android.tools.analytics-library:protos:26.3.2:protos-26.3.2.jar:50238fb4298b297217b184b9cd93c14f83536fcee829eb0ca850bdb5b53251f0',
-            'com.google.code.findbugs:annotations:3.0.1:annotations-3.0.1.jar:6b47ff0a6de0ce17cbedc3abb0828ca5bce3009d53ea47b3723ff023c4742f79',
+        'com.android.tools.analytics-library:shared:26.3.2:shared-26.3.2.jar:ddd80dcf21905018b7c0583ba72b7282f446084d4952422609a09fbf8237ef71',
-            'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
+        'com.android.tools.analytics-library:tracker:26.3.2:tracker-26.3.2.jar:28c575d2d1af003e96d7b375a668ee10b2673a2dd0f6438750aa8c3b42e7d0ad',
-            'com.google.dagger:dagger-compiler:2.45:dagger-compiler-2.45.jar:5617dfb994537dba5b41f3744a6dd13ec3cd99789c065e0d5c6fa9f21cf7ca25',
+        'com.android.tools.build:apksig:3.3.2:apksig-3.3.2.jar:84c4aaa20127c6c1fe6bdd334b3f5df71f54ad080be9029c8a10f43b6a908acd',
-            'com.google.dagger:dagger-producers:2.45:dagger-producers-2.45.jar:a05abb4c3ccf6bb0f056bdcb5ef973898ecf172952ab5948a824aeea6c86ecaa',
+        'com.android.tools.build:apkzlib:3.3.2:apkzlib-3.3.2.jar:d34e523278e5dff565eba3ef3c089d515b2b5cc7b47dc77e2f3465e5e47176ac',
-            'com.google.dagger:dagger-spi:2.45:dagger-spi-2.45.jar:7cd6f0b09d88e64a9c97bc80e544ab8ac8fdee9301754413585a74cf64222b27',
+        'com.android.tools.build:builder-model:3.3.2:builder-model-3.3.2.jar:055e3db0ecee9e06b9f024034999a29cd92cb1885207b37542126bd8bcc57f46',
-            'com.google.dagger:dagger:2.45:dagger-2.45.jar:f011cae7d2c0fb7ea17c34e05bc10e768b1081a5892ad019cf1fdb0e125c49c1',
+        'com.android.tools.build:builder-test-api:3.3.2:builder-test-api-3.3.2.jar:0b2e4cd7615bbcad14a3c91fe45ae26693508d06e40ba06c5968b8bc24416618',
-            'com.google.devtools.ksp:symbol-processing-api:1.7.0-1.0.6:symbol-processing-api-1.7.0-1.0.6.jar:adc29417be5ca9ff42118105fea4e36d9ef44987abfc41432309371a60198941',
+        'com.android.tools.build:builder:3.3.2:builder-3.3.2.jar:65649704da7aef0487235fd326f0f2e99ed5cf958e80f204496e6e08a42bd9f5',
-            'com.google.errorprone:error_prone_annotations:2.7.1:error_prone_annotations-2.7.1.jar:cd5257c08a246cf8628817ae71cb822be192ef91f6881ca4a3fcff4f1de1cff3',
+        'com.android.tools.build:gradle-api:3.3.2:gradle-api-3.3.2.jar:3cbd47e41bb70330dd72ec2c9fe51e6173554b484a03829b5a2de9e00841e040',
-            'com.google.errorprone:javac-shaded:9-dev-r4023-3:javac-shaded-9-dev-r4023-3.jar:65bfccf60986c47fbc17c9ebab0be626afc41741e0a6ec7109e0768817a36f30',
+        'com.android.tools.build:manifest-merger:26.3.2:manifest-merger-26.3.2.jar:05c4a6d8b02fb9f08744876477d0a68547c03a8a9069b1f086684fa04af97c33',
-            'com.google.googlejavaformat:google-java-format:1.5:google-java-format-1.5.jar:aa19ad7850fb85178aa22f2fddb163b84d6ce4d0035872f30d4408195ca1144e',
+        'com.android.tools.ddms:ddmlib:26.3.2:ddmlib-26.3.2.jar:d248da8a563d6e46d2c7ebbf371a4877e00510f4ca763c0bb272d5a281bf8b85',
-            'com.google.guava:failureaccess:1.0.1:failureaccess-1.0.1.jar:a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26',
+        'com.android.tools.external.com-intellij:intellij-core:26.3.2:intellij-core-26.3.2.jar:6c5ecc968230e9f4dcd0fef28885379feace1f0cd8130de6f61d649c86139bf3',
-            'com.google.guava:guava:31.0.1-jre:guava-31.0.1-jre.jar:d5be94d65e87bd219fb3193ad1517baa55a3b88fc91d21cf735826ab5af087b9',
+        'com.android.tools.external.com-intellij:kotlin-compiler:26.3.2:kotlin-compiler-26.3.2.jar:1007d9b07ccb49cd8eaf30fda10ed4681d4714f2f9ab2ecda39b4e539cc51bbe',
-            'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava:listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar:b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99',
+        'com.android.tools.external.org-jetbrains:uast:26.3.2:uast-26.3.2.jar:5d1833e562ea4f38a89708dfde695f0a162cbd39d003d3dde818c3fdc2b05317',
-            'com.google.j2objc:j2objc-annotations:1.3:j2objc-annotations-1.3.jar:21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b',
+        'com.android.tools.layoutlib:layoutlib-api:26.3.2:layoutlib-api-26.3.2.jar:d7e61e874ab95f5c350dd38b6a95b5c9dbe0083a02001884264cdb390cb255b8',
-            'com.squareup:javapoet:1.13.0:javapoet-1.13.0.jar:4c7517e848a71b36d069d12bb3bf46a70fd4cda3105d822b0ed2e19c00b69291',
+        'com.android.tools.lint:lint-api:26.3.2:lint-api-26.3.2.jar:5867dfd7fb4a4e161a816a5d29d045f9b542d34594c00a1efec46fb4cd0e1033',
-            'com.squareup:kotlinpoet:1.11.0:kotlinpoet-1.11.0.jar:2887ada1ca03dd83baa2758640d87e840d1907564db0ef88d2289c868a980492',
+        'com.android.tools.lint:lint-checks:26.3.2:lint-checks-26.3.2.jar:4b163b9c93790d2771e92ba8de58a0d9e0671ffcf2ccef3cf496efd442e27517',
-            'io.github.willena:sqlite-jdbc:3.41.2.1:sqlite-jdbc-3.41.2.1.jar:fb60e7137c1791db89240701338d31ca42a0bec5508c1aab1c1131cf885f2309',
+        'com.android.tools.lint:lint-gradle-api:26.3.2:lint-gradle-api-26.3.2.jar:54cb282e0c054f9bed3f51302ce08b003c8ab7961dfd5a4f6de26c23cc23062f',
-            'javax.annotation:jsr250-api:1.0:jsr250-api-1.0.jar:a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f',
+        'com.android.tools.lint:lint-gradle:26.3.2:lint-gradle-26.3.2.jar:bb139615f4ce97d42cc394b9389b49b76a6eb85be6785a5d272991543b519013',
-            'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
+        'com.android.tools.lint:lint:26.3.2:lint-26.3.2.jar:ef7b369f8a56a92ccb0f4c1c357666b9339e4a711a9d84747d446441746cfe4e',
-            'junit:junit:4.13.2:junit-4.13.2.jar:8e495b634469d64fb8acfa3495a065cbacc8a0fff55ce1e31007be4c16dc57d3',
+        'com.android.tools:annotations:26.3.2:annotations-26.3.2.jar:5bcce8e98b6a2f5ccf13ebcefd8f734e0b35f8b19e456575665631442ce1f7a1',
-            'net.bytebuddy:byte-buddy:1.9.12:byte-buddy-1.9.12.jar:3688c3d434bebc3edc5516296a2ed0f47b65e451071b4afecad84f902f0efc11',
+        'com.android.tools:common:26.3.2:common-26.3.2.jar:d9f8e7f0669e9a701568e3db6a87c89cf12d8fa6811c9991e969f950215ecfac',
-            'net.jcip:jcip-annotations:1.0:jcip-annotations-1.0.jar:be5805392060c71474bf6c9a67a099471274d30b83eef84bfc4e0889a4f1dcc0',
+        'com.android.tools:dvlib:26.3.2:dvlib-26.3.2.jar:d84aad56161c7773579303d69714ded6897c64c6ddfd7d456e453231e4dfe811',
-            'net.ltgt.gradle.incap:incap:0.2:incap-0.2.jar:b625b9806b0f1e4bc7a2e3457119488de3cd57ea20feedd513db070a573a4ffd',
+        'com.android.tools:repository:26.3.2:repository-26.3.2.jar:da611eeb06e9ab8750d25b9e2901e10db8e5ec6304eb4c8b7103d39e0921ea40',
-            'org.apache-extras.beanshell:bsh:2.0b6:bsh-2.0b6.jar:a17955976070c0573235ee662f2794a78082758b61accffce8d3f8aedcd91047',
+        'com.android.tools:sdk-common:26.3.2:sdk-common-26.3.2.jar:82823a3bf25e64fac33a286490f0cf5ac50c2cdb3c540149b030896bb44bf96c',
-            'org.briarproject:dont-kill-me-lib:0.2.7:dont-kill-me-lib-0.2.7.aar:8a9540941fd927e1c127096a7a9b4aa61ce2f2965d2e24f849be92f9e57213c4',
+        'com.android.tools:sdklib:26.3.2:sdklib-26.3.2.jar:424d15492af67321900963238646d27495ab60de2a5b19e6a416963bc5d6932b',
-            'org.briarproject:jtorctl:0.5:jtorctl-0.5.jar:43f8c7d390169772b9a2c82ab806c8414c136a2a8636c555e22754bb7260793b',
+        'com.google.code.findbugs:jsr305:1.3.9:jsr305-1.3.9.jar:905721a0eea90a81534abb7ee6ef4ea2e5e645fa1def0a5cd88402df1b46c9ed',
-            'org.briarproject:null-safety:0.1:null-safety-0.1.jar:161760de5e838cb982bafa973df820675d4397098e9a91637a36a306d43ba011',
+        'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
-            'org.briarproject:obfs4proxy-android:0.0.14-tor2:obfs4proxy-android-0.0.14-tor2.jar:a0a93770d6760ce57d9dbd31cc7177687374e00c3361dac22ab75e3b6e0f289e',
+        'com.google.code.gson:gson:2.8.0:gson-2.8.0.jar:c6221763bd79c4f1c3dc7f750b5f29a0bb38b367b81314c4f71896e340c40825',
-            'org.briarproject:onionwrapper-android:0.0.5:onionwrapper-android-0.0.5.aar:d761854dac454616b3e0ca099b2cd17060365ce4316afe495cc7ae86b6c81d15',
+        'com.google.dagger:dagger-compiler:2.19:dagger-compiler-2.19.jar:27a4b202a2de908182edb261f8c0a264e08e5e4733d7514bc7fbf0d31da5c0fc',
-            'org.briarproject:onionwrapper-core:0.0.5:onionwrapper-core-0.0.5.jar:9071678323535cb3dfe0f3add96066037db43ea024333eba0117c759bcbd8d63',
+        'com.google.dagger:dagger-producers:2.19:dagger-producers-2.19.jar:a17663abe0fc38b676026950907d4c5f5e2bf338375415861eaff6e3bdb0b768',
-            'org.briarproject:snowflake-android:2.5.1:snowflake-android-2.5.1.jar:88ec81c17b1b6fa884d06839dec0330e328b45c89f88c970a213ce91ca8eac87',
+        'com.google.dagger:dagger-spi:2.19:dagger-spi-2.19.jar:e7a6379d82c841f6aac2866948ad1eed716528707814602842a8d844ce04e2e1',
-            'org.briarproject:tor-android:0.4.7.14:tor-android-0.4.7.14.jar:d39faa3a8abb116136c191c6ebadf8ea0e1f3e4785076d2c66a7b3b0f26988a2',
+        'com.google.dagger:dagger:2.19:dagger-2.19.jar:514b6f1e0727c6572e1d65cb27e4ae668b7aeaeb93a29515182965265b609939',
-            'org.checkerframework:checker-compat-qual:2.5.5:checker-compat-qual-2.5.5.jar:11d134b245e9cacc474514d2d66b5b8618f8039a1465cdc55bbc0b34e0008b7a',
+        'com.google.errorprone:error_prone_annotations:2.1.3:error_prone_annotations-2.1.3.jar:03d0329547c13da9e17c634d1049ea2ead093925e290567e1a364fd6b1fc7ff8',
-            'org.checkerframework:checker-qual:3.12.0:checker-qual-3.12.0.jar:ff10785ac2a357ec5de9c293cb982a2cbb605c0309ea4cc1cb9b9bc6dbe7f3cb',
+        'com.google.errorprone:javac-shaded:9-dev-r4023-3:javac-shaded-9-dev-r4023-3.jar:65bfccf60986c47fbc17c9ebab0be626afc41741e0a6ec7109e0768817a36f30',
-            'org.hamcrest:hamcrest-core:2.1:hamcrest-core-2.1.jar:e09109e54a289d88506b9bfec987ddd199f4217c9464132668351b9a4f00bee9',
+        'com.google.googlejavaformat:google-java-format:1.5:google-java-format-1.5.jar:aa19ad7850fb85178aa22f2fddb163b84d6ce4d0035872f30d4408195ca1144e',
-            'org.hamcrest:hamcrest-library:2.1:hamcrest-library-2.1.jar:b7e2b6895b3b679f0e47b6380fda391b225e9b78505db9d8bdde8d3cc8d52a21',
+        'com.google.guava:guava:25.0-jre:guava-25.0-jre.jar:3fd4341776428c7e0e5c18a7c10de129475b69ab9d30aeafbb5c277bb6074fa9',
-            'org.hamcrest:hamcrest:2.1:hamcrest-2.1.jar:ba93b2e3a562322ba432f0a1b53addcc55cb188253319a020ed77f824e692050',
+        'com.google.guava:guava:26.0-jre:guava-26.0-jre.jar:a0e9cabad665bc20bcd2b01f108e5fc03f756e13aea80abaadb9f407033bea2c',
-            'org.jacoco:org.jacoco.agent:0.8.8:org.jacoco.agent-0.8.8.jar:072ecbd496896623899a696fff12c01c1615f737616d2792e6d0e10cdf8a610d',
+        'com.google.j2objc:j2objc-annotations:1.1:j2objc-annotations-1.1.jar:40ceb7157feb263949e0f503fe5f71689333a621021aa20ce0d0acee3badaa0f',
-            'org.jacoco:org.jacoco.ant:0.8.8:org.jacoco.ant-0.8.8.jar:02e33bd2c48dc0be67c2fea84d43beececfd400da6797c58153253d4c30aca15',
+        'com.google.jimfs:jimfs:1.1:jimfs-1.1.jar:c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd',
-            'org.jacoco:org.jacoco.core:0.8.8:org.jacoco.core-0.8.8.jar:474c782f809d88924713dfdbf0acb79d330f904be576484803463d0465611643',
+        'com.google.protobuf:protobuf-java:3.4.0:protobuf-java-3.4.0.jar:dce7e66b32456a1b1198da0caff3a8acb71548658391e798c79369241e6490a4',
-            'org.jacoco:org.jacoco.report:0.8.8:org.jacoco.report-0.8.8.jar:2c129110f3e3fcaa1f8179578ea3894586199cb0826be5c7790278084c9622a9',
+        'com.googlecode.json-simple:json-simple:1.1:json-simple-1.1.jar:2d9484f4c649f708f47f9a479465fc729770ee65617dca3011836602264f6439',
-            'org.jetbrains.kotlin:kotlin-reflect:1.6.10:kotlin-reflect-1.6.10.jar:3277ac102ae17aad10a55abec75ff5696c8d109790396434b496e75087854203',
+        'com.squareup:javapoet:1.11.1:javapoet-1.11.1.jar:9cbf2107be499ec6e95afd36b58e3ca122a24166cdd375732e51267d64058e90',
-            'org.jetbrains.kotlin:kotlin-stdlib-common:1.7.0:kotlin-stdlib-common-1.7.0.jar:59c6ff64fe9a6604afce03e8aaa75f83586c6030ac71fb0b34ee7cdefed3618f',
+        'com.squareup:javawriter:2.5.0:javawriter-2.5.0.jar:fcfb09fb0ea0aa97d3cfe7ea792398081348e468f126b3603cb3803f240197f0',
-            'org.jetbrains.kotlin:kotlin-stdlib-common:1.8.0:kotlin-stdlib-common-1.8.0.jar:78ef93b59e603cc0fe51def9bd4c037b07cbace3b3b7806d1a490a42bc1f4cb2',
+        'com.sun.activation:javax.activation:1.2.0:javax.activation-1.2.0.jar:993302b16cd7056f21e779cc577d175a810bb4900ef73cd8fbf2b50f928ba9ce',
-            'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.0:kotlin-stdlib-jdk7-1.7.0.jar:07e91be9b2ca20672d2bdb7e181b766e73453a2da13492b5ddaee8fa47aea239',
+        'com.sun.istack:istack-commons-runtime:2.21:istack-commons-runtime-2.21.jar:c33e67a0807095f02a0e2da139412dd7c4f9cc1a4c054b3e434f96831ba950f4',
-            'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0:kotlin-stdlib-jdk7-1.8.0.jar:4c889d1d9803f5f2eb6c1592a6b7e62369ac7660c9eee15aba16fec059163666',
+        'com.sun.xml.fastinfoset:FastInfoset:1.2.13:FastInfoset-1.2.13.jar:27a77db909f3c2833c0b1a37c55af1db06045118ad2eed96ce567b6632bce038',
-            'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.0:kotlin-stdlib-jdk8-1.7.0.jar:cf058e11db1dfc9944680c8c61b95ac689aaaa8a3eb30bced028100f038f030b',
+        'commons-codec:commons-codec:1.9:commons-codec-1.9.jar:ad19d2601c3abf0b946b5c3a4113e226a8c1e3305e395b90013b78dd94a723ce',
-            'org.jetbrains.kotlin:kotlin-stdlib:1.7.0:kotlin-stdlib-1.7.0.jar:aa88e9625577957f3249a46cb6e166ee09b369e600f7a11d148d16b0a6d87f05',
+        'commons-logging:commons-logging:1.2:commons-logging-1.2.jar:daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636',
-            'org.jetbrains.kotlin:kotlin-stdlib:1.8.0:kotlin-stdlib-1.8.0.jar:c77bef8774640b9fb9d6e217459ff220dae59878beb7d2e4b430506feffc654e',
+        'it.unimi.dsi:fastutil:7.2.0:fastutil-7.2.0.jar:74fa208043740642f7e6eb09faba15965218ad2f50ce3020efb100136e4b591c',
-            'org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.5.0:kotlinx-metadata-jvm-0.5.0.jar:ca063a96639b08b9eaa0de4d65e899480740a6efbe28ab9a8681a2ced03055a4',
+        'javax.annotation:jsr250-api:1.0:jsr250-api-1.0.jar:a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f',
-            'org.jetbrains:annotations:13.0:annotations-13.0.jar:ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478',
+        'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
-            'org.jmock:jmock-imposters:2.12.0:jmock-imposters-2.12.0.jar:3b836269745a137c9b2347e8d7c2104845b126ef04f012d6bfd94f1a7dea7b09',
+        'javax.xml.bind:jaxb-api:2.2.12-b140109.1041:jaxb-api-2.2.12-b140109.1041.jar:b5e60cd8b7b5ff01ce4a74c5dd008f4fbd14ced3495d0b47b85cfedc182211f2',
-            'org.jmock:jmock-junit4:2.12.0:jmock-junit4-2.12.0.jar:3233062fc889637c151a24f1ee086bad04321ab7d8264fef279daff0fa27205b',
+        'junit:junit:4.12:junit-4.12.jar:59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a',
-            'org.jmock:jmock-legacy:2.12.0:jmock-legacy-2.12.0.jar:dea3a9cca653d082e2fe7e40232e982fe03a9984c7d67ceff24f3e03fe580dcd',
+        'net.sf.jopt-simple:jopt-simple:4.9:jopt-simple-4.9.jar:26c5856e954b5f864db76f13b86919b59c6eecf9fd930b96baa8884626baf2f5',
-            'org.jmock:jmock-testjar:2.12.0:jmock-testjar-2.12.0.jar:efefbcf6cd294d0e29f0c46eb2a3380d4ca4e1763ff719c69e2f2ac62f564a04',
+        'net.sf.kxml:kxml2:2.3.0:kxml2-2.3.0.jar:f264dd9f79a1fde10ce5ecc53221eff24be4c9331c830b7d52f2f08a7b633de2',
-            'org.jmock:jmock:2.12.0:jmock-2.12.0.jar:266d07314c0cd343c46ff8a55601272de8cf406807caf55e6f313295f83d10be',
+        'org.apache.ant:ant-launcher:1.9.4:ant-launcher-1.9.4.jar:7bccea20b41801ca17bcbc909a78c835d0f443f12d639c77bd6ae3d05861608d',
-            'org.objenesis:objenesis:3.0.1:objenesis-3.0.1.jar:7a8ff780b9ff48415d7c705f60030b0acaa616e7f823c98eede3b63508d4e984',
+        'org.apache.ant:ant:1.9.4:ant-1.9.4.jar:649ae0730251de07b8913f49286d46bba7b92d47c5f332610aa426c4f02161d8',
-            'org.ow2.asm:asm-analysis:9.2:asm-analysis-9.2.jar:878fbe521731c072d14d2d65b983b1beae6ad06fda0007b6a8bae81f73f433c4',
+        'org.apache.commons:commons-compress:1.12:commons-compress-1.12.jar:2c1542faf343185b7cab9c3d55c8ae5471d6d095d3887a4adefdbdf2984dc0b6',
-            'org.ow2.asm:asm-commons:9.2:asm-commons-9.2.jar:be4ce53138a238bb522cd781cf91f3ba5ce2f6ca93ec62d46a162a127225e0a6',
+        'org.apache.httpcomponents:httpclient:4.5.2:httpclient-4.5.2.jar:0dffc621400d6c632f55787d996b8aeca36b30746a716e079a985f24d8074057',
-            'org.ow2.asm:asm-tree:9.2:asm-tree-9.2.jar:aabf9bd23091a4ebfc109c1f3ee7cf3e4b89f6ba2d3f51c5243f16b3cffae011',
+        'org.apache.httpcomponents:httpcore:4.4.5:httpcore-4.4.5.jar:64d5453874cab7e40a7065cb01a9a9ca1053845a9786b478878b679e0580cec3',
-            'org.ow2.asm:asm:7.1:asm-7.1.jar:4ab2fa2b6d2cc9ccb1eaa05ea329c407b47b13ed2915f62f8c4b8cc96258d4de',
+        'org.apache.httpcomponents:httpmime:4.5.2:httpmime-4.5.2.jar:231a3f7e4962053db2be8461d5422e68fc458a3a7dd7d8ada803a348e21f8f07',
-            'org.ow2.asm:asm:9.2:asm-9.2.jar:b9d4fe4d71938df38839f0eca42aaaa64cf8b313d678da036f0cb3ca199b47f5',
+        'org.beanshell:bsh:1.3.0:bsh-1.3.0.jar:9b04edc75d19db54f1b4e8b5355e9364384c6cf71eb0a1b9724c159d779879f8',
+        'org.bouncycastle:bcpkix-jdk15on:1.56:bcpkix-jdk15on-1.56.jar:7043dee4e9e7175e93e0b36f45b1ec1ecb893c5f755667e8b916eb8dd201c6ca',
+        'org.bouncycastle:bcprov-jdk15on:1.56:bcprov-jdk15on-1.56.jar:963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349',
+        'org.briarproject:obfs4proxy-android:0.0.9:obfs4proxy-android-0.0.9.zip:9b7e9181535ea8d8bbe8ae6338e08cf4c5fc1e357a779393e0ce49586d459ae0',
+        'org.briarproject:tor-android:0.3.5.8:tor-android-0.3.5.8.zip:42a13a6f185be1a62f42e3f30ce66a3c099ac5ec890a65e7593111b65b44a54a',
+        'org.checkerframework:checker-compat-qual:2.5.3:checker-compat-qual-2.5.3.jar:d76b9afea61c7c082908023f0cbc1427fab9abd2df915c8b8a3e7a509bccbc6d',
+        'org.checkerframework:checker-qual:2.5.2:checker-qual-2.5.2.jar:64b02691c8b9d4e7700f8ee2e742dce7ea2c6e81e662b7522c9ee3bf568c040a',
+        'org.codehaus.groovy:groovy-all:2.4.15:groovy-all-2.4.15.jar:51d6c4e71782e85674239189499854359d380fb75e1a703756e3aaa5b98a5af0',
+        'org.codehaus.mojo:animal-sniffer-annotations:1.14:animal-sniffer-annotations-1.14.jar:2068320bd6bad744c3673ab048f67e30bef8f518996fa380033556600669905d',
+        'org.glassfish.jaxb:jaxb-core:2.2.11:jaxb-core-2.2.11.jar:37bcaee8ebb04362c8352a5bf6221b86967ecdab5164c696b10b9a2bb587b2aa',
+        'org.glassfish.jaxb:jaxb-runtime:2.2.11:jaxb-runtime-2.2.11.jar:a874f2351cfba8e2946be3002d10c18a6da8f21b52ba2acf52f2b85d5520ed70',
+        'org.glassfish.jaxb:txw2:2.2.11:txw2-2.2.11.jar:272a3ccad45a4511351920cd2a8633c53cab8d5220c7a92954da5526bb5eafea',
+        'org.hamcrest:hamcrest-core:1.3:hamcrest-core-1.3.jar:66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9',
+        'org.hamcrest:hamcrest-library:1.3:hamcrest-library-1.3.jar:711d64522f9ec410983bd310934296da134be4254a125080a0416ec178dfad1c',
+        'org.jetbrains.kotlin:kotlin-reflect:1.3.21:kotlin-reflect-1.3.21.jar:a3065c822633191e0a3e3ee12a29bec234fc4b2864a6bb87ef48cce3e9e0c26a',
+        'org.jetbrains.kotlin:kotlin-stdlib-common:1.3.21:kotlin-stdlib-common-1.3.21.jar:cea61f7b611895e64f58569a9757fc0ab0d582f107211e1930e0ce2a0add52a7',
+        'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.21:kotlin-stdlib-jdk7-1.3.21.jar:a87875604fd42140da6938ae4d35ee61081f4482536efc6d2615b8b626a198af',
+        'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.21:kotlin-stdlib-jdk8-1.3.21.jar:5823ed66ac122a1c55442ebca5a209a843ccd87f562edc31a787f3d2e47f74d4',
+        'org.jetbrains.kotlin:kotlin-stdlib:1.3.21:kotlin-stdlib-1.3.21.jar:38ba2370d9f06f50433e06b2ca775b94473c2e2785f410926079ab793c72b034',
+        'org.jetbrains.trove4j:trove4j:20160824:trove4j-20160824.jar:1917871c8deb468307a584680c87a44572f5a8b0b98c6d397fc0f5f86596dbe7',
+        'org.jetbrains:annotations:13.0:annotations-13.0.jar:ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478',
+        'org.jmock:jmock-junit4:2.8.2:jmock-junit4-2.8.2.jar:f7ee4df4f7bd7b7f1cafad3b99eb74d579f109d5992ff625347352edb55e674c',
+        'org.jmock:jmock-legacy:2.8.2:jmock-legacy-2.8.2.jar:f2b985a5c08a9edb7f37612330c058809da3f6a6d63ce792426ebf8ff0d6d31b',
+        'org.jmock:jmock-testjar:2.8.2:jmock-testjar-2.8.2.jar:8900860f72c474e027cf97fe78dcbf154a1aa7fc62b6845c5fb4e4f3c7bc8760',
+        'org.jmock:jmock:2.8.2:jmock-2.8.2.jar:6c73cb4a2e6dbfb61fd99c9a768539c170ab6568e57846bd60dbf19596b65b16',
+        'org.jvnet.staxex:stax-ex:1.7.7:stax-ex-1.7.7.jar:a31ff7d77163c0deb09e7fee59ad35ae44c2cee2cc8552a116ccd1583d813fb4',
+        'org.objenesis:objenesis:2.1:objenesis-2.1.jar:c74330cc6b806c804fd37e74487b4fe5d7c2750c5e15fbc6efa13bdee1bdef80',
+        'org.ow2.asm:asm-analysis:6.0:asm-analysis-6.0.jar:2f1a6387219c3a6cc4856481f221b03bd9f2408a326d416af09af5d6f608c1f4',
+        'org.ow2.asm:asm-commons:6.0:asm-commons-6.0.jar:f1bce5c648a96a017bdcd01fe5d59af9845297fd7b79b81c015a6fbbd9719abf',
+        'org.ow2.asm:asm-tree:6.0:asm-tree-6.0.jar:887998fb69727c8759e4d253f856822801e33f9fd4caa566b3ac58ee92106215',
+        'org.ow2.asm:asm-util:6.0:asm-util-6.0.jar:356afebdb0f870175262e5188f8709a3b17aa2a5a6a4b0340b04d4b449bca5f6',
+        'org.ow2.asm:asm:5.0.4:asm-5.0.4.jar:896618ed8ae62702521a78bc7be42b7c491a08e6920a15f89a3ecdec31e9a220',
+        'org.ow2.asm:asm:6.0:asm-6.0.jar:dd8971c74a4e697899a8e95caae4ea8760ea6c486dc6b97b1795e75760420461',
     ]
 }

bramble-api/build.gradle

@@ -7,16 +7,13 @@ apply plugin: 'witness'
 apply from: 'witness.gradle'
 
 dependencies {
-	api 'org.briarproject:null-safety:0.1'
+	implementation "com.google.dagger:dagger:2.19"
-	api 'com.google.code.findbugs:jsr305:3.0.2'
+	implementation 'com.google.code.findbugs:jsr305:3.0.2'
-	api 'javax.inject:javax.inject:1'
-	api "com.google.dagger:dagger:$dagger_version"
 
-	implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
+	testImplementation 'junit:junit:4.12'
-
+	testImplementation "org.jmock:jmock:2.8.2"
-	testImplementation "junit:junit:$junit_version"
+	testImplementation "org.jmock:jmock-junit4:2.8.2"
-	testImplementation "org.jmock:jmock:$jmock_version"
+	testImplementation "org.jmock:jmock-legacy:2.8.2"
-	testImplementation "org.jmock:jmock-junit4:$jmock_version"
 
 	signature 'org.codehaus.mojo.signature:java16:1.1@signature'
 }
@@ -26,7 +23,7 @@ configurations {
 	testOutput.extendsFrom(testCompile)
 }
 task jarTest(type: Jar, dependsOn: testClasses) {
-	from sourceSets.test.output, sourceSets.main.output
+	from sourceSets.test.output
 	classifier = 'test'
 }
 artifacts {

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

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

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

@@ -1,6 +0,0 @@
-package org.briarproject.bramble.api;
-
-public interface Cancellable {
-
-	void cancel();
-}

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

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

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

@@ -1,19 +0,0 @@
-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 shouldEnablePrivateGroupsInCore();
-
-	boolean shouldEnableForumsInCore();
-
-	boolean shouldEnableBlogsInCore();
-}

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

@@ -1,6 +1,6 @@
 package org.briarproject.bramble.api;
 
-import org.briarproject.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import java.util.Collections;
 import java.util.HashMap;

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

@@ -1,6 +1,6 @@
 package org.briarproject.bramble.api;
 
-import org.briarproject.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 @NotNullByDefault
 public interface Nameable {

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

@@ -1,6 +1,6 @@
 package org.briarproject.bramble.api;
 
-import org.briarproject.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import javax.annotation.concurrent.Immutable;
 

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

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

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

@@ -1,14 +1,8 @@
 package org.briarproject.bramble.api;
 
-import org.briarproject.bramble.util.StringUtils;
-
-import java.util.ArrayList;
 import java.util.Hashtable;
-import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Nullable;
-
 public abstract class StringMap extends Hashtable<String, String> {
 
 	protected StringMap(Map<String, String> m) {
@@ -58,31 +52,4 @@ public abstract class StringMap extends Hashtable<String, String> {
 	public void putLong(String key, long value) {
 		put(key, String.valueOf(value));
 	}
-
-	@Nullable
-	public int[] getIntArray(String key) {
-		String s = get(key);
-		if (s == null) return null;
-		// Handle empty string because "".split(",") returns {""}
-		if (s.length() == 0) return new int[0];
-		String[] intStrings = s.split(",");
-		int[] ints = new int[intStrings.length];
-		try {
-			for (int i = 0; i < ints.length; i++) {
-				ints[i] = Integer.parseInt(intStrings[i]);
-			}
-		} catch (NumberFormatException e) {
-			return null;
-		}
-		return ints;
-	}
-
-	public void putIntArray(String key, int[] value) {
-		List<String> intStrings = new ArrayList<>();
-		for (int integer : value) {
-			intStrings.add(String.valueOf(integer));
-		}
-		// Puts empty string if input array value is empty
-		put(key, StringUtils.join(intStrings, ","));
-	}
 }

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

@@ -1,19 +1,19 @@
 package org.briarproject.bramble.api;
 
-import org.briarproject.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import javax.annotation.concurrent.ThreadSafe;
 
 @ThreadSafe
 @NotNullByDefault
-public class UniqueId extends Bytes {
+public abstract class UniqueId extends Bytes {
 
 	/**
 	 * The length of a unique identifier in bytes.
 	 */
 	public static final int LENGTH = 32;
 
-	public UniqueId(byte[] id) {
+	protected UniqueId(byte[] id) {
 		super(id);
 		if (id.length != LENGTH) throw new IllegalArgumentException();
 	}

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

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

@@ -1,35 +0,0 @@
-package org.briarproject.bramble.api;
-
-import org.briarproject.nullsafety.NotNullByDefault;
-
-import java.lang.ref.WeakReference;
-
-import javax.annotation.concurrent.GuardedBy;
-import javax.inject.Provider;
-
-/**
- * A {@link Provider} that keeps a {@link WeakReference} to the last provided
- * instance and provides the same instance again until the instance is garbage
- * collected.
- */
-@NotNullByDefault
-public abstract class WeakSingletonProvider<T> implements Provider<T> {
-
-	private final Object lock = new Object();
-	@GuardedBy("lock")
-	private WeakReference<T> ref = new WeakReference<>(null);
-
-	@Override
-	public T get() {
-		synchronized (lock) {
-			T instance = ref.get();
-			if (instance == null) {
-				instance = createInstance();
-				ref = new WeakReference<>(instance);
-			}
-			return instance;
-		}
-	}
-
-	public abstract T createInstance();
-}

bramble-api/src/main/java/org/briarproject/bramble/api/account/AccountManager.java

@@ -1,9 +1,8 @@
 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.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import javax.annotation.Nullable;
 
@@ -14,8 +13,7 @@ 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
+	 * or {@link #signIn(String)} has returned true, until the process exits.
-	 * {@link #deleteAccount()} is called or the process exits.
 	 */
 	boolean hasDatabaseKey();
 
@@ -24,22 +22,25 @@ public interface AccountManager {
 	 * 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
+	 * returned true, until the process exits.
-	 * exits.
 	 */
 	@Nullable
 	SecretKey getDatabaseKey();
 
 	/**
-	 * Returns true if the encrypted database key can be loaded from disk.
+	 * Returns true if the encrypted database key can be loaded from disk, and
+	 * the database directory exists and is a directory.
 	 */
 	boolean accountExists();
 
 	/**
 	 * Creates an identity with the given name and registers it with the
 	 * {@link IdentityManager}. Creates a database key, encrypts it with the
-	 * given password and stores it on disk. {@link #accountExists()} will
+	 * given password and stores it on disk.
-	 * return true after this method returns true.
+	 * <p/>
+	 * This method does not create the database directory, so
+	 * {@link #accountExists()} will continue to return false until the
+	 * database directory is created.
 	 */
 	boolean createAccount(String name, String password);
 
@@ -53,19 +54,17 @@ public interface AccountManager {
 	 * 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
+	 * @return true if the database key was successfully loaded and decrypted.
-	 * decrypted.
 	 */
-	void signIn(String password) throws DecryptionException;
+	boolean signIn(String password);
 
 	/**
 	 * Loads the encrypted database key from disk, decrypts it with the old
 	 * password, encrypts it with the new password, and stores it on disk,
 	 * replacing the old key.
 	 *
-	 * @throws DecryptionException If the database key could not be loaded and
+	 * @return true if the database key was successfully loaded, re-encrypted
-	 * decrypted.
+	 * and stored.
 	 */
-	void changePassword(String oldPassword, String newPassword)
+	boolean changePassword(String oldPassword, String newPassword);
-			throws DecryptionException;
 }

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

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

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

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

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

@@ -1,32 +0,0 @@
-package org.briarproject.bramble.api.cleanup.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.sync.MessageId;
-import org.briarproject.nullsafety.NotNullByDefault;
-
-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

@@ -8,10 +8,10 @@ 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 org.briarproject.nullsafety.NotNullByDefault;
 
 import javax.annotation.concurrent.Immutable;
 
@@ -32,31 +32,27 @@ public abstract class BdfIncomingMessageHook implements IncomingMessageHook {
 
 	/**
 	 * 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
+	 * @return whether or not this message should be shared
-	 * @throws DbException if a database error occurs while delivering the
+	 * @throws DbException Should only be used for real database errors.
-	 * message. Delivery will be attempted again at next startup. Throwing
+	 * If this is thrown, delivery will be attempted again at next startup,
-	 * this exception has the same effect as returning
+	 * whereas if a FormatException is thrown, the message will be permanently
-	 * {@link DeliveryAction#DEFER}.
+	 * invalidated.
-	 * @throws FormatException if the message is invalid in the context of its
+	 * @throws FormatException Use this for any non-database error
-	 * dependencies. The message and any dependents will be marked as invalid
+	 * that occurs while handling remotely created data.
-	 * and deleted along with their metadata. Throwing this exception has the
+	 * This includes errors that occur while handling locally created data
-	 * same effect as returning {@link DeliveryAction#REJECT}.
+	 * in a context controlled by remotely created data
+	 * (for example, parsing the metadata of a dependency
+	 * of an incoming message).
+	 * Never rethrow DbException as FormatException!
 	 */
-	protected abstract DeliveryAction incomingMessage(Transaction txn,
+	protected abstract boolean incomingMessage(Transaction txn, Message m,
-			Message m, BdfList body, BdfDictionary meta)
+			BdfList body, BdfDictionary meta) throws DbException,
-			throws DbException, FormatException;
+			FormatException;
 
 	@Override
-	public DeliveryAction incomingMessage(Transaction txn, Message m,
+	public boolean incomingMessage(Transaction txn, Message m, Metadata meta)
-			Metadata meta) throws DbException, InvalidMessageException {
+			throws DbException, InvalidMessageException {
 		try {
 			BdfList body = clientHelper.toList(m);
 			BdfDictionary metaDictionary = metadataParser.parse(meta);

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

@@ -1,8 +1,8 @@
 package org.briarproject.bramble.api.client;
 
 import org.briarproject.bramble.api.data.BdfDictionary;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.MessageId;
-import org.briarproject.nullsafety.NotNullByDefault;
 
 import java.util.Collection;
 import java.util.Collections;

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

@@ -4,19 +4,18 @@ import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.data.BdfList;
 import org.briarproject.bramble.api.data.MetadataEncoder;
 import org.briarproject.bramble.api.db.Metadata;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.Group;
 import org.briarproject.bramble.api.sync.InvalidMessageException;
 import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageContext;
 import org.briarproject.bramble.api.sync.validation.MessageValidator;
 import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.nullsafety.NotNullByDefault;
 
 import java.util.logging.Logger;
 
 import javax.annotation.concurrent.Immutable;
 
-import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.api.transport.TransportConstants.MAX_CLOCK_DIFFERENCE;
 
 @Immutable
@@ -24,30 +23,17 @@ import static org.briarproject.bramble.api.transport.TransportConstants.MAX_CLOC
 public abstract class BdfMessageValidator implements MessageValidator {
 
 	protected static final Logger LOG =
-			getLogger(BdfMessageValidator.class.getName());
+			Logger.getLogger(BdfMessageValidator.class.getName());
 
 	protected final ClientHelper clientHelper;
 	protected final MetadataEncoder metadataEncoder;
 	protected final Clock clock;
-	protected final boolean canonical;
-
-	/**
-	 * Transitional alternative to
-	 * {@link #BdfMessageValidator(ClientHelper, MetadataEncoder, Clock)} that
-	 * accepts messages in non-canonical form, for backward compatibility.
-	 */
-	@Deprecated
-	protected BdfMessageValidator(ClientHelper clientHelper,
-			MetadataEncoder metadataEncoder, Clock clock, boolean canonical) {
-		this.clientHelper = clientHelper;
-		this.metadataEncoder = metadataEncoder;
-		this.clock = clock;
-		this.canonical = canonical;
-	}
 
 	protected BdfMessageValidator(ClientHelper clientHelper,
 			MetadataEncoder metadataEncoder, Clock clock) {
-		this(clientHelper, metadataEncoder, clock, true);
+		this.clientHelper = clientHelper;
+		this.metadataEncoder = metadataEncoder;
+		this.clock = clock;
 	}
 
 	protected abstract BdfMessageContext validateMessage(Message m, Group g,
@@ -63,7 +49,7 @@ public abstract class BdfMessageValidator implements MessageValidator {
 					"Timestamp is too far in the future");
 		}
 		try {
-			BdfList bodyList = clientHelper.toList(m, canonical);
+			BdfList bodyList = clientHelper.toList(m.getBody());
 			BdfMessageContext result = validateMessage(m, g, bodyList);
 			Metadata meta = metadataEncoder.encode(result.getDictionary());
 			return new MessageContext(meta, result.getDependencies());

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

@@ -1,26 +1,19 @@
 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.mailbox.MailboxUpdate;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.mailbox.MailboxVersion;
 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 org.briarproject.nullsafety.NotNullByDefault;
 
 import java.security.GeneralSecurityException;
-import java.util.Collection;
-import java.util.List;
 import java.util.Map;
 
 @NotNullByDefault
@@ -30,10 +23,7 @@ public interface ClientHelper {
 			throws DbException, FormatException;
 
 	void addLocalMessage(Transaction txn, Message m, BdfDictionary metadata,
-			boolean shared, boolean temporary)
+			boolean shared) throws DbException, FormatException;
-			throws DbException, FormatException;
-
-	Message createMessage(GroupId g, long timestamp, byte[] body);
 
 	Message createMessage(GroupId g, long timestamp, BdfList body)
 			throws FormatException;
@@ -49,29 +39,15 @@ public interface ClientHelper {
 	BdfList getMessageAsList(Transaction txn, MessageId m) throws DbException,
 			FormatException;
 
-	/**
-	 * Transitional alternative to
-	 * {@link #getMessageAsList(Transaction, MessageId)} that allows the
-	 * message to be in non-canonical form, for backward compatibility.
-	 *
-	 * @param canonical True if the message must be in canonical form (a
-	 * {@link FormatException} will be thrown if it's not.
-	 */
-	@Deprecated
-	BdfList getMessageAsList(Transaction txn, MessageId m, boolean canonical)
-			throws DbException, FormatException;
-
 	BdfDictionary getGroupMetadataAsDictionary(GroupId g) throws DbException,
 			FormatException;
 
 	BdfDictionary getGroupMetadataAsDictionary(Transaction txn, GroupId g)
 			throws DbException, FormatException;
 
-	Collection<MessageId> getMessageIds(Transaction txn, GroupId g,
-			BdfDictionary query) throws DbException, FormatException;
-
 	BdfDictionary getMessageMetadataAsDictionary(MessageId m)
-			throws DbException, FormatException;
+			throws DbException,
+			FormatException;
 
 	BdfDictionary getMessageMetadataAsDictionary(Transaction txn, MessageId m)
 			throws DbException, FormatException;
@@ -118,60 +94,20 @@ public interface ClientHelper {
 
 	BdfList toList(Message m) throws FormatException;
 
-	/**
-	 * Transitional alternative to {@link #toList(Message)} that allows the
-	 * message to be in non-canonical form, for backward compatibility.
-	 *
-	 * @param canonical True if the message must be in canonical form (a
-	 * {@link FormatException} will be thrown if it's not.
-	 */
-	@Deprecated
-	BdfList toList(Message m, boolean canonical) throws FormatException;
-
 	BdfList toList(Author a);
 
-	byte[] sign(String label, BdfList toSign, PrivateKey privateKey)
+	byte[] sign(String label, BdfList toSign, byte[] privateKey)
 			throws FormatException, GeneralSecurityException;
 
 	void verifySignature(byte[] signature, String label, BdfList signed,
-			PublicKey publicKey)
+			byte[] publicKey) throws FormatException, GeneralSecurityException;
-			throws FormatException, GeneralSecurityException;
 
 	Author parseAndValidateAuthor(BdfList author) throws FormatException;
 
-	PublicKey parseAndValidateAgreementPublicKey(byte[] publicKeyBytes)
-			throws FormatException;
-
 	TransportProperties parseAndValidateTransportProperties(
 			BdfDictionary properties) throws FormatException;
 
 	Map<TransportId, TransportProperties> parseAndValidateTransportPropertiesMap(
 			BdfDictionary properties) throws FormatException;
 
-	/**
-	 * Parse and validate the elements of a Mailbox update message.
-	 *
-	 * @return the parsed update message
-	 * @throws FormatException if the message elements are invalid
-	 */
-	MailboxUpdate parseAndValidateMailboxUpdate(BdfList clientSupports,
-			BdfList serverSupports, BdfDictionary properties)
-			throws FormatException;
-
-	List<MailboxVersion> parseMailboxVersionList(BdfList bdfList)
-			throws FormatException;
-
-	/**
-	 * Retrieves the contact ID from the group metadata of the given contact
-	 * group.
-	 */
-	ContactId getContactId(Transaction txn, GroupId contactGroupId)
-			throws DbException;
-
-	/**
-	 * Stores the given contact ID in the group metadata of the given contact
-	 * group.
-	 */
-	void setContactId(Transaction txn, GroupId contactGroupId, ContactId c)
-			throws DbException;
 }

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

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

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

@@ -2,9 +2,9 @@ package org.briarproject.bramble.api.client;
 
 import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.identity.AuthorId;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.ClientId;
 import org.briarproject.bramble.api.sync.Group;
-import org.briarproject.nullsafety.NotNullByDefault;
 
 @NotNullByDefault
 public interface ContactGroupFactory {
@@ -18,11 +18,10 @@ public interface ContactGroupFactory {
 	 * Creates a group for the given client to share with the given contact.
 	 */
 	Group createContactGroup(ClientId clientId, int majorVersion,
-			Contact contact);
+			Contact contact, AuthorId local);
 
 	/**
-	 * Creates a group for the given client to share between the given authors
+	 * Creates a group for the given client to share between the given authors.
-	 * identified by their AuthorIds.
 	 */
 	Group createContactGroup(ClientId clientId, int majorVersion,
 			AuthorId authorId1, AuthorId authorId2);

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

@@ -1,86 +0,0 @@
-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.plugin.TransportConnectionReader;
-import org.briarproject.bramble.api.plugin.TransportConnectionWriter;
-import org.briarproject.bramble.api.plugin.TransportId;
-import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
-import org.briarproject.bramble.api.sync.OutgoingSessionRecord;
-import org.briarproject.nullsafety.NotNullByDefault;
-
-@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 via a mailbox.
-	 * <p>
-	 * This method does not mark the tag as recognised until after the data
-	 * has been read from the {@link TransportConnectionReader}, at which
-	 * point the {@link TagController} is called to decide whether the tag
-	 * should be marked as recognised.
-	 */
-	void manageIncomingConnection(TransportId t, TransportConnectionReader r,
-			TagController c);
-
-	/**
-	 * 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 via a mailbox. The IDs of
-	 * any messages sent or acked are added to the given
-	 * {@link OutgoingSessionRecord}.
-	 */
-	void manageOutgoingConnection(ContactId c, TransportId t,
-			TransportConnectionWriter w, OutgoingSessionRecord sessionRecord);
-
-	/**
-	 * 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);
-
-	/**
-	 * An interface for controlling whether a tag should be marked as
-	 * recognised.
-	 */
-	interface TagController {
-		/**
-		 * This method is only called if a tag was read from the corresponding
-		 * {@link TransportConnectionReader} and recognised.
-		 *
-		 * @param exception True if an exception was thrown while reading from
-		 * the {@link TransportConnectionReader}, after successfully reading
-		 * and recognising the tag.
-		 * @return True if the tag should be marked as recognised.
-		 */
-		boolean shouldMarkTagAsRecognised(boolean exception);
-	}
-}

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

@@ -1,130 +0,0 @@
-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.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 org.briarproject.nullsafety.NotNullByDefault;
-
-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

@@ -1,19 +0,0 @@
-package org.briarproject.bramble.api.connection;
-
-import org.briarproject.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,14 +1,13 @@
 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 org.briarproject.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.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
 import static org.briarproject.bramble.util.StringUtils.toUtf8;
 
 @Immutable
@@ -17,24 +16,25 @@ public class Contact {
 
 	private final ContactId id;
 	private final Author author;
-	private final AuthorId localAuthorId;
 	@Nullable
 	private final String alias;
 	@Nullable
-	private final PublicKey handshakePublicKey;
+	private final byte[] handshakePublicKey;
 	private final boolean verified;
 
-	public Contact(ContactId id, Author author, AuthorId localAuthorId,
+	public Contact(ContactId id, Author author, @Nullable String alias,
-			@Nullable String alias, @Nullable PublicKey handshakePublicKey,
+			@Nullable byte[] handshakePublicKey, boolean verified) {
-			boolean verified) {
 		if (alias != null) {
 			int aliasLength = toUtf8(alias).length;
 			if (aliasLength == 0 || aliasLength > MAX_AUTHOR_NAME_LENGTH)
 				throw new IllegalArgumentException();
 		}
+		if (handshakePublicKey != null && (handshakePublicKey.length == 0 ||
+				handshakePublicKey.length > MAX_PUBLIC_KEY_LENGTH)) {
+			throw new IllegalArgumentException();
+		}
 		this.id = id;
 		this.author = author;
-		this.localAuthorId = localAuthorId;
 		this.alias = alias;
 		this.handshakePublicKey = handshakePublicKey;
 		this.verified = verified;
@@ -48,17 +48,13 @@ public class Contact {
 		return author;
 	}
 
-	public AuthorId getLocalAuthorId() {
-		return localAuthorId;
-	}
-
 	@Nullable
 	public String getAlias() {
 		return alias;
 	}
 
 	@Nullable
-	public PublicKey getHandshakePublicKey() {
+	public byte[] getHandshakePublicKey() {
 		return handshakePublicKey;
 	}
 

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

@@ -1,37 +0,0 @@
-package org.briarproject.bramble.api.contact;
-
-import org.briarproject.bramble.api.crypto.SecretKey;
-import org.briarproject.bramble.api.db.ContactExistsException;
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
-import org.briarproject.nullsafety.NotNullByDefault;
-
-import java.io.IOException;
-
-@NotNullByDefault
-public interface ContactExchangeManager {
-
-	/**
-	 * Exchanges contact information with a remote peer and adds the peer
-	 * as a contact.
-	 *
-	 * @param alice Whether the local peer takes the role of Alice
-	 * @return The newly added contact
-	 * @throws ContactExistsException If the contact already exists
-	 */
-	Contact exchangeContacts(DuplexTransportConnection conn,
-			SecretKey masterKey, boolean alice, boolean verified)
-			throws IOException, DbException;
-
-	/**
-	 * Exchanges contact information with a remote peer and adds the peer
-	 * as a contact, replacing the given pending contact.
-	 *
-	 * @param alice Whether the local peer takes the role of Alice
-	 * @return The newly added contact
-	 * @throws ContactExistsException If the contact already exists
-	 */
-	Contact exchangeContacts(PendingContactId p, DuplexTransportConnection conn,
-			SecretKey masterKey, boolean alice, boolean verified)
-			throws IOException, DbException;
-}

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

@@ -1,6 +1,16 @@
-package org.briarproject.bramble.contact;
+package org.briarproject.bramble.api.contact;
 
-interface ContactExchangeConstants {
+import org.briarproject.bramble.api.crypto.SecretKey;
+import org.briarproject.bramble.api.identity.LocalAuthor;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.plugin.TransportId;
+import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
+
+/**
+ * A task for conducting a contact information exchange with a remote peer.
+ */
+@NotNullByDefault
+public interface ContactExchangeTask {
 
 	/**
 	 * The current version of the contact exchange protocol.
@@ -29,7 +39,9 @@ interface ContactExchangeConstants {
 	String BOB_NONCE_LABEL = "org.briarproject.bramble.contact/BOB_NONCE";
 
 	/**
-	 * Label for signing key binding nonces.
+	 * Exchanges contact information with a remote peer.
 	 */
-	String SIGNING_LABEL = "org.briarproject.briar.contact/EXCHANGE";
+	void startExchange(LocalAuthor localAuthor, SecretKey masterKey,
+			DuplexTransportConnection conn, TransportId transportId,
+			boolean alice);
 }

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

@@ -1,8 +1,7 @@
 package org.briarproject.bramble.api.contact;
 
-import org.briarproject.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
-import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
 /**
@@ -29,7 +28,7 @@ public class ContactId {
 	}
 
 	@Override
-	public boolean equals(@Nullable Object o) {
+	public boolean equals(Object o) {
 		return o instanceof ContactId && id == ((ContactId) o).id;
 	}
 }

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

@@ -1,20 +1,14 @@
 package org.briarproject.bramble.api.contact;
 
-import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.Pair;
-import org.briarproject.bramble.api.UnsupportedVersionException;
 import org.briarproject.bramble.api.crypto.SecretKey;
-import org.briarproject.bramble.api.db.ContactExistsException;
 import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.NoSuchContactException;
-import org.briarproject.bramble.api.db.PendingContactExistsException;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorId;
+import org.briarproject.bramble.api.identity.AuthorInfo;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
-import org.briarproject.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
-import java.security.GeneralSecurityException;
 import java.util.Collection;
 
 import javax.annotation.Nullable;
@@ -30,159 +24,60 @@ public interface ContactManager {
 	void registerContactHook(ContactHook hook);
 
 	/**
-	 * Stores a contact associated with the given local and remote pseudonyms,
+	 * Stores a contact with the given pseudonym, derives and stores transport
-	 * derives and stores rotation mode transport keys for each transport, and
+	 * keys for each transport, and returns an ID for the contact.
-	 * returns an ID for the contact.
 	 *
-	 * @param rootKey The root key for a set of rotation mode transport keys
+	 * @param alice true if the local party is Alice
-	 * @param timestamp The timestamp for deriving rotation mode transport
-	 * keys from the root key
-	 * @param alice True if the local party is Alice
-	 * @param verified True if the contact's identity has been verified, which
-	 * is true if the contact was added in person or false if the contact was
-	 * introduced or added remotely
-	 * @param active True if the rotation mode transport keys can be used for
-	 * outgoing streams
 	 */
-	ContactId addContact(Transaction txn, Author remote, AuthorId local,
+	ContactId addContact(Transaction txn, Author a, SecretKey rootKey,
-			SecretKey rootKey, long timestamp, boolean alice, boolean verified,
-			boolean active) throws DbException;
-
-	/**
-	 * Stores a contact associated with the given local and remote pseudonyms,
-	 * replacing the given pending contact, derives and stores handshake mode
-	 * and rotation mode transport keys for each transport, and returns an ID
-	 * for the contact.
-	 *
-	 * @param rootKey The root key for a set of rotation mode transport keys
-	 * @param timestamp The timestamp for deriving rotation mode transport
-	 * keys from the root key
-	 * @param alice True if the local party is Alice
-	 * @param verified True if the contact's identity has been verified, which
-	 * is true if the contact was added in person or false if the contact was
-	 * introduced or added remotely
-	 * @param active True if the rotation mode transport keys can be used for
-	 * outgoing streams
-	 * @throws GeneralSecurityException If the pending contact's handshake
-	 * public key is invalid
-	 */
-	ContactId addContact(Transaction txn, PendingContactId p, Author remote,
-			AuthorId local, SecretKey rootKey, long timestamp, boolean alice,
-			boolean verified, boolean active)
-			throws DbException, GeneralSecurityException;
-
-	/**
-	 * Stores a contact associated with the given local and remote pseudonyms
-	 * and returns an ID for the contact.
-	 *
-	 * @param verified True if the contact's identity has been verified, which
-	 * is true if the contact was added in person or false if the contact was
-	 * introduced or added remotely
-	 */
-	ContactId addContact(Transaction txn, Author remote, AuthorId local,
-			boolean verified) throws DbException;
-
-	/**
-	 * Stores a contact associated with the given local and remote pseudonyms,
-	 * derives and stores rotation mode transport keys for each transport, and
-	 * returns an ID for the contact.
-	 *
-	 * @param rootKey The root key for a set of rotation mode transport keys
-	 * @param timestamp The timestamp for deriving rotation mode transport
-	 * keys from the root key
-	 * @param alice True if the local party is Alice
-	 * @param verified True if the contact's identity has been verified, which
-	 * is true if the contact was added in person or false if the contact was
-	 * introduced or added remotely
-	 * @param active True if the rotation mode transport keys can be used for
-	 * outgoing streams
-	 */
-	ContactId addContact(Author remote, AuthorId local, SecretKey rootKey,
 			long timestamp, boolean alice, boolean verified, boolean active)
 			throws DbException;
 
 	/**
-	 * Returns the handshake link that needs to be sent to a contact we want
+	 * Stores a contact with the given pseudonym and returns an ID for the
-	 * to add.
+	 * contact.
 	 */
-	String getHandshakeLink() throws DbException;
+	ContactId addContact(Transaction txn, Author a, boolean verified)
+			throws DbException;
 
 	/**
-	 * Returns the handshake link that needs to be sent to a contact we want
+	 * Stores a contact with the given pseudonym, derives and stores transport
-	 * to add.
+	 * keys for each transport, and returns an ID for the contact.
-	 */
-	String getHandshakeLink(Transaction txn) throws DbException;
-
-	/**
-	 * Creates a {@link PendingContact} from the given handshake link and
-	 * alias, adds it to the database and returns it.
 	 *
-	 * @param link The handshake link received from the pending contact
+	 * @param alice true if the local party is Alice
-	 * @param alias The alias the user has given this pending contact
-	 * @throws UnsupportedVersionException If the link uses a format version
-	 * that is not supported
-	 * @throws FormatException If the link is invalid
-	 * @throws GeneralSecurityException If the pending contact's handshake
-	 * public key is invalid
-	 * @throws ContactExistsException If a contact with the same handshake
-	 * public key already exists
-	 * @throws PendingContactExistsException If a pending contact with the same
-	 * handshake public key already exists
 	 */
-	PendingContact addPendingContact(Transaction txn, String link, String alias)
+	ContactId addContact(Author a, SecretKey rootKey, long timestamp,
-			throws DbException, FormatException, GeneralSecurityException,
+			boolean alice, boolean verified, boolean active) throws DbException;
-			ContactExistsException, PendingContactExistsException;
 
 	/**
-	 * Creates a {@link PendingContact} from the given handshake link and
+	 * Returns the static link that needs to be sent to the contact to be added.
-	 * alias, adds it to the database and returns it.
+	 */
+	String getRemoteContactLink();
+
+	/**
+	 * Returns true if the given link is syntactically valid.
+	 */
+	boolean isValidRemoteContactLink(String link);
+
+	/**
+	 * Requests a new contact to be added via the given {@code link}.
 	 *
-	 * @param link The handshake link received from the pending contact
+	 * @param link The link received from the contact we want to add.
-	 * @param alias The alias the user has given this pending contact
+	 * @param alias The alias the user has given this contact.
-	 * @throws UnsupportedVersionException If the link uses a format version
+	 * @return A PendingContact representing the contact to be added.
-	 * that is not supported
-	 * @throws FormatException If the link is invalid
-	 * @throws GeneralSecurityException If the pending contact's handshake
-	 * public key is invalid
-	 * @throws ContactExistsException If a contact with the same handshake
-	 * public key already exists
-	 * @throws PendingContactExistsException If a pending contact with the same
-	 * handshake public key already exists
 	 */
-	PendingContact addPendingContact(String link, String alias)
+	PendingContact addRemoteContactRequest(String link, String alias);
-			throws DbException, FormatException, GeneralSecurityException,
-			ContactExistsException, PendingContactExistsException;
 
 	/**
-	 * Returns the pending contact with the given ID.
+	 * Returns a list of {@link PendingContact}s.
 	 */
-	PendingContact getPendingContact(Transaction txn, PendingContactId p)
+	Collection<PendingContact> getPendingContacts();
-			throws DbException;
 
 	/**
-	 * Returns a list of {@link PendingContact PendingContacts} and their
+	 * Removes a {@link PendingContact} that is in state
-	 * {@link PendingContactState states}.
+	 * {@link PendingContactState FAILED}.
 	 */
-	Collection<Pair<PendingContact, PendingContactState>> getPendingContacts()
+	void removePendingContact(PendingContact pendingContact);
-			throws DbException;
-
-	/**
-	 * Returns a list of {@link PendingContact PendingContacts} and their
-	 * {@link PendingContactState states}.
-	 */
-	Collection<Pair<PendingContact, PendingContactState>> getPendingContacts(Transaction txn)
-			throws DbException;
-
-	/**
-	 * Removes a {@link PendingContact}.
-	 */
-	void removePendingContact(PendingContactId p) throws DbException;
-
-	/**
-	 * Removes a {@link PendingContact}.
-	 */
-	void removePendingContact(Transaction txn, PendingContactId p)
-			throws DbException;
 
 	/**
 	 * Returns the contact with the given ID.
@@ -192,36 +87,18 @@ public interface ContactManager {
 	/**
 	 * Returns the contact with the given ID.
 	 */
-	Contact getContact(Transaction txn, ContactId c) throws DbException;
+	Contact getContact(AuthorId a) throws DbException;
 
 	/**
-	 * Returns the contact with the given {@code remoteAuthorId}
+	 * Returns the contact with the given ID.
-	 * that belongs to the local pseudonym with the given {@code localAuthorId}.
-	 *
-	 * @throws NoSuchContactException If the contact is not in the database
 	 */
-	Contact getContact(AuthorId remoteAuthorId, AuthorId localAuthorId)
+	Contact getContact(Transaction txn, AuthorId a) throws DbException;
-			throws DbException;
 
 	/**
-	 * Returns the contact with the given {@code remoteAuthorId}
+	 * Returns all active contacts.
-	 * that belongs to the local pseudonym with the given {@code localAuthorId}.
-	 *
-	 * @throws NoSuchContactException If the contact is not in the database
-	 */
-	Contact getContact(Transaction txn, AuthorId remoteAuthorId,
-			AuthorId localAuthorId) throws DbException;
-
-	/**
-	 * Returns all contacts.
 	 */
 	Collection<Contact> getContacts() throws DbException;
 
-	/**
-	 * Returns all contacts.
-	 */
-	Collection<Contact> getContacts(Transaction txn) throws DbException;
-
 	/**
 	 * Removes a contact and all associated state.
 	 */
@@ -233,47 +110,41 @@ public interface ContactManager {
 	void removeContact(Transaction txn, ContactId c) throws DbException;
 
 	/**
-	 * Sets an alias for the contact or unsets it if {@code alias} is null.
+	 * Sets an alias name for the contact or unsets it if alias is null.
 	 */
 	void setContactAlias(Transaction txn, ContactId c, @Nullable String alias)
 			throws DbException;
 
 	/**
-	 * Sets an alias for the contact or unsets it if {@code alias} is null.
+	 * Sets an alias name for the contact or unsets it if alias is null.
 	 */
 	void setContactAlias(ContactId c, @Nullable String alias)
 			throws DbException;
 
 	/**
-	 * Returns true if a contact with this {@code remoteAuthorId} belongs to
+	 * Returns true if a contact with this pseudonym already exists.
-	 * the local pseudonym with this {@code localAuthorId}.
 	 */
-	boolean contactExists(Transaction txn, AuthorId remoteAuthorId,
+	boolean contactExists(Transaction txn, AuthorId a) throws DbException;
-			AuthorId localAuthorId) throws DbException;
 
 	/**
-	 * Returns true if a contact with this {@code remoteAuthorId} belongs to
+	 * Returns true if a contact with this pseudonym already exists.
-	 * the local pseudonym with this {@code localAuthorId}.
 	 */
-	boolean contactExists(AuthorId remoteAuthorId, AuthorId localAuthorId)
+	boolean contactExists(AuthorId a) throws DbException;
-			throws DbException;
+
+	/**
+	 * Returns the {@link AuthorInfo} for the given author.
+	 */
+	AuthorInfo getAuthorInfo(AuthorId a) throws DbException;
+
+	/**
+	 * Returns the {@link AuthorInfo} for the given author.
+	 */
+	AuthorInfo getAuthorInfo(Transaction txn, AuthorId a) throws DbException;
 
 	interface ContactHook {
 
-		/**
-		 * Called when a contact is being added.
-		 *
-		 * @param txn A read-write transaction
-		 * @param c The contact that is being added
-		 */
 		void addingContact(Transaction txn, Contact c) throws DbException;
 
-		/**
-		 * Called when a contact is being removed
-		 *
-		 * @param txn A read-write transaction
-		 * @param c The contact that is being removed
-		 */
 		void removingContact(Transaction txn, Contact c) throws DbException;
 	}
 }

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

@@ -1,34 +0,0 @@
-package org.briarproject.bramble.api.contact;
-
-import java.util.regex.Pattern;
-
-public interface HandshakeLinkConstants {
-
-	/**
-	 * The current version of the handshake link format.
-	 */
-	int FORMAT_VERSION = 0;
-
-	/**
-	 * The length of a base32-encoded handshake link in bytes, excluding the
-	 * 'briar://' prefix.
-	 */
-	int BASE32_LINK_BYTES = 53;
-
-	/**
-	 * The length of a raw handshake link in bytes, before base32 encoding.
-	 */
-	int RAW_LINK_BYTES = 33;
-
-	/**
-	 * Regular expression for matching handshake links, including or excluding
-	 * the 'briar://' prefix.
-	 */
-	Pattern LINK_REGEX =
-			Pattern.compile("(briar://)?([a-z2-7]{" + BASE32_LINK_BYTES + "})");
-
-	/**
-	 * Label for hashing handshake public keys to calculate their identifiers.
-	 */
-	String ID_LABEL = "org.briarproject.bramble/HANDSHAKE_KEY_ID";
-}

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

@@ -1,45 +0,0 @@
-package org.briarproject.bramble.api.contact;
-
-import org.briarproject.bramble.api.crypto.SecretKey;
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.transport.StreamWriter;
-import org.briarproject.nullsafety.NotNullByDefault;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-@NotNullByDefault
-public interface HandshakeManager {
-
-	/**
-	 * Handshakes with the given pending contact. Returns an ephemeral master
-	 * key authenticated with both parties' handshake key pairs and a flag
-	 * indicating whether the local peer is Alice or Bob.
-	 *
-	 * @param in An incoming stream for the handshake, which must be secured in
-	 * handshake mode
-	 * @param out An outgoing stream for the handshake, which must be secured
-	 * in handshake mode
-	 */
-	HandshakeResult handshake(PendingContactId p, InputStream in,
-			StreamWriter out) throws DbException, IOException;
-
-	class HandshakeResult {
-
-		private final SecretKey masterKey;
-		private final boolean alice;
-
-		public HandshakeResult(SecretKey masterKey, boolean alice) {
-			this.masterKey = masterKey;
-			this.alice = alice;
-		}
-
-		public SecretKey getMasterKey() {
-			return masterKey;
-		}
-
-		public boolean isAlice() {
-			return alice;
-		}
-	}
-}

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

@@ -1,7 +1,6 @@
 package org.briarproject.bramble.api.contact;
 
-import org.briarproject.bramble.api.crypto.PublicKey;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.nullsafety.NotNullByDefault;
 
 import javax.annotation.concurrent.Immutable;
 
@@ -10,15 +9,17 @@ import javax.annotation.concurrent.Immutable;
 public class PendingContact {
 
 	private final PendingContactId id;
-	private final PublicKey publicKey;
+	private final byte[] publicKey;
 	private final String alias;
+	private final PendingContactState state;
 	private final long timestamp;
 
-	public PendingContact(PendingContactId id, PublicKey publicKey,
+	public PendingContact(PendingContactId id, byte[] publicKey,
-			String alias, long timestamp) {
+			String alias, PendingContactState state, long timestamp) {
 		this.id = id;
 		this.publicKey = publicKey;
 		this.alias = alias;
+		this.state = state;
 		this.timestamp = timestamp;
 	}
 
@@ -26,7 +27,7 @@ public class PendingContact {
 		return id;
 	}
 
-	public PublicKey getPublicKey() {
+	public byte[] getPublicKey() {
 		return publicKey;
 	}
 
@@ -34,6 +35,10 @@ public class PendingContact {
 		return alias;
 	}
 
+	public PendingContactState getState() {
+		return state;
+	}
+
 	public long getTimestamp() {
 		return timestamp;
 	}

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

@@ -1,7 +1,7 @@
 package org.briarproject.bramble.api.contact;
 
 import org.briarproject.bramble.api.UniqueId;
-import org.briarproject.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import javax.annotation.concurrent.ThreadSafe;
 
@@ -16,4 +16,10 @@ public class PendingContactId extends UniqueId {
 	public PendingContactId(byte[] id) {
 		super(id);
 	}
+
+
+	@Override
+	public boolean equals(Object o) {
+		return o instanceof PendingContactId && super.equals(o);
+	}
 }

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

@@ -1,10 +1,30 @@
 package org.briarproject.bramble.api.contact;
 
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+import javax.annotation.concurrent.Immutable;
+
+@Immutable
+@NotNullByDefault
 public enum PendingContactState {
 
-	WAITING_FOR_CONNECTION,
+	WAITING_FOR_CONNECTION(0),
-	OFFLINE,
+	CONNECTED(1),
-	CONNECTING,
+	ADDING_CONTACT(2),
-	ADDING_CONTACT,
+	FAILED(3);
-	FAILED
+
+	private final int value;
+
+	PendingContactState(int value) {
+		this.value = value;
+	}
+
+	public int getValue() {
+		return value;
+	}
+
+	public static PendingContactState fromValue(int value) {
+		for (PendingContactState s : values()) if (s.value == value) return s;
+		throw new IllegalArgumentException();
+	}
 }

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

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

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

@@ -2,7 +2,7 @@ package org.briarproject.bramble.api.contact.event;
 
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.event.Event;
-import org.briarproject.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import javax.annotation.concurrent.Immutable;
 
@@ -14,18 +14,12 @@ import javax.annotation.concurrent.Immutable;
 public class ContactAddedEvent extends Event {
 
 	private final ContactId contactId;
-	private final boolean verified;
 
-	public ContactAddedEvent(ContactId contactId, boolean verified) {
+	public ContactAddedEvent(ContactId contactId) {
 		this.contactId = contactId;
-		this.verified = verified;
 	}
 
 	public ContactId getContactId() {
 		return contactId;
 	}
-
-	public boolean isVerified() {
-		return verified;
-	}
 }