Move task to back rather than showing home screen.

.gitlab-ci.yml

@@ -11,8 +11,8 @@ test:
       - .gradle/caches
 
   script:
-    - ./gradlew --no-daemon -Djava.security.egd=file:/dev/urandom animalSnifferMain animalSnifferTest
+    - ./gradlew --no-daemon animalSnifferMain animalSnifferTest
-    - ./gradlew --no-daemon -Djava.security.egd=file:/dev/urandom test
+    - ./gradlew --no-daemon test
 
   after_script:
     # these file change every time but should not be cached

.idea/codeStyles/Project.xml

@@ -36,9 +36,31 @@
       <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
       <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
     </JavaCodeStyleSettings>
-    <JetCodeStyleSettings>
+    <Objective-C-extensions>
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+      <file>
-    </JetCodeStyleSettings>
+        <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>
@@ -235,11 +257,5 @@
         </rules>
       </arrangement>
     </codeStyleSettings>
-    <codeStyleSettings language="kotlin">
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-      <option name="PARAMETER_ANNOTATION_WRAP" value="1" />
-      <option name="VARIABLE_ANNOTATION_WRAP" value="1" />
-      <option name="ENUM_CONSTANTS_WRAP" value="1" />
-    </codeStyleSettings>
   </code_scheme>
 </component>

.idea/runConfigurations/All_in_briar_headless.xml

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

.idea/runConfigurations/All_tests.xml

@@ -22,9 +22,8 @@
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-api" run_configuration_type="AndroidJUnit" />
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-core" run_configuration_type="AndroidJUnit" />
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-android" run_configuration_type="AndroidJUnit" />
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-java" run_configuration_type="AndroidJUnit" />
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-j2se" run_configuration_type="AndroidJUnit" />
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in briar-core" run_configuration_type="AndroidJUnit" />
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All in briar-headless" run_configuration_type="AndroidJUnit" />
     </method>
   </configuration>
 </component>

.idea/runConfigurations/All_tests_in_bramble_android.xml

@@ -1,5 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="All tests in bramble-android" type="AndroidJUnit" factoryName="Android JUnit">
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <module name="bramble-android" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
     <option name="ALTERNATIVE_JRE_PATH" />
@@ -10,10 +11,12 @@
     <option name="VM_PARAMETERS" value="-ea" />
     <option name="PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-android" />
+    <option name="ENV_VARIABLES" />
     <option name="PASS_PARENT_ENVS" value="true" />
     <option name="TEST_SEARCH_SCOPE">
       <value defaultName="singleModule" />
     </option>
+    <envs />
     <patterns />
     <method />
   </configuration>

.idea/runConfigurations/All_tests_in_bramble_api.xml

@@ -1,5 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="All tests in bramble-api" type="AndroidJUnit" factoryName="Android JUnit">
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <module name="bramble-api" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
     <option name="ALTERNATIVE_JRE_PATH" />
@@ -10,10 +11,12 @@
     <option name="VM_PARAMETERS" value="-ea" />
     <option name="PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-api" />
+    <option name="ENV_VARIABLES" />
     <option name="PASS_PARENT_ENVS" value="true" />
     <option name="TEST_SEARCH_SCOPE">
       <value defaultName="singleModule" />
     </option>
+    <envs />
     <patterns />
     <method />
   </configuration>

.idea/runConfigurations/All_tests_in_bramble_core.xml

@@ -1,5 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="All tests in bramble-core" type="AndroidJUnit" factoryName="Android JUnit">
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <module name="bramble-core" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
     <option name="ALTERNATIVE_JRE_PATH" />
@@ -10,10 +11,12 @@
     <option name="VM_PARAMETERS" value="-ea" />
     <option name="PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-core" />
+    <option name="ENV_VARIABLES" />
     <option name="PASS_PARENT_ENVS" value="true" />
     <option name="TEST_SEARCH_SCOPE">
       <value defaultName="singleModule" />
     </option>
+    <envs />
     <patterns />
     <method />
   </configuration>

.idea/runConfigurations/All_tests_in_bramble_j2se.xml

@@ -1,6 +1,7 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All tests in bramble-java" type="AndroidJUnit" factoryName="Android JUnit">
+  <configuration default="false" name="All tests in bramble-j2se" type="AndroidJUnit" factoryName="Android JUnit">
-    <module name="bramble-java" />
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+    <module name="bramble-j2se" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
     <option name="ALTERNATIVE_JRE_PATH" />
     <option name="PACKAGE_NAME" value="" />
@@ -9,11 +10,13 @@
     <option name="TEST_OBJECT" value="package" />
     <option name="VM_PARAMETERS" value="-ea -Djava.library.path=libs" />
     <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-java" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-j2se" />
+    <option name="ENV_VARIABLES" />
     <option name="PASS_PARENT_ENVS" value="true" />
     <option name="TEST_SEARCH_SCOPE">
       <value defaultName="singleModule" />
     </option>
+    <envs />
     <patterns />
     <method />
   </configuration>

.idea/runConfigurations/All_tests_in_briar_android.xml

@@ -1,5 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="All tests in briar-android" type="AndroidJUnit" factoryName="Android JUnit">
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <module name="briar-android" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
     <option name="ALTERNATIVE_JRE_PATH" />
@@ -10,10 +11,12 @@
     <option name="VM_PARAMETERS" value="-ea" />
     <option name="PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/briar-android" />
+    <option name="ENV_VARIABLES" />
     <option name="PASS_PARENT_ENVS" value="true" />
     <option name="TEST_SEARCH_SCOPE">
       <value defaultName="singleModule" />
     </option>
+    <envs />
     <patterns />
     <method />
   </configuration>

.idea/runConfigurations/All_tests_in_briar_core.xml

@@ -1,5 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="All tests in briar-core" type="AndroidJUnit" factoryName="Android JUnit">
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <module name="briar-core" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
     <option name="ALTERNATIVE_JRE_PATH" />
@@ -10,10 +11,12 @@
     <option name="VM_PARAMETERS" value="-ea" />
     <option name="PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/briar-core" />
+    <option name="ENV_VARIABLES" />
     <option name="PASS_PARENT_ENVS" value="true" />
     <option name="TEST_SEARCH_SCOPE">
       <value defaultName="singleModule" />
     </option>
+    <envs />
     <patterns />
     <method />
   </configuration>

.idea/runConfigurations/H2_Performance_Test.xml

@@ -1,5 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="H2 Performance Test" type="AndroidJUnit" factoryName="Android JUnit">
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <module name="bramble-core" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
     <option name="ALTERNATIVE_JRE_PATH" />
@@ -10,10 +11,12 @@
     <option name="VM_PARAMETERS" value="-ea" />
     <option name="PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="" />
+    <option name="ENV_VARIABLES" />
     <option name="PASS_PARENT_ENVS" value="true" />
     <option name="TEST_SEARCH_SCOPE">
       <value defaultName="singleModule" />
     </option>
+    <envs />
     <patterns />
     <method />
   </configuration>

.idea/runConfigurations/HyperSQL_Performance_Test.xml

@@ -1,5 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="HyperSQL Performance Test" type="AndroidJUnit" factoryName="Android JUnit">
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <module name="bramble-core" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
     <option name="ALTERNATIVE_JRE_PATH" />
@@ -10,10 +11,12 @@
     <option name="VM_PARAMETERS" value="-ea" />
     <option name="PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="" />
+    <option name="ENV_VARIABLES" />
     <option name="PASS_PARENT_ENVS" value="true" />
     <option name="TEST_SEARCH_SCOPE">
       <value defaultName="singleModule" />
     </option>
+    <envs />
     <patterns />
     <method />
   </configuration>

.idea/runConfigurations/briar_headless.xml

@@ -1,17 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="briar-headless" type="JetRunConfigurationType" factoryName="Kotlin" singleton="true">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <option name="VM_PARAMETERS" value="" />
-    <option name="PROGRAM_PARAMETERS" value="-v" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="MAIN_CLASS_NAME" value="org.briarproject.briar.headless.MainKt" />
-    <option name="WORKING_DIRECTORY" value="" />
-    <module name="briar-headless" />
-    <envs />
-    <method>
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="jar" externalProjectPath="$PROJECT_DIR$/briar-headless" vmOptions="" scriptParameters="" />
-    </method>
-  </configuration>
-</component>

bramble-android/build.gradle

@@ -1,18 +1,15 @@
-import com.android.build.gradle.tasks.MergeResources
-
 apply plugin: 'com.android.library'
 apply plugin: 'witness'
-apply from: 'witness.gradle'
 
 android {
-	compileSdkVersion 28
+	compileSdkVersion 27
-	buildToolsVersion '28.0.3'
+	buildToolsVersion '27.0.3'
 
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 26
-		versionCode 10106
+		versionCode 10013
-		versionName "1.1.6"
+		versionName "1.0.13"
 		consumerProguardFiles 'proguard-rules.txt'
 
 		testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -30,10 +27,10 @@ configurations {
 
 dependencies {
 	implementation project(path: ':bramble-core', configuration: 'default')
-	tor 'org.briarproject:tor-android:0.3.5.8@zip'
+	implementation 'org.briarproject:jtorctl:0.3'
-	tor 'org.briarproject:obfs4proxy-android:0.0.9@zip'
+	tor 'org.briarproject:tor-android:0.2.9.16@zip'
 
-	annotationProcessor 'com.google.dagger:dagger-compiler:2.22.1'
+	annotationProcessor 'com.google.dagger:dagger-compiler:2.0.2'
 
 	compileOnly 'javax.annotation:jsr250-api:1.0'
 
@@ -42,29 +39,115 @@ dependencies {
 	testImplementation "org.jmock:jmock:2.8.2"
 	testImplementation "org.jmock:jmock-junit4:2.8.2"
 	testImplementation "org.jmock:jmock-legacy:2.8.2"
+	testImplementation "org.hamcrest:hamcrest-library:1.3"
+	testImplementation "org.hamcrest:hamcrest-core:1.3"
+
+	androidTestImplementation project(path: ':bramble-api', configuration: 'testOutput')
+	androidTestImplementation project(path: ':bramble-core', configuration: 'testOutput')
+	androidTestImplementation 'com.android.support.test:runner:1.0.2'
+	androidTestAnnotationProcessor 'com.google.dagger:dagger-compiler:2.0.2'
+	androidTestCompileOnly 'javax.annotation:jsr250-api:1.0'
 }
 
-def torBinariesDir = 'src/main/res/raw'
+dependencyVerification {
+	verify = [
+			'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861',
+			'com.android.support.test:monitor:1.0.2:monitor-1.0.2.aar:38ef4fa98a32dc55550ff49bb36a583e178b3a9b830fcb8dcc27bfc4254bc2bc',
+			'com.android.support.test:runner:1.0.2:runner-1.0.2.aar:f04b9ae342975ba1cb3e4a06e13426e3e6b8a73faa45acba604493d83c9a4f00',
+			'com.android.support:support-annotations:27.1.1:support-annotations-27.1.1.jar:3365960206c3d2b09e845f555e7f88f8effc8d2f00b369e66c4be384029299cf',
+			'com.android.tools.analytics-library:protos:26.1.3:protos-26.1.3.jar:818c9f256f141d9dafec03a1aa2b94d240b2c140acfd7ee31a8b3e6c2b9479e3',
+			'com.android.tools.analytics-library:shared:26.1.3:shared-26.1.3.jar:7110706c7ada96c8b6f5ca80c478291bc7899d46277de2c48527e045442401a3',
+			'com.android.tools.analytics-library:tracker:26.1.3:tracker-26.1.3.jar:4155424bf2ce4872da83332579a1707252bc66cbd77c5144fdc4483d0f2e1418',
+			'com.android.tools.build:apksig:3.1.3:apksig-3.1.3.jar:7e1f8e675a6e768e5b56405e41d6c3cc05befe62e601b04177de1029902c9c89',
+			'com.android.tools.build:builder-model:3.1.3:builder-model-3.1.3.jar:06ad1c422d679fc698451479cb40ba863849d67bfd1de23f6d2c16d78b024b0b',
+			'com.android.tools.build:builder-test-api:3.1.3:builder-test-api-3.1.3.jar:4d989f780436794f0f8b2f50e9e079b786571eac90f26c208ab2ae6d4012f389',
+			'com.android.tools.build:builder:3.1.3:builder-3.1.3.jar:8a1092012c89d0ec1ee2eff09c5708c71ef4482a6862df8d3a44a67fccace01c',
+			'com.android.tools.build:gradle-api:3.1.3:gradle-api-3.1.3.jar:01e4df521456aef66514336f1d492346730dd1fb8f6433a89f62da834941ed72',
+			'com.android.tools.build:manifest-merger:26.1.3:manifest-merger-26.1.3.jar:1e4fc7e932adb4607082409800e5e6fccb42e6c5360ae5990094bf522f3ada55',
+			'com.android.tools.ddms:ddmlib:26.1.3:ddmlib-26.1.3.jar:c54931cd68df5d1ea2923b3b320eae47cd2307a5a916bb8674c0acf93cd1d3cd',
+			'com.android.tools.external.com-intellij:intellij-core:26.1.3:intellij-core-26.1.3.jar:af67f5535fef2e1a28b1007a4acb8c5deb6a1e33b8afe7b11d012c9e778ebcec',
+			'com.android.tools.external.com-intellij:kotlin-compiler:26.1.3:kotlin-compiler-26.1.3.jar:c746d2859dc11cc05c84b692b3498d3a621e0929511f8440ee009c6557838fd4',
+			'com.android.tools.external.org-jetbrains:uast:26.1.3:uast-26.1.3.jar:3f3f6651d0c7685a77ecb22e9c82d6b49fdf24322c17360768dc530678f43265',
+			'com.android.tools.layoutlib:layoutlib-api:26.1.3:layoutlib-api-26.1.3.jar:10bc73ce706c45629872d6a999dbe12116df64e24f47ff93b7b13121ff57b4b0',
+			'com.android.tools.lint:lint-api:26.1.3:lint-api-26.1.3.jar:6f97323f9af8deda86278717885b5c927f3766757db89709f52d11d42b6fb751',
+			'com.android.tools.lint:lint-checks:26.1.3:lint-checks-26.1.3.jar:73c3d53784c9ce3e6d5968506581918e0179645d20809927ca4a001dd766b001',
+			'com.android.tools.lint:lint-gradle-api:26.1.3:lint-gradle-api-26.1.3.jar:7ca3c4866ec21dc21d53a9d86f752b77ace6f6c610a0c9dc877313856c733d9d',
+			'com.android.tools.lint:lint-gradle:26.1.3:lint-gradle-26.1.3.jar:db0c354b8f4b6f6637e31f91c564785a59ff896325331fcbc3de7458e0b6c067',
+			'com.android.tools.lint:lint-kotlin:26.1.3:lint-kotlin-26.1.3.jar:94e2b0f4565a241561cfb8fc1222bb3f132a3b98d2a90421dbb72ee8358e7d68',
+			'com.android.tools.lint:lint:26.1.3:lint-26.1.3.jar:8d5f32c989c6d191d712e90ad3ca2d1c409313599551d04d834caa44d26c78df',
+			'com.android.tools:annotations:26.1.3:annotations-26.1.3.jar:c950430b24ac5d58fc97e7283b8f0115f99587e76e08b4e1e2aaa780f2d77323',
+			'com.android.tools:common:26.1.3:common-26.1.3.jar:7c31a90581a148ab219f615a59667f0dded7fa39b248529784474da3c2274ef2',
+			'com.android.tools:dvlib:26.1.3:dvlib-26.1.3.jar:0cae87906f53d3f1088366a916ed180a7312b6d9919b90797f238875c8492855',
+			'com.android.tools:repository:26.1.3:repository-26.1.3.jar:52d4539cc68db91b261e2a33b2c8206b26e05539078758dc28cfb3854adb4f59',
+			'com.android.tools:sdk-common:26.1.3:sdk-common-26.1.3.jar:1948603ca9ff22c7ebb3178000bffa3a9dd2ca1cc5cb0c793cae08468b8fcfc1',
+			'com.android.tools:sdklib:26.1.3:sdklib-26.1.3.jar:4adcfaad9514607098d2c51503c39811112d3050f4d1e744c01c7f08f591032b',
+			'com.google.code.findbugs:jsr305:1.3.9:jsr305-1.3.9.jar:905721a0eea90a81534abb7ee6ef4ea2e5e645fa1def0a5cd88402df1b46c9ed',
+			'com.google.code.gson:gson:2.7:gson-2.7.jar:2d43eb5ea9e133d2ee2405cc14f5ee08951b8361302fdd93494a3a997b508d32',
+			'com.google.dagger:dagger-compiler:2.0.2:dagger-compiler-2.0.2.jar:b74bc9de063dd4c6400b232231f2ef5056145b8fbecbf5382012007dd1c071b3',
+			'com.google.dagger:dagger-producers:2.0-beta:dagger-producers-2.0-beta.jar:99ec15e8a0507ba569e7655bc1165ee5e5ca5aa914b3c8f7e2c2458f724edd6b',
+			'com.google.dagger:dagger:2.0.2:dagger-2.0.2.jar:84c0282ed8be73a29e0475d639da030b55dee72369e58dd35ae7d4fe6243dcf9',
+			'com.google.errorprone:error_prone_annotations:2.0.18:error_prone_annotations-2.0.18.jar:cb4cfad870bf563a07199f3ebea5763f0dec440fcda0b318640b1feaa788656b',
+			'com.google.guava:guava:18.0:guava-18.0.jar:d664fbfc03d2e5ce9cab2a44fb01f1d0bf9dfebeccc1a473b1f9ea31f79f6f99',
+			'com.google.guava:guava:22.0:guava-22.0.jar:1158e94c7de4da480873f0b4ab4a1da14c0d23d4b1902cc94a58a6f0f9ab579e',
+			'com.google.j2objc:j2objc-annotations:1.1:j2objc-annotations-1.1.jar:40ceb7157feb263949e0f503fe5f71689333a621021aa20ce0d0acee3badaa0f',
+			'com.google.jimfs:jimfs:1.1:jimfs-1.1.jar:c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd',
+			'com.google.protobuf:protobuf-java:3.4.0:protobuf-java-3.4.0.jar:dce7e66b32456a1b1198da0caff3a8acb71548658391e798c79369241e6490a4',
+			'com.googlecode.json-simple:json-simple:1.1:json-simple-1.1.jar:2d9484f4c649f708f47f9a479465fc729770ee65617dca3011836602264f6439',
+			'com.squareup:javawriter:2.5.0:javawriter-2.5.0.jar:fcfb09fb0ea0aa97d3cfe7ea792398081348e468f126b3603cb3803f240197f0',
+			'com.sun.activation:javax.activation:1.2.0:javax.activation-1.2.0.jar:993302b16cd7056f21e779cc577d175a810bb4900ef73cd8fbf2b50f928ba9ce',
+			'com.sun.istack:istack-commons-runtime:2.21:istack-commons-runtime-2.21.jar:c33e67a0807095f02a0e2da139412dd7c4f9cc1a4c054b3e434f96831ba950f4',
+			'com.sun.xml.fastinfoset:FastInfoset:1.2.13:FastInfoset-1.2.13.jar:27a77db909f3c2833c0b1a37c55af1db06045118ad2eed96ce567b6632bce038',
+			'commons-codec:commons-codec:1.6:commons-codec-1.6.jar:54b34e941b8e1414bd3e40d736efd3481772dc26db3296f6aa45cec9f6203d86',
+			'commons-logging:commons-logging:1.1.1:commons-logging-1.1.1.jar:ce6f913cad1f0db3aad70186d65c5bc7ffcc9a99e3fe8e0b137312819f7c362f',
+			'it.unimi.dsi:fastutil:7.2.0:fastutil-7.2.0.jar:74fa208043740642f7e6eb09faba15965218ad2f50ce3020efb100136e4b591c',
+			'javax.annotation:jsr250-api:1.0:jsr250-api-1.0.jar:a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f',
+			'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
+			'javax.xml.bind:jaxb-api:2.2.12-b140109.1041:jaxb-api-2.2.12-b140109.1041.jar:b5e60cd8b7b5ff01ce4a74c5dd008f4fbd14ced3495d0b47b85cfedc182211f2',
+			'junit:junit:4.12:junit-4.12.jar:59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a',
+			'net.sf.jopt-simple:jopt-simple:4.9:jopt-simple-4.9.jar:26c5856e954b5f864db76f13b86919b59c6eecf9fd930b96baa8884626baf2f5',
+			'net.sf.kxml:kxml2:2.3.0:kxml2-2.3.0.jar:f264dd9f79a1fde10ce5ecc53221eff24be4c9331c830b7d52f2f08a7b633de2',
+			'org.apache.ant:ant-launcher:1.9.4:ant-launcher-1.9.4.jar:7bccea20b41801ca17bcbc909a78c835d0f443f12d639c77bd6ae3d05861608d',
+			'org.apache.ant:ant:1.9.4:ant-1.9.4.jar:649ae0730251de07b8913f49286d46bba7b92d47c5f332610aa426c4f02161d8',
+			'org.apache.commons:commons-compress:1.12:commons-compress-1.12.jar:2c1542faf343185b7cab9c3d55c8ae5471d6d095d3887a4adefdbdf2984dc0b6',
+			'org.apache.httpcomponents:httpclient:4.2.6:httpclient-4.2.6.jar:362e9324ee7c697e21279e20077b52737ddef3f1b2c1a7abe5ad34b465145550',
+			'org.apache.httpcomponents:httpcore:4.2.5:httpcore-4.2.5.jar:e5e82da4cc66c8d917bbf743e3c0752efe8522735e7fc9dbddb65bccea81cfe9',
+			'org.apache.httpcomponents:httpmime:4.1:httpmime-4.1.jar:31629566148e8a47688ae43b420abc3ecd783ed15b33bebc00824bf24c9b15aa',
+			'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:jtorctl:0.3:jtorctl-0.3.jar:f2939238a097898998432effe93b0334d97a787972ab3a91a8973a1d309fc864',
+			'org.briarproject:tor-android:0.2.9.16:tor-android-0.2.9.16.zip:515e33dda6a30853c885a2de2c79ae1ab9ad8b6db44f5db8890333ec2e24f4ae',
+			'org.codehaus.groovy:groovy-all:2.4.12:groovy-all-2.4.12.jar:6a56af4bd48903d56bec62821876cadefafd007360cc6bd0d8f7aa8d72b38be4',
+			'org.codehaus.mojo:animal-sniffer-annotations:1.14:animal-sniffer-annotations-1.14.jar:2068320bd6bad744c3673ab048f67e30bef8f518996fa380033556600669905d',
+			'org.glassfish.jaxb:jaxb-core:2.2.11:jaxb-core-2.2.11.jar:37bcaee8ebb04362c8352a5bf6221b86967ecdab5164c696b10b9a2bb587b2aa',
+			'org.glassfish.jaxb:jaxb-runtime:2.2.11:jaxb-runtime-2.2.11.jar:a874f2351cfba8e2946be3002d10c18a6da8f21b52ba2acf52f2b85d5520ed70',
+			'org.glassfish.jaxb:txw2:2.2.11:txw2-2.2.11.jar:272a3ccad45a4511351920cd2a8633c53cab8d5220c7a92954da5526bb5eafea',
+			'org.hamcrest:hamcrest-core:1.3:hamcrest-core-1.3.jar:66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9',
+			'org.hamcrest:hamcrest-library:1.3:hamcrest-library-1.3.jar:711d64522f9ec410983bd310934296da134be4254a125080a0416ec178dfad1c',
+			'org.jetbrains.kotlin:kotlin-reflect:1.2.0:kotlin-reflect-1.2.0.jar:4f48a872bad6e4d9c053f4ad610d11e4012ad7e58dc19a03dd5eb811f36069dd',
+			'org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.0:kotlin-stdlib-jre7-1.2.0.jar:c7a20fb951d437797afe8980aff6c1e5a03f310c661ba58ba1d4fa90cb0f2926',
+			'org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.0:kotlin-stdlib-jre8-1.2.0.jar:633524eee6ef1941f7cb1dab7ee3927b0a221ceee9047aeb5515f4cbb990c82a',
+			'org.jetbrains.kotlin:kotlin-stdlib:1.2.0:kotlin-stdlib-1.2.0.jar:05cfd9f5ac0b41910703a8925f7211a495909b27a2ffdd1c5106f1689aeafcd4',
+			'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:5.1:asm-analysis-5.1.jar:a34658f5c5de4b573eef21131cc32cc25f7b66407944f312b28ec2e56abb1fa9',
+			'org.ow2.asm:asm-commons:5.1:asm-commons-5.1.jar:97b3786e1f55e74bddf8ad102bf50e33bbcbc1f6b7fd7b36f0bbbb25cd4981be',
+			'org.ow2.asm:asm-tree:5.1:asm-tree-5.1.jar:c0de2bbc4cb8297419659813ecd4ed1d077ed1dd5c1f5544cc5143e493e84c10',
+			'org.ow2.asm:asm-util:5.1:asm-util-5.1.jar:ee032c39ae5e3cd099148fbba9a2124f9ed613e5cb93e03ee0fa8808ce364040',
+			'org.ow2.asm:asm:5.0.4:asm-5.0.4.jar:896618ed8ae62702521a78bc7be42b7c491a08e6920a15f89a3ecdec31e9a220',
+			'org.ow2.asm:asm:5.1:asm-5.1.jar:d2da399a9967c69f0a21739256fa79d284222c223082cacadc17372244764b54',
+	]
+}
 
-task cleanTorBinaries {
+project.afterEvaluate {
-	doLast {
+	copy {
-		delete fileTree(torBinariesDir) { include '*.zip' }
+		from configurations.tor.collect { zipTree(it) }
+		into 'src/main/res/raw'
 	}
 }
-
-clean.dependsOn cleanTorBinaries
-
-task unpackTorBinaries {
-	doLast {
-		copy {
-			from configurations.tor.collect { zipTree(it) }
-			into torBinariesDir
-		}
-	}
-	dependsOn cleanTorBinaries
-}
-
-tasks.withType(MergeResources) {
-	inputs.dir torBinariesDir
-	dependsOn unpackTorBinaries
-}

bramble-android/src/androidTest/java/org/briarproject/bramble/plugin/tor/BridgeTest.java

@@ -0,0 +1,129 @@
+package org.briarproject.bramble.plugin.tor;
+
+import android.content.Context;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.briarproject.bramble.api.event.EventBus;
+import org.briarproject.bramble.api.network.NetworkManager;
+import org.briarproject.bramble.api.plugin.BackoffFactory;
+import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
+import org.briarproject.bramble.api.system.Clock;
+import org.briarproject.bramble.api.system.LocationUtils;
+import org.briarproject.bramble.test.BrambleAndroidIntegrationTestComponent;
+import org.briarproject.bramble.test.BrambleTestCase;
+import org.briarproject.bramble.test.DaggerBrambleAndroidIntegrationTestComponent;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.logging.Logger;
+
+import javax.inject.Inject;
+import javax.net.SocketFactory;
+
+import static android.support.test.InstrumentationRegistry.getTargetContext;
+import static java.util.Collections.singletonList;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+
+@RunWith(AndroidJUnit4.class)
+public class BridgeTest extends BrambleTestCase {
+
+	private final static long TIMEOUT = SECONDS.toMillis(23);
+
+	private final static Logger LOG =
+			Logger.getLogger(BridgeTest.class.getSimpleName());
+
+	@Inject
+	NetworkManager networkManager;
+	@Inject
+	EventBus eventBus;
+	@Inject
+	BackoffFactory backoffFactory;
+	@Inject
+	Clock clock;
+
+	private final Context appContext = getTargetContext();
+	private final CircumventionProvider circumventionProvider;
+	private final List<String> bridges;
+	private TorPluginFactory factory;
+	private volatile int currentBridge = 0;
+
+	public BridgeTest() {
+		super();
+		circumventionProvider = new CircumventionProvider() {
+			@Override
+			public boolean isTorProbablyBlocked(String countryCode) {
+				return true;
+			}
+
+			@Override
+			public boolean doBridgesWork(String countryCode) {
+				return true;
+			}
+
+			@Override
+			public List<String> getBridges() {
+				return singletonList(bridges.get(currentBridge));
+			}
+		};
+		bridges = new CircumventionProviderImpl(appContext).getBridges();
+	}
+
+	@Before
+	public void setUp() {
+		BrambleAndroidIntegrationTestComponent component =
+				DaggerBrambleAndroidIntegrationTestComponent.builder().build();
+		component.inject(this);
+
+		Executor ioExecutor = Executors.newCachedThreadPool();
+		ScheduledExecutorService scheduler = new ScheduledThreadPoolExecutor(1);
+		LocationUtils locationUtils = () -> "US";
+		SocketFactory torSocketFactory = SocketFactory.getDefault();
+
+		factory = new TorPluginFactory(ioExecutor, scheduler, appContext,
+				networkManager, locationUtils, eventBus, torSocketFactory,
+				backoffFactory, circumventionProvider, clock);
+	}
+
+	@Test
+	public void testBridges() throws Exception {
+		assertTrue(bridges.size() > 0);
+
+		for (int i = 0; i < bridges.size(); i++) {
+			testBridge(i);
+		}
+	}
+
+	private void testBridge(int bridge) throws Exception {
+		DuplexPlugin duplexPlugin =
+				factory.createPlugin(new TorPluginCallBack());
+		assertNotNull(duplexPlugin);
+		TorPlugin plugin = (TorPlugin) duplexPlugin;
+
+		currentBridge = bridge;
+		LOG.warning("Testing " + bridges.get(currentBridge));
+		try {
+			plugin.start();
+			long start = clock.currentTimeMillis();
+			while (clock.currentTimeMillis() - start < TIMEOUT) {
+				if (plugin.isRunning()) return;
+				clock.sleep(500);
+			}
+			if (!plugin.isRunning()) {
+				fail("Could not connect to Tor within timeout.");
+			}
+		} finally {
+			plugin.stop();
+		}
+	}
+
+}

bramble-android/src/androidTest/java/org/briarproject/bramble/test/ApplicationModule.java

@@ -0,0 +1,20 @@
+package org.briarproject.bramble.test;
+
+import android.app.Application;
+import android.support.test.InstrumentationRegistry;
+
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module
+class ApplicationModule {
+
+	@Provides
+	@Singleton
+	Application provideApplication() {
+		return (Application) InstrumentationRegistry.getTargetContext()
+						.getApplicationContext();
+	}
+}

bramble-android/src/androidTest/java/org/briarproject/bramble/test/BrambleAndroidIntegrationTestComponent.java

@@ -1,12 +1,9 @@
 package org.briarproject.bramble.test;
 
-import org.briarproject.bramble.BrambleJavaModule;
+import org.briarproject.bramble.BrambleAndroidModule;
-import org.briarproject.bramble.battery.DefaultBatteryManagerModule;
-import org.briarproject.bramble.event.DefaultEventExecutorModule;
 import org.briarproject.bramble.event.EventModule;
 import org.briarproject.bramble.plugin.PluginModule;
 import org.briarproject.bramble.plugin.tor.BridgeTest;
-import org.briarproject.bramble.plugin.tor.CircumventionProvider;
 import org.briarproject.bramble.system.SystemModule;
 
 import javax.inject.Singleton;
@@ -15,17 +12,15 @@ import dagger.Component;
 
 @Singleton
 @Component(modules = {
-		BrambleJavaModule.class,
+		BrambleAndroidModule.class,
 		TestLifecycleModule.class,
-		DefaultBatteryManagerModule.class,
+		ApplicationModule.class,
-		DefaultEventExecutorModule.class,
-		EventModule.class,
 		PluginModule.class,  // needed for BackoffFactory
+		EventModule.class,
 		SystemModule.class,
 })
-public interface BrambleJavaIntegrationTestComponent {
+public interface BrambleAndroidIntegrationTestComponent {
 
 	void inject(BridgeTest init);
 
-	CircumventionProvider getCircumventionProvider();
 }

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

@@ -1,11 +0,0 @@
-package org.briarproject.bramble;
-
-import org.briarproject.bramble.battery.AndroidBatteryModule;
-import org.briarproject.bramble.network.AndroidNetworkModule;
-
-public interface BrambleAndroidEagerSingletons {
-
-	void inject(AndroidBatteryModule.EagerSingletons init);
-
-	void inject(AndroidNetworkModule.EagerSingletons init);
-}

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

@@ -1,22 +1,27 @@
 package org.briarproject.bramble;
 
-import org.briarproject.bramble.battery.AndroidBatteryModule;
+import android.app.Application;
+
 import org.briarproject.bramble.network.AndroidNetworkModule;
-import org.briarproject.bramble.plugin.tor.CircumventionModule;
+import org.briarproject.bramble.plugin.tor.CircumventionProvider;
+import org.briarproject.bramble.plugin.tor.CircumventionProviderImpl;
 import org.briarproject.bramble.system.AndroidSystemModule;
 
+import javax.inject.Singleton;
+
 import dagger.Module;
+import dagger.Provides;
 
 @Module(includes = {
-		AndroidBatteryModule.class,
 		AndroidNetworkModule.class,
-		AndroidSystemModule.class,
+		AndroidSystemModule.class
-		CircumventionModule.class
 })
 public class BrambleAndroidModule {
 
-	public static void initEagerSingletons(BrambleAndroidEagerSingletons c) {
+	@Provides
-		c.inject(new AndroidBatteryModule.EagerSingletons());
+	@Singleton
-		c.inject(new AndroidNetworkModule.EagerSingletons());
+	CircumventionProvider provideCircumventionProvider(Application app) {
+		return new CircumventionProviderImpl(app.getApplicationContext());
 	}
+
 }

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

@@ -12,15 +12,11 @@ import org.briarproject.bramble.api.identity.IdentityManager;
 import org.briarproject.bramble.util.IoUtils;
 
 import java.io.File;
-import java.util.HashSet;
-import java.util.Set;
 import java.util.logging.Logger;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
-import static android.os.Build.VERSION.SDK_INT;
-
 class AndroidAccountManager extends AccountManagerImpl
 		implements AccountManager {
 
@@ -93,42 +89,20 @@ class AndroidAccountManager extends AccountManagerImpl
 				LOG.warning("Could not clear shared preferences");
 		}
 		// Delete files, except lib and shared_prefs directories
-		Set<File> files = new HashSet<>();
 		File dataDir = new File(appContext.getApplicationInfo().dataDir);
-		@Nullable
+		File[] children = dataDir.listFiles();
-		File[] fileArray = dataDir.listFiles();
+		if (children == null) {
-		if (fileArray == null) {
 			LOG.warning("Could not list files in app data dir");
 		} else {
-			for (File file : fileArray) {
+			for (File child : children) {
-				String name = file.getName();
+				String name = child.getName();
 				if (!name.equals("lib") && !name.equals("shared_prefs")) {
-					files.add(file);
+					IoUtils.deleteFileOrDir(child);
 				}
 			}
 		}
-		files.add(appContext.getFilesDir());
-		files.add(appContext.getCacheDir());
-		addIfNotNull(files, appContext.getExternalCacheDir());
-		if (SDK_INT >= 19) {
-			for (File file : appContext.getExternalCacheDirs()) {
-				addIfNotNull(files, file);
-			}
-		}
-		if (SDK_INT >= 21) {
-			for (File file : appContext.getExternalMediaDirs()) {
-				addIfNotNull(files, file);
-			}
-		}
-		for (File file : files) {
-			IoUtils.deleteFileOrDir(file);
-		}
 		// Recreate the cache dir as some OpenGL drivers expect it to exist
-		if (!new File(dataDir, "cache").mkdirs())
+		if (!new File(dataDir, "cache").mkdir())
 			LOG.warning("Could not recreate cache dir");
 	}
-
-	private void addIfNotNull(Set<File> files, @Nullable File file) {
-		if (file != null) files.add(file);
-	}
 }

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

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

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

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

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

@@ -91,7 +91,7 @@ class AndroidNetworkManager implements NetworkManager, Service {
 	public NetworkStatus getNetworkStatus() {
 		ConnectivityManager cm = (ConnectivityManager)
 				appContext.getSystemService(CONNECTIVITY_SERVICE);
-		if (cm == null) throw new AssertionError();
+		assert cm != null;
 		NetworkInfo net = cm.getActiveNetworkInfo();
 		boolean connected = net != null && net.isConnected();
 		boolean wifi = connected && net.getType() == TYPE_WIFI;

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

@@ -3,7 +3,6 @@ package org.briarproject.bramble.network;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.network.NetworkManager;
 
-import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import dagger.Module;
@@ -12,11 +11,6 @@ import dagger.Provides;
 @Module
 public class AndroidNetworkModule {
 
-	public static class EagerSingletons {
-		@Inject
-		NetworkManager networkManager;
-	}
-
 	@Provides
 	@Singleton
 	NetworkManager provideNetworkManager(LifecycleManager lifecycleManager,

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

@@ -16,27 +16,18 @@ import org.briarproject.bramble.api.plugin.PluginException;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
 import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
 import org.briarproject.bramble.api.system.AndroidExecutor;
-import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.util.AndroidUtils;
-import org.briarproject.bramble.util.IoUtils;
 
+import java.io.Closeable;
 import java.io.IOException;
 import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
 import java.util.UUID;
-import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
-import java.util.concurrent.LinkedBlockingQueue;
 import java.util.logging.Logger;
 
 import javax.annotation.Nullable;
 
-import static android.bluetooth.BluetoothAdapter.ACTION_DISCOVERY_FINISHED;
-import static android.bluetooth.BluetoothAdapter.ACTION_DISCOVERY_STARTED;
 import static android.bluetooth.BluetoothAdapter.ACTION_SCAN_MODE_CHANGED;
 import static android.bluetooth.BluetoothAdapter.ACTION_STATE_CHANGED;
 import static android.bluetooth.BluetoothAdapter.EXTRA_SCAN_MODE;
@@ -46,12 +37,8 @@ import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERA
 import static android.bluetooth.BluetoothAdapter.SCAN_MODE_NONE;
 import static android.bluetooth.BluetoothAdapter.STATE_OFF;
 import static android.bluetooth.BluetoothAdapter.STATE_ON;
-import static android.bluetooth.BluetoothDevice.ACTION_FOUND;
-import static android.bluetooth.BluetoothDevice.EXTRA_DEVICE;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
-import static org.briarproject.bramble.util.PrivacyUtils.scrubMacAddress;
+import static org.briarproject.bramble.util.LogUtils.logException;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
@@ -60,11 +47,8 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
 	private static final Logger LOG =
 			Logger.getLogger(AndroidBluetoothPlugin.class.getName());
 
-	private static final int MAX_DISCOVERY_MS = 10_000;
-
 	private final AndroidExecutor androidExecutor;
 	private final Context appContext;
-	private final Clock clock;
 
 	private volatile boolean wasEnabledByUs = false;
 	private volatile BluetoothStateReceiver receiver = null;
@@ -74,13 +58,12 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
 
 	AndroidBluetoothPlugin(BluetoothConnectionLimiter connectionLimiter,
 			Executor ioExecutor, AndroidExecutor androidExecutor,
-			Context appContext, SecureRandom secureRandom, Clock clock,
+			Context appContext, SecureRandom secureRandom, Backoff backoff,
-			Backoff backoff, DuplexPluginCallback callback, int maxLatency) {
+			DuplexPluginCallback callback, int maxLatency) {
 		super(connectionLimiter, ioExecutor, secureRandom, backoff, callback,
 				maxLatency);
 		this.androidExecutor = androidExecutor;
 		this.appContext = appContext;
-		this.clock = clock;
 	}
 
 	@Override
@@ -160,7 +143,11 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
 
 	@Override
 	void tryToClose(@Nullable BluetoothServerSocket ss) {
-		IoUtils.tryToClose(ss, LOG, WARNING);
+		try {
+			if (ss != null) ss.close();
+		} catch (IOException e) {
+			logException(LOG, WARNING, e);
+		}
 	}
 
 	@Override
@@ -190,77 +177,17 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
 			s.connect();
 			return wrapSocket(s);
 		} catch (IOException e) {
-			IoUtils.tryToClose(s, LOG, WARNING);
+			tryToClose(s);
 			throw e;
 		}
 	}
 
-	@Override
+	private void tryToClose(@Nullable Closeable c) {
-	@Nullable
-	DuplexTransportConnection discoverAndConnect(String uuid) {
-		if (adapter == null) return null;
-		for (String address : discoverDevices()) {
-			try {
-				if (LOG.isLoggable(INFO))
-					LOG.info("Connecting to " + scrubMacAddress(address));
-				return connectTo(address, uuid);
-			} catch (IOException e) {
-				if (LOG.isLoggable(INFO)) {
-					LOG.info("Could not connect to "
-							+ scrubMacAddress(address));
-				}
-			}
-		}
-		LOG.info("Could not connect to any devices");
-		return null;
-	}
-
-	private Collection<String> discoverDevices() {
-		List<String> addresses = new ArrayList<>();
-		BlockingQueue<Intent> intents = new LinkedBlockingQueue<>();
-		DiscoveryReceiver receiver = new DiscoveryReceiver(intents);
-		IntentFilter filter = new IntentFilter();
-		filter.addAction(ACTION_DISCOVERY_STARTED);
-		filter.addAction(ACTION_DISCOVERY_FINISHED);
-		filter.addAction(ACTION_FOUND);
-		appContext.registerReceiver(receiver, filter);
 		try {
-			if (adapter.startDiscovery()) {
+			if (c != null) c.close();
-				long now = clock.currentTimeMillis();
+		} catch (IOException e) {
-				long end = now + MAX_DISCOVERY_MS;
+			logException(LOG, WARNING, e);
-				while (now < end) {
-					Intent i = intents.poll(end - now, MILLISECONDS);
-					if (i == null) break;
-					String action = i.getAction();
-					if (ACTION_DISCOVERY_STARTED.equals(action)) {
-						LOG.info("Discovery started");
-					} else if (ACTION_DISCOVERY_FINISHED.equals(action)) {
-						LOG.info("Discovery finished");
-						break;
-					} else if (ACTION_FOUND.equals(action)) {
-						BluetoothDevice d = i.getParcelableExtra(EXTRA_DEVICE);
-						String address = d.getAddress();
-						if (LOG.isLoggable(INFO))
-							LOG.info("Discovered " + scrubMacAddress(address));
-						if (!addresses.contains(address))
-							addresses.add(address);
-					}
-					now = clock.currentTimeMillis();
-				}
-			} else {
-				LOG.info("Could not start discovery");
-			}
-		} catch (InterruptedException e) {
-			LOG.info("Interrupted while discovering devices");
-			Thread.currentThread().interrupt();
-		} finally {
-			LOG.info("Cancelling discovery");
-			adapter.cancelDiscovery();
-			appContext.unregisterReceiver(receiver);
 		}
-		// Shuffle the addresses so we don't always try the same one first
-		Collections.shuffle(addresses);
-		return addresses;
 	}
 
 	private class BluetoothStateReceiver extends BroadcastReceiver {
@@ -280,18 +207,4 @@ class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
 			}
 		}
 	}
-
-	private static class DiscoveryReceiver extends BroadcastReceiver {
-
-		private final BlockingQueue<Intent> intents;
-
-		private DiscoveryReceiver(BlockingQueue<Intent> intents) {
-			this.intents = intents;
-		}
-
-		@Override
-		public void onReceive(Context ctx, Intent intent) {
-			intents.add(intent);
-		}
-	}
 }

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

@@ -11,7 +11,6 @@ import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
 import org.briarproject.bramble.api.system.AndroidExecutor;
-import org.briarproject.bramble.api.system.Clock;
 
 import java.security.SecureRandom;
 import java.util.concurrent.Executor;
@@ -34,19 +33,17 @@ public class AndroidBluetoothPluginFactory implements DuplexPluginFactory {
 	private final Context appContext;
 	private final SecureRandom secureRandom;
 	private final EventBus eventBus;
-	private final Clock clock;
 	private final BackoffFactory backoffFactory;
 
 	public AndroidBluetoothPluginFactory(Executor ioExecutor,
 			AndroidExecutor androidExecutor, Context appContext,
-			SecureRandom secureRandom, EventBus eventBus, Clock clock,
+			SecureRandom secureRandom, EventBus eventBus,
 			BackoffFactory backoffFactory) {
 		this.ioExecutor = ioExecutor;
 		this.androidExecutor = androidExecutor;
 		this.appContext = appContext;
 		this.secureRandom = secureRandom;
 		this.eventBus = eventBus;
-		this.clock = clock;
 		this.backoffFactory = backoffFactory;
 	}
 
@@ -68,7 +65,7 @@ public class AndroidBluetoothPluginFactory implements DuplexPluginFactory {
 				MAX_POLLING_INTERVAL, BACKOFF_BASE);
 		AndroidBluetoothPlugin plugin = new AndroidBluetoothPlugin(
 				connectionLimiter, ioExecutor, androidExecutor, appContext,
-				secureRandom, clock, backoff, callback, MAX_LATENCY);
+				secureRandom, backoff, callback, MAX_LATENCY);
 		eventBus.addListener(plugin);
 		return plugin;
 	}

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

@@ -68,7 +68,7 @@ class AndroidLanTcpPlugin extends LanTcpPlugin implements EventListener {
 				new PoliteExecutor("AndroidLanTcpPlugin", ioExecutor, 1);
 		ConnectivityManager connectivityManager = (ConnectivityManager)
 				appContext.getSystemService(CONNECTIVITY_SERVICE);
-		if (connectivityManager == null) throw new AssertionError();
+		assert connectivityManager != null;
 		this.connectivityManager = connectivityManager;
 		wifiManager = (WifiManager) appContext.getApplicationContext()
 				.getSystemService(WIFI_SERVICE);

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

@@ -1,100 +0,0 @@
-package org.briarproject.bramble.plugin.tor;
-
-import android.content.Context;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.os.PowerManager;
-
-import org.briarproject.bramble.api.battery.BatteryManager;
-import org.briarproject.bramble.api.network.NetworkManager;
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
-import org.briarproject.bramble.api.plugin.Backoff;
-import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
-import org.briarproject.bramble.api.system.Clock;
-import org.briarproject.bramble.api.system.LocationUtils;
-import org.briarproject.bramble.api.system.ResourceProvider;
-import org.briarproject.bramble.util.RenewableWakeLock;
-
-import java.io.IOException;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ScheduledExecutorService;
-
-import javax.net.SocketFactory;
-
-import static android.content.Context.MODE_PRIVATE;
-import static android.content.Context.POWER_SERVICE;
-import static android.os.PowerManager.PARTIAL_WAKE_LOCK;
-import static java.util.concurrent.TimeUnit.MINUTES;
-
-@MethodsNotNullByDefault
-@ParametersNotNullByDefault
-class AndroidTorPlugin extends TorPlugin {
-
-	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/CircumventionProvider.java

@@ -17,24 +17,16 @@ public interface CircumventionProvider {
 	String[] BLOCKED = {"CN", "IR", "EG", "BY", "TR", "SY", "VE"};
 
 	/**
-	 * Countries where obfs4 bridge connection are likely to work.
+	 * Countries where vanilla bridge connection are likely to work.
 	 * Should be a subset of {@link #BLOCKED}.
 	 */
-	String[] BRIDGES = { "CN", "IR", "EG", "BY", "TR", "SY", "VE" };
+	String[] BRIDGES = { "EG", "BY", "TR", "SY", "VE" };
-
-	/**
-	 * Countries where obfs4 bridges won't work and meek is needed.
-	 * Should be a subset of {@link #BRIDGES}.
-	 */
-	String[] NEEDS_MEEK = {"CN", "IR"};
 
 	boolean isTorProbablyBlocked(String countryCode);
 
 	boolean doBridgesWork(String countryCode);
 
-	boolean needsMeek(String countryCode);
-
 	@IoExecutor
-	List<String> getBridges(boolean meek);
+	List<String> getBridges();
 
 }

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

@@ -1,9 +1,13 @@
 package org.briarproject.bramble.plugin.tor;
 
+import android.content.Context;
+import android.content.res.Resources;
+
 import org.briarproject.bramble.api.lifecycle.IoExecutor;
 
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Scanner;
@@ -12,26 +16,26 @@ import java.util.Set;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
-import static java.util.Arrays.asList;
+// TODO: Create a module for this so it doesn't need to be public
 
-class CircumventionProviderImpl implements CircumventionProvider {
+public class CircumventionProviderImpl implements CircumventionProvider {
 
 	private final static String BRIDGE_FILE_NAME = "bridges";
 
-	private static final Set<String> BLOCKED_IN_COUNTRIES =
+	private final Context ctx;
-			new HashSet<>(asList(BLOCKED));
-	private static final Set<String> BRIDGES_WORK_IN_COUNTRIES =
-			new HashSet<>(asList(BRIDGES));
-	private static final Set<String> BRIDGES_NEED_MEEK =
-			new HashSet<>(asList(NEEDS_MEEK));
-
 	@Nullable
 	private volatile List<String> bridges = null;
 
 	@Inject
-	CircumventionProviderImpl() {
+	public CircumventionProviderImpl(Context ctx) {
+		this.ctx = ctx;
 	}
 
+	private static final Set<String> BLOCKED_IN_COUNTRIES =
+			new HashSet<>(Arrays.asList(BLOCKED));
+	private static final Set<String> BRIDGES_WORK_IN_COUNTRIES =
+			new HashSet<>(Arrays.asList(BRIDGES));
+
 	@Override
 	public boolean isTorProbablyBlocked(String countryCode) {
 		return BLOCKED_IN_COUNTRIES.contains(countryCode);
@@ -42,26 +46,20 @@ class CircumventionProviderImpl implements CircumventionProvider {
 		return BRIDGES_WORK_IN_COUNTRIES.contains(countryCode);
 	}
 
-	@Override
-	public boolean needsMeek(String countryCode) {
-		return BRIDGES_NEED_MEEK.contains(countryCode);
-	}
-
 	@Override
 	@IoExecutor
-	public List<String> getBridges(boolean useMeek) {
+	public List<String> getBridges() {
-		List<String> bridges = this.bridges;
+		if (this.bridges != null) return this.bridges;
-		if (bridges != null) return new ArrayList<>(bridges);
 
-		InputStream is = getClass().getClassLoader()
+		Resources res = ctx.getResources();
-				.getResourceAsStream(BRIDGE_FILE_NAME);
+		int resId = res.getIdentifier(BRIDGE_FILE_NAME, "raw",
+				ctx.getPackageName());
+		InputStream is = ctx.getResources().openRawResource(resId);
 		Scanner scanner = new Scanner(is);
 
-		bridges = new ArrayList<>();
+		List<String> bridges = new ArrayList<>();
 		while (scanner.hasNextLine()) {
 			String line = scanner.nextLine();
-			boolean isMeekBridge = line.startsWith("Bridge meek");
-			if (useMeek && !isMeekBridge || !useMeek && isMeekBridge) continue;
 			if (!line.startsWith("#")) bridges.add(line);
 		}
 		scanner.close();

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

@@ -1,11 +1,16 @@
 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.content.res.Resources;
+import android.os.PowerManager;
+
 import net.freehaven.tor.control.EventHandler;
 import net.freehaven.tor.control.TorControlConnection;
 
 import org.briarproject.bramble.PoliteExecutor;
-import org.briarproject.bramble.api.battery.BatteryManager;
-import org.briarproject.bramble.api.battery.event.BatteryEvent;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.data.BdfList;
 import org.briarproject.bramble.api.event.Event;
@@ -28,9 +33,11 @@ import org.briarproject.bramble.api.settings.Settings;
 import org.briarproject.bramble.api.settings.event.SettingsUpdatedEvent;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.api.system.LocationUtils;
-import org.briarproject.bramble.api.system.ResourceProvider;
 import org.briarproject.bramble.util.IoUtils;
+import org.briarproject.bramble.util.RenewableWakeLock;
+import org.briarproject.bramble.util.StringUtils;
 
+import java.io.Closeable;
 import java.io.EOFException;
 import java.io.File;
 import java.io.FileInputStream;
@@ -50,6 +57,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Scanner;
 import java.util.concurrent.Executor;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
@@ -58,31 +66,29 @@ import java.util.zip.ZipInputStream;
 import javax.annotation.Nullable;
 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;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static net.freehaven.tor.control.TorControlCommands.HS_ADDRESS;
 import static net.freehaven.tor.control.TorControlCommands.HS_PRIVKEY;
 import static org.briarproject.bramble.api.plugin.TorConstants.CONTROL_PORT;
 import static org.briarproject.bramble.api.plugin.TorConstants.ID;
-import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_MOBILE;
+import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_DISABLE_BLOCKED;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK;
-import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_AUTOMATIC;
+import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_ALWAYS;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_NEVER;
-import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_WITH_BRIDGES;
+import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_WIFI;
-import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_ONLY_WHEN_CHARGING;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_PORT;
-import static org.briarproject.bramble.api.plugin.TorConstants.PROP_ONION_V2;
+import static org.briarproject.bramble.api.plugin.TorConstants.PROP_ONION;
-import static org.briarproject.bramble.api.plugin.TorConstants.PROP_ONION_V3;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.bramble.util.PrivacyUtils.scrubOnion;
-import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
-abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
+class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
-
-	private static final Logger LOG =
-			Logger.getLogger(TorPlugin.class.getName());
 
 	private static final String[] EVENTS = {
 			"CIRC", "ORCONN", "HS_DESC", "NOTICE", "WARN", "ERR"
@@ -90,71 +96,69 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	private static final String OWNER = "__OwningControllerProcess";
 	private static final int COOKIE_TIMEOUT_MS = 3000;
 	private static final int COOKIE_POLLING_INTERVAL_MS = 200;
-	private static final Pattern ONION_V2 = Pattern.compile("[a-z2-7]{16}");
+	private static final Pattern ONION = Pattern.compile("[a-z2-7]{16}");
-	private static final Pattern ONION_V3 = Pattern.compile("[a-z2-7]{56}");
+	// This tag may prevent Huawei's power manager from killing us
+	private static final String WAKE_LOCK_TAG = "LocationManagerService";
+	private static final Logger LOG =
+			Logger.getLogger(TorPlugin.class.getName());
 
 	private final Executor ioExecutor, connectionStatusExecutor;
+	private final Context appContext;
 	private final NetworkManager networkManager;
 	private final LocationUtils locationUtils;
 	private final SocketFactory torSocketFactory;
 	private final Clock clock;
-	private final BatteryManager batteryManager;
 	private final Backoff backoff;
 	private final DuplexPluginCallback callback;
 	private final String architecture;
 	private final CircumventionProvider circumventionProvider;
-	private final ResourceProvider resourceProvider;
 	private final int maxLatency, maxIdleTime, socketTimeout;
-	private final File torDirectory, torFile, geoIpFile, obfs4File, configFile;
-	private final File doneFile, cookieFile;
 	private final ConnectionStatus connectionStatus;
+	private final File torDirectory, torFile, geoIpFile, configFile;
+	private final File doneFile, cookieFile;
+	private final RenewableWakeLock wakeLock;
 	private final AtomicBoolean used = new AtomicBoolean(false);
 
+	private volatile boolean running = false;
 	private volatile ServerSocket socket = null;
 	private volatile Socket controlSocket = null;
 	private volatile TorControlConnection controlConnection = null;
-	private volatile Settings settings = null;
 
-	protected volatile boolean running = false;
+	TorPlugin(Executor ioExecutor, ScheduledExecutorService scheduler,
-
+			Context appContext, NetworkManager networkManager,
-	protected abstract int getProcessId();
-
-	protected abstract long getLastUpdateTime();
-
-	TorPlugin(Executor ioExecutor, NetworkManager networkManager,
 			LocationUtils locationUtils, SocketFactory torSocketFactory,
-			Clock clock, ResourceProvider resourceProvider,
+			Clock clock, CircumventionProvider circumventionProvider,
-			CircumventionProvider circumventionProvider,
+			Backoff backoff, DuplexPluginCallback callback,
-			BatteryManager batteryManager, Backoff backoff,
+			String architecture, int maxLatency, int maxIdleTime) {
-			DuplexPluginCallback callback, String architecture, int maxLatency,
-			int maxIdleTime, File torDirectory) {
 		this.ioExecutor = ioExecutor;
+		this.appContext = appContext;
 		this.networkManager = networkManager;
 		this.locationUtils = locationUtils;
 		this.torSocketFactory = torSocketFactory;
 		this.clock = clock;
-		this.resourceProvider = resourceProvider;
-		this.circumventionProvider = circumventionProvider;
-		this.batteryManager = batteryManager;
 		this.backoff = backoff;
 		this.callback = callback;
 		this.architecture = architecture;
+		this.circumventionProvider = circumventionProvider;
 		this.maxLatency = maxLatency;
 		this.maxIdleTime = maxIdleTime;
 		if (maxIdleTime > Integer.MAX_VALUE / 2)
 			socketTimeout = Integer.MAX_VALUE;
 		else socketTimeout = maxIdleTime * 2;
-		this.torDirectory = torDirectory;
+		connectionStatus = new ConnectionStatus();
+		torDirectory = appContext.getDir("tor", MODE_PRIVATE);
 		torFile = new File(torDirectory, "tor");
 		geoIpFile = new File(torDirectory, "geoip");
-		obfs4File = new File(torDirectory, "obfs4proxy");
 		configFile = new File(torDirectory, "torrc");
 		doneFile = new File(torDirectory, "done");
 		cookieFile = new File(torDirectory, ".tor/control_auth_cookie");
-		connectionStatus = new ConnectionStatus();
 		// Don't execute more than one connection status check at a time
 		connectionStatusExecutor =
 				new PoliteExecutor("TorPlugin", ioExecutor, 1);
+		PowerManager pm = (PowerManager)
+				appContext.getSystemService(POWER_SERVICE);
+		wakeLock = new RenewableWakeLock(pm, scheduler, PARTIAL_WAKE_LOCK,
+				WAKE_LOCK_TAG, 1, MINUTES);
 	}
 
 	@Override
@@ -175,25 +179,15 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	@Override
 	public void start() throws PluginException {
 		if (used.getAndSet(true)) throw new IllegalStateException();
-		if (!torDirectory.exists()) {
-			if (!torDirectory.mkdirs()) {
-				LOG.warning("Could not create Tor directory.");
-				throw new PluginException();
-			}
-		}
-		// Load the settings
-		settings = callback.getSettings();
 		// Install or update the assets if necessary
 		if (!assetsAreUpToDate()) installAssets();
 		if (cookieFile.exists() && !cookieFile.delete())
 			LOG.warning("Old auth cookie not deleted");
-		// Migrate old settings before having a chance to stop
-		migrateSettings();
 		// Start a new Tor process
 		LOG.info("Starting Tor");
 		String torPath = torFile.getAbsolutePath();
 		String configPath = configFile.getAbsolutePath();
-		String pid = String.valueOf(getProcessId());
+		String pid = String.valueOf(android.os.Process.myPid());
 		Process torProcess;
 		ProcessBuilder pb =
 				new ProcessBuilder(torPath, "-f", configPath, OWNER, pid);
@@ -266,14 +260,19 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			throw new PluginException(e);
 		}
 		// Check whether we're online
-		updateConnectionStatus(networkManager.getNetworkStatus(),
+		updateConnectionStatus(networkManager.getNetworkStatus());
-				batteryManager.isCharging());
 		// Bind a server socket to receive incoming hidden service connections
 		bind();
 	}
 
 	private boolean assetsAreUpToDate() {
-		return doneFile.lastModified() > getLastUpdateTime();
+		try {
+			PackageManager pm = appContext.getPackageManager();
+			PackageInfo pi = pm.getPackageInfo(appContext.getPackageName(), 0);
+			return doneFile.lastModified() > pi.lastUpdateTime;
+		} catch (NameNotFoundException e) {
+			throw new RuntimeException(e);
+		}
 	}
 
 	private void installAssets() throws PluginException {
@@ -291,20 +290,14 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			in = getGeoIpInputStream();
 			out = new FileOutputStream(geoIpFile);
 			IoUtils.copyAndClose(in, out);
-			// Unzip the Obfs4 proxy to the filesystem
-			in = getObfs4InputStream();
-			out = new FileOutputStream(obfs4File);
-			IoUtils.copyAndClose(in, out);
-			// Make the Obfs4 proxy executable
-			if (!obfs4File.setExecutable(true, true)) throw new IOException();
 			// Copy the config file to the filesystem
 			in = getConfigInputStream();
 			out = new FileOutputStream(configFile);
 			IoUtils.copyAndClose(in, out);
 			doneFile.createNewFile();
 		} catch (IOException e) {
-			IoUtils.tryToClose(in, LOG, WARNING);
+			tryToClose(in);
-			IoUtils.tryToClose(out, LOG, WARNING);
+			tryToClose(out);
 			throw new PluginException(e);
 		}
 	}
@@ -312,33 +305,45 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	private InputStream getTorInputStream() throws IOException {
 		if (LOG.isLoggable(INFO))
 			LOG.info("Installing Tor binary for " + architecture);
-		InputStream in = resourceProvider
+		int resId = getResourceId("tor_" + architecture);
-				.getResourceInputStream("tor_" + architecture, ".zip");
+		InputStream in = appContext.getResources().openRawResource(resId);
 		ZipInputStream zin = new ZipInputStream(in);
 		if (zin.getNextEntry() == null) throw new IOException();
 		return zin;
 	}
 
 	private InputStream getGeoIpInputStream() throws IOException {
-		InputStream in = resourceProvider.getResourceInputStream("geoip",
+		int resId = getResourceId("geoip");
-				".zip");
+		InputStream in = appContext.getResources().openRawResource(resId);
-		ZipInputStream zin = new ZipInputStream(in);
-		if (zin.getNextEntry() == null) throw new IOException();
-		return zin;
-	}
-
-	private InputStream getObfs4InputStream() throws IOException {
-		if (LOG.isLoggable(INFO))
-			LOG.info("Installing obfs4proxy binary for " + architecture);
-		InputStream in = resourceProvider
-				.getResourceInputStream("obfs4proxy_" + architecture, ".zip");
 		ZipInputStream zin = new ZipInputStream(in);
 		if (zin.getNextEntry() == null) throw new IOException();
 		return zin;
 	}
 
 	private InputStream getConfigInputStream() {
-		return getClass().getClassLoader().getResourceAsStream("torrc");
+		int resId = getResourceId("torrc");
+		return appContext.getResources().openRawResource(resId);
+	}
+
+	private int getResourceId(String filename) {
+		Resources res = appContext.getResources();
+		return res.getIdentifier(filename, "raw", appContext.getPackageName());
+	}
+
+	private void tryToClose(@Nullable Closeable c) {
+		try {
+			if (c != null) c.close();
+		} catch (IOException e) {
+			logException(LOG, WARNING, e);
+		}
+	}
+
+	private void tryToClose(@Nullable Socket s) {
+		try {
+			if (s != null) s.close();
+		} catch (IOException e) {
+			logException(LOG, WARNING, e);
+		}
 	}
 
 	private void listFiles(File f) {
@@ -362,16 +367,16 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			}
 			return b;
 		} finally {
-			IoUtils.tryToClose(in, LOG, WARNING);
+			tryToClose(in);
 		}
 	}
 
 	private void bind() {
 		ioExecutor.execute(() -> {
 			// If there's already a port number stored in config, reuse it
-			String portString = settings.get(PREF_TOR_PORT);
+			String portString = callback.getSettings().get(PREF_TOR_PORT);
 			int port;
-			if (isNullOrEmpty(portString)) port = 0;
+			if (StringUtils.isNullOrEmpty(portString)) port = 0;
 			else port = Integer.parseInt(portString);
 			// Bind a server socket to receive connections from Tor
 			ServerSocket ss = null;
@@ -402,14 +407,19 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	}
 
 	private void tryToClose(@Nullable ServerSocket ss) {
-		IoUtils.tryToClose(ss, LOG, WARNING);
+		try {
-		callback.transportDisabled();
+			if (ss != null) ss.close();
+		} catch (IOException e) {
+			logException(LOG, WARNING, e);
+		} finally {
+			callback.transportDisabled();
+		}
 	}
 
 	private void publishHiddenService(String port) {
 		if (!running) return;
 		LOG.info("Creating hidden service");
-		String privKey = settings.get(HS_PRIVKEY);
+		String privKey = callback.getSettings().get(HS_PRIVKEY);
 		Map<Integer, String> portLines =
 				Collections.singletonMap(80, "127.0.0.1:" + port);
 		Map<String, String> response;
@@ -431,11 +441,11 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			return;
 		}
 		// Publish the hidden service's onion hostname in transport properties
-		String onion2 = response.get(HS_ADDRESS);
+		String hostname = response.get(HS_ADDRESS);
 		if (LOG.isLoggable(INFO))
-			LOG.info("Hidden service " + scrubOnion(onion2));
+			LOG.info("Hidden service " + scrubOnion(hostname));
 		TransportProperties p = new TransportProperties();
-		p.put(PROP_ONION_V2, onion2);
+		p.put(PROP_ONION, hostname);
 		callback.mergeLocalProperties(p);
 		if (privKey == null) {
 			// Save the hidden service's private key for next time
@@ -463,26 +473,22 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		}
 	}
 
-	protected void enableNetwork(boolean enable) throws IOException {
+	private void enableNetwork(boolean enable) throws IOException {
 		if (!running) return;
+		if (enable) wakeLock.acquire();
 		connectionStatus.enableNetwork(enable);
 		controlConnection.setConf("DisableNetwork", enable ? "0" : "1");
-		if (!enable) callback.transportDisabled();
+		if (!enable) {
+			callback.transportDisabled();
+			wakeLock.release();
+		}
 	}
 
-	private void enableBridges(boolean enable, boolean needsMeek)
+	private void enableBridges(boolean enable) throws IOException {
-			throws IOException {
 		if (enable) {
 			Collection<String> conf = new ArrayList<>();
 			conf.add("UseBridges 1");
-			if (needsMeek) {
+			conf.addAll(circumventionProvider.getBridges());
-				conf.add("ClientTransportPlugin meek_lite exec " +
-						obfs4File.getAbsolutePath());
-			} else {
-				conf.add("ClientTransportPlugin obfs4 exec " +
-						obfs4File.getAbsolutePath());
-			}
-			conf.addAll(circumventionProvider.getBridges(needsMeek));
 			controlConnection.setConf(conf);
 		} else {
 			controlConnection.setConf("UseBridges", "0");
@@ -503,6 +509,7 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 				logException(LOG, WARNING, e);
 			}
 		}
+		wakeLock.release();
 	}
 
 	@Override
@@ -542,43 +549,28 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	@Override
 	public DuplexTransportConnection createConnection(TransportProperties p) {
 		if (!isRunning()) return null;
-		String bestOnion = null;
+		String onion = p.get(PROP_ONION);
-		String onion2 = p.get(PROP_ONION_V2);
+		if (StringUtils.isNullOrEmpty(onion)) return null;
-		String onion3 = p.get(PROP_ONION_V3);
+		if (!ONION.matcher(onion).matches()) {
-		if (!isNullOrEmpty(onion2)) {
+			// not scrubbing this address, so we are able to find the problem
-			if (ONION_V2.matcher(onion2).matches()) {
+			if (LOG.isLoggable(INFO)) LOG.info("Invalid hostname: " + onion);
-				bestOnion = onion2;
+			return null;
-			} else {
-				// Don't scrub the address so we can find the problem
-				if (LOG.isLoggable(INFO))
-					LOG.info("Invalid v2 hostname: " + onion2);
-			}
 		}
-		if (!isNullOrEmpty(onion3)) {
-			if (ONION_V3.matcher(onion3).matches()) {
-				bestOnion = onion3;
-			} else {
-				// Don't scrub the address so we can find the problem
-				if (LOG.isLoggable(INFO))
-					LOG.info("Invalid v3 hostname: " + onion3);
-			}
-		}
-		if (bestOnion == null) return null;
 		Socket s = null;
 		try {
 			if (LOG.isLoggable(INFO))
-				LOG.info("Connecting to " + scrubOnion(bestOnion));
+				LOG.info("Connecting to " + scrubOnion(onion));
-			s = torSocketFactory.createSocket(bestOnion + ".onion", 80);
+			s = torSocketFactory.createSocket(onion + ".onion", 80);
 			s.setSoTimeout(socketTimeout);
 			if (LOG.isLoggable(INFO))
-				LOG.info("Connected to " + scrubOnion(bestOnion));
+				LOG.info("Connected to " + scrubOnion(onion));
 			return new TorTransportConnection(this, s);
 		} catch (IOException e) {
 			if (LOG.isLoggable(INFO)) {
-				LOG.info("Could not connect to " + scrubOnion(bestOnion)
+				LOG.info("Could not connect to " + scrubOnion(onion) + ": " +
-						+ ": " + e.toString());
+						e.toString());
 			}
-			IoUtils.tryToClose(s, LOG, WARNING);
+			tryToClose(s);
 			return null;
 		}
 	}
@@ -615,12 +607,10 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 
 	@Override
 	public void orConnStatus(String status, String orName) {
-		if (LOG.isLoggable(INFO))
+		if (LOG.isLoggable(INFO)) LOG.info("OR connection " + status);
-			LOG.info("OR connection " + status + " " + orName);
 		if (status.equals("CLOSED") || status.equals("FAILED")) {
 			// Check whether we've lost connectivity
-			updateConnectionStatus(networkManager.getNetworkStatus(),
+			updateConnectionStatus(networkManager.getNetworkStatus());
-					batteryManager.isCharging());
 		}
 	}
 
@@ -654,36 +644,14 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			SettingsUpdatedEvent s = (SettingsUpdatedEvent) e;
 			if (s.getNamespace().equals(ID.getString())) {
 				LOG.info("Tor settings updated");
-				settings = s.getSettings();
+				updateConnectionStatus(networkManager.getNetworkStatus());
-				// Works around a bug introduced in Tor 0.3.4.8.
-				// https://trac.torproject.org/projects/tor/ticket/28027
-				// Could be replaced with callback.transportDisabled()
-				// when fixed.
-				disableNetwork();
-				updateConnectionStatus(networkManager.getNetworkStatus(),
-						batteryManager.isCharging());
 			}
 		} else if (e instanceof NetworkStatusEvent) {
-			updateConnectionStatus(((NetworkStatusEvent) e).getStatus(),
+			updateConnectionStatus(((NetworkStatusEvent) e).getStatus());
-					batteryManager.isCharging());
-		} else if (e instanceof BatteryEvent) {
-			updateConnectionStatus(networkManager.getNetworkStatus(),
-					((BatteryEvent) e).isCharging());
 		}
 	}
 
-	private void disableNetwork() {
+	private void updateConnectionStatus(NetworkStatus status) {
-		connectionStatusExecutor.execute(() -> {
-			try {
-				enableNetwork(false);
-			} catch (IOException ex) {
-				logException(LOG, WARNING, ex);
-			}
-		});
-	}
-
-	private void updateConnectionStatus(NetworkStatus status,
-			boolean charging) {
 		connectionStatusExecutor.execute(() -> {
 			if (!running) return;
 			boolean online = status.isConnected();
@@ -691,83 +659,49 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			String country = locationUtils.getCurrentCountry();
 			boolean blocked =
 					circumventionProvider.isTorProbablyBlocked(country);
-			int network = settings.getInt(PREF_TOR_NETWORK,
+			Settings s = callback.getSettings();
-					PREF_TOR_NETWORK_AUTOMATIC);
+			int network = s.getInt(PREF_TOR_NETWORK, PREF_TOR_NETWORK_ALWAYS);
-			boolean useMobile = settings.getBoolean(PREF_TOR_MOBILE, true);
+			boolean disableWhenBlocked =
-			boolean onlyWhenCharging =
+					s.getBoolean(PREF_TOR_DISABLE_BLOCKED, true);
-					settings.getBoolean(PREF_TOR_ONLY_WHEN_CHARGING, false);
-			boolean bridgesWork = circumventionProvider.doBridgesWork(country);
-			boolean automatic = network == PREF_TOR_NETWORK_AUTOMATIC;
 
 			if (LOG.isLoggable(INFO)) {
 				LOG.info("Online: " + online + ", wifi: " + wifi);
 				if ("".equals(country)) LOG.info("Country code unknown");
 				else LOG.info("Country code: " + country);
-				LOG.info("Charging: " + charging);
 			}
 
 			try {
 				if (!online) {
 					LOG.info("Disabling network, device is offline");
 					enableNetwork(false);
-				} else if (!charging && onlyWhenCharging) {
+				} else if (network == PREF_TOR_NETWORK_NEVER
-					LOG.info("Disabling network, device is on battery");
+						|| (network == PREF_TOR_NETWORK_WIFI && !wifi)) {
+					LOG.info("Disabling network due to data setting");
 					enableNetwork(false);
-				} else if (network == PREF_TOR_NETWORK_NEVER ||
+				} else if (blocked) {
-						(!useMobile && !wifi)) {
+					if (circumventionProvider.doBridgesWork(country)) {
-					LOG.info("Disabling network, device is using mobile data");
+						LOG.info("Enabling network, using bridges");
-					enableNetwork(false);
+						enableBridges(true);
-				} else if (automatic && blocked && !bridgesWork) {
+						enableNetwork(true);
-					LOG.info("Disabling network, country is blocked");
+					} else if (disableWhenBlocked) {
-					enableNetwork(false);
+						LOG.info("Disabling network, country is blocked");
-				} else if (network == PREF_TOR_NETWORK_WITH_BRIDGES ||
+						enableNetwork(false);
-						(automatic && bridgesWork)) {
-					if (circumventionProvider.needsMeek(country)) {
-						LOG.info("Enabling network, using meek bridges");
-						enableBridges(true, true);
 					} else {
-						LOG.info("Enabling network, using obfs4 bridges");
+						LOG.info("Enabling network but country is blocked");
-						enableBridges(true, false);
+						enableBridges(false);
+						enableNetwork(true);
 					}
-					enableNetwork(true);
 				} else {
-					LOG.info("Enabling network, not using bridges");
+					LOG.info("Enabling network");
-					enableBridges(false, false);
+					enableBridges(false);
 					enableNetwork(true);
 				}
-				if (online && wifi && charging) {
-					LOG.info("Enabling connection padding");
-					enableConnectionPadding(true);
-				} else {
-					LOG.info("Disabling connection padding");
-					enableConnectionPadding(false);
-				}
 			} catch (IOException e) {
 				logException(LOG, WARNING, e);
 			}
 		});
 	}
 
-	private void enableConnectionPadding(boolean enable) throws IOException {
-		if (!running) return;
-		controlConnection.setConf("ConnectionPadding", enable ? "1" : "0");
-	}
-
-	// TODO remove when sufficient time has passed. Added 2018-08-15
-	private void migrateSettings() {
-		Settings sOld = callback.getSettings();
-		int oldNetwork = sOld.getInt("network", -1);
-		if (oldNetwork == -1) return;
-		Settings s = new Settings();
-		if (oldNetwork == 0) {
-			s.putInt(PREF_TOR_NETWORK, PREF_TOR_NETWORK_NEVER);
-		} else if (oldNetwork == 1) {
-			s.putBoolean(PREF_TOR_MOBILE, false);
-		}
-		s.putInt("network", -1);
-		callback.mergeSettings(s);
-	}
-
 	private static class ConnectionStatus {
 
 		// All of the following are locking: this

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

@@ -3,7 +3,6 @@ package org.briarproject.bramble.plugin.tor;
 import android.content.Context;
 import android.os.Build;
 
-import org.briarproject.bramble.api.battery.BatteryManager;
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.network.NetworkManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@@ -16,7 +15,6 @@ 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.LocationUtils;
-import org.briarproject.bramble.api.system.ResourceProvider;
 import org.briarproject.bramble.util.AndroidUtils;
 
 import java.util.concurrent.Executor;
@@ -28,10 +26,10 @@ import javax.net.SocketFactory;
 
 @Immutable
 @NotNullByDefault
-public class AndroidTorPluginFactory implements DuplexPluginFactory {
+public class TorPluginFactory implements DuplexPluginFactory {
 
 	private static final Logger LOG =
-			Logger.getLogger(AndroidTorPluginFactory.class.getName());
+			Logger.getLogger(TorPluginFactory.class.getName());
 
 	private static final int MAX_LATENCY = 30 * 1000; // 30 seconds
 	private static final int MAX_IDLE_TIME = 30 * 1000; // 30 seconds
@@ -47,18 +45,15 @@ public class AndroidTorPluginFactory implements DuplexPluginFactory {
 	private final EventBus eventBus;
 	private final SocketFactory torSocketFactory;
 	private final BackoffFactory backoffFactory;
-	private final ResourceProvider resourceProvider;
 	private final CircumventionProvider circumventionProvider;
-	private final BatteryManager batteryManager;
 	private final Clock clock;
 
-	public AndroidTorPluginFactory(Executor ioExecutor,
+	public TorPluginFactory(Executor ioExecutor,
 			ScheduledExecutorService scheduler, Context appContext,
 			NetworkManager networkManager, LocationUtils locationUtils,
 			EventBus eventBus, SocketFactory torSocketFactory,
-			BackoffFactory backoffFactory, ResourceProvider resourceProvider,
+			BackoffFactory backoffFactory,
-			CircumventionProvider circumventionProvider,
+			CircumventionProvider circumventionProvider, Clock clock) {
-			BatteryManager batteryManager, Clock clock) {
 		this.ioExecutor = ioExecutor;
 		this.scheduler = scheduler;
 		this.appContext = appContext;
@@ -67,9 +62,7 @@ public class AndroidTorPluginFactory implements DuplexPluginFactory {
 		this.eventBus = eventBus;
 		this.torSocketFactory = torSocketFactory;
 		this.backoffFactory = backoffFactory;
-		this.resourceProvider = resourceProvider;
 		this.circumventionProvider = circumventionProvider;
-		this.batteryManager = batteryManager;
 		this.clock = clock;
 	}
 
@@ -106,10 +99,10 @@ public class AndroidTorPluginFactory implements DuplexPluginFactory {
 
 		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
 				MAX_POLLING_INTERVAL, BACKOFF_BASE);
-		AndroidTorPlugin plugin = new AndroidTorPlugin(ioExecutor, scheduler,
+		TorPlugin plugin = new TorPlugin(ioExecutor, scheduler, appContext,
-				appContext, networkManager, locationUtils, torSocketFactory,
+				networkManager, locationUtils, torSocketFactory, clock,
-				clock, resourceProvider, circumventionProvider, batteryManager,
+				circumventionProvider, backoff, callback, architecture,
-				backoff, callback, architecture, MAX_LATENCY, MAX_IDLE_TIME);
+				MAX_LATENCY, MAX_IDLE_TIME);
 		eventBus.addListener(plugin);
 		return plugin;
 	}

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

@@ -1,32 +0,0 @@
-package org.briarproject.bramble.system;
-
-import android.app.Application;
-import android.content.Context;
-import android.content.res.Resources;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.system.ResourceProvider;
-
-import java.io.InputStream;
-
-import javax.inject.Inject;
-
-@NotNullByDefault
-class AndroidResourceProvider implements ResourceProvider {
-
-	private final Context appContext;
-
-	@Inject
-	AndroidResourceProvider(Application app) {
-		this.appContext = app.getApplicationContext();
-	}
-
-	@Override
-	public InputStream getResourceInputStream(String name, String extension) {
-		Resources res = appContext.getResources();
-		// extension is ignored on Android, resources are retrieved without it
-		int resId =
-				res.getIdentifier(name, "raw", appContext.getPackageName());
-		return res.openRawResource(resId);
-	}
-}

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

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.system;
 
-import android.annotation.SuppressLint;
 import android.app.Application;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
@@ -27,7 +26,7 @@ import static android.provider.Settings.Secure.ANDROID_ID;
 
 @Immutable
 @NotNullByDefault
-class AndroidSecureRandomProvider extends UnixSecureRandomProvider {
+class AndroidSecureRandomProvider extends LinuxSecureRandomProvider {
 
 	private static final int SEED_LENGTH = 32;
 
@@ -38,7 +37,6 @@ class AndroidSecureRandomProvider extends UnixSecureRandomProvider {
 		appContext = app.getApplicationContext();
 	}
 
-	@SuppressLint("HardwareIds")
 	@Override
 	protected void writeToEntropyPool(DataOutputStream out) throws IOException {
 		super.writeToEntropyPool(out);
@@ -51,14 +49,12 @@ class AndroidSecureRandomProvider extends UnixSecureRandomProvider {
 		String id = Settings.Secure.getString(contentResolver, ANDROID_ID);
 		if (id != null) out.writeUTF(id);
 		Parcel parcel = Parcel.obtain();
-		WifiManager wm = (WifiManager) appContext.getApplicationContext()
+		WifiManager wm =
-				.getSystemService(WIFI_SERVICE);
+				(WifiManager) appContext.getSystemService(WIFI_SERVICE);
-		if (wm != null) {
+		List<WifiConfiguration> configs = wm.getConfiguredNetworks();
-			List<WifiConfiguration> configs = wm.getConfiguredNetworks();
+		if (configs != null) {
-			if (configs != null) {
+			for (WifiConfiguration config : configs)
-				for (WifiConfiguration config : configs)
+				parcel.writeParcelable(config, 0);
-					parcel.writeParcelable(config, 0);
-			}
 		}
 		BluetoothAdapter bt = BluetoothAdapter.getDefaultAdapter();
 		if (bt != null) {
@@ -81,13 +77,13 @@ class AndroidSecureRandomProvider extends UnixSecureRandomProvider {
 
 	// Based on https://android-developers.googleblog.com/2013/08/some-securerandom-thoughts.html
 	private void applyOpenSslFix() {
-		byte[] seed = new UnixSecureRandomSpi().engineGenerateSeed(
+		byte[] seed = new LinuxSecureRandomSpi().engineGenerateSeed(
 				SEED_LENGTH);
 		try {
 			// Seed the OpenSSL PRNG
 			Class.forName("org.apache.harmony.xnet.provider.jsse.NativeCrypto")
 					.getMethod("RAND_seed", byte[].class)
-					.invoke(null, (Object) seed);
+					.invoke(null, seed);
 			// Mix the output of the Linux PRNG into the OpenSSL PRNG
 			int bytesRead = (Integer) Class.forName(
 					"org.apache.harmony.xnet.provider.jsse.NativeCrypto")

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

@@ -1,13 +1,11 @@
 package org.briarproject.bramble.system;
 
-import org.briarproject.bramble.api.event.EventExecutor;
+import android.app.Application;
+
 import org.briarproject.bramble.api.system.AndroidExecutor;
 import org.briarproject.bramble.api.system.LocationUtils;
-import org.briarproject.bramble.api.system.ResourceProvider;
 import org.briarproject.bramble.api.system.SecureRandomProvider;
 
-import java.util.concurrent.Executor;
-
 import javax.inject.Singleton;
 
 import dagger.Module;
@@ -18,33 +16,18 @@ public class AndroidSystemModule {
 
 	@Provides
 	@Singleton
-	SecureRandomProvider provideSecureRandomProvider(
+	SecureRandomProvider provideSecureRandomProvider(Application app) {
-			AndroidSecureRandomProvider provider) {
+		return new AndroidSecureRandomProvider(app);
-		return provider;
 	}
 
 	@Provides
-	LocationUtils provideLocationUtils(AndroidLocationUtils locationUtils) {
+	LocationUtils provideLocationUtils(Application app) {
-		return locationUtils;
+		return new AndroidLocationUtils(app);
 	}
 
 	@Provides
 	@Singleton
-	AndroidExecutor provideAndroidExecutor(
+	AndroidExecutor provideAndroidExecutor(Application app) {
-			AndroidExecutorImpl androidExecutor) {
+		return new AndroidExecutorImpl(app);
-		return androidExecutor;
-	}
-
-	@Provides
-	@Singleton
-	@EventExecutor
-	Executor provideEventExecutor(AndroidExecutor androidExecutor) {
-		return androidExecutor::runOnUiThread;
-	}
-
-	@Provides
-	@Singleton
-	ResourceProvider provideResourceProvider(AndroidResourceProvider provider) {
-		return provider;
 	}
 }

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

@@ -11,12 +11,15 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.logging.Logger;
 
 import static android.content.Context.MODE_PRIVATE;
-import static android.os.Build.VERSION.SDK_INT;
 
 public class AndroidUtils {
 
+	private static final Logger LOG =
+			Logger.getLogger(AndroidUtils.class.getName());
+
 	// Fake Bluetooth address returned by BluetoothAdapter on API 23 and later
 	private static final String FAKE_BLUETOOTH_ADDRESS = "02:00:00:00:00:00";
 
@@ -25,7 +28,7 @@ public class AndroidUtils {
 	@SuppressWarnings("deprecation")
 	public static Collection<String> getSupportedArchitectures() {
 		List<String> abis = new ArrayList<>();
-		if (SDK_INT >= 21) {
+		if (Build.VERSION.SDK_INT >= 21) {
 			abis.addAll(Arrays.asList(Build.SUPPORTED_ABIS));
 		} else {
 			abis.add(Build.CPU_ABI);

bramble-android/src/main/res/raw/bridges

@@ -0,0 +1,8 @@
+Bridge 131.252.210.150:8081 0E858AC201BF0F3FA3C462F64844CBFFC7297A42
+Bridge 67.205.189.122:8443 12D64D5D44E20169585E7378580C0D33A872AD98
+Bridge 45.32.148.146:8443 0CE016FB2462D8BF179AE71F7D702D09DEAC3F1D
+Bridge 148.251.90.59:7510 019F727CA6DCA6CA5C90B55E477B7D87981E75BC
+Bridge 195.91.239.8:9001 BA83F62551545655BBEBBFF353A45438D73FD45A
+Bridge 185.165.184.217:6429 64CC94BEC51254E4409AD059192833854CCB95F0
+Bridge 45.55.1.74:8443 6F18FEFBB0CAECD5ABA755312FCCB34FC11A7AB8
+Bridge 95.85.40.163:9001 40057BE9CF76B6C5BDBE713753468BE0A990DE9C

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

@@ -112,8 +112,6 @@ public class AndroidAccountManagerTest extends BrambleMockTestCase {
 		// Other directories should be deleted
 		File potatoDir = new File(testDir, ".potato");
 		File potatoFile = new File(potatoDir, "file");
-		File filesDir = new File(testDir, "filesDir");
-		File externalCacheDir = new File(testDir, "externalCacheDir");
 
 		context.checking(new Expectations() {{
 			oneOf(prefs).edit();
@@ -130,12 +128,6 @@ public class AndroidAccountManagerTest extends BrambleMockTestCase {
 			will(returnValue(true));
 			oneOf(app).getApplicationInfo();
 			will(returnValue(applicationInfo));
-			oneOf(app).getFilesDir();
-			will(returnValue(filesDir));
-			oneOf(app).getCacheDir();
-			will(returnValue(cacheDir));
-			oneOf(app).getExternalCacheDir();
-			will(returnValue(externalCacheDir));
 		}});
 
 		assertTrue(dbDir.mkdirs());
@@ -148,8 +140,6 @@ public class AndroidAccountManagerTest extends BrambleMockTestCase {
 		assertTrue(cacheFile.createNewFile());
 		assertTrue(potatoDir.mkdirs());
 		assertTrue(potatoFile.createNewFile());
-		assertTrue(filesDir.mkdirs());
-		assertTrue(externalCacheDir.mkdirs());
 
 		accountManager.deleteAccount();
 
@@ -163,8 +153,6 @@ public class AndroidAccountManagerTest extends BrambleMockTestCase {
 		assertFalse(cacheFile.exists());
 		assertFalse(potatoDir.exists());
 		assertFalse(potatoFile.exists());
-		assertFalse(filesDir.exists());
-		assertFalse(externalCacheDir.exists());
 	}
 
 	@After

bramble-android/witness.gradle

@@ -1,100 +0,0 @@
-dependencyVerification {
-    verify = [
-        'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861',
-        'com.android.tools.analytics-library:protos:26.4.0:protos-26.4.0.jar:ad760915586797d39319f402837b378bff3bb4ed583e3e0c48c965631fb2135f',
-        'com.android.tools.analytics-library:shared:26.4.0:shared-26.4.0.jar:1332106a905d48909c81268c9e414946de3e83487db394c6073b0a9b5c3d0ed2',
-        'com.android.tools.analytics-library:tracker:26.4.0:tracker-26.4.0.jar:d0020cfbfd4cd75935f2972d6a24089840d4a10df6f3ef2a796093217dd37796',
-        'com.android.tools.build:apksig:3.4.0:apksig-3.4.0.jar:91d5a1866139c69756280355a6f61b4d619d0516841580114f45a10f2177327e',
-        'com.android.tools.build:apkzlib:3.4.0:apkzlib-3.4.0.jar:8653c85f5fdf1dde840e8b8af7396aeb79c34b66e541b5860059616006535592',
-        'com.android.tools.build:builder-model:3.4.0:builder-model-3.4.0.jar:a88f138124a9f016a70bcb4760359a502f65c7deed56507ee4014f4dd9ea853b',
-        'com.android.tools.build:builder-test-api:3.4.0:builder-test-api-3.4.0.jar:31089ab1ec19ca7687a010867d2f3807513c805b8226979706f4247b5d4df26f',
-        'com.android.tools.build:builder:3.4.0:builder-3.4.0.jar:476221b5203a7f50089bf185ed95000a34b6f5020ef0a17815afd58606922679',
-        'com.android.tools.build:gradle-api:3.4.0:gradle-api-3.4.0.jar:215eca38f6719213c2f492b4d622cdd11676c66c9871f8a2aed0c66d00175628',
-        'com.android.tools.build:manifest-merger:26.4.0:manifest-merger-26.4.0.jar:29e45e690dedd165035e97c21c2ca94d0bd4ec16b6b210daa26669a582b6f220',
-        'com.android.tools.ddms:ddmlib:26.4.0:ddmlib-26.4.0.jar:93f56fe4630c3166adbd6c51d7bb602d96abb91b07ba5b1165fdcd071e88c940',
-        'com.android.tools.external.com-intellij:intellij-core:26.4.0:intellij-core-26.4.0.jar:30cb0e879d4424de9677a50b537fb628636b4a50f5470af5e52437980c41421f',
-        'com.android.tools.external.com-intellij:kotlin-compiler:26.4.0:kotlin-compiler-26.4.0.jar:dd1fe225c31a0e012dc025336363a5b783e2c5c20ffb69e77f8f57e89420d998',
-        'com.android.tools.external.org-jetbrains:uast:26.4.0:uast-26.4.0.jar:f25f3285b775a983327583ff6584dea54e447813ef69e0ce08b05a45b5f4aab0',
-        'com.android.tools.layoutlib:layoutlib-api:26.4.0:layoutlib-api-26.4.0.jar:52128f5cf293b224072be361919bfd416e59480ab7264ddcdbbf046b0d7a12e3',
-        'com.android.tools.lint:lint-api:26.4.0:lint-api-26.4.0.jar:fdb8fca8ae4c254f438338d03d72605e00ed106f2d5550405af41ca1c8509401',
-        'com.android.tools.lint:lint-checks:26.4.0:lint-checks-26.4.0.jar:4ff52d40488cd3e22b9c6b2eb67784e0c3269d0b42ef9d17689cd75a7b2bceb4',
-        'com.android.tools.lint:lint-gradle-api:26.4.0:lint-gradle-api-26.4.0.jar:714b7a85c7d2aa10daeab16e969fe7530c659d0728a7f24021da456870418d0f',
-        'com.android.tools.lint:lint-gradle:26.4.0:lint-gradle-26.4.0.jar:b8c130d273f522388734457e1b96790f41528fcec6fda9e8eaa4e4d95a07cfbb',
-        'com.android.tools.lint:lint:26.4.0:lint-26.4.0.jar:83aa062fb0405b60ed358d858c8c2955e1bae44a455b498068c6a60988755f00',
-        'com.android.tools:annotations:26.4.0:annotations-26.4.0.jar:a7955b8e19c3a2a861d6faa43a58b7c0d46ea9112188ee3e235c6f9f439ecc1a',
-        'com.android.tools:common:26.4.0:common-26.4.0.jar:ea40b94b3c1284ea7700f011388e2906a8363a66abd902891722b3c557984852',
-        'com.android.tools:dvlib:26.4.0:dvlib-26.4.0.jar:23af89c535b01ba36ceed1b6b309b672814eba624e643cd7dedf0519edad50cc',
-        'com.android.tools:repository:26.4.0:repository-26.4.0.jar:3d1763ab46199374dc6d94129bba11c70f1d5857e2c81a3ac4898abca40b176b',
-        'com.android.tools:sdk-common:26.4.0:sdk-common-26.4.0.jar:78a522525b30ffc6b7bf1299c831d24ce385f68a9f4878f8f752e9baefa31b0f',
-        'com.android.tools:sdklib:26.4.0:sdklib-26.4.0.jar:b854c23892013a326d761cf071c72cf3e038ed0469d10f4a356829fa56e4c132',
-        'com.google.code.findbugs:jsr305:1.3.9:jsr305-1.3.9.jar:905721a0eea90a81534abb7ee6ef4ea2e5e645fa1def0a5cd88402df1b46c9ed',
-        'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
-        'com.google.code.gson:gson:2.8.0:gson-2.8.0.jar:c6221763bd79c4f1c3dc7f750b5f29a0bb38b367b81314c4f71896e340c40825',
-        'com.google.dagger:dagger-compiler:2.22.1:dagger-compiler-2.22.1.jar:e5f28302cbe70a79d3620cddebfb8ec0736814f3980ffe1e673bfe3342f507d3',
-        'com.google.dagger:dagger-producers:2.22.1:dagger-producers-2.22.1.jar:f834a0082014213a68ff06a0f048d750178d02196c58b0b15beb367d32b97e35',
-        'com.google.dagger:dagger-spi:2.22.1:dagger-spi-2.22.1.jar:4b0b922793b3bcb91b99fabb75dba77c68afd7ae4c5f0c4fd6ba681f0a291c7d',
-        'com.google.dagger:dagger:2.22.1:dagger-2.22.1.jar:329d4340f24c4f5717af016c097e90668bfea2a5376e6aa9964b01cef3fd241a',
-        'com.google.errorprone:error_prone_annotations:2.1.3:error_prone_annotations-2.1.3.jar:03d0329547c13da9e17c634d1049ea2ead093925e290567e1a364fd6b1fc7ff8',
-        'com.google.errorprone:javac-shaded:9-dev-r4023-3:javac-shaded-9-dev-r4023-3.jar:65bfccf60986c47fbc17c9ebab0be626afc41741e0a6ec7109e0768817a36f30',
-        'com.google.googlejavaformat:google-java-format:1.5:google-java-format-1.5.jar:aa19ad7850fb85178aa22f2fddb163b84d6ce4d0035872f30d4408195ca1144e',
-        'com.google.guava:guava:25.0-jre:guava-25.0-jre.jar:3fd4341776428c7e0e5c18a7c10de129475b69ab9d30aeafbb5c277bb6074fa9',
-        'com.google.guava:guava:26.0-jre:guava-26.0-jre.jar:a0e9cabad665bc20bcd2b01f108e5fc03f756e13aea80abaadb9f407033bea2c',
-        'com.google.j2objc:j2objc-annotations:1.1:j2objc-annotations-1.1.jar:2994a7eb78f2710bd3d3bfb639b2c94e219cedac0d4d084d516e78c16dddecf6',
-        'com.google.jimfs:jimfs:1.1:jimfs-1.1.jar:c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd',
-        'com.google.protobuf:protobuf-java:3.4.0:protobuf-java-3.4.0.jar:dce7e66b32456a1b1198da0caff3a8acb71548658391e798c79369241e6490a4',
-        'com.googlecode.json-simple:json-simple:1.1:json-simple-1.1.jar:2d9484f4c649f708f47f9a479465fc729770ee65617dca3011836602264f6439',
-        'com.squareup:javapoet:1.11.1:javapoet-1.11.1.jar:9cbf2107be499ec6e95afd36b58e3ca122a24166cdd375732e51267d64058e90',
-        'com.squareup:javawriter:2.5.0:javawriter-2.5.0.jar:fcfb09fb0ea0aa97d3cfe7ea792398081348e468f126b3603cb3803f240197f0',
-        'com.sun.activation:javax.activation:1.2.0:javax.activation-1.2.0.jar:993302b16cd7056f21e779cc577d175a810bb4900ef73cd8fbf2b50f928ba9ce',
-        'com.sun.istack:istack-commons-runtime:2.21:istack-commons-runtime-2.21.jar:c33e67a0807095f02a0e2da139412dd7c4f9cc1a4c054b3e434f96831ba950f4',
-        'com.sun.xml.fastinfoset:FastInfoset:1.2.13:FastInfoset-1.2.13.jar:27a77db909f3c2833c0b1a37c55af1db06045118ad2eed96ce567b6632bce038',
-        'commons-codec:commons-codec:1.10:commons-codec-1.10.jar:4241dfa94e711d435f29a4604a3e2de5c4aa3c165e23bd066be6fc1fc4309569',
-        'commons-logging:commons-logging:1.2:commons-logging-1.2.jar:daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636',
-        'it.unimi.dsi:fastutil:7.2.0:fastutil-7.2.0.jar:74fa208043740642f7e6eb09faba15965218ad2f50ce3020efb100136e4b591c',
-        'javax.annotation:jsr250-api:1.0:jsr250-api-1.0.jar:a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f',
-        'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
-        'javax.xml.bind:jaxb-api:2.2.12-b140109.1041:jaxb-api-2.2.12-b140109.1041.jar:b5e60cd8b7b5ff01ce4a74c5dd008f4fbd14ced3495d0b47b85cfedc182211f2',
-        'junit:junit:4.12:junit-4.12.jar:59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a',
-        'net.sf.jopt-simple:jopt-simple:4.9:jopt-simple-4.9.jar:26c5856e954b5f864db76f13b86919b59c6eecf9fd930b96baa8884626baf2f5',
-        'net.sf.kxml:kxml2:2.3.0:kxml2-2.3.0.jar:f264dd9f79a1fde10ce5ecc53221eff24be4c9331c830b7d52f2f08a7b633de2',
-        'org.apache.ant:ant-launcher:1.9.4:ant-launcher-1.9.4.jar:7bccea20b41801ca17bcbc909a78c835d0f443f12d639c77bd6ae3d05861608d',
-        'org.apache.ant:ant:1.9.4:ant-1.9.4.jar:649ae0730251de07b8913f49286d46bba7b92d47c5f332610aa426c4f02161d8',
-        'org.apache.commons:commons-compress:1.12:commons-compress-1.12.jar:2c1542faf343185b7cab9c3d55c8ae5471d6d095d3887a4adefdbdf2984dc0b6',
-        'org.apache.httpcomponents:httpclient:4.5.6:httpclient-4.5.6.jar:c03f813195e7a80e3608d0ddd8da80b21696a4c92a6a2298865bf149071551c7',
-        'org.apache.httpcomponents:httpcore:4.4.10:httpcore-4.4.10.jar:78ba1096561957db1b55200a159b648876430342d15d461277e62360da19f6fd',
-        'org.apache.httpcomponents:httpmime:4.5.6:httpmime-4.5.6.jar:0b2b1102c18d3c7e05a77214b9b7501a6f6056174ae5604e0e256776eda7553e',
-        'org.beanshell:bsh:1.3.0:bsh-1.3.0.jar:9b04edc75d19db54f1b4e8b5355e9364384c6cf71eb0a1b9724c159d779879f8',
-        'org.bouncycastle:bcpkix-jdk15on:1.56:bcpkix-jdk15on-1.56.jar:7043dee4e9e7175e93e0b36f45b1ec1ecb893c5f755667e8b916eb8dd201c6ca',
-        'org.bouncycastle:bcprov-jdk15on:1.56:bcprov-jdk15on-1.56.jar:963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349',
-        'org.briarproject:obfs4proxy-android:0.0.9:obfs4proxy-android-0.0.9.zip:9b7e9181535ea8d8bbe8ae6338e08cf4c5fc1e357a779393e0ce49586d459ae0',
-        'org.briarproject:tor-android:0.3.5.8:tor-android-0.3.5.8.zip:42a13a6f185be1a62f42e3f30ce66a3c099ac5ec890a65e7593111b65b44a54a',
-        'org.checkerframework:checker-compat-qual:2.5.3:checker-compat-qual-2.5.3.jar:d76b9afea61c7c082908023f0cbc1427fab9abd2df915c8b8a3e7a509bccbc6d',
-        'org.checkerframework:checker-qual:2.5.2:checker-qual-2.5.2.jar:64b02691c8b9d4e7700f8ee2e742dce7ea2c6e81e662b7522c9ee3bf568c040a',
-        'org.codehaus.groovy:groovy-all:2.4.15:groovy-all-2.4.15.jar:51d6c4e71782e85674239189499854359d380fb75e1a703756e3aaa5b98a5af0',
-        'org.codehaus.mojo:animal-sniffer-annotations:1.14:animal-sniffer-annotations-1.14.jar:2068320bd6bad744c3673ab048f67e30bef8f518996fa380033556600669905d',
-        'org.glassfish.jaxb:jaxb-core:2.2.11:jaxb-core-2.2.11.jar:37bcaee8ebb04362c8352a5bf6221b86967ecdab5164c696b10b9a2bb587b2aa',
-        'org.glassfish.jaxb:jaxb-runtime:2.2.11:jaxb-runtime-2.2.11.jar:a874f2351cfba8e2946be3002d10c18a6da8f21b52ba2acf52f2b85d5520ed70',
-        'org.glassfish.jaxb:txw2:2.2.11:txw2-2.2.11.jar:272a3ccad45a4511351920cd2a8633c53cab8d5220c7a92954da5526bb5eafea',
-        'org.hamcrest:hamcrest-core:1.3:hamcrest-core-1.3.jar:66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9',
-        'org.hamcrest:hamcrest-library:1.3:hamcrest-library-1.3.jar:711d64522f9ec410983bd310934296da134be4254a125080a0416ec178dfad1c',
-        'org.jetbrains.kotlin:kotlin-reflect:1.3.21:kotlin-reflect-1.3.21.jar:a3065c822633191e0a3e3ee12a29bec234fc4b2864a6bb87ef48cce3e9e0c26a',
-        'org.jetbrains.kotlin:kotlin-stdlib-common:1.3.21:kotlin-stdlib-common-1.3.21.jar:cea61f7b611895e64f58569a9757fc0ab0d582f107211e1930e0ce2a0add52a7',
-        'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.21:kotlin-stdlib-jdk7-1.3.21.jar:a87875604fd42140da6938ae4d35ee61081f4482536efc6d2615b8b626a198af',
-        'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.21:kotlin-stdlib-jdk8-1.3.21.jar:5823ed66ac122a1c55442ebca5a209a843ccd87f562edc31a787f3d2e47f74d4',
-        'org.jetbrains.kotlin:kotlin-stdlib:1.3.21:kotlin-stdlib-1.3.21.jar:38ba2370d9f06f50433e06b2ca775b94473c2e2785f410926079ab793c72b034',
-        'org.jetbrains.trove4j:trove4j:20160824:trove4j-20160824.jar:1917871c8deb468307a584680c87a44572f5a8b0b98c6d397fc0f5f86596dbe7',
-        'org.jetbrains:annotations:13.0:annotations-13.0.jar:ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478',
-        'org.jmock:jmock-junit4:2.8.2:jmock-junit4-2.8.2.jar:f7ee4df4f7bd7b7f1cafad3b99eb74d579f109d5992ff625347352edb55e674c',
-        'org.jmock:jmock-legacy:2.8.2:jmock-legacy-2.8.2.jar:f2b985a5c08a9edb7f37612330c058809da3f6a6d63ce792426ebf8ff0d6d31b',
-        'org.jmock:jmock-testjar:2.8.2:jmock-testjar-2.8.2.jar:8900860f72c474e027cf97fe78dcbf154a1aa7fc62b6845c5fb4e4f3c7bc8760',
-        'org.jmock:jmock:2.8.2:jmock-2.8.2.jar:6c73cb4a2e6dbfb61fd99c9a768539c170ab6568e57846bd60dbf19596b65b16',
-        'org.jvnet.staxex:stax-ex:1.7.7:stax-ex-1.7.7.jar:a31ff7d77163c0deb09e7fee59ad35ae44c2cee2cc8552a116ccd1583d813fb4',
-        'org.objenesis:objenesis:2.1:objenesis-2.1.jar:c74330cc6b806c804fd37e74487b4fe5d7c2750c5e15fbc6efa13bdee1bdef80',
-        'org.ow2.asm:asm-analysis:6.0:asm-analysis-6.0.jar:2f1a6387219c3a6cc4856481f221b03bd9f2408a326d416af09af5d6f608c1f4',
-        'org.ow2.asm:asm-commons:6.0:asm-commons-6.0.jar:f1bce5c648a96a017bdcd01fe5d59af9845297fd7b79b81c015a6fbbd9719abf',
-        'org.ow2.asm:asm-tree:6.0:asm-tree-6.0.jar:887998fb69727c8759e4d253f856822801e33f9fd4caa566b3ac58ee92106215',
-        'org.ow2.asm:asm-util:6.0:asm-util-6.0.jar:356afebdb0f870175262e5188f8709a3b17aa2a5a6a4b0340b04d4b449bca5f6',
-        'org.ow2.asm:asm:5.0.4:asm-5.0.4.jar:896618ed8ae62702521a78bc7be42b7c491a08e6920a15f89a3ecdec31e9a220',
-        'org.ow2.asm:asm:6.0:asm-6.0.jar:dd8971c74a4e697899a8e95caae4ea8760ea6c486dc6b97b1795e75760420461',
-    ]
-}

bramble-api/build.gradle

@@ -4,20 +4,46 @@ targetCompatibility = 1.8
 
 apply plugin: 'ru.vyarus.animalsniffer'
 apply plugin: 'witness'
-apply from: 'witness.gradle'
 
 dependencies {
-	implementation "com.google.dagger:dagger:2.22.1"
+	implementation "com.google.dagger:dagger:2.0.2"
 	implementation 'com.google.code.findbugs:jsr305:3.0.2'
 
 	testImplementation 'junit:junit:4.12'
 	testImplementation "org.jmock:jmock:2.8.2"
 	testImplementation "org.jmock:jmock-junit4:2.8.2"
 	testImplementation "org.jmock:jmock-legacy:2.8.2"
+	testImplementation "org.hamcrest:hamcrest-library:1.3"
+	testImplementation "org.hamcrest:hamcrest-core:1.3"
 
 	signature 'org.codehaus.mojo.signature:java16:1.1@signature'
 }
 
+dependencyVerification {
+	verify = [
+			'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861',
+			'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
+			'com.google.dagger:dagger:2.0.2:dagger-2.0.2.jar:84c0282ed8be73a29e0475d639da030b55dee72369e58dd35ae7d4fe6243dcf9',
+			'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
+			'junit:junit:4.12:junit-4.12.jar:59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a',
+			'org.apache.ant:ant-launcher:1.9.4:ant-launcher-1.9.4.jar:7bccea20b41801ca17bcbc909a78c835d0f443f12d639c77bd6ae3d05861608d',
+			'org.apache.ant:ant:1.9.4:ant-1.9.4.jar:649ae0730251de07b8913f49286d46bba7b92d47c5f332610aa426c4f02161d8',
+			'org.beanshell:bsh:1.3.0:bsh-1.3.0.jar:9b04edc75d19db54f1b4e8b5355e9364384c6cf71eb0a1b9724c159d779879f8',
+			'org.codehaus.mojo.signature:java16:1.1:java16-1.1.signature:53799223a2c98dba2d0add810bed76315460df285c69e4f397ae6098f87dd619',
+			'org.codehaus.mojo:animal-sniffer-ant-tasks:1.16:animal-sniffer-ant-tasks-1.16.jar:890040976fbe2d584619a6a61b1fd2e925b3b5eb342a85eb2762c467c0d64e90',
+			'org.codehaus.mojo:animal-sniffer:1.16:animal-sniffer-1.16.jar:72be8bcc226ba43b937c722a08a07852bfa1b11400089265d5df0ee7b38b1d52',
+			'org.hamcrest:hamcrest-core:1.3:hamcrest-core-1.3.jar:66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9',
+			'org.hamcrest:hamcrest-library:1.3:hamcrest-library-1.3.jar:711d64522f9ec410983bd310934296da134be4254a125080a0416ec178dfad1c',
+			'org.jmock:jmock-junit4:2.8.2:jmock-junit4-2.8.2.jar:f7ee4df4f7bd7b7f1cafad3b99eb74d579f109d5992ff625347352edb55e674c',
+			'org.jmock:jmock-legacy:2.8.2:jmock-legacy-2.8.2.jar:f2b985a5c08a9edb7f37612330c058809da3f6a6d63ce792426ebf8ff0d6d31b',
+			'org.jmock:jmock-testjar:2.8.2:jmock-testjar-2.8.2.jar:8900860f72c474e027cf97fe78dcbf154a1aa7fc62b6845c5fb4e4f3c7bc8760',
+			'org.jmock:jmock:2.8.2:jmock-2.8.2.jar:6c73cb4a2e6dbfb61fd99c9a768539c170ab6568e57846bd60dbf19596b65b16',
+			'org.objenesis:objenesis:2.1:objenesis-2.1.jar:c74330cc6b806c804fd37e74487b4fe5d7c2750c5e15fbc6efa13bdee1bdef80',
+			'org.ow2.asm:asm-all:5.2:asm-all-5.2.jar:7fbffbc1db3422e2101689fd88df8384b15817b52b9b2b267b9f6d2511dc198d',
+			'org.ow2.asm:asm:5.0.4:asm-5.0.4.jar:896618ed8ae62702521a78bc7be42b7c491a08e6920a15f89a3ecdec31e9a220',
+	]
+}
+
 // needed to make test output available to bramble-core and briar-core
 configurations {
 	testOutput.extendsFrom(testCompile)

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

@@ -1,10 +0,0 @@
-package org.briarproject.bramble.api;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public interface Nameable {
-
-	String getName();
-
-}

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

@@ -1,26 +0,0 @@
-package org.briarproject.bramble.api;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-@Immutable
-@NotNullByDefault
-public class Pair<A, B> {
-
-	private final A first;
-	private final B second;
-
-	public Pair(A first, B second) {
-		this.first = first;
-		this.second = second;
-	}
-
-	public A getFirst() {
-		return first;
-	}
-
-	public B getSecond() {
-		return second;
-	}
-}

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

@@ -38,18 +38,4 @@ public abstract class StringMap extends Hashtable<String, String> {
 	public void putInt(String key, int value) {
 		put(key, String.valueOf(value));
 	}
-
-	public long getLong(String key, long defaultValue) {
-		String s = get(key);
-		if (s == null) return defaultValue;
-		try {
-			return Long.valueOf(s);
-		} catch (NumberFormatException e) {
-			return defaultValue;
-		}
-	}
-
-	public void putLong(String key, long value) {
-		put(key, String.valueOf(value));
-	}
 }

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

@@ -1,18 +1,9 @@
 package org.briarproject.bramble.api;
 
+import java.io.IOException;
+
 /**
- * Thrown when data being parsed uses a protocol or format version that is not
+ * An exception that indicates an unrecoverable version mismatch.
- * supported.
  */
-public class UnsupportedVersionException extends FormatException {
+public class UnsupportedVersionException extends IOException {
-
-	private final boolean tooOld;
-
-	public UnsupportedVersionException(boolean tooOld) {
-		this.tooOld = tooOld;
-	}
-
-	public boolean isTooOld() {
-		return tooOld;
-	}
 }

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

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

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

@@ -1,19 +0,0 @@
-package org.briarproject.bramble.api.battery.event;
-
-import org.briarproject.bramble.api.event.Event;
-
-/**
- * An event that is broadcast when the device starts or stops charging.
- */
-public class BatteryEvent extends Event {
-
-	private final boolean charging;
-
-	public BatteryEvent(boolean charging) {
-		this.charging = charging;
-	}
-
-	public boolean isCharging() {
-		return charging;
-	}
-}

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

@@ -9,13 +9,14 @@ import org.briarproject.bramble.api.sync.Group;
 import org.briarproject.bramble.api.sync.InvalidMessageException;
 import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageContext;
-import org.briarproject.bramble.api.sync.validation.MessageValidator;
+import org.briarproject.bramble.api.sync.ValidationManager.MessageValidator;
 import org.briarproject.bramble.api.system.Clock;
 
 import java.util.logging.Logger;
 
 import javax.annotation.concurrent.Immutable;
 
+import static org.briarproject.bramble.api.sync.SyncConstants.MESSAGE_HEADER_LENGTH;
 import static org.briarproject.bramble.api.transport.TransportConstants.MAX_CLOCK_DIFFERENCE;
 
 @Immutable
@@ -48,9 +49,14 @@ public abstract class BdfMessageValidator implements MessageValidator {
 			throw new InvalidMessageException(
 					"Timestamp is too far in the future");
 		}
+		byte[] raw = m.getRaw();
+		if (raw.length <= MESSAGE_HEADER_LENGTH) {
+			throw new InvalidMessageException("Message is too short");
+		}
 		try {
-			BdfList bodyList = clientHelper.toList(m.getBody());
+			BdfList body = clientHelper.toList(raw, MESSAGE_HEADER_LENGTH,
-			BdfMessageContext result = validateMessage(m, g, bodyList);
+					raw.length - MESSAGE_HEADER_LENGTH);
+			BdfMessageContext result = validateMessage(m, g, body);
 			Metadata meta = metadataEncoder.encode(result.getDictionary());
 			return new MessageContext(meta, result.getDependencies());
 		} catch (FormatException e) {

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

@@ -16,6 +16,8 @@ import org.briarproject.bramble.api.sync.MessageId;
 import java.security.GeneralSecurityException;
 import java.util.Map;
 
+import javax.annotation.Nullable;
+
 @NotNullByDefault
 public interface ClientHelper {
 
@@ -30,12 +32,16 @@ public interface ClientHelper {
 
 	Message createMessageForStoringMetadata(GroupId g);
 
+	@Nullable
 	Message getMessage(MessageId m) throws DbException;
 
+	@Nullable
 	Message getMessage(Transaction txn, MessageId m) throws DbException;
 
+	@Nullable
 	BdfList getMessageAsList(MessageId m) throws DbException, FormatException;
 
+	@Nullable
 	BdfList getMessageAsList(Transaction txn, MessageId m) throws DbException,
 			FormatException;
 

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

@@ -4,13 +4,8 @@ import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorId;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
-import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
-import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
-import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
-import static org.briarproject.bramble.util.StringUtils.toUtf8;
-
 @Immutable
 @NotNullByDefault
 public class Contact {
@@ -18,30 +13,15 @@ public class Contact {
 	private final ContactId id;
 	private final Author author;
 	private final AuthorId localAuthorId;
-	@Nullable
+	private final boolean verified, active;
-	private final String alias;
-	@Nullable
-	private final byte[] handshakePublicKey;
-	private final boolean verified;
 
 	public Contact(ContactId id, Author author, AuthorId localAuthorId,
-			@Nullable String alias, @Nullable byte[] handshakePublicKey,
+			boolean verified, boolean active) {
-			boolean verified) {
-		if (alias != null) {
-			int aliasLength = toUtf8(alias).length;
-			if (aliasLength == 0 || aliasLength > MAX_AUTHOR_NAME_LENGTH)
-				throw new IllegalArgumentException();
-		}
-		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;
+		this.active = active;
 	}
 
 	public ContactId getId() {
@@ -56,20 +36,14 @@ public class Contact {
 		return localAuthorId;
 	}
 
-	@Nullable
-	public String getAlias() {
-		return alias;
-	}
-
-	@Nullable
-	public byte[] getHandshakePublicKey() {
-		return handshakePublicKey;
-	}
-
 	public boolean isVerified() {
 		return verified;
 	}
 
+	public boolean isActive() {
+		return active;
+	}
+
 	@Override
 	public int hashCode() {
 		return id.hashCode();

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

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

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

@@ -18,30 +18,31 @@ public interface ContactExchangeTask {
 	byte PROTOCOL_VERSION = 1;
 
 	/**
-	 * Label for deriving Alice's header key from the master key.
+	 * Label for deriving Alice's header key from the master secret.
 	 */
 	String ALICE_KEY_LABEL =
 			"org.briarproject.bramble.contact/ALICE_HEADER_KEY";
 
 	/**
-	 * Label for deriving Bob's header key from the master key.
+	 * Label for deriving Bob's header key from the master secret.
 	 */
 	String BOB_KEY_LABEL = "org.briarproject.bramble.contact/BOB_HEADER_KEY";
 
 	/**
-	 * Label for deriving Alice's key binding nonce from the master key.
+	 * Label for deriving Alice's key binding nonce from the master secret.
 	 */
 	String ALICE_NONCE_LABEL = "org.briarproject.bramble.contact/ALICE_NONCE";
 
 	/**
-	 * Label for deriving Bob's key binding nonce from the master key.
+	 * Label for deriving Bob's key binding nonce from the master secret.
 	 */
 	String BOB_NONCE_LABEL = "org.briarproject.bramble.contact/BOB_NONCE";
 
 	/**
 	 * Exchanges contact information with a remote peer.
 	 */
-	void startExchange(LocalAuthor localAuthor, SecretKey masterKey,
+	void startExchange(ContactExchangeListener listener,
+			LocalAuthor localAuthor, SecretKey masterSecret,
 			DuplexTransportConnection conn, TransportId transportId,
 			boolean alice);
 }

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

@@ -1,21 +1,15 @@
 package org.briarproject.bramble.api.contact;
 
-import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.UnsupportedVersionException;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.NoSuchContactException;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorId;
-import org.briarproject.bramble.api.identity.AuthorInfo;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 import java.util.Collection;
 
-import javax.annotation.Nullable;
-
 @NotNullByDefault
 public interface ContactManager {
 
@@ -34,7 +28,7 @@ public interface ContactManager {
 	 * @param alice true if the local party is Alice
 	 */
 	ContactId addContact(Transaction txn, Author remote, AuthorId local,
-			SecretKey rootKey, long timestamp, boolean alice, boolean verified,
+			SecretKey master, long timestamp, boolean alice, boolean verified,
 			boolean active) throws DbException;
 
 	/**
@@ -42,7 +36,7 @@ public interface ContactManager {
 	 * and returns an ID for the contact.
 	 */
 	ContactId addContact(Transaction txn, Author remote, AuthorId local,
-			boolean verified) throws DbException;
+			boolean verified, boolean active) throws DbException;
 
 	/**
 	 * Stores a contact associated with the given local and remote pseudonyms,
@@ -51,40 +45,10 @@ public interface ContactManager {
 	 *
 	 * @param alice true if the local party is Alice
 	 */
-	ContactId addContact(Author remote, AuthorId local, SecretKey rootKey,
+	ContactId addContact(Author remote, AuthorId local, SecretKey master,
 			long timestamp, boolean alice, boolean verified, boolean active)
 			throws DbException;
 
-	/**
-	 * Returns the handshake link that needs to be sent to a contact we want
-	 * to add.
-	 */
-	String getHandshakeLink() throws DbException;
-
-	/**
-	 * Creates a {@link PendingContact} from the given handshake link and
-	 * alias, adds it to the database and returns it.
-	 *
-	 * @param link The handshake link received from the contact we want to add
-	 * @param alias The alias the user has given this contact
-	 * @return A PendingContact representing the contact to be added
-	 * @throws UnsupportedVersionException If the link uses a format version
-	 * that is not supported
-	 * @throws FormatException If the link is invalid
-	 */
-	PendingContact addPendingContact(String link, String alias)
-			throws DbException, FormatException;
-
-	/**
-	 * Returns a list of {@link PendingContact}s.
-	 */
-	Collection<PendingContact> getPendingContacts() throws DbException;
-
-	/**
-	 * Removes a {@link PendingContact}.
-	 */
-	void removePendingContact(PendingContactId p) throws DbException;
-
 	/**
 	 * Returns the contact with the given ID.
 	 */
@@ -94,7 +58,7 @@ public interface ContactManager {
 	 * Returns the contact with the given remoteAuthorId
 	 * that was added by the LocalAuthor with the given localAuthorId
 	 *
-	 * @throws NoSuchContactException If the contact is not in the database
+	 * @throws org.briarproject.bramble.api.db.NoSuchContactException
 	 */
 	Contact getContact(AuthorId remoteAuthorId, AuthorId localAuthorId)
 			throws DbException;
@@ -103,7 +67,7 @@ public interface ContactManager {
 	 * Returns the contact with the given remoteAuthorId
 	 * that was added by the LocalAuthor with the given localAuthorId
 	 *
-	 * @throws NoSuchContactException If the contact is not in the database
+	 * @throws org.briarproject.bramble.api.db.NoSuchContactException
 	 */
 	Contact getContact(Transaction txn, AuthorId remoteAuthorId,
 			AuthorId localAuthorId) throws DbException;
@@ -111,7 +75,7 @@ public interface ContactManager {
 	/**
 	 * Returns all active contacts.
 	 */
-	Collection<Contact> getContacts() throws DbException;
+	Collection<Contact> getActiveContacts() throws DbException;
 
 	/**
 	 * Removes a contact and all associated state.
@@ -124,15 +88,9 @@ public interface ContactManager {
 	void removeContact(Transaction txn, ContactId c) throws DbException;
 
 	/**
-	 * Sets an alias name for the contact or unsets it if alias is null.
+	 * Marks a contact as active or inactive.
 	 */
-	void setContactAlias(Transaction txn, ContactId c, @Nullable String alias)
+	void setContactActive(Transaction txn, ContactId c, boolean active)
-			throws DbException;
-
-	/**
-	 * Sets an alias name for the contact or unsets it if alias is null.
-	 */
-	void setContactAlias(ContactId c, @Nullable String alias)
 			throws DbException;
 
 	/**
@@ -147,32 +105,10 @@ public interface ContactManager {
 	boolean contactExists(AuthorId remoteAuthorId, AuthorId localAuthorId)
 			throws DbException;
 
-	/**
-	 * Returns the {@link AuthorInfo} for the given author.
-	 */
-	AuthorInfo getAuthorInfo(AuthorId a) throws DbException;
-
-	/**
-	 * Returns the {@link AuthorInfo} for the given author.
-	 */
-	AuthorInfo getAuthorInfo(Transaction txn, AuthorId a) throws DbException;
-
 	interface ContactHook {
 
-		/**
-		 * 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/PendingContact.java

@@ -1,56 +0,0 @@
-package org.briarproject.bramble.api.contact;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-@Immutable
-@NotNullByDefault
-public class PendingContact {
-
-	private final PendingContactId id;
-	private final byte[] publicKey;
-	private final String alias;
-	private final PendingContactState state;
-	private final long timestamp;
-
-	public PendingContact(PendingContactId id, byte[] publicKey,
-			String alias, PendingContactState state, long timestamp) {
-		this.id = id;
-		this.publicKey = publicKey;
-		this.alias = alias;
-		this.state = state;
-		this.timestamp = timestamp;
-	}
-
-	public PendingContactId getId() {
-		return id;
-	}
-
-	public byte[] getPublicKey() {
-		return publicKey;
-	}
-
-	public String getAlias() {
-		return alias;
-	}
-
-	public PendingContactState getState() {
-		return state;
-	}
-
-	public long getTimestamp() {
-		return timestamp;
-	}
-
-	@Override
-	public int hashCode() {
-		return id.hashCode();
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		return o instanceof PendingContact &&
-				id.equals(((PendingContact) o).id);
-	}
-}

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

@@ -1,25 +0,0 @@
-package org.briarproject.bramble.api.contact;
-
-import org.briarproject.bramble.api.UniqueId;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.ThreadSafe;
-
-/**
- * Type-safe wrapper for a byte array that uniquely identifies a
- * {@link PendingContact}.
- */
-@ThreadSafe
-@NotNullByDefault
-public class PendingContactId extends UniqueId {
-
-	public PendingContactId(byte[] id) {
-		super(id);
-	}
-
-
-	@Override
-	public boolean equals(Object o) {
-		return o instanceof PendingContactId && super.equals(o);
-	}
-}

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

@@ -1,30 +0,0 @@
-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(0),
-	CONNECTED(1),
-	ADDING_CONTACT(2),
-	FAILED(3);
-
-	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/event/ContactAddedEvent.java

@@ -14,12 +14,18 @@ import javax.annotation.concurrent.Immutable;
 public class ContactAddedEvent extends Event {
 
 	private final ContactId contactId;
+	private final boolean active;
 
-	public ContactAddedEvent(ContactId contactId) {
+	public ContactAddedEvent(ContactId contactId, boolean active) {
 		this.contactId = contactId;
+		this.active = active;
 	}
 
 	public ContactId getContactId() {
 		return contactId;
 	}
+
+	public boolean isActive() {
+		return active;
+	}
 }

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

@@ -1,32 +0,0 @@
-package org.briarproject.bramble.api.contact.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.Nullable;
-
-@NotNullByDefault
-public class ContactExchangeFailedEvent extends Event {
-
-	@Nullable
-	private final Author duplicateRemoteAuthor;
-
-	public ContactExchangeFailedEvent(@Nullable Author duplicateRemoteAuthor) {
-		this.duplicateRemoteAuthor = duplicateRemoteAuthor;
-	}
-
-	public ContactExchangeFailedEvent() {
-		this(null);
-	}
-
-	@Nullable
-	public Author getDuplicateRemoteAuthor() {
-		return duplicateRemoteAuthor;
-	}
-
-	public boolean wasDuplicateContact() {
-		return duplicateRemoteAuthor != null;
-	}
-
-}

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

@@ -1,20 +0,0 @@
-package org.briarproject.bramble.api.contact.event;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public class ContactExchangeSucceededEvent extends Event {
-
-	private final Author remoteAuthor;
-
-	public ContactExchangeSucceededEvent(Author remoteAuthor) {
-		this.remoteAuthor = remoteAuthor;
-	}
-
-	public Author getRemoteAuthor() {
-		return remoteAuthor;
-	}
-
-}

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

@@ -0,0 +1,31 @@
+package org.briarproject.bramble.api.contact.event;
+
+import org.briarproject.bramble.api.contact.ContactId;
+import org.briarproject.bramble.api.event.Event;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+import javax.annotation.concurrent.Immutable;
+
+/**
+ * An event that is broadcast when a contact is marked active or inactive.
+ */
+@Immutable
+@NotNullByDefault
+public class ContactStatusChangedEvent extends Event {
+
+	private final ContactId contactId;
+	private final boolean active;
+
+	public ContactStatusChangedEvent(ContactId contactId, boolean active) {
+		this.contactId = contactId;
+		this.active = active;
+	}
+
+	public ContactId getContactId() {
+		return contactId;
+	}
+
+	public boolean isActive() {
+		return active;
+	}
+}

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

@@ -1,26 +0,0 @@
-package org.briarproject.bramble.api.contact.event;
-
-import org.briarproject.bramble.api.contact.PendingContactId;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a pending contact is removed.
- */
-@Immutable
-@NotNullByDefault
-public class PendingContactRemovedEvent extends Event {
-
-	private final PendingContactId id;
-
-	public PendingContactRemovedEvent(PendingContactId id) {
-		this.id = id;
-	}
-
-	public PendingContactId getId() {
-		return id;
-	}
-
-}

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

@@ -1,34 +0,0 @@
-package org.briarproject.bramble.api.contact.event;
-
-import org.briarproject.bramble.api.contact.PendingContactId;
-import org.briarproject.bramble.api.contact.PendingContactState;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import javax.annotation.concurrent.Immutable;
-
-/**
- * An event that is broadcast when a pending contact's state is changed.
- */
-@Immutable
-@NotNullByDefault
-public class PendingContactStateChangedEvent extends Event {
-
-	private final PendingContactId id;
-	private final PendingContactState state;
-
-	public PendingContactStateChangedEvent(PendingContactId id,
-			PendingContactState state) {
-		this.id = id;
-		this.state = state;
-	}
-
-	public PendingContactId getId() {
-		return id;
-	}
-
-	public PendingContactState getPendingContactState() {
-		return state;
-	}
-
-}

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

@@ -2,7 +2,7 @@ package org.briarproject.bramble.api.crypto;
 
 /**
  * Crypto operations for the key agreement protocol - see
- * https://code.briarproject.org/briar/briar-spec/blob/master/protocols/BQP.md
+ * https://code.briarproject.org/akwizgran/briar-spec/blob/master/protocols/BQP.md
  */
 public interface KeyAgreementCrypto {
 

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

@@ -1,45 +1,29 @@
 package org.briarproject.bramble.api.crypto;
 
 import org.briarproject.bramble.api.plugin.TransportId;
-import org.briarproject.bramble.api.transport.HandshakeKeys;
 import org.briarproject.bramble.api.transport.TransportKeys;
 
 /**
  * Crypto operations for the transport security protocol - see
- * https://code.briarproject.org/briar/briar-spec/blob/master/protocols/BTP.md
+ * https://code.briarproject.org/akwizgran/briar-spec/blob/master/protocols/BTP.md
  */
 public interface TransportCrypto {
 
 	/**
 	 * Derives initial transport keys for the given transport in the given
-	 * time period from the given root key.
+	 * rotation period from the given master secret.
 	 *
 	 * @param alice whether the keys are for use by Alice or Bob.
 	 * @param active whether the keys are usable for outgoing streams.
 	 */
-	TransportKeys deriveTransportKeys(TransportId t, SecretKey rootKey,
+	TransportKeys deriveTransportKeys(TransportId t, SecretKey master,
-			long timePeriod, boolean alice, boolean active);
+			long rotationPeriod, boolean alice, boolean active);
 
 	/**
-	 * Rotates the given transport keys to the given time period. If the keys
+	 * Rotates the given transport keys to the given rotation period. If the
-	 * are for the given period or any later period they are not rotated.
+	 * keys are for the given period or any later period they are not rotated.
 	 */
-	TransportKeys rotateTransportKeys(TransportKeys k, long timePeriod);
+	TransportKeys rotateTransportKeys(TransportKeys k, long rotationPeriod);
-
-	/**
-	 * Derives handshake keys for the given transport in the given time period
-	 * from the given root key.
-	 *
-	 * @param alice whether the keys are for use by Alice or Bob.
-	 */
-	HandshakeKeys deriveHandshakeKeys(TransportId t, SecretKey rootKey,
-			long timePeriod, boolean alice);
-
-	/**
-	 * Updates the given handshake keys to the given time period. If the keys
-	 * are for the given period or any later period they are not updated.
-	 */
-	HandshakeKeys updateHandshakeKeys(HandshakeKeys k, long timePeriod);
 
 	/**
 	 * Encodes the pseudo-random tag that is used to recognise a stream.

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

@@ -1,71 +0,0 @@
-package org.briarproject.bramble.api.data;
-
-import org.briarproject.bramble.api.Bytes;
-import org.briarproject.bramble.api.FormatException;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import javax.annotation.Nullable;
-
-import static org.briarproject.bramble.api.data.BdfDictionary.NULL_VALUE;
-import static org.briarproject.bramble.util.StringUtils.toHexString;
-
-@NotNullByDefault
-public class BdfStringUtils {
-
-	public static String toString(@Nullable Object o) throws FormatException {
-		return toString(o, 0);
-	}
-
-	private static String toString(@Nullable Object o, int indent)
-			throws FormatException {
-		if (o == null || o == NULL_VALUE) return "null";
-		if (o instanceof Boolean) return o.toString();
-		if (o instanceof Number) return o.toString();
-		if (o instanceof String) return "\"" + o + "\"";
-		if (o instanceof Bytes)
-			return "x" + toHexString(((Bytes) o).getBytes());
-		if (o instanceof byte[])
-			return "x" + toHexString((byte[]) o);
-		if (o instanceof List) {
-			List<?> list = (List) o;
-			StringBuilder sb = new StringBuilder();
-			sb.append("[\n");
-			int i = 0, size = list.size();
-			for (Object e : list) {
-				indent(sb, indent + 1);
-				sb.append(toString(e, indent + 1));
-				if (i++ < size - 1) sb.append(',');
-				sb.append('\n');
-			}
-			indent(sb, indent);
-			sb.append(']');
-			return sb.toString();
-		}
-		if (o instanceof Map) {
-			Map<?, ?> map = (Map) o;
-			StringBuilder sb = new StringBuilder();
-			sb.append("{\n");
-			int i = 0, size = map.size();
-			for (Entry e : map.entrySet()) {
-				indent(sb, indent + 1);
-				sb.append(toString(e.getKey(), indent + 1));
-				sb.append(": ");
-				sb.append(toString(e.getValue(), indent + 1));
-				if (i++ < size - 1) sb.append(',');
-				sb.append('\n');
-			}
-			indent(sb, indent);
-			sb.append('}');
-			return sb.toString();
-		}
-		throw new FormatException();
-	}
-
-	private static void indent(StringBuilder sb, int indent) {
-		for (int i = 0; i < indent; i++) sb.append('\t');
-	}
-}

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

@@ -1,20 +0,0 @@
-package org.briarproject.bramble.api.db;
-
-import org.briarproject.bramble.api.event.EventExecutor;
-
-/**
- * An action that's taken when a {@link Transaction} is committed.
- */
-public interface CommitAction {
-
-	void accept(Visitor visitor);
-
-	interface Visitor {
-
-		@EventExecutor
-		void visit(EventAction a);
-
-		@EventExecutor
-		void visit(TaskAction a);
-	}
-}

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

@@ -2,12 +2,10 @@ package org.briarproject.bramble.api.db;
 
 import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.bramble.api.contact.PendingContact;
-import org.briarproject.bramble.api.contact.PendingContactId;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorId;
-import org.briarproject.bramble.api.identity.Identity;
+import org.briarproject.bramble.api.identity.LocalAuthor;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.settings.Settings;
@@ -21,12 +19,8 @@ import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.bramble.api.sync.MessageStatus;
 import org.briarproject.bramble.api.sync.Offer;
 import org.briarproject.bramble.api.sync.Request;
-import org.briarproject.bramble.api.sync.validation.MessageState;
+import org.briarproject.bramble.api.transport.KeySet;
-import org.briarproject.bramble.api.transport.HandshakeKeySet;
+import org.briarproject.bramble.api.transport.KeySetId;
-import org.briarproject.bramble.api.transport.HandshakeKeySetId;
-import org.briarproject.bramble.api.transport.HandshakeKeys;
-import org.briarproject.bramble.api.transport.TransportKeySet;
-import org.briarproject.bramble.api.transport.TransportKeySetId;
 import org.briarproject.bramble.api.transport.TransportKeys;
 
 import java.util.Collection;
@@ -34,6 +28,8 @@ import java.util.Map;
 
 import javax.annotation.Nullable;
 
+import static org.briarproject.bramble.api.sync.ValidationManager.State;
+
 /**
  * Encapsulates the database implementation and exposes high-level operations
  * to other components.
@@ -80,33 +76,12 @@ public interface DatabaseComponent {
 	 */
 	void endTransaction(Transaction txn);
 
-	/**
-	 * Runs the given task within a transaction.
-	 */
-	<E extends Exception> void transaction(boolean readOnly,
-			DbRunnable<E> task) throws DbException, E;
-
-	/**
-	 * Runs the given task within a transaction and returns the result of the
-	 * task.
-	 */
-	<R, E extends Exception> R transactionWithResult(boolean readOnly,
-			DbCallable<R, E> task) throws DbException, E;
-
-	/**
-	 * Runs the given task within a transaction and returns the result of the
-	 * task, which may be null.
-	 */
-	@Nullable
-	<R, E extends Exception> R transactionWithNullableResult(boolean readOnly,
-			NullableDbCallable<R, E> task) throws DbException, E;
-
 	/**
 	 * Stores a contact associated with the given local and remote pseudonyms,
 	 * and returns an ID for the contact.
 	 */
 	ContactId addContact(Transaction txn, Author remote, AuthorId local,
-			boolean verified) throws DbException;
+			boolean verified, boolean active) throws DbException;
 
 	/**
 	 * Stores a group.
@@ -114,23 +89,9 @@ public interface DatabaseComponent {
 	void addGroup(Transaction txn, Group g) throws DbException;
 
 	/**
-	 * Stores the given handshake keys for the given contact and returns a
+	 * Stores a local pseudonym.
-	 * key set ID.
 	 */
-	HandshakeKeySetId addHandshakeKeys(Transaction txn, ContactId c,
+	void addLocalAuthor(Transaction txn, LocalAuthor a) throws DbException;
-			HandshakeKeys k) throws DbException;
-
-	/**
-	 * Stores the given handshake keys for the given pending contact and
-	 * returns a key set ID.
-	 */
-	HandshakeKeySetId addHandshakeKeys(Transaction txn, PendingContactId p,
-			HandshakeKeys k) throws DbException;
-
-	/**
-	 * Stores an identity.
-	 */
-	void addIdentity(Transaction txn, Identity i) throws DbException;
 
 	/**
 	 * Stores a local message.
@@ -138,12 +99,6 @@ public interface DatabaseComponent {
 	void addLocalMessage(Transaction txn, Message m, Metadata meta,
 			boolean shared) throws DbException;
 
-	/**
-	 * Stores a pending contact.
-	 */
-	void addPendingContact(Transaction txn, PendingContact p)
-			throws DbException;
-
 	/**
 	 * Stores a transport.
 	 */
@@ -154,39 +109,25 @@ public interface DatabaseComponent {
 	 * Stores the given transport keys for the given contact and returns a
 	 * key set ID.
 	 */
-	TransportKeySetId addTransportKeys(Transaction txn, ContactId c,
+	KeySetId addTransportKeys(Transaction txn, ContactId c,
 			TransportKeys k) throws DbException;
 
 	/**
 	 * Returns true if the database contains the given contact for the given
 	 * local pseudonym.
-	 * <p/>
-	 * Read-only.
 	 */
 	boolean containsContact(Transaction txn, AuthorId remote, AuthorId local)
 			throws DbException;
 
 	/**
 	 * Returns true if the database contains the given group.
-	 * <p/>
-	 * Read-only.
 	 */
 	boolean containsGroup(Transaction txn, GroupId g) throws DbException;
 
 	/**
-	 * Returns true if the database contains an identity for the given
+	 * Returns true if the database contains the given local author.
-	 * pseudonym.
-	 * <p/>
-	 * Read-only.
 	 */
-	boolean containsIdentity(Transaction txn, AuthorId a) throws DbException;
+	boolean containsLocalAuthor(Transaction txn, AuthorId local)
-
-	/**
-	 * Returns true if the database contains the given pending contact.
-	 * <p/>
-	 * Read-only.
-	 */
-	boolean containsPendingContact(Transaction txn, PendingContactId p)
 			throws DbException;
 
 	/**
@@ -210,13 +151,13 @@ public interface DatabaseComponent {
 			throws DbException;
 
 	/**
-	 * Returns a batch of messages for the given contact, with a total length
+	 * Returns a batch of raw messages for the given contact, with a total
-	 * less than or equal to the given length, for transmission over a
+	 * length less than or equal to the given length, for transmission over a
 	 * transport with the given maximum latency. Returns null if there are no
 	 * sendable messages that fit in the given length.
 	 */
 	@Nullable
-	Collection<Message> generateBatch(Transaction txn, ContactId c,
+	Collection<byte[]> generateBatch(Transaction txn, ContactId c,
 			int maxLength, int maxLatency) throws DbException;
 
 	/**
@@ -237,14 +178,14 @@ public interface DatabaseComponent {
 			throws DbException;
 
 	/**
-	 * Returns a batch of messages for the given contact, with a total length
+	 * Returns a batch of raw messages for the given contact, with a total
-	 * less than or equal to the given length, for transmission over a
+	 * length less than or equal to the given length, for transmission over a
 	 * transport with the given maximum latency. Only messages that have been
 	 * requested by the contact are returned. Returns null if there are no
 	 * sendable messages that fit in the given length.
 	 */
 	@Nullable
-	Collection<Message> generateRequestedBatch(Transaction txn, ContactId c,
+	Collection<byte[]> generateRequestedBatch(Transaction txn, ContactId c,
 			int maxLength, int maxLatency) throws DbException;
 
 	/**
@@ -309,35 +250,18 @@ public interface DatabaseComponent {
 			throws DbException;
 
 	/**
-	 * Returns all handshake keys for the given transport.
+	 * Returns the local pseudonym with the given ID.
 	 * <p/>
 	 * Read-only.
 	 */
-	Collection<HandshakeKeySet> getHandshakeKeys(Transaction txn, TransportId t)
+	LocalAuthor getLocalAuthor(Transaction txn, AuthorId a) throws DbException;
-			throws DbException;
 
 	/**
-	 * Returns the identity for the local pseudonym with the given ID.
+	 * Returns all local pseudonyms.
 	 * <p/>
 	 * Read-only.
 	 */
-	Identity getIdentity(Transaction txn, AuthorId a) throws DbException;
+	Collection<LocalAuthor> getLocalAuthors(Transaction txn) throws DbException;
-
-	/**
-	 * Returns the identities for all local pseudonyms.
-	 * <p/>
-	 * Read-only.
-	 */
-	Collection<Identity> getIdentities(Transaction txn) throws DbException;
-
-	/**
-	 * Returns the message with the given ID.
-	 * <p/>
-	 * Read-only.
-	 *
-	 * @throws MessageDeletedException if the message has been deleted
-	 */
-	Message getMessage(Transaction txn, MessageId m) throws DbException;
 
 	/**
 	 * Returns the IDs of all delivered messages in the given group.
@@ -373,6 +297,15 @@ public interface DatabaseComponent {
 	Collection<MessageId> getMessagesToShare(Transaction txn)
 			throws DbException;
 
+	/**
+	 * Returns the message with the given ID, in serialised form, or null if
+	 * the message has been deleted.
+	 * <p/>
+	 * Read-only.
+	 */
+	@Nullable
+	byte[] getRawMessage(Transaction txn, MessageId m) throws DbException;
+
 	/**
 	 * Returns the metadata for all delivered messages in the given group.
 	 * <p/>
@@ -420,12 +353,12 @@ public interface DatabaseComponent {
 	/**
 	 * Returns the IDs and states of all dependencies of the given message.
 	 * For missing dependencies and dependencies in other groups, the state
-	 * {@link MessageState UNKNOWN} is returned.
+	 * {@link State UNKNOWN} is returned.
 	 * <p/>
 	 * Read-only.
 	 */
-	Map<MessageId, MessageState> getMessageDependencies(Transaction txn,
+	Map<MessageId, State> getMessageDependencies(Transaction txn, MessageId m)
-			MessageId m) throws DbException;
+			throws DbException;
 
 	/**
 	 * Returns the IDs and states of all dependents of the given message.
@@ -434,16 +367,15 @@ public interface DatabaseComponent {
 	 * <p/>
 	 * Read-only.
 	 */
-	Map<MessageId, MessageState> getMessageDependents(Transaction txn,
+	Map<MessageId, State> getMessageDependents(Transaction txn, MessageId m)
-			MessageId m) throws DbException;
+			throws DbException;
 
 	/**
 	 * Gets the validation and delivery state of the given message.
 	 * <p/>
 	 * Read-only.
 	 */
-	MessageState getMessageState(Transaction txn, MessageId m)
+	State getMessageState(Transaction txn, MessageId m) throws DbException;
-			throws DbException;
 
 	/**
 	 * Returns the status of the given delivered message with respect to the
@@ -464,14 +396,6 @@ public interface DatabaseComponent {
 	 */
 	long getNextSendTime(Transaction txn, ContactId c) throws DbException;
 
-	/**
-	 * Returns all pending contacts.
-	 * <p/>
-	 * Read-only.
-	 */
-	Collection<PendingContact> getPendingContacts(Transaction txn)
-			throws DbException;
-
 	/**
 	 * Returns all settings in the given namespace.
 	 * <p/>
@@ -484,20 +408,14 @@ public interface DatabaseComponent {
 	 * <p/>
 	 * Read-only.
 	 */
-	Collection<TransportKeySet> getTransportKeys(Transaction txn, TransportId t)
+	Collection<KeySet> getTransportKeys(Transaction txn, TransportId t)
 			throws DbException;
 
-	/**
-	 * Increments the outgoing stream counter for the given handshake keys.
-	 */
-	void incrementStreamCounter(Transaction txn, TransportId t,
-			HandshakeKeySetId k) throws DbException;
-
 	/**
 	 * Increments the outgoing stream counter for the given transport keys.
 	 */
-	void incrementStreamCounter(Transaction txn, TransportId t,
+	void incrementStreamCounter(Transaction txn, TransportId t, KeySetId k)
-			TransportKeySetId k) throws DbException;
+			throws DbException;
 
 	/**
 	 * Merges the given metadata with the existing metadata for the given
@@ -553,27 +471,15 @@ public interface DatabaseComponent {
 	void removeGroup(Transaction txn, Group g) throws DbException;
 
 	/**
-	 * Removes the given handshake keys from the database.
+	 * Removes a local pseudonym (and all associated state) from the database.
 	 */
-	void removeHandshakeKeys(Transaction txn, TransportId t,
+	void removeLocalAuthor(Transaction txn, AuthorId a) throws DbException;
-			HandshakeKeySetId k) throws DbException;
-
-	/**
-	 * Removes an identity (and all associated state) from the database.
-	 */
-	void removeIdentity(Transaction txn, AuthorId a) throws DbException;
 
 	/**
 	 * Removes a message (and all associated state) from the database.
 	 */
 	void removeMessage(Transaction txn, MessageId m) throws DbException;
 
-	/**
-	 * Removes a pending contact (and all associated state) from the database.
-	 */
-	void removePendingContact(Transaction txn, PendingContactId p)
-			throws DbException;
-
 	/**
 	 * Removes a transport (and all associated state) from the database.
 	 */
@@ -582,8 +488,8 @@ public interface DatabaseComponent {
 	/**
 	 * Removes the given transport keys from the database.
 	 */
-	void removeTransportKeys(Transaction txn, TransportId t,
+	void removeTransportKeys(Transaction txn, TransportId t, KeySetId k)
-			TransportKeySetId k) throws DbException;
+			throws DbException;
 
 	/**
 	 * Marks the given contact as verified.
@@ -591,9 +497,9 @@ public interface DatabaseComponent {
 	void setContactVerified(Transaction txn, ContactId c) throws DbException;
 
 	/**
-	 * Sets an alias name for the contact or unsets it if alias is null.
+	 * Marks the given contact as active or inactive.
 	 */
-	void setContactAlias(Transaction txn, ContactId c, @Nullable String alias)
+	void setContactActive(Transaction txn, ContactId c, boolean active)
 			throws DbException;
 
 	/**
@@ -610,7 +516,7 @@ public interface DatabaseComponent {
 	/**
 	 * Sets the validation and delivery state of the given message.
 	 */
-	void setMessageState(Transaction txn, MessageId m, MessageState state)
+	void setMessageState(Transaction txn, MessageId m, State state)
 			throws DbException;
 
 	/**
@@ -620,42 +526,21 @@ public interface DatabaseComponent {
 			Collection<MessageId> dependencies) throws DbException;
 
 	/**
-	 * Sets the handshake key pair for the identity with the given ID.
+	 * Sets the reordering window for the given key set and transport in the
+	 * given rotation period.
 	 */
-	void setHandshakeKeyPair(Transaction txn, AuthorId local, byte[] publicKey,
+	void setReorderingWindow(Transaction txn, KeySetId k, TransportId t,
-			byte[] privateKey) throws DbException;
+			long rotationPeriod, long base, byte[] bitmap) throws DbException;
-
-	/**
-	 * Sets the reordering window for the given transport key set in the given
-	 * time period.
-	 */
-	void setReorderingWindow(Transaction txn, TransportKeySetId k,
-			TransportId t, long timePeriod, long base, byte[] bitmap)
-			throws DbException;
-
-	/**
-	 * Sets the reordering window for the given handshake key set in the given
-	 * time period.
-	 */
-	void setReorderingWindow(Transaction txn, HandshakeKeySetId k,
-			TransportId t, long timePeriod, long base, byte[] bitmap)
-			throws DbException;
 
 	/**
 	 * Marks the given transport keys as usable for outgoing streams.
 	 */
-	void setTransportKeysActive(Transaction txn, TransportId t,
+	void setTransportKeysActive(Transaction txn, TransportId t, KeySetId k)
-			TransportKeySetId k) throws DbException;
-
-	/**
-	 * Stores the given handshake keys, deleting any keys they have replaced.
-	 */
-	void updateHandshakeKeys(Transaction txn, Collection<HandshakeKeySet> keys)
 			throws DbException;
 
 	/**
 	 * Stores the given transport keys, deleting any keys they have replaced.
 	 */
-	void updateTransportKeys(Transaction txn, Collection<TransportKeySet> keys)
+	void updateTransportKeys(Transaction txn, Collection<KeySet> keys)
 			throws DbException;
 }

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

@@ -10,4 +10,6 @@ public interface DatabaseConfig {
 	File getDatabaseDirectory();
 
 	File getDatabaseKeyDirectory();
+
+	long getMaxSize();
 }

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

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

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

@@ -1,9 +0,0 @@
-package org.briarproject.bramble.api.db;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-@NotNullByDefault
-public interface DbRunnable<E extends Exception> {
-
-	void run(Transaction txn) throws DbException, E;
-}

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

@@ -1,24 +0,0 @@
-package org.briarproject.bramble.api.db;
-
-import org.briarproject.bramble.api.event.Event;
-
-/**
- * A {@link CommitAction} that broadcasts an event.
- */
-public class EventAction implements CommitAction {
-
-	private final Event event;
-
-	EventAction(Event event) {
-		this.event = event;
-	}
-
-	public Event getEvent() {
-		return event;
-	}
-
-	@Override
-	public void accept(Visitor visitor) {
-		visitor.visit(this);
-	}
-}

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

@@ -1,9 +0,0 @@
-package org.briarproject.bramble.api.db;
-
-/**
- * Thrown when a message that has been deleted is requested from the database.
- * This exception may occur due to concurrent updates and does not indicate a
- * database error.
- */
-public class MessageDeletedException extends DbException {
-}

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

@@ -6,10 +6,6 @@ public interface MigrationListener {
 	 * This is called when a migration is started while opening the database.
 	 * It will be called once for each migration being applied.
 	 */
-	void onDatabaseMigration();
+	void onMigrationRun();
 
-	/**
-	 * This is called when compaction is started while opening the database.
-	 */
-	void onDatabaseCompaction();
 }

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

@@ -1,9 +1,9 @@
 package org.briarproject.bramble.api.db;
 
 /**
- * Thrown when a database operation is attempted for an identity that is not in
+ * Thrown when a database operation is attempted for a pseudonym that is not in
  * the database. This exception may occur due to concurrent updates and does
  * not indicate a database error.
  */
-public class NoSuchIdentityException extends DbException {
+public class NoSuchLocalAuthorException extends DbException {
 }

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

@@ -1,9 +0,0 @@
-package org.briarproject.bramble.api.db;
-
-/**
- * Thrown when a database operation is attempted for a pending contact that is
- * not in the database. This exception may occur due to concurrent updates and
- * does not indicate a database error.
- */
-public class NoSuchPendingContactException extends DbException {
-}

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

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

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

@@ -1,9 +0,0 @@
-package org.briarproject.bramble.api.db;
-
-/**
- * Thrown when a duplicate pending contact is added to the database. This
- * exception may occur due to concurrent updates and does not indicate a
- * database error.
- */
-public class PendingContactExistsException extends DbException {
-}

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

@@ -1,24 +0,0 @@
-package org.briarproject.bramble.api.db;
-
-import org.briarproject.bramble.api.event.EventExecutor;
-
-/**
- * A {@link CommitAction} that submits a task to the {@link EventExecutor}.
- */
-public class TaskAction implements CommitAction {
-
-	private final Runnable task;
-
-	TaskAction(Runnable task) {
-		this.task = task;
-	}
-
-	public Runnable getTask() {
-		return task;
-	}
-
-	@Override
-	public void accept(Visitor visitor) {
-		visitor.visit(this);
-	}
-}

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

@@ -1,15 +1,13 @@
 package org.briarproject.bramble.api.db;
 
 import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.event.EventExecutor;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import javax.annotation.concurrent.NotThreadSafe;
 
-import static java.util.Collections.emptyList;
-
 /**
  * A wrapper around a database transaction. Transactions are not thread-safe.
  */
@@ -19,7 +17,7 @@ public class Transaction {
 	private final Object txn;
 	private final boolean readOnly;
 
-	private List<CommitAction> actions = null;
+	private List<Event> events = null;
 	private boolean committed = false;
 
 	public Transaction(Object txn, boolean readOnly) {
@@ -44,27 +42,19 @@ public class Transaction {
 
 	/**
 	 * Attaches an event to be broadcast when the transaction has been
-	 * committed. The event will be broadcast on the {@link EventExecutor}.
+	 * committed.
 	 */
 	public void attach(Event e) {
-		if (actions == null) actions = new ArrayList<>();
+		if (events == null) events = new ArrayList<>();
-		actions.add(new EventAction(e));
+		events.add(e);
 	}
 
 	/**
-	 * Attaches a task to be executed when the transaction has been
+	 * Returns any events attached to the transaction.
-	 * committed. The task will be run on the {@link EventExecutor}.
 	 */
-	public void attach(Runnable r) {
+	public List<Event> getEvents() {
-		if (actions == null) actions = new ArrayList<>();
+		if (events == null) return Collections.emptyList();
-		actions.add(new TaskAction(r));
+		return events;
-	}
-
-	/**
-	 * Returns any actions attached to the transaction.
-	 */
-	public List<CommitAction> getActions() {
-		return actions == null ? emptyList() : actions;
 	}
 
 	/**

bramble-api/src/main/java/org/briarproject/bramble/api/event/EventBus.java

@@ -16,8 +16,7 @@ public interface EventBus {
 	void removeListener(EventListener l);
 
 	/**
-	 * Asynchronously notifies all listeners of an event. Listeners are
+	 * Notifies all listeners of an event.
-	 * notified on the {@link EventExecutor}.
 	 */
 	void broadcast(Event e);
 }

bramble-api/src/main/java/org/briarproject/bramble/api/event/EventExecutor.java

@@ -1,26 +0,0 @@
-package org.briarproject.bramble.api.event;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Annotation for injecting the executor for broadcasting events and running
- * tasks that need to run in a defined order with respect to events. Also used
- * for annotating methods that should run on the event executor.
- * <p>
- * The contract of this executor is that tasks are run in the order they're
- * submitted, tasks are not run concurrently, and submitting a task will never
- * block. Tasks must not block. Tasks submitted during shutdown are discarded.
- */
-@Qualifier
-@Target({FIELD, METHOD, PARAMETER})
-@Retention(RUNTIME)
-public @interface EventExecutor {
-}

bramble-api/src/main/java/org/briarproject/bramble/api/event/EventListener.java

@@ -12,6 +12,5 @@ public interface EventListener {
 	 * Called when an event is broadcast. Implementations of this method must
 	 * not block.
 	 */
-	@EventExecutor
 	void eventOccurred(Event e);
 }

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

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.api.identity;
 
-import org.briarproject.bramble.api.Nameable;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.util.StringUtils;
 
@@ -14,7 +13,11 @@ import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_PUBLIC_K
  */
 @Immutable
 @NotNullByDefault
-public class Author implements Nameable {
+public class Author {
+
+	public enum Status {
+		NONE, ANONYMOUS, UNKNOWN, UNVERIFIED, VERIFIED, OURSELVES
+	}
 
 	/**
 	 * The current version of the author structure.

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

@@ -18,7 +18,14 @@ public interface AuthorFactory {
 
 	/**
 	 * Creates a local author with the current format version and the given
-	 * name.
+	 * name and keys.
 	 */
-	LocalAuthor createLocalAuthor(String name);
+	LocalAuthor createLocalAuthor(String name, byte[] publicKey,
+			byte[] privateKey);
+
+	/**
+	 * Creates a local author with the given format version, name and keys.
+	 */
+	LocalAuthor createLocalAuthor(int formatVersion, String name,
+			byte[] publicKey, byte[] privateKey);
 }

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

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

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

@@ -1,96 +0,0 @@
-package org.briarproject.bramble.api.identity;
-
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-
-import java.util.Arrays;
-
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
-
-import static org.briarproject.bramble.api.crypto.CryptoConstants.MAX_AGREEMENT_PUBLIC_KEY_BYTES;
-
-@Immutable
-@NotNullByDefault
-public class Identity {
-
-	private final LocalAuthor localAuthor;
-	@Nullable
-	private final byte[] handshakePublicKey, handshakePrivateKey;
-	private final long created;
-
-	public Identity(LocalAuthor localAuthor,
-			@Nullable byte[] handshakePublicKey,
-			@Nullable byte[] handshakePrivateKey, long created) {
-		if (handshakePublicKey != null) {
-			int keyLength = handshakePublicKey.length;
-			if (keyLength == 0 || keyLength > MAX_AGREEMENT_PUBLIC_KEY_BYTES)
-				throw new IllegalArgumentException();
-		}
-		this.localAuthor = localAuthor;
-		this.handshakePublicKey = handshakePublicKey;
-		this.handshakePrivateKey = handshakePrivateKey;
-		this.created = created;
-	}
-
-	/**
-	 * Returns the ID of the user's pseudonym.
-	 */
-	public AuthorId getId() {
-		return localAuthor.getId();
-	}
-
-	/**
-	 * Returns the user's pseudonym.
-	 */
-	public LocalAuthor getLocalAuthor() {
-		return localAuthor;
-	}
-
-	/**
-	 * Returns true if the identity has a handshake key pair.
-	 */
-	public boolean hasHandshakeKeyPair() {
-		return handshakePublicKey != null && handshakePrivateKey != null;
-	}
-
-	/**
-	 * Returns the public key used for handshaking, or null if no key exists.
-	 */
-	@Nullable
-	public byte[] getHandshakePublicKey() {
-		return handshakePublicKey;
-	}
-
-	/**
-	 * Returns the private key used for handshaking, or null if no key exists.
-	 */
-	@Nullable
-	public byte[] getHandshakePrivateKey() {
-		return handshakePrivateKey;
-	}
-
-	/**
-	 * Returns the time the identity was created, in milliseconds since the
-	 * Unix epoch.
-	 */
-	public long getTimeCreated() {
-		return created;
-	}
-
-	@Override
-	public int hashCode() {
-		return localAuthor.getId().hashCode();
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (o instanceof Identity) {
-			Identity i = (Identity) o;
-			return created == i.created &&
-					localAuthor.equals(i.localAuthor) &&
-					Arrays.equals(handshakePublicKey, i.handshakePublicKey) &&
-					Arrays.equals(handshakePrivateKey, i.handshakePrivateKey);
-		}
-		return false;
-	}
-}

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

@@ -1,29 +1,31 @@
 package org.briarproject.bramble.api.identity;
 
 import org.briarproject.bramble.api.crypto.CryptoExecutor;
-import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.bramble.api.lifecycle.LifecycleManager;
+import org.briarproject.bramble.api.identity.Author.Status;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 @NotNullByDefault
 public interface IdentityManager {
 
 	/**
-	 * Creates an identity with the given name. The identity includes a
+	 * Creates a local identity with the given name.
-	 * handshake key pair.
 	 */
 	@CryptoExecutor
-	Identity createIdentity(String name);
+	LocalAuthor createLocalAuthor(String name);
 
 	/**
-	 * Registers the given identity with the manager. This method should be
+	 * Registers the given local identity with the manager. The identity is
-	 * called before {@link LifecycleManager#startServices(SecretKey)}. The
+	 * not stored until {@link #storeLocalAuthor()} is called.
-	 * identity is stored when {@link LifecycleManager#startServices(SecretKey)}
-	 * is called. The identity must include a handshake key pair.
 	 */
-	void registerIdentity(Identity i);
+	void registerLocalAuthor(LocalAuthor a);
+
+	/**
+	 * Stores the local identity registered with
+	 * {@link #registerLocalAuthor(LocalAuthor)}, if any.
+	 */
+	void storeLocalAuthor() throws DbException;
 
 	/**
 	 * Returns the cached local identity or loads it from the database.
@@ -32,18 +34,17 @@ public interface IdentityManager {
 
 	/**
 	 * Returns the cached local identity or loads it from the database.
-	 * <p/>
-	 * Read-only.
 	 */
 	LocalAuthor getLocalAuthor(Transaction txn) throws DbException;
 
 	/**
-	 * Returns the cached handshake keys or loads them from the database.
+	 * Returns the {@link Status} of the given author.
-	 * <p/>
-	 * Read-only.
-	 *
-	 * @return A two-element array containing the public key in the first
-	 * element and the private key in the second
 	 */
-	byte[][] getHandshakeKeys(Transaction txn) throws DbException;
+	Status getAuthorStatus(AuthorId a) throws DbException;
+
+	/**
+	 * Returns the {@link Status} of the given author.
+	 */
+	Status getAuthorStatus(Transaction txn, AuthorId a) throws DbException;
+
 }

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

@@ -12,11 +12,13 @@ import javax.annotation.concurrent.Immutable;
 public class LocalAuthor extends Author {
 
 	private final byte[] privateKey;
+	private final long created;
 
 	public LocalAuthor(AuthorId id, int formatVersion, String name,
-			byte[] publicKey, byte[] privateKey) {
+			byte[] publicKey, byte[] privateKey, long created) {
 		super(id, formatVersion, name, publicKey);
 		this.privateKey = privateKey;
+		this.created = created;
 	}
 
 	/**
@@ -25,4 +27,12 @@ public class LocalAuthor extends Author {
 	public byte[] getPrivateKey() {
 		return privateKey;
 	}
+
+	/**
+	 * Returns the time the pseudonym was created, in milliseconds since the
+	 * Unix epoch.
+	 */
+	public long getTimeCreated() {
+		return created;
+	}
 }

bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/LocalAuthorAddedEvent.java

@@ -7,15 +7,15 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import javax.annotation.concurrent.Immutable;
 
 /**
- * An event that is broadcast when an identity is removed.
+ * An event that is broadcast when a local pseudonym is added.
  */
 @Immutable
 @NotNullByDefault
-public class IdentityRemovedEvent extends Event {
+public class LocalAuthorAddedEvent extends Event {
 
 	private final AuthorId authorId;
 
-	public IdentityRemovedEvent(AuthorId authorId) {
+	public LocalAuthorAddedEvent(AuthorId authorId) {
 		this.authorId = authorId;
 	}
 

bramble-api/src/main/java/org/briarproject/bramble/api/identity/event/LocalAuthorRemovedEvent.java

@@ -7,15 +7,15 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import javax.annotation.concurrent.Immutable;
 
 /**
- * An event that is broadcast when an identity is added.
+ * An event that is broadcast when a local pseudonym is removed.
  */
 @Immutable
 @NotNullByDefault
-public class IdentityAddedEvent extends Event {
+public class LocalAuthorRemovedEvent extends Event {
 
 	private final AuthorId authorId;
 
-	public IdentityAddedEvent(AuthorId authorId) {
+	public LocalAuthorRemovedEvent(AuthorId authorId) {
 		this.authorId = authorId;
 	}
 

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

@@ -3,16 +3,20 @@ package org.briarproject.bramble.api.keyagreement;
 public interface KeyAgreementConstants {
 
 	/**
-	 * The version of the BQP protocol used in beta releases. This version
+	 * The current version of the BQP protocol. Version number 89 is reserved.
-	 * number is reserved.
-	 */
-	byte BETA_PROTOCOL_VERSION = 89;
-
-	/**
-	 * The current version of the BQP protocol.
 	 */
 	byte PROTOCOL_VERSION = 4;
 
+	/**
+	 * The length of the record header in bytes.
+	 */
+	int RECORD_HEADER_LENGTH = 4;
+
+	/**
+	 * The offset of the payload length in the record header, in bytes.
+	 */
+	int RECORD_HEADER_PAYLOAD_LENGTH_OFFSET = 2;
+
 	/**
 	 * The length of the BQP key commitment in bytes.
 	 */
@@ -21,7 +25,7 @@ public interface KeyAgreementConstants {
 	/**
 	 * The connection timeout in milliseconds.
 	 */
-	long CONNECTION_TIMEOUT = 60_000;
+	long CONNECTION_TIMEOUT = 20 * 1000;
 
 	/**
 	 * The transport identifier for Bluetooth.
@@ -40,8 +44,8 @@ public interface KeyAgreementConstants {
 			"org.briarproject.bramble.keyagreement/SHARED_SECRET";
 
 	/**
-	 * Label for deriving the master key.
+	 * Label for deriving the master secret.
 	 */
-	String MASTER_KEY_LABEL =
+	String MASTER_SECRET_LABEL =
 			"org.briarproject.bramble.keyagreement/MASTER_SECRET";
 }

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

@@ -2,16 +2,16 @@ package org.briarproject.bramble.api.lifecycle;
 
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.db.DatabaseComponent;
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.sync.Client;
 
 import java.util.concurrent.ExecutorService;
 
 /**
- * Manages the lifecycle of the app: opening and closing the
+ * Manages the lifecycle of the app, starting {@link Client Clients}, starting
- * {@link DatabaseComponent} starting and stopping {@link Service Services},
+ * and stopping {@link Service Services}, shutting down
- * and shutting down {@link ExecutorService ExecutorServices}.
+ * {@link ExecutorService ExecutorServices}, and opening and closing the
+ * {@link DatabaseComponent}.
  */
 @NotNullByDefault
 public interface LifecycleManager {
@@ -34,27 +34,25 @@ public interface LifecycleManager {
 	 */
 	enum LifecycleState {
 
-		STARTING, MIGRATING_DATABASE, COMPACTING_DATABASE, STARTING_SERVICES,
+		STARTING, MIGRATING_DATABASE, STARTING_SERVICES, RUNNING, STOPPING;
-		RUNNING, STOPPING;
 
 		public boolean isAfter(LifecycleState state) {
 			return ordinal() > state.ordinal();
 		}
 	}
 
-	/**
-	 * Registers a hook to be called after the database is opened and before
-	 * {@link Service services} are started. This method should be called
-	 * before {@link #startServices(SecretKey)}.
-	 */
-	void registerOpenDatabaseHook(OpenDatabaseHook hook);
-
 	/**
 	 * Registers a {@link Service} to be started and stopped. This method
 	 * should be called before {@link #startServices(SecretKey)}.
 	 */
 	void registerService(Service s);
 
+	/**
+	 * Registers a {@link Client} to be started. This method should be called
+	 * before {@link #startServices(SecretKey)}.
+	 */
+	void registerClient(Client c);
+
 	/**
 	 * Registers an {@link ExecutorService} to be shut down. This method
 	 * should be called before {@link #startServices(SecretKey)}.
@@ -63,7 +61,7 @@ public interface LifecycleManager {
 
 	/**
 	 * Opens the {@link DatabaseComponent} using the given key and starts any
-	 * registered {@link Service Services}.
+	 * registered {@link Client Clients} and {@link Service Services}.
 	 */
 	StartResult startServices(SecretKey dbKey);
 
@@ -81,7 +79,8 @@ public interface LifecycleManager {
 
 	/**
 	 * Waits for the {@link DatabaseComponent} to be opened and all registered
-	 * {@link Service Services} to start before returning.
+	 * {@link Client Clients} and {@link Service Services} to start before
+	 * returning.
 	 */
 	void waitForStartup() throws InterruptedException;
 
@@ -97,13 +96,4 @@ public interface LifecycleManager {
 	 */
 	LifecycleState getLifecycleState();
 
-	interface OpenDatabaseHook {
-		/**
-		 * Called when the database is being opened, before
-		 * {@link #waitForDatabase()} returns.
-		 *
-		 * @param txn A read-write transaction
-		 */
-		void onDatabaseOpened(Transaction txn) throws DbException;
-	}
 }

bramble-api/src/main/java/org/briarproject/bramble/api/nullsafety/NullSafety.java

@@ -1,15 +0,0 @@
-package org.briarproject.bramble.api.nullsafety;
-
-import javax.annotation.Nullable;
-
-@NotNullByDefault
-public class NullSafety {
-
-	/**
-	 * Stand-in for `Objects.requireNonNull()`.
-	 */
-	public static <T> T requireNonNull(@Nullable T t) {
-		if (t == null) throw new NullPointerException();
-		return t;
-	}
-}

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

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

bramble-api/src/main/java/org/briarproject/bramble/api/settings/SettingsManager.java

@@ -1,7 +1,6 @@
 package org.briarproject.bramble.api.settings;
 
 import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 @NotNullByDefault
@@ -12,11 +11,6 @@ public interface SettingsManager {
 	 */
 	Settings getSettings(String namespace) throws DbException;
 
-	/**
-	 * Returns all settings in the given namespace.
-	 */
-	Settings getSettings(Transaction txn, String namespace) throws DbException;
-
 	/**
 	 * Merges the given settings with any existing settings in the given
 	 * namespace.

bramble-api/src/main/java/org/briarproject/bramble/api/settings/event/SettingsUpdatedEvent.java

@@ -2,7 +2,6 @@ package org.briarproject.bramble.api.settings.event;
 
 import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.api.settings.Settings;
 
 import javax.annotation.concurrent.Immutable;
 
@@ -14,18 +13,12 @@ import javax.annotation.concurrent.Immutable;
 public class SettingsUpdatedEvent extends Event {
 
 	private final String namespace;
-	private final Settings settings;
 
-	public SettingsUpdatedEvent(String namespace, Settings settings) {
+	public SettingsUpdatedEvent(String namespace) {
 		this.namespace = namespace;
-		this.settings = settings;
 	}
 
 	public String getNamespace() {
 		return namespace;
 	}
-
-	public Settings getSettings() {
-		return settings;
-	}
 }

bramble-api/src/main/java/org/briarproject/bramble/api/sync/Client.java

@@ -0,0 +1,14 @@
+package org.briarproject.bramble.api.sync;
+
+import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.db.Transaction;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+@NotNullByDefault
+public interface Client {
+
+	/**
+	 * Called at startup to create any local state needed by the client.
+	 */
+	void createLocalState(Transaction txn) throws DbException;
+}