Bump version numbers for 1.0.2 release.

Update translations
Merge branch '1225-improve-setup-ux' into 'master'
2026-02-12 10:49:06 +01:00 · 2018-05-09 16:59:09 +01:00 · 2018-05-09 09:56:15 -03:00 · 2018-05-09 10:41:17 +00:00 · 2018-05-09 10:50:23 +01:00 · 2018-05-08 12:56:25 +00:00
1991 changed files with 103814 additions and 60403 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -9,15 +9,19 @@ Thumbs.db
 .DS_Store
 # Eclipse project files
-#.classpath
+.classpath
-#.project
+.project
 .settings
 # Local configuration file (sdk path, etc)
 local.properties
 # Android Studio
 .idea/*
 !.idea/runConfigurations/
 !.idea/codeStyleSettings.xml
 !.idea/codeStyles
 .gradle
 build/
 *.iml
 projectFilesBackup/
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -0,0 +1,27 @@
 image: registry.gitlab.com/fdroid/ci-images-base:latest
 cache:
  paths:
    - .gradle/wrapper
    - .gradle/caches
 before_script:
  - set -e
  - export GRADLE_USER_HOME=$PWD/.gradle
  # Download OpenJDK 6 so we can compile against its standard library
  - JDK_FILE=openjdk-6-jre-headless_6b38-1.13.10-1~deb7u1_amd64.deb
  - if [ ! -d openjdk ]
  - then
  - wget -q http://ftp.uk.debian.org/debian/pool/main/o/openjdk-6/$JDK_FILE
  - dpkg-deb -x $JDK_FILE openjdk
  - fi
  - export JAVA_6_HOME=$PWD/openjdk/usr/lib/jvm/java-6-openjdk-amd64
 test:
  script:
    - ./gradlew test
 after_script:
    # this file changes every time but should not be cached
    - rm -f $GRADLE_USER_HOME/caches/modules-2/modules-2.lock
    - rm -fr $GRADLE_USER_HOME/caches/*/plugin-resolution/
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -31,6 +31,8 @@
          </value>
        </option>
        <option name="RIGHT_MARGIN" value="100" />
        <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
        <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
        <AndroidXmlCodeStyleSettings>
          <option name="USE_CUSTOM_SETTINGS" value="true" />
        </AndroidXmlCodeStyleSettings>
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,261 @@
 <component name="ProjectCodeStyleConfiguration">
  <code_scheme name="Project" version="173">
    <option name="RIGHT_MARGIN" value="100" />
    <AndroidXmlCodeStyleSettings>
      <option name="USE_CUSTOM_SETTINGS" value="true" />
    </AndroidXmlCodeStyleSettings>
    <JavaCodeStyleSettings>
      <option name="ANNOTATION_PARAMETER_WRAP" value="1" />
      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
      <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
        <value />
      </option>
      <option name="IMPORT_LAYOUT_TABLE">
        <value>
          <package name="android" withSubpackages="true" static="false" />
          <emptyLine />
          <package name="com" withSubpackages="true" static="false" />
          <emptyLine />
          <package name="junit" withSubpackages="true" static="false" />
          <emptyLine />
          <package name="net" withSubpackages="true" static="false" />
          <emptyLine />
          <package name="org" withSubpackages="true" static="false" />
          <emptyLine />
          <package name="java" withSubpackages="true" static="false" />
          <emptyLine />
          <package name="javax" withSubpackages="true" static="false" />
          <emptyLine />
          <package name="" withSubpackages="true" static="false" />
          <emptyLine />
          <package name="" withSubpackages="true" static="true" />
          <emptyLine />
        </value>
      </option>
      <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
      <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
    </JavaCodeStyleSettings>
    <Objective-C-extensions>
      <file>
        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
      </file>
      <class>
        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
      </class>
      <extensions>
        <pair source="cpp" header="h" fileNamingConvention="NONE" />
        <pair source="c" header="h" fileNamingConvention="NONE" />
      </extensions>
    </Objective-C-extensions>
    <XML>
      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
    </XML>
    <codeStyleSettings language="Groovy">
      <indentOptions>
        <option name="USE_TAB_CHARACTER" value="true" />
        <option name="SMART_TABS" value="true" />
      </indentOptions>
    </codeStyleSettings>
    <codeStyleSettings language="JAVA">
      <option name="RIGHT_MARGIN" value="80" />
      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
      <option name="ALIGN_MULTILINE_RESOURCES" value="false" />
      <option name="ALIGN_MULTILINE_FOR" value="false" />
      <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
      <option name="CALL_PARAMETERS_WRAP" value="1" />
      <option name="METHOD_PARAMETERS_WRAP" value="1" />
      <option name="RESOURCE_LIST_WRAP" value="1" />
      <option name="EXTENDS_LIST_WRAP" value="1" />
      <option name="THROWS_LIST_WRAP" value="1" />
      <option name="EXTENDS_KEYWORD_WRAP" value="1" />
      <option name="THROWS_KEYWORD_WRAP" value="1" />
      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
      <option name="BINARY_OPERATION_WRAP" value="1" />
      <option name="TERNARY_OPERATION_WRAP" value="1" />
      <option name="FOR_STATEMENT_WRAP" value="1" />
      <option name="ARRAY_INITIALIZER_WRAP" value="1" />
      <option name="ASSIGNMENT_WRAP" value="1" />
      <option name="ASSERT_STATEMENT_WRAP" value="1" />
      <option name="PARAMETER_ANNOTATION_WRAP" value="1" />
      <option name="VARIABLE_ANNOTATION_WRAP" value="1" />
      <option name="ENUM_CONSTANTS_WRAP" value="1" />
      <indentOptions>
        <option name="USE_TAB_CHARACTER" value="true" />
        <option name="SMART_TABS" value="true" />
      </indentOptions>
    </codeStyleSettings>
    <codeStyleSettings language="XML">
      <option name="FORCE_REARRANGE_MODE" value="1" />
      <indentOptions>
        <option name="CONTINUATION_INDENT_SIZE" value="4" />
        <option name="USE_TAB_CHARACTER" value="true" />
        <option name="SMART_TABS" value="true" />
      </indentOptions>
      <arrangement>
        <rules>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>xmlns:android</NAME>
                  <XML_NAMESPACE>Namespace:</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>xmlns:.*</NAME>
                  <XML_NAMESPACE>Namespace:</XML_NAMESPACE>
                </AND>
              </match>
              <order>BY_NAME</order>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*:id</NAME>
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*:name</NAME>
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>name</NAME>
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>style</NAME>
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*</NAME>
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
              <order>BY_NAME</order>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*:layout_width</NAME>
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*:layout_height</NAME>
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*:layout_.*</NAME>
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
              <order>BY_NAME</order>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*:width</NAME>
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
              <order>BY_NAME</order>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*:height</NAME>
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
              <order>BY_NAME</order>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*</NAME>
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
              <order>BY_NAME</order>
            </rule>
          </section>
          <section>
            <rule>
              <match>
                <AND>
                  <NAME>.*</NAME>
                  <XML_NAMESPACE>.*</XML_NAMESPACE>
                </AND>
              </match>
              <order>BY_NAME</order>
            </rule>
          </section>
        </rules>
      </arrangement>
    </codeStyleSettings>
  </code_scheme>
 </component>
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
  <state>
    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
  </state>
 </component>
--- a/.idea/runConfigurations/All_tests.xml
+++ b/.idea/runConfigurations/All_tests.xml
@@ -0,0 +1,28 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="All tests" type="AndroidJUnit" factoryName="Android JUnit">
    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
    <module name="briar-android" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
    <option name="ALTERNATIVE_JRE_PATH" />
    <option name="PACKAGE_NAME" value="" />
    <option name="MAIN_CLASS_NAME" value="" />
    <option name="METHOD_NAME" value="" />
    <option name="TEST_OBJECT" value="package" />
    <option name="VM_PARAMETERS" value="-ea" />
    <option name="PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="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>
      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-api" run_configuration_type="AndroidJUnit" />
      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-core" run_configuration_type="AndroidJUnit" />
      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in bramble-j2se" run_configuration_type="AndroidJUnit" />
      <option name="RunConfigurationTask" enabled="true" run_configuration_name="All tests in briar-core" run_configuration_type="AndroidJUnit" />
    </method>
  </configuration>
 </component>
--- a/.idea/runConfigurations/All_tests_in_bramble_api.xml
+++ b/.idea/runConfigurations/All_tests_in_bramble_api.xml
@@ -0,0 +1,23 @@
 <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" />
    <option name="PACKAGE_NAME" value="" />
    <option name="MAIN_CLASS_NAME" value="" />
    <option name="METHOD_NAME" value="" />
    <option name="TEST_OBJECT" value="package" />
    <option name="VM_PARAMETERS" value="-ea" />
    <option name="PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-api" />
    <option name="ENV_VARIABLES" />
    <option name="PASS_PARENT_ENVS" value="true" />
    <option name="TEST_SEARCH_SCOPE">
      <value defaultName="singleModule" />
    </option>
    <envs />
    <patterns />
    <method />
  </configuration>
 </component>
--- a/.idea/runConfigurations/All_tests_in_bramble_core.xml
+++ b/.idea/runConfigurations/All_tests_in_bramble_core.xml
@@ -0,0 +1,23 @@
 <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" />
    <option name="PACKAGE_NAME" value="" />
    <option name="MAIN_CLASS_NAME" value="" />
    <option name="METHOD_NAME" value="" />
    <option name="TEST_OBJECT" value="package" />
    <option name="VM_PARAMETERS" value="-ea" />
    <option name="PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-core" />
    <option name="ENV_VARIABLES" />
    <option name="PASS_PARENT_ENVS" value="true" />
    <option name="TEST_SEARCH_SCOPE">
      <value defaultName="singleModule" />
    </option>
    <envs />
    <patterns />
    <method />
  </configuration>
 </component>
--- a/.idea/runConfigurations/All_tests_in_bramble_j2se.xml
+++ b/.idea/runConfigurations/All_tests_in_bramble_j2se.xml
@@ -0,0 +1,23 @@
 <component name="ProjectRunConfigurationManager">
  <configuration default="false" name="All tests in bramble-j2se" type="AndroidJUnit" factoryName="Android JUnit">
    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
    <module name="bramble-j2se" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
    <option name="ALTERNATIVE_JRE_PATH" />
    <option name="PACKAGE_NAME" value="" />
    <option name="MAIN_CLASS_NAME" value="" />
    <option name="METHOD_NAME" value="" />
    <option name="TEST_OBJECT" value="package" />
    <option name="VM_PARAMETERS" value="-ea -Djava.library.path=libs" />
    <option name="PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bramble-j2se" />
    <option name="ENV_VARIABLES" />
    <option name="PASS_PARENT_ENVS" value="true" />
    <option name="TEST_SEARCH_SCOPE">
      <value defaultName="singleModule" />
    </option>
    <envs />
    <patterns />
    <method />
  </configuration>
 </component>
--- a/.idea/runConfigurations/All_tests_in_briar_android.xml
+++ b/.idea/runConfigurations/All_tests_in_briar_android.xml
@@ -0,0 +1,23 @@
 <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" />
    <option name="PACKAGE_NAME" value="" />
    <option name="MAIN_CLASS_NAME" value="" />
    <option name="METHOD_NAME" value="" />
    <option name="TEST_OBJECT" value="package" />
    <option name="VM_PARAMETERS" value="-ea" />
    <option name="PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/briar-android" />
    <option name="ENV_VARIABLES" />
    <option name="PASS_PARENT_ENVS" value="true" />
    <option name="TEST_SEARCH_SCOPE">
      <value defaultName="singleModule" />
    </option>
    <envs />
    <patterns />
    <method />
  </configuration>
 </component>
--- a/.idea/runConfigurations/All_tests_in_briar_core.xml
+++ b/.idea/runConfigurations/All_tests_in_briar_core.xml
@@ -0,0 +1,23 @@
 <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" />
    <option name="PACKAGE_NAME" value="" />
    <option name="MAIN_CLASS_NAME" value="" />
    <option name="METHOD_NAME" value="" />
    <option name="TEST_OBJECT" value="package" />
    <option name="VM_PARAMETERS" value="-ea" />
    <option name="PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/briar-core" />
    <option name="ENV_VARIABLES" />
    <option name="PASS_PARENT_ENVS" value="true" />
    <option name="TEST_SEARCH_SCOPE">
      <value defaultName="singleModule" />
    </option>
    <envs />
    <patterns />
    <method />
  </configuration>
 </component>
--- a/.idea/runConfigurations/H2_Performance_Test.xml
+++ b/.idea/runConfigurations/H2_Performance_Test.xml
@@ -0,0 +1,23 @@
 <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" />
    <option name="PACKAGE_NAME" value="org.briarproject.bramble.db" />
    <option name="MAIN_CLASS_NAME" value="org.briarproject.bramble.db.H2DatabasePerformanceTest" />
    <option name="METHOD_NAME" value="" />
    <option name="TEST_OBJECT" value="class" />
    <option name="VM_PARAMETERS" value="-ea" />
    <option name="PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="" />
    <option name="ENV_VARIABLES" />
    <option name="PASS_PARENT_ENVS" value="true" />
    <option name="TEST_SEARCH_SCOPE">
      <value defaultName="singleModule" />
    </option>
    <envs />
    <patterns />
    <method />
  </configuration>
 </component>
--- a/.idea/runConfigurations/HyperSQL_Performance_Test.xml
+++ b/.idea/runConfigurations/HyperSQL_Performance_Test.xml
@@ -0,0 +1,23 @@
 <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" />
    <option name="PACKAGE_NAME" value="org.briarproject.bramble.db" />
    <option name="MAIN_CLASS_NAME" value="org.briarproject.bramble.db.HyperSqlDatabasePerformanceTest" />
    <option name="METHOD_NAME" value="" />
    <option name="TEST_OBJECT" value="class" />
    <option name="VM_PARAMETERS" value="-ea" />
    <option name="PARAMETERS" value="" />
    <option name="WORKING_DIRECTORY" value="" />
    <option name="ENV_VARIABLES" />
    <option name="PASS_PARENT_ENVS" value="true" />
    <option name="TEST_SEARCH_SCOPE">
      <value defaultName="singleModule" />
    </option>
    <envs />
    <patterns />
    <method />
  </configuration>
 </component>
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -13,23 +13,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -------------------------------------------------------------------------
    All files under the directories briar-android/src, briar-api/src,
    briar-core/src, briar-desktop/src and briar-test/src are licensed
    under the Apache License, version 2.0 (the "License"); you may not
    use these files except in compliance with the License.
    You may obtain a copy of the License at
    http://www.apache.org/licenses/LICENSE-2.0
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
    implied. See the License for the specific language governing
    permissions and limitations under the License.
 -------------------------------------------------------------------------
                    GNU GENERAL PUBLIC LICENSE
--- a/briar-android-tests/.gitignore
+++ b/briar-android-tests/.gitignore
@@ -1,5 +1,5 @@
 bin
 gen
 build
 local.properties
 .settings
 src/main/res/raw/*.zip
--- a/bramble-android/build.gradle
+++ b/bramble-android/build.gradle
@@ -0,0 +1,192 @@
 import de.undercouch.gradle.tasks.download.Download
 import de.undercouch.gradle.tasks.download.Verify
 import java.security.NoSuchAlgorithmException
 apply plugin: 'com.android.library'
 apply plugin: 'witness'
 apply plugin: 'de.undercouch.download'
 android {
 	compileSdkVersion 27
 	buildToolsVersion '27.0.3'
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 26
 		versionCode 10002
 		versionName "1.0.2"
 		consumerProguardFiles 'proguard-rules.txt'
 	}
 	compileOptions {
 		sourceCompatibility JavaVersion.VERSION_1_8
 		targetCompatibility JavaVersion.VERSION_1_8
 	}
 }
 dependencies {
 	implementation project(path: ':bramble-core', configuration: 'default')
 	implementation fileTree(dir: 'libs', include: '*.jar')
 	annotationProcessor 'com.google.dagger:dagger-compiler:2.0.2'
 	compileOnly 'javax.annotation:jsr250-api:1.0'
 }
 dependencyVerification {
 	verify = [
 			'com.android.tools.analytics-library:protos:26.1.2:protos-26.1.2.jar:52672a0b42b572a06aecc3535d5068eb46c0e15d129b9f1085d3c16a1da5cdbb',
 			'com.android.tools.analytics-library:shared:26.1.2:shared-26.1.2.jar:5c7e0eda18c6f87feeb83628c707e8aaa3298b41fb72e38efe31ad1675f9e8e9',
 			'com.android.tools.analytics-library:tracker:26.1.2:tracker-26.1.2.jar:06f97aa0adf44ffb06f8681c6a79d9be153a08f61d21eddc42b8d3db96df4282',
 			'com.android.tools.build:apksig:3.1.2:apksig-3.1.2.jar:40696a4559124d1d57873d208857eee059d48859239d569c7d18374ac644a8be',
 			'com.android.tools.build:builder-model:3.1.2:builder-model-3.1.2.jar:d49bfa2a135c9562b6ca7aa4342036cfa1582c7074c2d1d93d1dae8b3a134e17',
 			'com.android.tools.build:builder-test-api:3.1.2:builder-test-api-3.1.2.jar:dfe2a50b740d41b11189101062434d4283d18647e89a492ad51710c719363e9f',
 			'com.android.tools.build:builder:3.1.2:builder-3.1.2.jar:b60f825a42e2efe8433619fbc759f3d9effecab718279048d36881188ceb1d14',
 			'com.android.tools.build:gradle-api:3.1.2:gradle-api-3.1.2.jar:e58bcc5b893e4583ab0f5c8ef89c4dbcce202b405a9d7fcc116d21e5357d4893',
 			'com.android.tools.build:manifest-merger:26.1.2:manifest-merger-26.1.2.jar:9c61c27ea5266573107b954acf1216d398f4d7e7ae6fad6409d6b2b767eb091c',
 			'com.android.tools.ddms:ddmlib:26.1.2:ddmlib-26.1.2.jar:18a2a5fbef36882f07d03c2b9e59eba05cf8248177bf5cbff736e4b582804c44',
 			'com.android.tools.external.com-intellij:intellij-core:26.1.2:intellij-core-26.1.2.jar:37c5acf279f1ae3e85b1a5be3c9f15f43bde7b08f978eefefffb9c4035760c52',
 			'com.android.tools.external.com-intellij:kotlin-compiler:26.1.2:kotlin-compiler-26.1.2.jar:152df0bee7580326c77316b669a9d96e3b09efb1d45f545dce4147271b0b8944',
 			'com.android.tools.external.org-jetbrains:uast:26.1.2:uast-26.1.2.jar:02d39582206d3f5fc0a6cb18bfd9e8b9f9c1acb805ec6dac08b4e3a56849d279',
 			'com.android.tools.layoutlib:layoutlib-api:26.1.2:layoutlib-api-26.1.2.jar:20220039fcc7d799f928153beff862e704457c0f55ab44258f3745ebeb662b4f',
 			'com.android.tools.lint:lint-api:26.1.2:lint-api-26.1.2.jar:e1d5b62b870a7c566e9877a6b96b27784a4d713f8caa07fdcb4705d47a40a1d9',
 			'com.android.tools.lint:lint-checks:26.1.2:lint-checks-26.1.2.jar:211e2afd58504372385d71b1e5be982c2b5121ab6fee1c04ddabeb75a8729e07',
 			'com.android.tools.lint:lint-gradle-api:26.1.2:lint-gradle-api-26.1.2.jar:71284f2a8b03c3e55c94511c9eb36f8184fbb85324325fc6b78abf5183f03d90',
 			'com.android.tools.lint:lint-gradle:26.1.2:lint-gradle-26.1.2.jar:855f0c82b7fc690df1b7319c0774f7517f7f8f5dd4eee1f6077dcf50e07c6240',
 			'com.android.tools.lint:lint-kotlin:26.1.2:lint-kotlin-26.1.2.jar:1e591f70bcbbc11569720a9bbcca2bc1f3d4f789f01f40f642848d920643d484',
 			'com.android.tools.lint:lint:26.1.2:lint-26.1.2.jar:93736c62e9f1976998c2b4aa716aea0734cdb162d05502f4af7292654aedb182',
 			'com.android.tools:annotations:26.1.2:annotations-26.1.2.jar:72773dcaf5c4ccca828e3c8467f1b78a8a00b3cc5f8ad1aab88fcf9379928018',
 			'com.android.tools:common:26.1.2:common-26.1.2.jar:ea4320f0c17dcbc4491896bb705c4d25ec08bd62ef02ab0579fe154e75e788e6',
 			'com.android.tools:dvlib:26.1.2:dvlib-26.1.2.jar:1187aa4fb666595c96c4deb6bc0e0f4b7e396bde9f6243330b49a232946130ea',
 			'com.android.tools:repository:26.1.2:repository-26.1.2.jar:8b86e512ad6d32bd76989451eefe2b271f5efce6d4d65ecb173afaf14606e01a',
 			'com.android.tools:sdk-common:26.1.2:sdk-common-26.1.2.jar:23584720a60a21cdcb5b1ec10269e3013789d6805d153cc696c39ec7ce251896',
 			'com.android.tools:sdklib:26.1.2:sdklib-26.1.2.jar:d3870fafc59ab8efa70d3f9649f40ee299c8ec5b58377b06e8853d7272a5bf4e',
 			'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',
 			'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.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.bouncycastle:bcpkix-jdk15on:1.56:bcpkix-jdk15on-1.56.jar:7043dee4e9e7175e93e0b36f45b1ec1ecb893c5f755667e8b916eb8dd201c6ca',
 			'org.bouncycastle:bcprov-jdk15on:1.56:bcprov-jdk15on-1.56.jar:963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349',
 			'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.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.jvnet.staxex:stax-ex:1.7.7:stax-ex-1.7.7.jar:a31ff7d77163c0deb09e7fee59ad35ae44c2cee2cc8552a116ccd1583d813fb4',
 			'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.1:asm-5.1.jar:d2da399a9967c69f0a21739256fa79d284222c223082cacadc17372244764b54',
 	]
 }
 ext.torBinaryDir = 'src/main/res/raw'
 ext.torVersion = '0.2.9.14'
 ext.geoipVersion = '2017-11-06'
 ext.torDownloadUrl = 'https://briarproject.org/build/'
 def torBinaries = [
 		"tor_arm"    : '1710ea6c47b7f4c1a88bdf4858c7893837635db10e8866854eed8d61629f50e8',
 		"tor_arm_pie": '974e6949507db8fa2ea45231817c2c3677ed4ccf5488a2252317d744b0be1917',
 		"tor_x86"    : '3a5e45b3f051fcda9353b098b7086e762ffe7ba9242f7d7c8bf6523faaa8b1e9',
 		"tor_x86_pie": 'd1d96d8ce1a4b68accf04850185780d10cd5563d3552f7e1f040f8ca32cb4e51',
 		"geoip"      : '8239b98374493529a29096e45fc5877d4d6fdad0146ad8380b291f90d61484ea'
 ]
 def verifyOrDeleteBinary(name, chksum, alreadyVerified) {
 	return tasks.create("verifyOrDeleteBinary${name}", VerifyOrDelete) {
 		src "${torBinaryDir}/${name}.zip"
 		algorithm 'SHA-256'
 		checksum chksum
 		result alreadyVerified
 		onlyIf {
 			src.exists()
 		}
 	}
 }
 def downloadBinary(name, chksum, alreadyVerified) {
 	return tasks.create([
 			name: "downloadBinary${name}",
 			type: Download,
 			dependsOn: verifyOrDeleteBinary(name, chksum, alreadyVerified)]) {
 		src "${torDownloadUrl}${name}.zip"
 				.replace('tor_', "tor-${torVersion}-")
 				.replace('geoip', "geoip-${geoipVersion}")
 				.replaceAll('_', '-')
 		dest "${torBinaryDir}/${name}.zip"
 		onlyIf {
 			!dest.exists()
 		}
 	}
 }
 def verifyBinary(name, chksum) {
 	boolean[] alreadyVerified = [false]
 	return tasks.create([
 			name     : "verifyBinary${name}",
 			type     : Verify,
 			dependsOn: downloadBinary(name, chksum, alreadyVerified)]) {
 		src "${torBinaryDir}/${name}.zip"
 		algorithm 'SHA-256'
 		checksum chksum
 		onlyIf {
 			!alreadyVerified[0]
 		}
 	}
 }
 project.afterEvaluate {
 	torBinaries.every { name, checksum ->
 		preBuild.dependsOn.add(verifyBinary(name, checksum))
 	}
 }
 class VerifyOrDelete extends Verify {
 	boolean[] result
 	@TaskAction
 	@Override
 	void verify() throws IOException, NoSuchAlgorithmException {
 		try {
 			super.verify()
 			result[0] = true
 		} catch (Exception e) {
 			println "${src} failed verification - deleting"
 			src.delete()
 		}
 	}
 }
--- a/bramble-android/libs/jtorctl-briar.jar
+++ b/bramble-android/libs/jtorctl-briar.jar
--- a/bramble-android/proguard-rules.txt
+++ b/bramble-android/proguard-rules.txt
@@ -0,0 +1,19 @@
 -keep,includedescriptorclasses class org.briarproject.** { *; }
 -keep class org.h2.** { *; }
 -dontwarn org.h2.**
 -dontnote org.h2.**
 -keep class dagger.** { *; }
 -dontwarn dagger.**
 -dontnote dagger.**
 -keep class net.i2p.crypto.eddsa.** { *; }
 -keep class org.whispersystems.curve25519.** { *; }
 -dontwarn sun.misc.Unsafe
 -dontnote com.google.common.**
 # UPnP library isn't used
 -dontwarn org.bitlet.weupnp.**
--- a/bramble-android/src/main/AndroidManifest.xml
+++ b/bramble-android/src/main/AndroidManifest.xml
@@ -0,0 +1,22 @@
 <manifest
 	package="org.briarproject.bramble"
 	xmlns:android="http://schemas.android.com/apk/res/android">
 	<uses-feature android:name="android.hardware.bluetooth"/>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
 	<uses-permission android:name="android.permission.BLUETOOTH"/>
 	<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<uses-permission android:name="android.permission.READ_LOGS"/>
 	<uses-permission android:name="android.permission.WAKE_LOCK"/>
 	<application
 		android:allowBackup="false"
 		android:label="@string/app_name"
 		android:supportsRtl="true">
 	</application>
 </manifest>
--- a/bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidModule.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidModule.java
@@ -0,0 +1,13 @@
 package org.briarproject.bramble;
 import org.briarproject.bramble.plugin.AndroidPluginModule;
 import org.briarproject.bramble.system.AndroidSystemModule;
 import dagger.Module;
@Module(includes = {
 		AndroidPluginModule.class,
 		AndroidSystemModule.class
 })
 public class BrambleAndroidModule {
 }
--- a/bramble-android/src/main/java/org/briarproject/bramble/api/system/AndroidExecutor.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/api/system/AndroidExecutor.java
@@ -1,4 +1,4 @@
-package org.briarproject.android.api;
+package org.briarproject.bramble.api.system;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/AndroidPluginModule.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/AndroidPluginModule.java
@@ -0,0 +1,69 @@
 package org.briarproject.bramble.plugin;
 import android.app.Application;
 import android.content.Context;
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.lifecycle.IoExecutor;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.BackoffFactory;
 import org.briarproject.bramble.api.plugin.PluginConfig;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
 import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory;
 import org.briarproject.bramble.api.reporting.DevReporter;
 import org.briarproject.bramble.api.system.AndroidExecutor;
 import org.briarproject.bramble.api.system.LocationUtils;
 import org.briarproject.bramble.api.system.Scheduler;
 import org.briarproject.bramble.plugin.bluetooth.AndroidBluetoothPluginFactory;
 import org.briarproject.bramble.plugin.tcp.AndroidLanTcpPluginFactory;
 import org.briarproject.bramble.plugin.tor.TorPluginFactory;
 import java.security.SecureRandom;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledExecutorService;
 import javax.net.SocketFactory;
 import dagger.Module;
 import dagger.Provides;
@Module
 public class AndroidPluginModule {
 	@Provides
 	PluginConfig providePluginConfig(@IoExecutor Executor ioExecutor,
 			@Scheduler ScheduledExecutorService scheduler,
 			AndroidExecutor androidExecutor, SecureRandom random,
 			SocketFactory torSocketFactory, BackoffFactory backoffFactory,
 			Application app, LocationUtils locationUtils, DevReporter reporter,
 			EventBus eventBus) {
 		Context appContext = app.getApplicationContext();
 		DuplexPluginFactory bluetooth =
 				new AndroidBluetoothPluginFactory(ioExecutor, androidExecutor,
 						appContext, random, eventBus, backoffFactory);
 		DuplexPluginFactory tor = new TorPluginFactory(ioExecutor, scheduler,
 				appContext, locationUtils, reporter, eventBus,
 				torSocketFactory, backoffFactory);
 		DuplexPluginFactory lan = new AndroidLanTcpPluginFactory(ioExecutor,
 				scheduler, backoffFactory, appContext);
 		Collection<DuplexPluginFactory> duplex =
 				Arrays.asList(bluetooth, tor, lan);
 		@NotNullByDefault
 		PluginConfig pluginConfig = new PluginConfig() {
 			@Override
 			public Collection<DuplexPluginFactory> getDuplexFactories() {
 				return duplex;
 			}
 			@Override
 			public Collection<SimplexPluginFactory> getSimplexFactories() {
 				return Collections.emptyList();
 			}
 		};
 		return pluginConfig;
 	}
 }
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPlugin.java
@@ -0,0 +1,209 @@
 package org.briarproject.bramble.plugin.bluetooth;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothServerSocket;
 import android.bluetooth.BluetoothSocket;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.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.util.AndroidUtils;
 import java.io.Closeable;
 import java.io.IOException;
 import java.security.SecureRandom;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
 import java.util.logging.Logger;
 import javax.annotation.Nullable;
 import static android.bluetooth.BluetoothAdapter.ACTION_SCAN_MODE_CHANGED;
 import static android.bluetooth.BluetoothAdapter.ACTION_STATE_CHANGED;
 import static android.bluetooth.BluetoothAdapter.EXTRA_SCAN_MODE;
 import static android.bluetooth.BluetoothAdapter.EXTRA_STATE;
 import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE;
 import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE;
 import static android.bluetooth.BluetoothAdapter.SCAN_MODE_NONE;
 import static android.bluetooth.BluetoothAdapter.STATE_OFF;
 import static android.bluetooth.BluetoothAdapter.STATE_ON;
 import static java.util.logging.Level.WARNING;
@MethodsNotNullByDefault
@ParametersNotNullByDefault
 class AndroidBluetoothPlugin extends BluetoothPlugin<BluetoothServerSocket> {
 	private static final Logger LOG =
 			Logger.getLogger(AndroidBluetoothPlugin.class.getName());
 	private final AndroidExecutor androidExecutor;
 	private final Context appContext;
 	private volatile boolean wasEnabledByUs = false;
 	private volatile BluetoothStateReceiver receiver = null;
 	// Non-null if the plugin started successfully
 	private volatile BluetoothAdapter adapter = null;
 	AndroidBluetoothPlugin(BluetoothConnectionLimiter connectionLimiter,
 			Executor ioExecutor, AndroidExecutor androidExecutor,
 			Context appContext, SecureRandom secureRandom, Backoff backoff,
 			DuplexPluginCallback callback, int maxLatency) {
 		super(connectionLimiter, ioExecutor, secureRandom, backoff, callback,
 				maxLatency);
 		this.androidExecutor = androidExecutor;
 		this.appContext = appContext;
 	}
 	@Override
 	public void start() throws PluginException {
 		super.start();
 		// Listen for changes to the Bluetooth state
 		IntentFilter filter = new IntentFilter();
 		filter.addAction(ACTION_STATE_CHANGED);
 		filter.addAction(ACTION_SCAN_MODE_CHANGED);
 		receiver = new BluetoothStateReceiver();
 		appContext.registerReceiver(receiver, filter);
 	}
 	@Override
 	public void stop() {
 		super.stop();
 		if (receiver != null) appContext.unregisterReceiver(receiver);
 	}
 	@Override
 	void initialiseAdapter() throws IOException {
 		// BluetoothAdapter.getDefaultAdapter() must be called on a thread
 		// with a message queue, so submit it to the AndroidExecutor
 		try {
 			adapter = androidExecutor.runOnBackgroundThread(
 					BluetoothAdapter::getDefaultAdapter).get();
 		} catch (InterruptedException | ExecutionException e) {
 			throw new IOException(e);
 		}
 		if (adapter == null)
 			throw new IOException("Bluetooth is not supported");
 	}
 	@Override
 	boolean isAdapterEnabled() {
 		return adapter != null && adapter.isEnabled();
 	}
 	@Override
 	void enableAdapter() {
 		if (adapter != null && !adapter.isEnabled()) {
 			if (adapter.enable()) {
 				LOG.info("Enabling Bluetooth");
 				wasEnabledByUs = true;
 			} else {
 				LOG.info("Could not enable Bluetooth");
 			}
 		}
 	}
 	@Override
 	void disableAdapterIfEnabledByUs() {
 		if (isAdapterEnabled() && wasEnabledByUs) {
 			if (adapter.disable()) LOG.info("Disabling Bluetooth");
 			else LOG.info("Could not disable Bluetooth");
 			wasEnabledByUs = false;
 		}
 	}
 	@Override
 	void setEnabledByUs() {
 		wasEnabledByUs = true;
 	}
 	@Override
 	@Nullable
 	String getBluetoothAddress() {
 		String address = AndroidUtils.getBluetoothAddress(appContext, adapter);
 		return address.isEmpty() ? null : address;
 	}
 	@Override
 	BluetoothServerSocket openServerSocket(String uuid) throws IOException {
 		return adapter.listenUsingInsecureRfcommWithServiceRecord(
 				"RFCOMM", UUID.fromString(uuid));
 	}
 	@Override
 	void tryToClose(@Nullable BluetoothServerSocket ss) {
 		try {
 			if (ss != null) ss.close();
 		} catch (IOException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 		}
 	}
 	@Override
 	DuplexTransportConnection acceptConnection(BluetoothServerSocket ss)
 			throws IOException {
 		return wrapSocket(ss.accept());
 	}
 	private DuplexTransportConnection wrapSocket(BluetoothSocket s) {
 		return new AndroidBluetoothTransportConnection(this,
 				connectionLimiter, s);
 	}
 	@Override
 	boolean isValidAddress(String address) {
 		return BluetoothAdapter.checkBluetoothAddress(address);
 	}
 	@Override
 	DuplexTransportConnection connectTo(String address, String uuid)
 			throws IOException {
 		BluetoothDevice d = adapter.getRemoteDevice(address);
 		UUID u = UUID.fromString(uuid);
 		BluetoothSocket s = null;
 		try {
 			s = d.createInsecureRfcommSocketToServiceRecord(u);
 			s.connect();
 			return wrapSocket(s);
 		} catch (IOException e) {
 			tryToClose(s);
 			throw e;
 		}
 	}
 	private void tryToClose(@Nullable Closeable c) {
 		try {
 			if (c != null) c.close();
 		} catch (IOException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 		}
 	}
 	private class BluetoothStateReceiver extends BroadcastReceiver {
 		@Override
 		public void onReceive(Context ctx, Intent intent) {
 			int state = intent.getIntExtra(EXTRA_STATE, 0);
 			if (state == STATE_ON) onAdapterEnabled();
 			else if (state == STATE_OFF) onAdapterDisabled();
 			int scanMode = intent.getIntExtra(EXTRA_SCAN_MODE, 0);
 			if (scanMode == SCAN_MODE_NONE) {
 				LOG.info("Scan mode: None");
 			} else if (scanMode == SCAN_MODE_CONNECTABLE) {
 				LOG.info("Scan mode: Connectable");
 			} else if (scanMode == SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
 				LOG.info("Scan mode: Discoverable");
 			}
 		}
 	}
 }
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPluginFactory.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothPluginFactory.java
@@ -0,0 +1,72 @@
 package org.briarproject.bramble.plugin.bluetooth;
 import android.content.Context;
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.BackoffFactory;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
 import org.briarproject.bramble.api.system.AndroidExecutor;
 import java.security.SecureRandom;
 import java.util.concurrent.Executor;
 import javax.annotation.concurrent.Immutable;
 import static org.briarproject.bramble.api.plugin.BluetoothConstants.ID;
@Immutable
@NotNullByDefault
 public class AndroidBluetoothPluginFactory implements DuplexPluginFactory {
 	private static final int MAX_LATENCY = 30 * 1000; // 30 seconds
 	private static final int MIN_POLLING_INTERVAL = 60 * 1000; // 1 minute
 	private static final int MAX_POLLING_INTERVAL = 10 * 60 * 1000; // 10 mins
 	private static final double BACKOFF_BASE = 1.2;
 	private final Executor ioExecutor;
 	private final AndroidExecutor androidExecutor;
 	private final Context appContext;
 	private final SecureRandom secureRandom;
 	private final EventBus eventBus;
 	private final BackoffFactory backoffFactory;
 	public AndroidBluetoothPluginFactory(Executor ioExecutor,
 			AndroidExecutor androidExecutor, Context appContext,
 			SecureRandom secureRandom, EventBus eventBus,
 			BackoffFactory backoffFactory) {
 		this.ioExecutor = ioExecutor;
 		this.androidExecutor = androidExecutor;
 		this.appContext = appContext;
 		this.secureRandom = secureRandom;
 		this.eventBus = eventBus;
 		this.backoffFactory = backoffFactory;
 	}
 	@Override
 	public TransportId getId() {
 		return ID;
 	}
 	@Override
 	public int getMaxLatency() {
 		return MAX_LATENCY;
 	}
 	@Override
 	public DuplexPlugin createPlugin(DuplexPluginCallback callback) {
 		BluetoothConnectionLimiter connectionLimiter =
 				new BluetoothConnectionLimiterImpl();
 		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
 				MAX_POLLING_INTERVAL, BACKOFF_BASE);
 		AndroidBluetoothPlugin plugin = new AndroidBluetoothPlugin(
 				connectionLimiter, ioExecutor, androidExecutor, appContext,
 				secureRandom, backoff, callback, MAX_LATENCY);
 		eventBus.addListener(plugin);
 		return plugin;
 	}
 }
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothTransportConnection.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/bluetooth/AndroidBluetoothTransportConnection.java
@@ -0,0 +1,46 @@
 package org.briarproject.bramble.plugin.bluetooth;
 import android.bluetooth.BluetoothSocket;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.Plugin;
 import org.briarproject.bramble.api.plugin.duplex.AbstractDuplexTransportConnection;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@NotNullByDefault
 class AndroidBluetoothTransportConnection
 		extends AbstractDuplexTransportConnection {
 	private final BluetoothConnectionLimiter connectionManager;
 	private final BluetoothSocket socket;
 	AndroidBluetoothTransportConnection(Plugin plugin,
 			BluetoothConnectionLimiter connectionManager,
 			BluetoothSocket socket) {
 		super(plugin);
 		this.connectionManager = connectionManager;
 		this.socket = socket;
 	}
 	@Override
 	protected InputStream getInputStream() throws IOException {
 		return socket.getInputStream();
 	}
 	@Override
 	protected OutputStream getOutputStream() throws IOException {
 		return socket.getOutputStream();
 	}
 	@Override
 	protected void closeConnection(boolean exception) throws IOException {
 		try {
 			socket.close();
 		} finally {
 			connectionManager.connectionClosed(this);
 		}
 	}
 }
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPlugin.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPlugin.java
@@ -0,0 +1,196 @@
 package org.briarproject.bramble.plugin.tcp;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.ConnectivityManager;
 import android.net.Network;
 import android.net.NetworkInfo;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.net.UnknownHostException;
 import java.util.Collection;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.logging.Logger;
 import javax.annotation.Nullable;
 import javax.net.SocketFactory;
 import static android.content.Context.CONNECTIVITY_SERVICE;
 import static android.content.Context.WIFI_SERVICE;
 import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;
 import static android.net.ConnectivityManager.TYPE_WIFI;
 import static android.net.wifi.WifiManager.EXTRA_WIFI_STATE;
 import static android.os.Build.VERSION.SDK_INT;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 import static java.util.concurrent.TimeUnit.SECONDS;
@NotNullByDefault
 class AndroidLanTcpPlugin extends LanTcpPlugin {
 	// See android.net.wifi.WifiManager
 	private static final String WIFI_AP_STATE_CHANGED_ACTION =
 			"android.net.wifi.WIFI_AP_STATE_CHANGED";
 	private static final int WIFI_AP_STATE_ENABLED = 13;
 	private static final byte[] WIFI_AP_ADDRESS_BYTES =
 			{(byte) 192, (byte) 168, 43, 1};
 	private static final InetAddress WIFI_AP_ADDRESS;
 	private static final Logger LOG =
 			Logger.getLogger(AndroidLanTcpPlugin.class.getName());
 	static {
 		try {
 			WIFI_AP_ADDRESS = InetAddress.getByAddress(WIFI_AP_ADDRESS_BYTES);
 		} catch (UnknownHostException e) {
 			// Should only be thrown if the address has an illegal length
 			throw new AssertionError(e);
 		}
 	}
 	private final ScheduledExecutorService scheduler;
 	private final Context appContext;
 	private final ConnectivityManager connectivityManager;
 	@Nullable
 	private final WifiManager wifiManager;
 	@Nullable
 	private volatile BroadcastReceiver networkStateReceiver = null;
 	private volatile SocketFactory socketFactory;
 	AndroidLanTcpPlugin(Executor ioExecutor, ScheduledExecutorService scheduler,
 			Backoff backoff, Context appContext, DuplexPluginCallback callback,
 			int maxLatency, int maxIdleTime) {
 		super(ioExecutor, backoff, callback, maxLatency, maxIdleTime);
 		this.scheduler = scheduler;
 		this.appContext = appContext;
 		ConnectivityManager connectivityManager = (ConnectivityManager)
 				appContext.getSystemService(CONNECTIVITY_SERVICE);
 		if (connectivityManager == null) throw new AssertionError();
 		this.connectivityManager = connectivityManager;
 		wifiManager = (WifiManager) appContext.getApplicationContext()
 				.getSystemService(WIFI_SERVICE);
 		socketFactory = SocketFactory.getDefault();
 	}
 	@Override
 	public void start() {
 		if (used.getAndSet(true)) throw new IllegalStateException();
 		running = true;
 		// Register to receive network status events
 		networkStateReceiver = new NetworkStateReceiver();
 		IntentFilter filter = new IntentFilter();
 		filter.addAction(CONNECTIVITY_ACTION);
 		filter.addAction(WIFI_AP_STATE_CHANGED_ACTION);
 		appContext.registerReceiver(networkStateReceiver, filter);
 	}
 	@Override
 	public void stop() {
 		running = false;
 		if (networkStateReceiver != null)
 			appContext.unregisterReceiver(networkStateReceiver);
 		tryToClose(socket);
 	}
 	@Override
 	protected Socket createSocket() throws IOException {
 		return socketFactory.createSocket();
 	}
 	@Override
 	protected Collection<InetAddress> getLocalIpAddresses() {
 		// If the device doesn't have wifi, don't open any sockets
 		if (wifiManager == null) return emptyList();
 		// If we're connected to a wifi network, use that network
 		WifiInfo info = wifiManager.getConnectionInfo();
 		if (info != null && info.getIpAddress() != 0)
 			return singletonList(intToInetAddress(info.getIpAddress()));
 		// If we're running an access point, return its address
 		if (super.getLocalIpAddresses().contains(WIFI_AP_ADDRESS))
 				return singletonList(WIFI_AP_ADDRESS);
 		// No suitable addresses
 		return emptyList();
 	}
 	private InetAddress intToInetAddress(int ip) {
 		byte[] ipBytes = new byte[4];
 		ipBytes[0] = (byte) (ip & 0xFF);
 		ipBytes[1] = (byte) ((ip >> 8) & 0xFF);
 		ipBytes[2] = (byte) ((ip >> 16) & 0xFF);
 		ipBytes[3] = (byte) ((ip >> 24) & 0xFF);
 		try {
 			return InetAddress.getByAddress(ipBytes);
 		} catch (UnknownHostException e) {
 			// Should only be thrown if address has illegal length
 			throw new AssertionError(e);
 		}
 	}
 	// On API 21 and later, a socket that is not created with the wifi
 	// network's socket factory may try to connect via another network
 	private SocketFactory getSocketFactory() {
 		if (SDK_INT < 21) return SocketFactory.getDefault();
 		for (Network net : connectivityManager.getAllNetworks()) {
 			NetworkInfo info = connectivityManager.getNetworkInfo(net);
 			if (info != null && info.getType() == TYPE_WIFI)
 				return net.getSocketFactory();
 		}
 		LOG.warning("Could not find suitable socket factory");
 		return SocketFactory.getDefault();
 	}
 	private class NetworkStateReceiver extends BroadcastReceiver {
 		@Override
 		public void onReceive(Context ctx, Intent i) {
 			if (!running) return;
 			if (isApEnabledEvent(i)) {
 				// The state change may be broadcast before the AP address is
 				// visible, so delay handling the event
 				scheduler.schedule(this::handleConnectivityChange, 1, SECONDS);
 			} else {
 				handleConnectivityChange();
 			}
 		}
 		private void handleConnectivityChange() {
 			if (!running) return;
 			Collection<InetAddress> addrs = getLocalIpAddresses();
 			if (addrs.contains(WIFI_AP_ADDRESS)) {
 				LOG.info("Providing wifi hotspot");
 				// There's no corresponding Network object and thus no way
 				// to get a suitable socket factory, so we won't be able to
 				// make outgoing connections on API 21+ if another network
 				// has internet access
 				socketFactory = SocketFactory.getDefault();
 				if (socket == null || socket.isClosed()) bind();
 			} else if (addrs.isEmpty()) {
 				LOG.info("Not connected to wifi");
 				socketFactory = SocketFactory.getDefault();
 				tryToClose(socket);
 			} else {
 				LOG.info("Connected to wifi");
 				socketFactory = getSocketFactory();
 				if (socket == null || socket.isClosed()) bind();
 			}
 		}
 		private boolean isApEnabledEvent(Intent i) {
 			return WIFI_AP_STATE_CHANGED_ACTION.equals(i.getAction()) &&
 					i.getIntExtra(EXTRA_WIFI_STATE, 0) == WIFI_AP_STATE_ENABLED;
 		}
 	}
 }
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPluginFactory.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPluginFactory.java
@@ -1,16 +1,24 @@
-package org.briarproject.plugins.tcp;
+package org.briarproject.bramble.plugin.tcp;
 import android.content.Context;
-import org.briarproject.api.TransportId;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.api.plugins.Backoff;
+import org.briarproject.bramble.api.plugin.Backoff;
-import org.briarproject.api.plugins.BackoffFactory;
+import org.briarproject.bramble.api.plugin.BackoffFactory;
-import org.briarproject.api.plugins.duplex.DuplexPlugin;
+import org.briarproject.bramble.api.plugin.TransportId;
-import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
+import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
-import org.briarproject.api.plugins.duplex.DuplexPluginFactory;
+import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledExecutorService;
 import javax.annotation.concurrent.Immutable;
 import static org.briarproject.bramble.api.plugin.LanTcpConstants.ID;
@Immutable
@NotNullByDefault
 public class AndroidLanTcpPluginFactory implements DuplexPluginFactory {
 	private static final int MAX_LATENCY = 30 * 1000; // 30 seconds
@@ -20,19 +28,22 @@ public class AndroidLanTcpPluginFactory implements DuplexPluginFactory {
 	private static final double BACKOFF_BASE = 1.2;
 	private final Executor ioExecutor;
 	private final ScheduledExecutorService scheduler;
 	private final BackoffFactory backoffFactory;
 	private final Context appContext;
 	public AndroidLanTcpPluginFactory(Executor ioExecutor,
-			BackoffFactory backoffFactory, Context appContext) {
+			ScheduledExecutorService scheduler, BackoffFactory backoffFactory,
 			Context appContext) {
 		this.ioExecutor = ioExecutor;
 		this.scheduler = scheduler;
 		this.backoffFactory = backoffFactory;
 		this.appContext = appContext;
 	}
 	@Override
 	public TransportId getId() {
-		return LanTcpPlugin.ID;
+		return ID;
 	}
 	@Override
@@ -44,7 +55,7 @@ public class AndroidLanTcpPluginFactory implements DuplexPluginFactory {
 	public DuplexPlugin createPlugin(DuplexPluginCallback callback) {
 		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
 				MAX_POLLING_INTERVAL, BACKOFF_BASE);
-		return new AndroidLanTcpPlugin(ioExecutor, backoff, appContext,
+		return new AndroidLanTcpPlugin(ioExecutor, scheduler, backoff,
-				callback, MAX_LATENCY, MAX_IDLE_TIME);
+				appContext, callback, MAX_LATENCY, MAX_IDLE_TIME);
 	}
 }
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorNetworkMetadata.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorNetworkMetadata.java
@@ -1,18 +1,18 @@
-package org.briarproject.plugins.tor;
+package org.briarproject.bramble.plugin.tor;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
-public class TorNetworkMetadata {
+class TorNetworkMetadata {
 	// See https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
 	// and https://trac.torproject.org/projects/tor/wiki/doc/OONI/censorshipwiki
 	// TODO: get a more complete list
 	private static final Set<String> BLOCKED_IN_COUNTRIES =
-			new HashSet<String>(Arrays.asList("CN", "IR", "SY", "ZZ"));
+			new HashSet<>(Arrays.asList("CN", "IR", "SY", "ZZ"));
-	public static boolean isTorProbablyBlocked(String countryCode) {
+	static boolean isTorProbablyBlocked(String countryCode) {
 		return BLOCKED_IN_COUNTRIES.contains(countryCode);
 	}
 }
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
@@ -1,4 +1,4 @@
-package org.briarproject.plugins.tor;
+package org.briarproject.bramble.plugin.tor;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -7,6 +7,7 @@ import android.content.IntentFilter;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Resources;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.FileObserver;
@@ -15,26 +16,29 @@ import android.os.PowerManager;
 import net.freehaven.tor.control.EventHandler;
 import net.freehaven.tor.control.TorControlConnection;
-import org.briarproject.android.util.AndroidUtils;
+import org.briarproject.bramble.PoliteExecutor;
-import org.briarproject.api.TransportId;
+import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.api.contact.ContactId;
+import org.briarproject.bramble.api.data.BdfList;
-import org.briarproject.api.crypto.PseudoRandom;
+import org.briarproject.bramble.api.event.Event;
-import org.briarproject.api.event.Event;
+import org.briarproject.bramble.api.event.EventListener;
-import org.briarproject.api.event.EventListener;
+import org.briarproject.bramble.api.keyagreement.KeyAgreementListener;
-import org.briarproject.api.event.SettingsUpdatedEvent;
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.api.keyagreement.KeyAgreementListener;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
-import org.briarproject.api.keyagreement.TransportDescriptor;
+import org.briarproject.bramble.api.plugin.Backoff;
-import org.briarproject.api.plugins.Backoff;
+import org.briarproject.bramble.api.plugin.PluginException;
-import org.briarproject.api.plugins.TorConstants;
+import org.briarproject.bramble.api.plugin.TorConstants;
-import org.briarproject.api.plugins.duplex.DuplexPlugin;
+import org.briarproject.bramble.api.plugin.TransportId;
-import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
+import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
-import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
+import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
-import org.briarproject.api.properties.TransportProperties;
+import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
-import org.briarproject.api.reporting.DevReporter;
+import org.briarproject.bramble.api.properties.TransportProperties;
-import org.briarproject.api.settings.Settings;
+import org.briarproject.bramble.api.reporting.DevReporter;
-import org.briarproject.api.system.LocationUtils;
+import org.briarproject.bramble.api.settings.Settings;
-import org.briarproject.util.IoUtils;
+import org.briarproject.bramble.api.settings.event.SettingsUpdatedEvent;
-import org.briarproject.util.StringUtils;
+import org.briarproject.bramble.api.system.LocationUtils;
 import org.briarproject.bramble.util.AndroidUtils;
 import org.briarproject.bramble.util.IoUtils;
 import org.briarproject.bramble.util.StringUtils;
 import java.io.Closeable;
 import java.io.EOFException;
@@ -52,33 +56,51 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Scanner;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
 import java.util.zip.ZipInputStream;
 import javax.annotation.Nullable;
 import javax.net.SocketFactory;
 import static android.content.Context.CONNECTIVITY_SERVICE;
 import static android.content.Context.MODE_PRIVATE;
 import static android.content.Context.POWER_SERVICE;
 import static android.content.Intent.ACTION_SCREEN_OFF;
 import static android.content.Intent.ACTION_SCREEN_ON;
 import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;
 import static android.net.ConnectivityManager.TYPE_WIFI;
 import static android.os.Build.VERSION.SDK_INT;
 import static android.os.PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED;
 import static android.os.PowerManager.PARTIAL_WAKE_LOCK;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static net.freehaven.tor.control.TorControlCommands.HS_ADDRESS;
 import static net.freehaven.tor.control.TorControlCommands.HS_PRIVKEY;
-import static org.briarproject.api.plugins.TorConstants.CONTROL_PORT;
+import static org.briarproject.bramble.api.plugin.TorConstants.CONTROL_PORT;
-import static org.briarproject.util.PrivacyUtils.scrubOnion;
+import static org.briarproject.bramble.api.plugin.TorConstants.ID;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_ALWAYS;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_NEVER;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_WIFI;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_PORT;
 import static org.briarproject.bramble.api.plugin.TorConstants.PROP_ONION;
 import static org.briarproject.bramble.util.PrivacyUtils.scrubOnion;
@MethodsNotNullByDefault
@ParametersNotNullByDefault
 class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	private static final String PROP_ONION = "onion";
 	private static final String[] EVENTS = {
 			"CIRC", "ORCONN", "HS_DESC", "NOTICE", "WARN", "ERR"
 	};
@@ -88,7 +110,8 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	private static final Logger LOG =
 			Logger.getLogger(TorPlugin.class.getName());
-	private final Executor ioExecutor;
+	private final Executor ioExecutor, connectionStatusExecutor;
 	private final ScheduledExecutorService scheduler;
 	private final Context appContext;
 	private final LocationUtils locationUtils;
 	private final DevReporter reporter;
@@ -101,6 +124,8 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	private final File torDirectory, torFile, geoIpFile, configFile;
 	private final File doneFile, cookieFile;
 	private final PowerManager.WakeLock wakeLock;
 	private final AtomicReference<Future<?>> connectivityCheck =
 			new AtomicReference<>();
 	private final AtomicBoolean used = new AtomicBoolean(false);
 	private volatile boolean running = false;
@@ -109,12 +134,13 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	private volatile TorControlConnection controlConnection = null;
 	private volatile BroadcastReceiver networkStateReceiver = null;
-	TorPlugin(Executor ioExecutor, Context appContext,
+	TorPlugin(Executor ioExecutor, ScheduledExecutorService scheduler,
-			LocationUtils locationUtils, DevReporter reporter,
+			Context appContext, LocationUtils locationUtils,
-			SocketFactory torSocketFactory, Backoff backoff,
+			DevReporter reporter, SocketFactory torSocketFactory,
-			DuplexPluginCallback callback, String architecture, int maxLatency,
+			Backoff backoff, DuplexPluginCallback callback,
-			int maxIdleTime) {
+			String architecture, int maxLatency, int maxIdleTime) {
 		this.ioExecutor = ioExecutor;
 		this.scheduler = scheduler;
 		this.appContext = appContext;
 		this.locationUtils = locationUtils;
 		this.reporter = reporter;
@@ -136,8 +162,12 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		cookieFile = new File(torDirectory, ".tor/control_auth_cookie");
 		Object o = appContext.getSystemService(POWER_SERVICE);
 		PowerManager pm = (PowerManager) o;
-		wakeLock = pm.newWakeLock(PARTIAL_WAKE_LOCK, "TorPlugin");
+		// This tag will prevent Huawei's powermanager from killing us.
 		wakeLock = pm.newWakeLock(PARTIAL_WAKE_LOCK, "LocationManagerService");
 		wakeLock.setReferenceCounted(false);
 		// Don't execute more than one connection status check at a time
 		connectionStatusExecutor = new PoliteExecutor("TorPlugin",
 				ioExecutor, 1);
 	}
 	@Override
@@ -156,14 +186,18 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	}
 	@Override
-	public boolean start() throws IOException {
+	public void start() throws PluginException {
 		if (used.getAndSet(true)) throw new IllegalStateException();
 		// Install or update the assets if necessary
 		if (!assetsAreUpToDate()) installAssets();
 		LOG.info("Starting Tor");
 		// Watch for the auth cookie file being updated
-		cookieFile.getParentFile().mkdirs();
+		try {
-		cookieFile.createNewFile();
+			cookieFile.getParentFile().mkdirs();
 			cookieFile.createNewFile();
 		} catch (IOException e) {
 			throw new PluginException(e);
 		}
 		CountDownLatch latch = new CountDownLatch(1);
 		FileObserver obs = new WriteObserver(cookieFile, latch);
 		obs.startWatching();
@@ -171,19 +205,31 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		String torPath = torFile.getAbsolutePath();
 		String configPath = configFile.getAbsolutePath();
 		String pid = String.valueOf(android.os.Process.myPid());
 		String[] cmd = {torPath, "-f", configPath, OWNER, pid};
 		String[] env = {"HOME=" + torDirectory.getAbsolutePath()};
 		Process torProcess;
 		ProcessBuilder pb =
 				new ProcessBuilder(torPath, "-f", configPath, OWNER, pid);
 		Map<String, String> env = pb.environment();
 		env.put("HOME", torDirectory.getAbsolutePath());
 		pb.directory(torDirectory);
 		try {
-			torProcess = Runtime.getRuntime().exec(cmd, env, torDirectory);
+			torProcess = pb.start();
-		} catch (SecurityException e) {
+		} catch (SecurityException | IOException e) {
-			throw new IOException(e);
+			throw new PluginException(e);
 		}
 		// Log the process's standard output until it detaches
 		if (LOG.isLoggable(INFO)) {
 			Scanner stdout = new Scanner(torProcess.getInputStream());
-			while (stdout.hasNextLine()) LOG.info(stdout.nextLine());
+			Scanner stderr = new Scanner(torProcess.getErrorStream());
 			while (stdout.hasNextLine() || stderr.hasNextLine()) {
 				if (stdout.hasNextLine()) {
 					LOG.info(stdout.nextLine());
 				}
 				if (stderr.hasNextLine()) {
 					LOG.info(stderr.nextLine());
 				}
 			}
 			stdout.close();
 			stderr.close();
 		}
 		try {
 			// Wait for the process to detach or exit
@@ -191,43 +237,50 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			if (exit != 0) {
 				if (LOG.isLoggable(WARNING))
 					LOG.warning("Tor exited with value " + exit);
-				return false;
+				throw new PluginException();
 			}
 			// Wait for the auth cookie file to be created/updated
 			if (!latch.await(COOKIE_TIMEOUT, MILLISECONDS)) {
 				LOG.warning("Auth cookie not created");
 				if (LOG.isLoggable(INFO)) listFiles(torDirectory);
-				return false;
+				throw new PluginException();
 			}
 		} catch (InterruptedException e) {
 			LOG.warning("Interrupted while starting Tor");
 			Thread.currentThread().interrupt();
-			return false;
+			throw new PluginException();
 		}
-		// Open a control connection and authenticate using the cookie file
+		try {
-		controlSocket = new Socket("127.0.0.1", CONTROL_PORT);
+			// Open a control connection and authenticate using the cookie file
-		controlConnection = new TorControlConnection(controlSocket);
+			controlSocket = new Socket("127.0.0.1", CONTROL_PORT);
-		controlConnection.authenticate(read(cookieFile));
+			controlConnection = new TorControlConnection(controlSocket);
-		// Tell Tor to exit when the control connection is closed
+			controlConnection.authenticate(read(cookieFile));
-		controlConnection.takeOwnership();
+			// Tell Tor to exit when the control connection is closed
-		controlConnection.resetConf(Collections.singletonList(OWNER));
+			controlConnection.takeOwnership();
-		running = true;
+			controlConnection.resetConf(Collections.singletonList(OWNER));
-		// Register to receive events from the Tor process
+			running = true;
-		controlConnection.setEventHandler(this);
+			// Register to receive events from the Tor process
-		controlConnection.setEvents(Arrays.asList(EVENTS));
+			controlConnection.setEventHandler(this);
-		// Check whether Tor has already bootstrapped
+			controlConnection.setEvents(Arrays.asList(EVENTS));
-		String phase = controlConnection.getInfo("status/bootstrap-phase");
+			// Check whether Tor has already bootstrapped
-		if (phase != null && phase.contains("PROGRESS=100")) {
+			String phase = controlConnection.getInfo("status/bootstrap-phase");
-			LOG.info("Tor has already bootstrapped");
+			if (phase != null && phase.contains("PROGRESS=100")) {
-			connectionStatus.setBootstrapped();
+				LOG.info("Tor has already bootstrapped");
 				connectionStatus.setBootstrapped();
 			}
 		} catch (IOException e) {
 			throw new PluginException(e);
 		}
 		// Register to receive network status events
 		networkStateReceiver = new NetworkStateReceiver();
-		IntentFilter filter = new IntentFilter(CONNECTIVITY_ACTION);
+		IntentFilter filter = new IntentFilter();
 		filter.addAction(CONNECTIVITY_ACTION);
 		filter.addAction(ACTION_SCREEN_ON);
 		filter.addAction(ACTION_SCREEN_OFF);
 		if (SDK_INT >= 23) filter.addAction(ACTION_DEVICE_IDLE_MODE_CHANGED);
 		appContext.registerReceiver(networkStateReceiver, filter);
 		// Bind a server socket to receive incoming hidden service connections
 		bind();
 		return true;
 	}
 	private boolean assetsAreUpToDate() {
@@ -240,7 +293,7 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		}
 	}
-	private void installAssets() throws IOException {
+	private void installAssets() throws PluginException {
 		InputStream in = null;
 		OutputStream out = null;
 		try {
@@ -248,48 +301,54 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			// Unzip the Tor binary to the filesystem
 			in = getTorInputStream();
 			out = new FileOutputStream(torFile);
-			IoUtils.copy(in, out);
+			IoUtils.copyAndClose(in, out);
 			// Make the Tor binary executable
 			if (!torFile.setExecutable(true, true)) throw new IOException();
 			// Unzip the GeoIP database to the filesystem
 			in = getGeoIpInputStream();
 			out = new FileOutputStream(geoIpFile);
-			IoUtils.copy(in, out);
+			IoUtils.copyAndClose(in, out);
 			// Copy the config file to the filesystem
 			in = getConfigInputStream();
 			out = new FileOutputStream(configFile);
-			IoUtils.copy(in, out);
+			IoUtils.copyAndClose(in, out);
 			doneFile.createNewFile();
 		} catch (IOException e) {
 			tryToClose(in);
 			tryToClose(out);
-			throw e;
+			throw new PluginException(e);
 		}
 	}
 	private InputStream getTorInputStream() throws IOException {
 		if (LOG.isLoggable(INFO))
 			LOG.info("Installing Tor binary for " + architecture);
-		String filename = "tor-" + architecture + ".zip";
+		int resId = getResourceId("tor_" + architecture);
-		InputStream in = appContext.getResources().getAssets().open(filename);
+		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 {
-		String filename = "geoip.zip";
+		int resId = getResourceId("geoip");
-		InputStream in = appContext.getResources().getAssets().open(filename);
+		InputStream in = appContext.getResources().openRawResource(resId);
 		ZipInputStream zin = new ZipInputStream(in);
 		if (zin.getNextEntry() == null) throw new IOException();
 		return zin;
 	}
 	private InputStream getConfigInputStream() throws IOException {
-		return appContext.getResources().getAssets().open("torrc");
+		int resId = getResourceId("torrc");
 		return appContext.getResources().openRawResource(resId);
 	}
-	private void tryToClose(Closeable c) {
+	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) {
@@ -297,7 +356,7 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		}
 	}
-	private void tryToClose(Socket s) {
+	private void tryToClose(@Nullable Socket s) {
 		try {
 			if (s != null) s.close();
 		} catch (IOException e) {
@@ -306,8 +365,12 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	}
 	private void listFiles(File f) {
-		if (f.isDirectory()) for (File child : f.listFiles()) listFiles(child);
+		if (f.isDirectory()) {
-		else LOG.info(f.getAbsolutePath());
+			File[] children = f.listFiles();
 			if (children != null) for (File child : children) listFiles(child);
 		} else {
 			LOG.info(f.getAbsolutePath());
 		}
 	}
 	private byte[] read(File f) throws IOException {
@@ -322,66 +385,54 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			}
 			return b;
 		} finally {
-			in.close();
+			tryToClose(in);
 		}
 	}
 	private void sendDevReports() {
-		ioExecutor.execute(new Runnable() {
+		ioExecutor.execute(() -> {
-			@Override
+			// TODO: Trigger this with a TransportEnabledEvent
-			public void run() {
+			File reportDir = AndroidUtils.getReportDir(appContext);
-				// TODO: Trigger this with a TransportEnabledEvent
+			reporter.sendReports(reportDir);
 				File reportDir = AndroidUtils.getReportDir(appContext);
 				reporter.sendReports(reportDir);
 			}
 		});
 	}
 	private void bind() {
-		ioExecutor.execute(new Runnable() {
+		ioExecutor.execute(() -> {
-			@Override
+			// If there's already a port number stored in config, reuse it
-			public void run() {
+			String portString = callback.getSettings().get(PREF_TOR_PORT);
-				// If there's already a port number stored in config, reuse it
+			int port;
-				String portString = callback.getSettings().get("port");
+			if (StringUtils.isNullOrEmpty(portString)) port = 0;
-				int port;
+			else port = Integer.parseInt(portString);
-				if (StringUtils.isNullOrEmpty(portString)) port = 0;
+			// Bind a server socket to receive connections from Tor
-				else port = Integer.parseInt(portString);
+			ServerSocket ss = null;
-				// Bind a server socket to receive connections from Tor
+			try {
-				ServerSocket ss = null;
+				ss = new ServerSocket();
-				try {
+				ss.bind(new InetSocketAddress("127.0.0.1", port));
-					ss = new ServerSocket();
+			} catch (IOException e) {
-					ss.bind(new InetSocketAddress("127.0.0.1", port));
+				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-				} catch (IOException e) {
+				tryToClose(ss);
-					if (LOG.isLoggable(WARNING))
+				return;
 						LOG.log(WARNING, e.toString(), e);
 					tryToClose(ss);
 					return;
 				}
 				if (!running) {
 					tryToClose(ss);
 					return;
 				}
 				socket = ss;
 				// Store the port number
 				final String localPort = String.valueOf(ss.getLocalPort());
 				Settings s = new Settings();
 				s.put("port", localPort);
 				callback.mergeSettings(s);
 				// Create a hidden service if necessary
 				ioExecutor.execute(new Runnable() {
 					@Override
 					public void run() {
 						publishHiddenService(localPort);
 					}
 				});
 				backoff.reset();
 				// Accept incoming hidden service connections from Tor
 				acceptContactConnections(ss);
 			}
 			if (!running) {
 				tryToClose(ss);
 				return;
 			}
 			socket = ss;
 			// Store the port number
 			String localPort = String.valueOf(ss.getLocalPort());
 			Settings s = new Settings();
 			s.put(PREF_TOR_PORT, localPort);
 			callback.mergeSettings(s);
 			// Create a hidden service if necessary
 			ioExecutor.execute(() -> publishHiddenService(localPort));
 			backoff.reset();
 			// Accept incoming hidden service connections from Tor
 			acceptContactConnections(ss);
 		});
 	}
-	private void tryToClose(ServerSocket ss) {
+	private void tryToClose(@Nullable ServerSocket ss) {
 		try {
 			if (ss != null) ss.close();
 		} catch (IOException e) {
@@ -460,7 +511,7 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	}
 	@Override
-	public void stop() throws IOException {
+	public void stop() throws PluginException {
 		running = false;
 		tryToClose(socket);
 		if (networkStateReceiver != null)
@@ -497,20 +548,21 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	public void poll(Collection<ContactId> connected) {
 		if (!isRunning()) return;
 		backoff.increment();
-		// TODO: Pass properties to connectAndCallBack()
+		Map<ContactId, TransportProperties> remote =
-		for (ContactId c : callback.getRemoteProperties().keySet())
+				callback.getRemoteProperties();
-			if (!connected.contains(c)) connectAndCallBack(c);
+		for (Entry<ContactId, TransportProperties> e : remote.entrySet()) {
 			ContactId c = e.getKey();
 			if (!connected.contains(c)) connectAndCallBack(c, e.getValue());
 		}
 	}
-	private void connectAndCallBack(final ContactId c) {
+	private void connectAndCallBack(ContactId c, TransportProperties p) {
-		ioExecutor.execute(new Runnable() {
+		ioExecutor.execute(() -> {
-			@Override
+			if (!isRunning()) return;
-			public void run() {
+			DuplexTransportConnection d = createConnection(p);
-				DuplexTransportConnection d = createConnection(c);
+			if (d != null) {
-				if (d != null) {
+				backoff.reset();
-					backoff.reset();
+				callback.outgoingConnectionCreated(c, d);
 					callback.outgoingConnectionCreated(c, d);
 				}
 			}
 		});
 	}
@@ -518,8 +570,11 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	@Override
 	public DuplexTransportConnection createConnection(ContactId c) {
 		if (!isRunning()) return null;
-		TransportProperties p = callback.getRemoteProperties().get(c);
+		return createConnection(callback.getRemoteProperties(c));
-		if (p == null) return null;
+	}
 	@Nullable
 	private DuplexTransportConnection createConnection(TransportProperties p) {
 		String onion = p.get(PROP_ONION);
 		if (StringUtils.isNullOrEmpty(onion)) return null;
 		if (!ONION.matcher(onion).matches()) {
@@ -547,17 +602,6 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		}
 	}
 	@Override
 	public boolean supportsInvitations() {
 		return false;
 	}
 	@Override
 	public DuplexTransportConnection createInvitationConnection(PseudoRandom r,
 			long timeout, boolean alice) {
 		throw new UnsupportedOperationException();
 	}
 	@Override
 	public boolean supportsKeyAgreement() {
 		return false;
@@ -570,7 +614,7 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	@Override
 	public DuplexTransportConnection createKeyAgreementConnection(
-			byte[] commitment, TransportDescriptor d, long timeout) {
+			byte[] commitment, BdfList descriptor) {
 		throw new UnsupportedOperationException();
 	}
@@ -594,6 +638,8 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	@Override
 	public void orConnStatus(String status, String orName) {
 		if (LOG.isLoggable(INFO)) LOG.info("OR connection " + status);
 		if (status.equals("CLOSED") || status.equals("FAILED"))
 			updateConnectionStatus(); // Check whether we've lost connectivity
 	}
 	@Override
@@ -633,7 +679,7 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		}
 		@Override
-		public void onEvent(int event, String path) {
+		public void onEvent(int event, @Nullable String path) {
 			stopWatching();
 			latch.countDown();
 		}
@@ -642,7 +688,8 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	@Override
 	public void eventOccurred(Event e) {
 		if (e instanceof SettingsUpdatedEvent) {
-			if (((SettingsUpdatedEvent) e).getNamespace().equals("tor")) {
+			SettingsUpdatedEvent s = (SettingsUpdatedEvent) e;
 			if (s.getNamespace().equals(ID.getString())) {
 				LOG.info("Tor settings updated");
 				updateConnectionStatus();
 			}
@@ -650,58 +697,65 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	}
 	private void updateConnectionStatus() {
-		ioExecutor.execute(new Runnable() {
+		connectionStatusExecutor.execute(() -> {
-			@Override
+			if (!running) return;
-			public void run() {
+			Object o = appContext.getSystemService(CONNECTIVITY_SERVICE);
-				if (!running) return;
+			ConnectivityManager cm = (ConnectivityManager) o;
 			NetworkInfo net = cm.getActiveNetworkInfo();
 			boolean online = net != null && net.isConnected();
 			boolean wifi = online && net.getType() == TYPE_WIFI;
 			String country = locationUtils.getCurrentCountry();
 			boolean blocked = TorNetworkMetadata.isTorProbablyBlocked(
 					country);
 			Settings s = callback.getSettings();
 			int network = s.getInt(PREF_TOR_NETWORK, PREF_TOR_NETWORK_ALWAYS);
-				Object o = appContext.getSystemService(CONNECTIVITY_SERVICE);
+			if (LOG.isLoggable(INFO)) {
-				ConnectivityManager cm = (ConnectivityManager) o;
+				LOG.info("Online: " + online + ", wifi: " + wifi);
-				NetworkInfo net = cm.getActiveNetworkInfo();
+				if ("".equals(country)) LOG.info("Country code unknown");
-				boolean online = net != null && net.isConnected();
+				else LOG.info("Country code: " + country);
-				boolean wifi = online && net.getType() == TYPE_WIFI;
+			}
 				String country = locationUtils.getCurrentCountry();
 				boolean blocked = TorNetworkMetadata.isTorProbablyBlocked(
 						country);
 				Settings s = callback.getSettings();
 				boolean useMobileData = s.getBoolean("torOverMobile", true);
-				if (LOG.isLoggable(INFO)) {
+			try {
-					LOG.info("Online: " + online + ", wifi: " + wifi);
+				if (!online) {
-					if ("".equals(country)) LOG.info("Country code unknown");
+					LOG.info("Disabling network, device is offline");
-					else LOG.info("Country code: " + country);
+					enableNetwork(false);
-				}
+				} else if (blocked) {
-
+					LOG.info("Disabling network, country is blocked");
-				try {
+					enableNetwork(false);
-					if (!online) {
+				} else if (network == PREF_TOR_NETWORK_NEVER
-						LOG.info("Disabling network, device is offline");
+						|| (network == PREF_TOR_NETWORK_WIFI && !wifi)) {
-						enableNetwork(false);
+					LOG.info("Disabling network due to data setting");
-					} else if (blocked) {
+					enableNetwork(false);
-						LOG.info("Disabling network, country is blocked");
+				} else {
-						enableNetwork(false);
+					LOG.info("Enabling network");
-					} else if (!wifi && !useMobileData) {
+					enableNetwork(true);
 						LOG.info("Disabling network due to data setting");
 						enableNetwork(false);
 					} else {
 						LOG.info("Enabling network");
 						enableNetwork(true);
 					}
 				} catch (IOException e) {
 					if (LOG.isLoggable(WARNING))
 						LOG.log(WARNING, e.toString(), e);
 				}
 			} catch (IOException e) {
 				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 			}
 		});
 	}
 	private void scheduleConnectionStatusUpdate() {
 		Future<?> newConnectivityCheck =
 				scheduler.schedule(this::updateConnectionStatus, 1, MINUTES);
 		Future<?> oldConnectivityCheck =
 				connectivityCheck.getAndSet(newConnectivityCheck);
 		if (oldConnectivityCheck != null) oldConnectivityCheck.cancel(false);
 	}
 	private class NetworkStateReceiver extends BroadcastReceiver {
 		@Override
 		public void onReceive(Context ctx, Intent i) {
 			if (!running) return;
-			if (CONNECTIVITY_ACTION.equals(i.getAction())) {
+			String action = i.getAction();
-				LOG.info("Detected connectivity change");
+			if (LOG.isLoggable(INFO)) LOG.info("Received broadcast " + action);
-				updateConnectionStatus();
+			updateConnectionStatus();
 			if (ACTION_SCREEN_ON.equals(action)
 					|| ACTION_SCREEN_OFF.equals(action)) {
 				scheduleConnectionStatusUpdate();
 			}
 		}
 	}
@@ -724,7 +778,7 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		private synchronized void enableNetwork(boolean enable) {
 			networkEnabled = enable;
-			circuitBuilt = false;
+			if (!enable) circuitBuilt = false;
 		}
 		private synchronized boolean isConnected() {
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPluginFactory.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPluginFactory.java
@@ -1,25 +1,30 @@
-package org.briarproject.plugins.tor;
+package org.briarproject.bramble.plugin.tor;
 import android.content.Context;
 import android.os.Build;
-import org.briarproject.android.util.AndroidUtils;
+import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.api.TransportId;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.api.event.EventBus;
+import org.briarproject.bramble.api.plugin.Backoff;
-import org.briarproject.api.plugins.Backoff;
+import org.briarproject.bramble.api.plugin.BackoffFactory;
-import org.briarproject.api.plugins.BackoffFactory;
+import org.briarproject.bramble.api.plugin.TorConstants;
-import org.briarproject.api.plugins.TorConstants;
+import org.briarproject.bramble.api.plugin.TransportId;
-import org.briarproject.api.plugins.duplex.DuplexPlugin;
+import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
-import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
+import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
-import org.briarproject.api.plugins.duplex.DuplexPluginFactory;
+import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
-import org.briarproject.api.reporting.DevReporter;
+import org.briarproject.bramble.api.reporting.DevReporter;
-import org.briarproject.api.system.LocationUtils;
+import org.briarproject.bramble.api.system.LocationUtils;
 import org.briarproject.bramble.util.AndroidUtils;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.logging.Logger;
 import javax.annotation.concurrent.Immutable;
 import javax.net.SocketFactory;
@Immutable
@NotNullByDefault
 public class TorPluginFactory implements DuplexPluginFactory {
 	private static final Logger LOG =
@@ -32,6 +37,7 @@ public class TorPluginFactory implements DuplexPluginFactory {
 	private static final double BACKOFF_BASE = 1.2;
 	private final Executor ioExecutor;
 	private final ScheduledExecutorService scheduler;
 	private final Context appContext;
 	private final LocationUtils locationUtils;
 	private final DevReporter reporter;
@@ -39,11 +45,13 @@ public class TorPluginFactory implements DuplexPluginFactory {
 	private final SocketFactory torSocketFactory;
 	private final BackoffFactory backoffFactory;
-	public TorPluginFactory(Executor ioExecutor, Context appContext,
+	public TorPluginFactory(Executor ioExecutor,
 			ScheduledExecutorService scheduler, Context appContext,
 			LocationUtils locationUtils, DevReporter reporter,
 			EventBus eventBus, SocketFactory torSocketFactory,
 			BackoffFactory backoffFactory) {
 		this.ioExecutor = ioExecutor;
 		this.scheduler = scheduler;
 		this.appContext = appContext;
 		this.locationUtils = locationUtils;
 		this.reporter = reporter;
@@ -81,13 +89,13 @@ public class TorPluginFactory implements DuplexPluginFactory {
 			return null;
 		}
 		// Use position-independent executable for SDK >= 16
-		if (Build.VERSION.SDK_INT >= 16) architecture += "-pie";
+		if (Build.VERSION.SDK_INT >= 16) architecture += "_pie";
 		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
 				MAX_POLLING_INTERVAL, BACKOFF_BASE);
-		TorPlugin plugin = new TorPlugin(ioExecutor, appContext, locationUtils,
+		TorPlugin plugin = new TorPlugin(ioExecutor, scheduler, appContext,
-				reporter, torSocketFactory, backoff, callback, architecture,
+				locationUtils, reporter, torSocketFactory, backoff, callback,
-				MAX_LATENCY, MAX_IDLE_TIME);
+				architecture, MAX_LATENCY, MAX_IDLE_TIME);
 		eventBus.addListener(plugin);
 		return plugin;
 	}
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorTransportConnection.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorTransportConnection.java
@@ -1,13 +1,16 @@
-package org.briarproject.plugins.tor;
+package org.briarproject.bramble.plugin.tor;
-import org.briarproject.api.plugins.Plugin;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.api.plugins.duplex.AbstractDuplexTransportConnection;
+import org.briarproject.bramble.api.plugin.Plugin;
 import org.briarproject.bramble.api.plugin.duplex.AbstractDuplexTransportConnection;
 import org.briarproject.bramble.util.IoUtils;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.Socket;
@NotNullByDefault
 class TorTransportConnection extends AbstractDuplexTransportConnection {
 	private final Socket socket;
@@ -19,12 +22,12 @@ class TorTransportConnection extends AbstractDuplexTransportConnection {
 	@Override
 	protected InputStream getInputStream() throws IOException {
-		return socket.getInputStream();
+		return IoUtils.getInputStream(socket);
 	}
 	@Override
 	protected OutputStream getOutputStream() throws IOException {
-		return socket.getOutputStream();
+		return IoUtils.getOutputStream(socket);
 	}
 	@Override
--- a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidExecutorImpl.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidExecutorImpl.java
@@ -1,10 +1,10 @@
-package org.briarproject.system;
+package org.briarproject.bramble.system;
 import android.app.Application;
 import android.os.Handler;
 import android.os.Looper;
-import org.briarproject.android.api.AndroidExecutor;
+import org.briarproject.bramble.api.system.AndroidExecutor;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
@@ -27,14 +27,11 @@ class AndroidExecutorImpl implements AndroidExecutor {
 	@Inject
 	AndroidExecutorImpl(Application app) {
 		uiHandler = new Handler(app.getApplicationContext().getMainLooper());
-		loop = new Runnable() {
+		loop = () -> {
-			@Override
+			Looper.prepare();
-			public void run() {
+			backgroundHandler = new Handler();
-				Looper.prepare();
+			startLatch.countDown();
-				backgroundHandler = new Handler();
+			Looper.loop();
 				startLatch.countDown();
 				Looper.loop();
 			}
 		};
 	}
--- a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidLocationUtils.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidLocationUtils.java
@@ -1,4 +1,4 @@
-package org.briarproject.system;
+package org.briarproject.bramble.system;
 import android.annotation.SuppressLint;
 import android.app.Application;
@@ -6,7 +6,8 @@ import android.content.Context;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
-import org.briarproject.api.system.LocationUtils;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.system.LocationUtils;
 import java.util.Locale;
 import java.util.logging.Logger;
@@ -15,6 +16,7 @@ import javax.inject.Inject;
 import static android.content.Context.TELEPHONY_SERVICE;
@NotNullByDefault
 class AndroidLocationUtils implements LocationUtils {
 	private static final Logger LOG =
@@ -23,7 +25,7 @@ class AndroidLocationUtils implements LocationUtils {
 	private final Context appContext;
 	@Inject
-	public AndroidLocationUtils(Application app) {
+	AndroidLocationUtils(Application app) {
 		appContext = app.getApplicationContext();
 	}
@@ -44,6 +46,7 @@ class AndroidLocationUtils implements LocationUtils {
 	 * some reason - both that class and {@code Context.COUNTRY_CODE} are
 	 * annotated {@code @hide}.
 	 */
 	@Override
 	@SuppressLint("DefaultLocale")
 	public String getCurrentCountry() {
 		String countryCode = getCountryFromPhoneNetwork();
--- a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSecureRandomProvider.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSecureRandomProvider.java
@@ -0,0 +1,93 @@
 package org.briarproject.bramble.system;
 import android.app.Application;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.os.Parcel;
 import android.provider.Settings;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.List;
 import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
 import static android.content.Context.WIFI_SERVICE;
 import static android.provider.Settings.Secure.ANDROID_ID;
@Immutable
@NotNullByDefault
 class AndroidSecureRandomProvider extends LinuxSecureRandomProvider {
 	private static final int SEED_LENGTH = 32;
 	private final Context appContext;
 	@Inject
 	AndroidSecureRandomProvider(Application app) {
 		appContext = app.getApplicationContext();
 	}
 	@Override
 	protected void writeToEntropyPool(DataOutputStream out) throws IOException {
 		super.writeToEntropyPool(out);
 		out.writeInt(android.os.Process.myPid());
 		out.writeInt(android.os.Process.myTid());
 		out.writeInt(android.os.Process.myUid());
 		if (Build.FINGERPRINT != null) out.writeUTF(Build.FINGERPRINT);
 		if (Build.SERIAL != null) out.writeUTF(Build.SERIAL);
 		ContentResolver contentResolver = appContext.getContentResolver();
 		String id = Settings.Secure.getString(contentResolver, ANDROID_ID);
 		if (id != null) out.writeUTF(id);
 		Parcel parcel = Parcel.obtain();
 		WifiManager wm =
 				(WifiManager) appContext.getSystemService(WIFI_SERVICE);
 		List<WifiConfiguration> configs = wm.getConfiguredNetworks();
 		if (configs != null) {
 			for (WifiConfiguration config : configs)
 				parcel.writeParcelable(config, 0);
 		}
 		BluetoothAdapter bt = BluetoothAdapter.getDefaultAdapter();
 		if (bt != null) {
 			for (BluetoothDevice device : bt.getBondedDevices())
 				parcel.writeParcelable(device, 0);
 		}
 		out.write(parcel.marshall());
 		parcel.recycle();
 	}
 	@Override
 	protected void writeSeed() {
 		super.writeSeed();
 		if (Build.VERSION.SDK_INT >= 16 && Build.VERSION.SDK_INT <= 18)
 			applyOpenSslFix();
 	}
 	// Based on https://android-developers.googleblog.com/2013/08/some-securerandom-thoughts.html
 	private void applyOpenSslFix() {
 		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, seed);
 			// Mix the output of the Linux PRNG into the OpenSSL PRNG
 			int bytesRead = (Integer) Class.forName(
 					"org.apache.harmony.xnet.provider.jsse.NativeCrypto")
 					.getMethod("RAND_load_file", String.class, long.class)
 					.invoke(null, "/dev/urandom", 1024);
 			if (bytesRead != 1024) throw new IOException();
 		} catch (Exception e) {
 			throw new SecurityException(e);
 		}
 	}
 }
--- a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSystemModule.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSystemModule.java
@@ -0,0 +1,33 @@
 package org.briarproject.bramble.system;
 import android.app.Application;
 import org.briarproject.bramble.api.system.AndroidExecutor;
 import org.briarproject.bramble.api.system.LocationUtils;
 import org.briarproject.bramble.api.system.SecureRandomProvider;
 import javax.inject.Singleton;
 import dagger.Module;
 import dagger.Provides;
@Module
 public class AndroidSystemModule {
 	@Provides
 	@Singleton
 	SecureRandomProvider provideSecureRandomProvider(Application app) {
 		return new AndroidSecureRandomProvider(app);
 	}
 	@Provides
 	LocationUtils provideLocationUtils(Application app) {
 		return new AndroidLocationUtils(app);
 	}
 	@Provides
 	@Singleton
 	AndroidExecutor provideAndroidExecutor(Application app) {
 		return new AndroidExecutorImpl(app);
 	}
 }
--- a/bramble-android/src/main/java/org/briarproject/bramble/util/AndroidUtils.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/util/AndroidUtils.java
@@ -0,0 +1,70 @@
 package org.briarproject.bramble.util;
 import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
 import android.os.Build;
 import android.provider.Settings;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import static android.content.Context.MODE_PRIVATE;
 public class AndroidUtils {
 	// Fake Bluetooth address returned by BluetoothAdapter on API 23 and later
 	private static final String FAKE_BLUETOOTH_ADDRESS = "02:00:00:00:00:00";
 	private static final String STORED_REPORTS = "dev-reports";
 	@SuppressWarnings("deprecation")
 	public static Collection<String> getSupportedArchitectures() {
 		List<String> abis = new ArrayList<>();
 		if (Build.VERSION.SDK_INT >= 21) {
 			abis.addAll(Arrays.asList(Build.SUPPORTED_ABIS));
 		} else {
 			abis.add(Build.CPU_ABI);
 			if (Build.CPU_ABI2 != null) abis.add(Build.CPU_ABI2);
 		}
 		return abis;
 	}
 	public static String getBluetoothAddress(Context ctx,
 			BluetoothAdapter adapter) {
 		// Return the adapter's address if it's valid and not fake
 		String address = adapter.getAddress();
 		if (isValidBluetoothAddress(address)) return address;
 		// Return the address from settings if it's valid and not fake
 		address = Settings.Secure.getString(ctx.getContentResolver(),
 				"bluetooth_address");
 		if (isValidBluetoothAddress(address)) return address;
 		// Let the caller know we can't find the address
 		return "";
 	}
 	private static boolean isValidBluetoothAddress(String address) {
 		return !StringUtils.isNullOrEmpty(address)
 				&& BluetoothAdapter.checkBluetoothAddress(address)
 				&& !address.equals(FAKE_BLUETOOTH_ADDRESS);
 	}
 	public static void deleteAppData(Context ctx) {
 		File dataDir = new File(ctx.getApplicationInfo().dataDir);
 		File[] children = dataDir.listFiles();
 		if (children != null) {
 			for (File child : children) {
 				if (!child.getName().equals("lib"))
 					IoUtils.deleteFileOrDir(child);
 			}
 		}
 		// Recreate the cache dir as some OpenGL drivers expect it to exist
 		new File(dataDir, "cache").mkdir();
 	}
 	public static File getReportDir(Context ctx) {
 		return ctx.getDir(STORED_REPORTS, MODE_PRIVATE);
 	}
 }
--- a/bramble-android/src/main/res/raw/torrc
+++ b/bramble-android/src/main/res/raw/torrc
--- a/bramble-android/src/main/res/values/strings.xml
+++ b/bramble-android/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
 <resources>
 	<string name="app_name">Bramble</string>
 </resources>
--- a/briar-desktop/.gitignore
+++ b/briar-desktop/.gitignore
--- a/bramble-api/build.gradle
+++ b/bramble-api/build.gradle
@@ -0,0 +1,55 @@
 apply plugin: 'java-library'
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 apply plugin: 'witness'
 dependencies {
 	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"
 }
 dependencyVerification {
 	verify = [
 			'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861',
 			'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
 			'com.google.dagger:dagger:2.0.2:dagger-2.0.2.jar:84c0282ed8be73a29e0475d639da030b55dee72369e58dd35ae7d4fe6243dcf9',
 			'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
 			'junit:junit:4.12:junit-4.12.jar:59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a',
 			'org.apache.ant:ant-launcher:1.9.4:ant-launcher-1.9.4.jar:7bccea20b41801ca17bcbc909a78c835d0f443f12d639c77bd6ae3d05861608d',
 			'org.apache.ant:ant:1.9.4:ant-1.9.4.jar:649ae0730251de07b8913f49286d46bba7b92d47c5f332610aa426c4f02161d8',
 			'org.beanshell:bsh:1.3.0:bsh-1.3.0.jar:9b04edc75d19db54f1b4e8b5355e9364384c6cf71eb0a1b9724c159d779879f8',
 			'org.hamcrest:hamcrest-core:1.3:hamcrest-core-1.3.jar:66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9',
 			'org.hamcrest:hamcrest-library:1.3:hamcrest-library-1.3.jar:711d64522f9ec410983bd310934296da134be4254a125080a0416ec178dfad1c',
 			'org.jmock:jmock-junit4:2.8.2:jmock-junit4-2.8.2.jar:f7ee4df4f7bd7b7f1cafad3b99eb74d579f109d5992ff625347352edb55e674c',
 			'org.jmock:jmock-legacy:2.8.2:jmock-legacy-2.8.2.jar:f2b985a5c08a9edb7f37612330c058809da3f6a6d63ce792426ebf8ff0d6d31b',
 			'org.jmock:jmock-testjar:2.8.2:jmock-testjar-2.8.2.jar:8900860f72c474e027cf97fe78dcbf154a1aa7fc62b6845c5fb4e4f3c7bc8760',
 			'org.jmock:jmock:2.8.2:jmock-2.8.2.jar:6c73cb4a2e6dbfb61fd99c9a768539c170ab6568e57846bd60dbf19596b65b16',
 			'org.objenesis:objenesis:2.1:objenesis-2.1.jar:c74330cc6b806c804fd37e74487b4fe5d7c2750c5e15fbc6efa13bdee1bdef80',
 			'org.ow2.asm:asm:5.0.4:asm-5.0.4.jar:896618ed8ae62702521a78bc7be42b7c491a08e6920a15f89a3ecdec31e9a220',
 	]
 }
 // needed to make test output available to bramble-core and briar-core
 configurations {
 	testOutput.extendsFrom(testCompile)
 }
 task jarTest(type: Jar, dependsOn: testClasses) {
 	from sourceSets.test.output
 	classifier = 'test'
 }
 artifacts {
 	testOutput jarTest
 }
 // If a Java 6 JRE is available, check we're not using any Java 7 or 8 APIs
 tasks.withType(JavaCompile) {
 	useJava6StandardLibrary(it)
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/Bytes.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/Bytes.java
@@ -1,11 +1,18 @@
-package org.briarproject.api;
+package org.briarproject.bramble.api;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.util.StringUtils;
 import java.util.Arrays;
 import java.util.Comparator;
 import javax.annotation.concurrent.ThreadSafe;
 /**
 * A wrapper around a byte array, to allow it to be stored in maps etc.
 */
@ThreadSafe
@NotNullByDefault
 public class Bytes implements Comparable<Bytes> {
 	public static final BytesComparator COMPARATOR = new BytesComparator();
@@ -47,6 +54,12 @@ public class Bytes implements Comparable<Bytes> {
 		return aBytes.length - bBytes.length;
 	}
 	@Override
 	public String toString() {
 		return getClass().getSimpleName() +
 				"(" + StringUtils.toHexString(getBytes()) + ")";
 	}
 	public static class BytesComparator implements Comparator<Bytes> {
 		@Override
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/FormatException.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/FormatException.java
@@ -0,0 +1,9 @@
 package org.briarproject.bramble.api;
 import java.io.IOException;
 /**
 * An exception that indicates an unrecoverable formatting error.
 */
 public class FormatException extends IOException {
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/Multiset.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/Multiset.java
@@ -0,0 +1,101 @@
 package org.briarproject.bramble.api;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Set;
 import javax.annotation.concurrent.NotThreadSafe;
@NotThreadSafe
@NotNullByDefault
 public class Multiset<T> {
 	private final Map<T, Integer> map = new HashMap<>();
 	private int total = 0;
 	/**
 	 * Returns how many items the multiset contains in total.
 	 */
 	public int getTotal() {
 		return total;
 	}
 	/**
 	 * Returns how many unique items the multiset contains.
 	 */
 	public int getUnique() {
 		return map.size();
 	}
 	/**
 	 * Returns how many of the given item the multiset contains.
 	 */
 	public int getCount(T t) {
 		Integer count = map.get(t);
 		return count == null ? 0 : count;
 	}
 	/**
 	 * Adds the given item to the multiset and returns how many of the item
 	 * the multiset now contains.
 	 */
 	public int add(T t) {
 		Integer count = map.get(t);
 		if (count == null) count = 0;
 		map.put(t, count + 1);
 		total++;
 		return count + 1;
 	}
 	/**
 	 * Removes the given item from the multiset and returns how many of the
 	 * item the multiset now contains.
 	 * @throws NoSuchElementException if the item is not in the multiset.
 	 */
 	public int remove(T t) {
 		Integer count = map.get(t);
 		if (count == null) throw new NoSuchElementException();
 		if (count == 1) map.remove(t);
 		else map.put(t, count - 1);
 		total--;
 		return count - 1;
 	}
 	/**
 	 * Removes all occurrences of the given item from the multiset.
 	 */
 	public int removeAll(T t) {
 		Integer count = map.remove(t);
 		if (count == null) return 0;
 		total -= count;
 		return count;
 	}
 	/**
 	 * Returns true if the multiset contains any occurrences of the given item.
 	 */
 	public boolean contains(T t) {
 		return map.containsKey(t);
 	}
 	/**
 	 * Removes all items from the multiset.
 	 */
 	public void clear() {
 		map.clear();
 		total = 0;
 	}
 	/**
 	 * Returns the set of unique items the multiset contains. The returned set
 	 * is unmodifiable.
 	 */
 	public Set<T> keySet() {
 		return Collections.unmodifiableSet(map.keySet());
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/StringMap.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/StringMap.java
@@ -1,12 +1,10 @@
-package org.briarproject.api;
+package org.briarproject.bramble.api;
 import java.util.Hashtable;
 import java.util.Map;
 public abstract class StringMap extends Hashtable<String, String> {
 	private static final long serialVersionUID = 2497176435908100448L;
 	protected StringMap(Map<String, String> m) {
 		super(m);
 	}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/UniqueId.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/UniqueId.java
@@ -0,0 +1,20 @@
 package org.briarproject.bramble.api;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import javax.annotation.concurrent.ThreadSafe;
@ThreadSafe
@NotNullByDefault
 public abstract class UniqueId extends Bytes {
 	/**
 	 * The length of a unique identifier in bytes.
 	 */
 	public static final int LENGTH = 32;
 	protected UniqueId(byte[] id) {
 		super(id);
 		if (id.length != LENGTH) throw new IllegalArgumentException();
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/UnsupportedVersionException.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/UnsupportedVersionException.java
@@ -0,0 +1,9 @@
 package org.briarproject.bramble.api;
 import java.io.IOException;
 /**
 * An exception that indicates an unrecoverable version mismatch.
 */
 public class UnsupportedVersionException extends IOException {
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/client/BdfMessageContext.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/client/BdfMessageContext.java
@@ -0,0 +1,36 @@
 package org.briarproject.bramble.api.client;
 import org.briarproject.bramble.api.data.BdfDictionary;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.MessageId;
 import java.util.Collection;
 import java.util.Collections;
 import javax.annotation.concurrent.Immutable;
@Immutable
@NotNullByDefault
 public class BdfMessageContext {
 	private final BdfDictionary dictionary;
 	private final Collection<MessageId> dependencies;
 	public BdfMessageContext(BdfDictionary dictionary,
 			Collection<MessageId> dependencies) {
 		this.dictionary = dictionary;
 		this.dependencies = dependencies;
 	}
 	public BdfMessageContext(BdfDictionary dictionary) {
 		this(dictionary, Collections.emptyList());
 	}
 	public BdfDictionary getDictionary() {
 		return dictionary;
 	}
 	public Collection<MessageId> getDependencies() {
 		return dependencies;
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/client/BdfMessageValidator.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/client/BdfMessageValidator.java
@@ -0,0 +1,66 @@
 package org.briarproject.bramble.api.client;
 import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.data.BdfList;
 import org.briarproject.bramble.api.data.MetadataEncoder;
 import org.briarproject.bramble.api.db.Metadata;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.Group;
 import org.briarproject.bramble.api.sync.InvalidMessageException;
 import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageContext;
 import org.briarproject.bramble.api.sync.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
@NotNullByDefault
 public abstract class BdfMessageValidator implements MessageValidator {
 	protected static final Logger LOG =
 			Logger.getLogger(BdfMessageValidator.class.getName());
 	protected final ClientHelper clientHelper;
 	protected final MetadataEncoder metadataEncoder;
 	protected final Clock clock;
 	protected BdfMessageValidator(ClientHelper clientHelper,
 			MetadataEncoder metadataEncoder, Clock clock) {
 		this.clientHelper = clientHelper;
 		this.metadataEncoder = metadataEncoder;
 		this.clock = clock;
 	}
 	protected abstract BdfMessageContext validateMessage(Message m, Group g,
 			BdfList body) throws InvalidMessageException, FormatException;
 	@Override
 	public MessageContext validateMessage(Message m, Group g)
 			throws InvalidMessageException {
 		// Reject the message if it's too far in the future
 		long now = clock.currentTimeMillis();
 		if (m.getTimestamp() - now > MAX_CLOCK_DIFFERENCE) {
 			throw new InvalidMessageException(
 					"Timestamp is too far in the future");
 		}
 		byte[] raw = m.getRaw();
 		if (raw.length <= MESSAGE_HEADER_LENGTH) {
 			throw new InvalidMessageException("Message is too short");
 		}
 		try {
 			BdfList body = clientHelper.toList(raw, MESSAGE_HEADER_LENGTH,
 					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) {
 			throw new InvalidMessageException(e);
 		}
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/client/ClientHelper.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/client/ClientHelper.java
@@ -1,17 +1,24 @@
-package org.briarproject.api.clients;
+package org.briarproject.bramble.api.client;
-import org.briarproject.api.FormatException;
+import org.briarproject.bramble.api.FormatException;
-import org.briarproject.api.data.BdfDictionary;
+import org.briarproject.bramble.api.data.BdfDictionary;
-import org.briarproject.api.data.BdfList;
+import org.briarproject.bramble.api.data.BdfList;
-import org.briarproject.api.db.DbException;
+import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.api.db.Transaction;
+import org.briarproject.bramble.api.db.Transaction;
-import org.briarproject.api.sync.GroupId;
+import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.api.sync.Message;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.api.sync.MessageId;
+import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageId;
 import java.security.GeneralSecurityException;
 import java.util.Map;
 import javax.annotation.Nullable;
@NotNullByDefault
 public interface ClientHelper {
 	void addLocalMessage(Message m, BdfDictionary metadata, boolean shared)
@@ -20,14 +27,21 @@ public interface ClientHelper {
 	void addLocalMessage(Transaction txn, Message m, BdfDictionary metadata,
 			boolean shared) throws DbException, FormatException;
 	Message createMessage(GroupId g, long timestamp, BdfDictionary body)
 			throws FormatException;
 	Message createMessage(GroupId g, long timestamp, BdfList body)
 			throws FormatException;
 	Message createMessageForStoringMetadata(GroupId g);
 	@Nullable
 	Message getMessage(MessageId m) throws DbException;
 	@Nullable
 	Message getMessage(Transaction txn, MessageId m) throws DbException;
 	@Nullable
 	BdfList getMessageAsList(MessageId m) throws DbException, FormatException;
 	@Nullable
 	BdfList getMessageAsList(Transaction txn, MessageId m) throws DbException,
 			FormatException;
@@ -37,7 +51,8 @@ public interface ClientHelper {
 	BdfDictionary getGroupMetadataAsDictionary(Transaction txn, GroupId g)
 			throws DbException, FormatException;
-	BdfDictionary getMessageMetadataAsDictionary(MessageId m) throws DbException,
+	BdfDictionary getMessageMetadataAsDictionary(MessageId m)
 			throws DbException,
 			FormatException;
 	BdfDictionary getMessageMetadataAsDictionary(Transaction txn, MessageId m)
@@ -68,12 +83,6 @@ public interface ClientHelper {
 	void mergeMessageMetadata(Transaction txn, MessageId m,
 			BdfDictionary metadata) throws DbException, FormatException;
 	/**
 	 * Marks the given message as shared or unshared with other contacts.
 	 */
 	void setMessageShared(Transaction txn, MessageId m, boolean shared)
 			throws DbException;
 	byte[] toByteArray(BdfDictionary dictionary) throws FormatException;
 	byte[] toByteArray(BdfList list) throws FormatException;
@@ -81,10 +90,30 @@ public interface ClientHelper {
 	BdfDictionary toDictionary(byte[] b, int off, int len)
 			throws FormatException;
 	BdfDictionary toDictionary(TransportProperties transportProperties);
 	BdfDictionary toDictionary(Map<TransportId, TransportProperties> map);
 	BdfList toList(byte[] b, int off, int len) throws FormatException;
 	BdfList toList(byte[] b) throws FormatException;
-	byte[] sign(BdfList toSign, byte[] privateKey)
+	BdfList toList(Message m) throws FormatException;
 	BdfList toList(Author a);
 	byte[] sign(String label, BdfList toSign, byte[] privateKey)
 			throws FormatException, GeneralSecurityException;
 	void verifySignature(byte[] signature, String label, BdfList signed,
 			byte[] publicKey) throws FormatException, GeneralSecurityException;
 	Author parseAndValidateAuthor(BdfList author) throws FormatException;
 	TransportProperties parseAndValidateTransportProperties(
 			BdfDictionary properties) throws FormatException;
 	Map<TransportId, TransportProperties> parseAndValidateTransportPropertiesMap(
 			BdfDictionary properties) throws FormatException;
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/client/ContactGroupFactory.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/client/ContactGroupFactory.java
@@ -0,0 +1,30 @@
 package org.briarproject.bramble.api.client;
 import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.identity.AuthorId;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.ClientId;
 import org.briarproject.bramble.api.sync.Group;
@NotNullByDefault
 public interface ContactGroupFactory {
 	/**
 	 * Creates a group that is not shared with any contacts.
 	 */
 	Group createLocalGroup(ClientId clientId, int majorVersion);
 	/**
 	 * Creates a group for the given client to share with the given contact.
 	 */
 	Group createContactGroup(ClientId clientId, int majorVersion,
 			Contact contact);
 	/**
 	 * Creates a group for the given client to share between the given authors
 	 * identified by their AuthorIds.
 	 */
 	Group createContactGroup(ClientId clientId, int majorVersion,
 			AuthorId authorId1, AuthorId authorId2);
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/Contact.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/Contact.java
@@ -1,8 +1,13 @@
-package org.briarproject.api.contact;
+package org.briarproject.bramble.api.contact;
-import org.briarproject.api.identity.Author;
+import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.api.identity.AuthorId;
+import org.briarproject.bramble.api.identity.AuthorId;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import javax.annotation.concurrent.Immutable;
@Immutable
@NotNullByDefault
 public class Contact {
 	private final ContactId id;
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactExchangeListener.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactExchangeListener.java
@@ -0,0 +1,20 @@
 package org.briarproject.bramble.api.contact;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@NotNullByDefault
 public interface ContactExchangeListener {
 	void contactExchangeSucceeded(Author remoteAuthor);
 	/**
 	 * The exchange failed because the contact already exists.
 	 */
 	void duplicateContact(Author remoteAuthor);
 	/**
 	 * A general failure.
 	 */
 	void contactExchangeFailed();
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactExchangeTask.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactExchangeTask.java
@@ -0,0 +1,48 @@
 package org.briarproject.bramble.api.contact;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.identity.LocalAuthor;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
 /**
 * A task for conducting a contact information exchange with a remote peer.
 */
@NotNullByDefault
 public interface ContactExchangeTask {
 	/**
 	 * The current version of the contact exchange protocol.
 	 */
 	byte PROTOCOL_VERSION = 1;
 	/**
 	 * Label for deriving Alice's header key from the master secret.
 	 */
 	String ALICE_KEY_LABEL =
 			"org.briarproject.bramble.contact/ALICE_HEADER_KEY";
 	/**
 	 * Label for deriving Bob's header key from the master secret.
 	 */
 	String BOB_KEY_LABEL = "org.briarproject.bramble.contact/BOB_HEADER_KEY";
 	/**
 	 * Label for deriving Alice's key binding nonce from the master secret.
 	 */
 	String ALICE_NONCE_LABEL = "org.briarproject.bramble.contact/ALICE_NONCE";
 	/**
 	 * Label for deriving Bob's key binding nonce from the master secret.
 	 */
 	String BOB_NONCE_LABEL = "org.briarproject.bramble.contact/BOB_NONCE";
 	/**
 	 * Exchanges contact information with a remote peer.
 	 */
 	void startExchange(ContactExchangeListener listener,
 			LocalAuthor localAuthor, SecretKey masterSecret,
 			DuplexTransportConnection conn, TransportId transportId,
 			boolean alice);
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactId.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactId.java
@@ -1,9 +1,15 @@
-package org.briarproject.api.contact;
+package org.briarproject.bramble.api.contact;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import javax.annotation.concurrent.Immutable;
 /**
 * Type-safe wrapper for an integer that uniquely identifies a contact within
- * the scope of a single node.
+ * the scope of the local device.
 */
@Immutable
@NotNullByDefault
 public class ContactId {
 	private final int id;
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactManager.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactManager.java
@@ -0,0 +1,114 @@
 package org.briarproject.bramble.api.contact;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorId;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import java.util.Collection;
@NotNullByDefault
 public interface ContactManager {
 	/**
 	 * Registers a hook to be called whenever a contact is added or removed.
 	 * This method should be called before
 	 * {@link LifecycleManager#startServices(String)}.
 	 */
 	void registerContactHook(ContactHook hook);
 	/**
 	 * Stores a contact associated with the given local and remote pseudonyms,
 	 * derives and stores transport keys for each transport, and returns an ID
 	 * for the contact.
 	 *
 	 * @param alice true if the local party is Alice
 	 */
 	ContactId addContact(Transaction txn, Author remote, AuthorId local,
 			SecretKey master, long timestamp, boolean alice, boolean verified,
 			boolean active) throws DbException;
 	/**
 	 * Stores a contact associated with the given local and remote pseudonyms
 	 * and returns an ID for the contact.
 	 */
 	ContactId addContact(Transaction txn, Author remote, AuthorId local,
 			boolean verified, boolean active) throws DbException;
 	/**
 	 * Stores a contact associated with the given local and remote pseudonyms,
 	 * derives and stores transport keys for each transport, and returns an ID
 	 * for the contact.
 	 *
 	 * @param alice true if the local party is Alice
 	 */
 	ContactId addContact(Author remote, AuthorId local,
 			SecretKey master, long timestamp, boolean alice, boolean verified,
 			boolean active) throws DbException;
 	/**
 	 * Returns the contact with the given ID.
 	 */
 	Contact getContact(ContactId c) throws DbException;
 	/**
 	 * Returns the contact with the given remoteAuthorId
 	 * that was added by the LocalAuthor with the given localAuthorId
 	 *
 	 * @throws org.briarproject.bramble.api.db.NoSuchContactException
 	 */
 	Contact getContact(AuthorId remoteAuthorId, AuthorId localAuthorId)
 			throws DbException;
 	/**
 	 * Returns the contact with the given remoteAuthorId
 	 * that was added by the LocalAuthor with the given localAuthorId
 	 *
 	 * @throws org.briarproject.bramble.api.db.NoSuchContactException
 	 */
 	Contact getContact(Transaction txn, AuthorId remoteAuthorId,
 			AuthorId localAuthorId) throws DbException;
 	/**
 	 * Returns all active contacts.
 	 */
 	Collection<Contact> getActiveContacts() throws DbException;
 	/**
 	 * Removes a contact and all associated state.
 	 */
 	void removeContact(ContactId c) throws DbException;
 	/**
 	 * Removes a contact and all associated state.
 	 */
 	void removeContact(Transaction txn, ContactId c) throws DbException;
 	/**
 	 * Marks a contact as active or inactive.
 	 */
 	void setContactActive(Transaction txn, ContactId c, boolean active)
 			throws DbException;
 	/**
 	 * Return true if a contact with this name and public key already exists
 	 */
 	boolean contactExists(Transaction txn, AuthorId remoteAuthorId,
 			AuthorId localAuthorId) throws DbException;
 	/**
 	 * Return true if a contact with this name and public key already exists
 	 */
 	boolean contactExists(AuthorId remoteAuthorId, AuthorId localAuthorId)
 			throws DbException;
 	interface ContactHook {
 		void addingContact(Transaction txn, Contact c) throws DbException;
 		void removingContact(Transaction txn, Contact c) throws DbException;
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/RecordTypes.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/RecordTypes.java
@@ -0,0 +1,9 @@
 package org.briarproject.bramble.api.contact;
 /**
 * Record types for the contact exchange protocol.
 */
 public interface RecordTypes {
 	byte CONTACT_INFO = 0;
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactAddedEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactAddedEvent.java
@@ -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 added.
 */
@Immutable
@NotNullByDefault
 public class ContactAddedEvent extends Event {
 	private final ContactId contactId;
 	private final boolean active;
 	public ContactAddedEvent(ContactId contactId, boolean active) {
 		this.contactId = contactId;
 		this.active = active;
 	}
 	public ContactId getContactId() {
 		return contactId;
 	}
 	public boolean isActive() {
 		return active;
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactRemovedEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactRemovedEvent.java
@@ -0,0 +1,25 @@
 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 removed.
 */
@Immutable
@NotNullByDefault
 public class ContactRemovedEvent extends Event {
 	private final ContactId contactId;
 	public ContactRemovedEvent(ContactId contactId) {
 		this.contactId = contactId;
 	}
 	public ContactId getContactId() {
 		return contactId;
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactStatusChangedEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactStatusChangedEvent.java
@@ -0,0 +1,31 @@
 package org.briarproject.bramble.api.contact.event;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import javax.annotation.concurrent.Immutable;
 /**
 * An event that is broadcast when a contact is marked active or inactive.
 */
@Immutable
@NotNullByDefault
 public class ContactStatusChangedEvent extends Event {
 	private final ContactId contactId;
 	private final boolean active;
 	public ContactStatusChangedEvent(ContactId contactId, boolean active) {
 		this.contactId = contactId;
 		this.active = active;
 	}
 	public ContactId getContactId() {
 		return contactId;
 	}
 	public boolean isActive() {
 		return active;
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactVerifiedEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/event/ContactVerifiedEvent.java
@@ -0,0 +1,26 @@
 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 verified.
 */
@Immutable
@NotNullByDefault
 public class ContactVerifiedEvent extends Event {
 	private final ContactId contactId;
 	public ContactVerifiedEvent(ContactId contactId) {
 		this.contactId = contactId;
 	}
 	public ContactId getContactId() {
 		return contactId;
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/CryptoComponent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/CryptoComponent.java
@@ -0,0 +1,133 @@
 package org.briarproject.bramble.api.crypto;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import java.security.GeneralSecurityException;
 import java.security.SecureRandom;
 import javax.annotation.Nullable;
@NotNullByDefault
 public interface CryptoComponent {
 	SecretKey generateSecretKey();
 	SecureRandom getSecureRandom();
 	KeyPair generateAgreementKeyPair();
 	KeyParser getAgreementKeyParser();
 	KeyPair generateSignatureKeyPair();
 	KeyParser getSignatureKeyParser();
 	KeyParser getMessageKeyParser();
 	/**
 	 * Derives another secret key from the given secret key.
 	 *
 	 * @param label a namespaced label indicating the purpose of the derived
 	 * key, to prevent it from being repurposed or colliding with a key derived
 	 * for another purpose
 	 */
 	SecretKey deriveKey(String label, SecretKey k, byte[]... inputs);
 	/**
 	 * Derives a common shared secret from two public keys and one of the
 	 * corresponding private keys.
 	 *
 	 * @param label a namespaced label indicating the purpose of this shared
 	 * secret, to prevent it from being repurposed or colliding with a shared
 	 * secret derived for another purpose
 	 * @param theirPublicKey the public key of the remote party
 	 * @param ourKeyPair the key pair of the local party
 	 * @return the shared secret
 	 */
 	SecretKey deriveSharedSecret(String label, PublicKey theirPublicKey,
 			KeyPair ourKeyPair, byte[]... inputs)
 			throws GeneralSecurityException;
 	/**
 	 * Signs the given byte[] with the given private key.
 	 *
 	 * @param label a namespaced label indicating the purpose of this
 	 * signature, to prevent it from being repurposed or colliding with a
 	 * signature created for another purpose
 	 */
 	byte[] sign(String label, byte[] toSign, byte[] privateKey)
 			throws GeneralSecurityException;
 	/**
 	 * Verifies that the given signature is valid for the signed data
 	 * and the given public key.
 	 *
 	 * @param label a namespaced label indicating the purpose of this
 	 * signature, to prevent it from being repurposed or colliding with a
 	 * signature created for another purpose
 	 * @return true if the signature was valid, false otherwise.
 	 */
 	boolean verifySignature(byte[] signature, String label, byte[] signed,
 			byte[] publicKey) throws GeneralSecurityException;
 	/**
 	 * Returns the hash of the given inputs. The inputs are unambiguously
 	 * combined by prefixing each input with its length.
 	 *
 	 * @param label a namespaced label indicating the purpose of this hash, to
 	 * prevent it from being repurposed or colliding with a hash created for
 	 * another purpose
 	 */
 	byte[] hash(String label, byte[]... inputs);
 	/**
 	 * Returns a message authentication code with the given key over the
 	 * given inputs. The inputs are unambiguously combined by prefixing each
 	 * input with its length.
 	 *
 	 * @param label a namespaced label indicating the purpose of this MAC, to
 	 * prevent it from being repurposed or colliding with a MAC created for
 	 * another purpose
 	 */
 	byte[] mac(String label, SecretKey macKey, byte[]... inputs);
 	/**
 	 * Verifies that the given message authentication code is valid for the
 	 * given secret key and inputs.
 	 *
 	 * @param label a namespaced label indicating the purpose of this MAC, to
 	 * prevent it from being repurposed or colliding with a MAC created for
 	 * another purpose
 	 * @return true if the MAC was valid, false otherwise.
 	 */
 	boolean verifyMac(byte[] mac, String label, SecretKey macKey,
 			byte[]... inputs);
 	/**
 	 * Encrypts and authenticates the given plaintext so it can be written to
 	 * storage. The encryption and authentication keys are derived from the
 	 * given password. The ciphertext will be decryptable using the same
 	 * password after the app restarts.
 	 */
 	byte[] encryptWithPassword(byte[] plaintext, String password);
 	/**
 	 * Decrypts and authenticates the given ciphertext that has been read from
 	 * storage. The encryption and authentication keys are derived from the
 	 * given password. Returns null if the ciphertext cannot be decrypted and
 	 * authenticated (for example, if the password is wrong).
 	 */
 	@Nullable
 	byte[] decryptWithPassword(byte[] ciphertext, String password);
 	/**
 	 * Encrypts the given plaintext to the given public key.
 	 */
 	byte[] encryptToKey(PublicKey publicKey, byte[] plaintext);
 	/**
 	 * Encodes the given data as a hex string divided into lines of the given
 	 * length. The line terminator is CRLF.
 	 */
 	String asciiArmour(byte[] b, int lineLength);
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/CryptoConstants.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/CryptoConstants.java
@@ -0,0 +1,25 @@
 package org.briarproject.bramble.api.crypto;
 public interface CryptoConstants {
 	/**
 	 * The maximum length of an agreement public key in bytes.
 	 */
 	int MAX_AGREEMENT_PUBLIC_KEY_BYTES = 32;
 	/**
 	 * The maximum length of a signature public key in bytes.
 	 */
 	int MAX_SIGNATURE_PUBLIC_KEY_BYTES = 32;
 	/**
 	 * The maximum length of a signature in bytes.
 	 */
 	int MAX_SIGNATURE_BYTES = 64;
 	/**
 	 * The length of a MAC in bytes.
 	 */
 	int MAC_BYTES = SecretKey.LENGTH;
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/CryptoExecutor.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/CryptoExecutor.java
@@ -0,0 +1,25 @@
 package org.briarproject.bramble.api.crypto;
 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 long-running crypto tasks. Also
 * used for annotating methods that should run on the crypto executor.
 * <p>
 * The contract of this executor is that tasks may be run concurrently, and
 * submitting a task will never block. Tasks must not run indefinitely. Tasks
 * submitted during shutdown are discarded.
 */
@Qualifier
@Target({FIELD, METHOD, PARAMETER})
@Retention(RUNTIME)
 public @interface CryptoExecutor {
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/KeyAgreementCrypto.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/KeyAgreementCrypto.java
@@ -0,0 +1,50 @@
 package org.briarproject.bramble.api.crypto;
 /**
 * Crypto operations for the key agreement protocol - see
 * https://code.briarproject.org/akwizgran/briar-spec/blob/master/protocols/BQP.md
 */
 public interface KeyAgreementCrypto {
 	/**
 	 * Hash label for public key commitment.
 	 */
 	String COMMIT_LABEL = "org.briarproject.bramble.keyagreement/COMMIT";
 	/**
 	 * Key derivation label for confirmation record.
 	 */
 	String CONFIRMATION_KEY_LABEL =
 			"org.briarproject.bramble.keyagreement/CONFIRMATION_KEY";
 	/**
 	 * MAC label for confirmation record.
 	 */
 	String CONFIRMATION_MAC_LABEL =
 			"org.briarproject.bramble.keyagreement/CONFIRMATION_MAC";
 	/**
 	 * Derives a commitment to the provided public key.
 	 *
 	 * @param publicKey the public key
 	 * @return the commitment to the provided public key.
 	 */
 	byte[] deriveKeyCommitment(PublicKey publicKey);
 	/**
 	 * Derives the content of a confirmation record.
 	 *
 	 * @param sharedSecret the common shared secret
 	 * @param theirPayload the key exchange payload of the remote party
 	 * @param ourPayload the key exchange payload of the local party
 	 * @param theirPublicKey the ephemeral public key of the remote party
 	 * @param ourKeyPair our ephemeral key pair of the local party
 	 * @param alice true if the local party is Alice
 	 * @param aliceRecord true if the confirmation record is for use by Alice
 	 * @return the confirmation record
 	 */
 	byte[] deriveConfirmationRecord(SecretKey sharedSecret,
 			byte[] theirPayload, byte[] ourPayload,
 			PublicKey theirPublicKey, KeyPair ourKeyPair,
 			boolean alice, boolean aliceRecord);
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/KeyPair.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/KeyPair.java
@@ -1,6 +1,14 @@
-package org.briarproject.api.crypto;
+package org.briarproject.bramble.api.crypto;
-/** A key pair consisting of a {@link PublicKey} and a {@link PrivateKey). */
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import javax.annotation.concurrent.Immutable;
 /**
 * A key pair consisting of a {@link PublicKey} and a {@link PrivateKey}.
 */
@Immutable
@NotNullByDefault
 public class KeyPair {
 	private final PublicKey publicKey;
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/KeyParser.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/KeyParser.java
@@ -1,7 +1,10 @@
-package org.briarproject.api.crypto;
+package org.briarproject.bramble.api.crypto;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import java.security.GeneralSecurityException;
@NotNullByDefault
 public interface KeyParser {
 	PublicKey parsePublicKey(byte[] encodedKey) throws GeneralSecurityException;
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/PasswordStrengthEstimator.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/PasswordStrengthEstimator.java
@@ -1,11 +1,14 @@
-package org.briarproject.api.crypto;
+package org.briarproject.bramble.api.crypto;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@NotNullByDefault
 public interface PasswordStrengthEstimator {
 	float NONE = 0;
-	float WEAK = 0.4f;
+	float WEAK = 0.25f;
-	float QUITE_WEAK = 0.6f;
+	float QUITE_WEAK = 0.5f;
-	float QUITE_STRONG = 0.8f;
+	float QUITE_STRONG = 0.75f;
 	float STRONG = 1;
 	/**
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/PrivateKey.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/PrivateKey.java
@@ -0,0 +1,15 @@
 package org.briarproject.bramble.api.crypto;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 /**
 * The private half of a public/private {@link KeyPair}.
 */
@NotNullByDefault
 public interface PrivateKey {
 	/**
 	 * Returns the encoded representation of this key.
 	 */
 	byte[] getEncoded();
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/PublicKey.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/PublicKey.java
@@ -0,0 +1,15 @@
 package org.briarproject.bramble.api.crypto;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 /**
 * The public half of a public/private {@link KeyPair}.
 */
@NotNullByDefault
 public interface PublicKey {
 	/**
 	 * Returns the encoded representation of this key.
 	 */
 	byte[] getEncoded();
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/SecretKey.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/SecretKey.java
@@ -1,9 +1,14 @@
-package org.briarproject.api.crypto;
+package org.briarproject.bramble.api.crypto;
-/** A secret key used for encryption and/or authentication. */
+/**
 * A secret key used for encryption and/or authentication.
 */
 public class SecretKey {
-	public static final int LENGTH = 32; // Bytes
+	/**
 	 * The length of a secret key in bytes.
 	 */
 	public static final int LENGTH = 32;
 	private final byte[] key;
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamDecrypter.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamDecrypter.java
@@ -1,13 +1,17 @@
-package org.briarproject.api.crypto;
+package org.briarproject.bramble.api.crypto;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import java.io.IOException;
@NotNullByDefault
 public interface StreamDecrypter {
 	/**
 	 * Reads a frame, decrypts its payload into the given buffer and returns
 	 * the payload length, or -1 if no more frames can be read from the stream.
-	 * @throws java.io.IOException if an error occurs while reading the frame,
+	 *
 	 * @throws IOException if an error occurs while reading the frame,
 	 * or if authenticated decryption fails.
 	 */
 	int readFrame(byte[] payload) throws IOException;
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamDecrypterFactory.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamDecrypterFactory.java
@@ -0,0 +1,22 @@
 package org.briarproject.bramble.api.crypto;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.transport.StreamContext;
 import java.io.InputStream;
@NotNullByDefault
 public interface StreamDecrypterFactory {
 	/**
 	 * Creates a {@link StreamDecrypter} for decrypting a transport stream.
 	 */
 	StreamDecrypter createStreamDecrypter(InputStream in, StreamContext ctx);
 	/**
 	 * Creates a {@link StreamDecrypter} for decrypting a contact exchange
 	 * stream.
 	 */
 	StreamDecrypter createContactExchangeStreamDecrypter(InputStream in,
 			SecretKey headerKey);
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamEncrypter.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamEncrypter.java
@@ -0,0 +1,20 @@
 package org.briarproject.bramble.api.crypto;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import java.io.IOException;
@NotNullByDefault
 public interface StreamEncrypter {
 	/**
 	 * Encrypts the given frame and writes it to the stream.
 	 */
 	void writeFrame(byte[] payload, int payloadLength, int paddingLength,
 			boolean finalFrame) throws IOException;
 	/**
 	 * Flushes the stream.
 	 */
 	void flush() throws IOException;
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamEncrypterFactory.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/StreamEncrypterFactory.java
@@ -0,0 +1,22 @@
 package org.briarproject.bramble.api.crypto;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.transport.StreamContext;
 import java.io.OutputStream;
@NotNullByDefault
 public interface StreamEncrypterFactory {
 	/**
 	 * Creates a {@link StreamEncrypter} for encrypting a transport stream.
 	 */
 	StreamEncrypter createStreamEncrypter(OutputStream out, StreamContext ctx);
 	/**
 	 * Creates a {@link StreamEncrypter} for encrypting a contact exchange
 	 * stream.
 	 */
 	StreamEncrypter createContactExchangeStreamDecrypter(OutputStream out,
 			SecretKey headerKey);
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/TransportCrypto.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/TransportCrypto.java
@@ -0,0 +1,33 @@
 package org.briarproject.bramble.api.crypto;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.transport.TransportKeys;
 /**
 * Crypto operations for the transport security protocol - see
 * https://code.briarproject.org/akwizgran/briar-spec/blob/master/protocols/BTP.md
 */
 public interface TransportCrypto {
 	/**
 	 * Derives initial transport keys for the given transport in the given
 	 * rotation period from the given master secret.
 	 *
 	 * @param alice whether the keys are for use by Alice or Bob.
 	 * @param active whether the keys are usable for outgoing streams.
 	 */
 	TransportKeys deriveTransportKeys(TransportId t, SecretKey master,
 			long rotationPeriod, boolean alice, boolean active);
 	/**
 	 * Rotates the given transport keys to the given rotation period. If the
 	 * keys are for the given period or any later period they are not rotated.
 	 */
 	TransportKeys rotateTransportKeys(TransportKeys k, long rotationPeriod);
 	/**
 	 * Encodes the pseudo-random tag that is used to recognise a stream.
 	 */
 	void encodeTag(byte[] tag, SecretKey tagKey, int protocolVersion,
 			long streamNumber);
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfDictionary.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfDictionary.java
@@ -1,12 +1,17 @@
-package org.briarproject.api.data;
+package org.briarproject.bramble.api.data;
-import org.briarproject.api.Bytes;
+import org.briarproject.bramble.api.Bytes;
-import org.briarproject.api.FormatException;
+import org.briarproject.bramble.api.FormatException;
 import java.util.Map;
-import java.util.concurrent.ConcurrentSkipListMap;
+import java.util.Map.Entry;
 import java.util.TreeMap;
-public class BdfDictionary extends ConcurrentSkipListMap<String, Object> {
+import javax.annotation.Nullable;
 import javax.annotation.concurrent.NotThreadSafe;
@NotThreadSafe
 public class BdfDictionary extends TreeMap<String, Object> {
 	public static final Object NULL_VALUE = new Object();
@@ -19,9 +24,9 @@ public class BdfDictionary extends ConcurrentSkipListMap<String, Object> {
 	 * );
 	 * </pre>
 	 */
-	public static BdfDictionary of(Entry<String, Object>... entries) {
+	public static BdfDictionary of(Entry<String, ?>... entries) {
 		BdfDictionary d = new BdfDictionary();
-		for (Entry<String, Object> e : entries) d.put(e.getKey(), e.getValue());
+		for (Entry<String, ?> e : entries) d.put(e.getKey(), e.getValue());
 		return d;
 	}
@@ -29,7 +34,7 @@ public class BdfDictionary extends ConcurrentSkipListMap<String, Object> {
 		super();
 	}
-	public BdfDictionary(Map<String, Object> m) {
+	public BdfDictionary(Map<String, ?> m) {
 		super(m);
 	}
@@ -39,6 +44,7 @@ public class BdfDictionary extends ConcurrentSkipListMap<String, Object> {
 		throw new FormatException();
 	}
 	@Nullable
 	public Boolean getOptionalBoolean(String key) throws FormatException {
 		Object o = get(key);
 		if (o == null || o == NULL_VALUE) return null;
@@ -61,6 +67,7 @@ public class BdfDictionary extends ConcurrentSkipListMap<String, Object> {
 		throw new FormatException();
 	}
 	@Nullable
 	public Long getOptionalLong(String key) throws FormatException {
 		Object o = get(key);
 		if (o == null || o == NULL_VALUE) return null;
@@ -87,6 +94,7 @@ public class BdfDictionary extends ConcurrentSkipListMap<String, Object> {
 		throw new FormatException();
 	}
 	@Nullable
 	public Double getOptionalDouble(String key) throws FormatException {
 		Object o = get(key);
 		if (o == null || o == NULL_VALUE) return null;
@@ -108,6 +116,7 @@ public class BdfDictionary extends ConcurrentSkipListMap<String, Object> {
 		throw new FormatException();
 	}
 	@Nullable
 	public String getOptionalString(String key) throws FormatException {
 		Object o = get(key);
 		if (o == null || o == NULL_VALUE) return null;
@@ -128,6 +137,7 @@ public class BdfDictionary extends ConcurrentSkipListMap<String, Object> {
 		throw new FormatException();
 	}
 	@Nullable
 	public byte[] getOptionalRaw(String key) throws FormatException {
 		Object o = get(key);
 		if (o == null || o == NULL_VALUE) return null;
@@ -149,6 +159,7 @@ public class BdfDictionary extends ConcurrentSkipListMap<String, Object> {
 		throw new FormatException();
 	}
 	@Nullable
 	public BdfList getOptionalList(String key) throws FormatException {
 		Object o = get(key);
 		if (o == null || o == NULL_VALUE) return null;
@@ -168,6 +179,7 @@ public class BdfDictionary extends ConcurrentSkipListMap<String, Object> {
 		throw new FormatException();
 	}
 	@Nullable
 	public BdfDictionary getOptionalDictionary(String key)
 			throws FormatException {
 		Object o = get(key);
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfEntry.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfEntry.java
@@ -1,7 +1,13 @@
-package org.briarproject.api.data;
+package org.briarproject.bramble.api.data;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import java.util.Map.Entry;
 import javax.annotation.concurrent.Immutable;
@Immutable
@NotNullByDefault
 public class BdfEntry implements Entry<String, Object>, Comparable<BdfEntry> {
 	private final String key;
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfList.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfList.java
@@ -1,15 +1,19 @@
-package org.briarproject.api.data;
+package org.briarproject.bramble.api.data;
-import org.briarproject.api.Bytes;
+import org.briarproject.bramble.api.Bytes;
-import org.briarproject.api.FormatException;
+import org.briarproject.bramble.api.FormatException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Vector;
-import static org.briarproject.api.data.BdfDictionary.NULL_VALUE;
+import javax.annotation.Nullable;
 import javax.annotation.concurrent.NotThreadSafe;
-public class BdfList extends Vector<Object> {
+import static org.briarproject.bramble.api.data.BdfDictionary.NULL_VALUE;
@NotThreadSafe
 public class BdfList extends ArrayList<Object> {
 	/**
 	 * Factory method for constructing lists inline.
@@ -29,13 +33,20 @@ public class BdfList extends Vector<Object> {
 		super(items);
 	}
 	private boolean isInRange(int index) {
 		return index >= 0 && index < size();
 	}
 	public Boolean getBoolean(int index) throws FormatException {
 		if (!isInRange(index)) throw new FormatException();
 		Object o = get(index);
 		if (o instanceof Boolean) return (Boolean) o;
 		throw new FormatException();
 	}
 	@Nullable
 	public Boolean getOptionalBoolean(int index) throws FormatException {
 		if (!isInRange(index)) throw new FormatException();
 		Object o = get(index);
 		if (o == null || o == NULL_VALUE) return null;
 		if (o instanceof Boolean) return (Boolean) o;
@@ -43,12 +54,14 @@ public class BdfList extends Vector<Object> {
 	}
 	public Boolean getBoolean(int index, Boolean defaultValue) {
 		if (!isInRange(index)) return defaultValue;
 		Object o = get(index);
 		if (o instanceof Boolean) return (Boolean) o;
 		return defaultValue;
 	}
 	public Long getLong(int index) throws FormatException {
 		if (!isInRange(index)) throw new FormatException();
 		Object o = get(index);
 		if (o instanceof Long) return (Long) o;
 		if (o instanceof Integer) return ((Integer) o).longValue();
@@ -57,7 +70,9 @@ public class BdfList extends Vector<Object> {
 		throw new FormatException();
 	}
 	@Nullable
 	public Long getOptionalLong(int index) throws FormatException {
 		if (!isInRange(index)) throw new FormatException();
 		Object o = get(index);
 		if (o == null || o == NULL_VALUE) return null;
 		if (o instanceof Long) return (Long) o;
@@ -68,6 +83,7 @@ public class BdfList extends Vector<Object> {
 	}
 	public Long getLong(int index, Long defaultValue) {
 		if (!isInRange(index)) return defaultValue;
 		Object o = get(index);
 		if (o instanceof Long) return (Long) o;
 		if (o instanceof Integer) return ((Integer) o).longValue();
@@ -77,13 +93,16 @@ public class BdfList extends Vector<Object> {
 	}
 	public Double getDouble(int index) throws FormatException {
 		if (!isInRange(index)) throw new FormatException();
 		Object o = get(index);
 		if (o instanceof Double) return (Double) o;
 		if (o instanceof Float) return ((Float) o).doubleValue();
 		throw new FormatException();
 	}
 	@Nullable
 	public Double getOptionalDouble(int index) throws FormatException {
 		if (!isInRange(index)) throw new FormatException();
 		Object o = get(index);
 		if (o == null || o == NULL_VALUE) return null;
 		if (o instanceof Double) return (Double) o;
@@ -92,6 +111,7 @@ public class BdfList extends Vector<Object> {
 	}
 	public Double getDouble(int index, Double defaultValue) {
 		if (!isInRange(index)) return defaultValue;
 		Object o = get(index);
 		if (o instanceof Double) return (Double) o;
 		if (o instanceof Float) return ((Float) o).doubleValue();
@@ -99,12 +119,15 @@ public class BdfList extends Vector<Object> {
 	}
 	public String getString(int index) throws FormatException {
 		if (!isInRange(index)) throw new FormatException();
 		Object o = get(index);
 		if (o instanceof String) return (String) o;
 		throw new FormatException();
 	}
 	@Nullable
 	public String getOptionalString(int index) throws FormatException {
 		if (!isInRange(index)) throw new FormatException();
 		Object o = get(index);
 		if (o == null || o == NULL_VALUE) return null;
 		if (o instanceof String) return (String) o;
@@ -112,19 +135,23 @@ public class BdfList extends Vector<Object> {
 	}
 	public String getString(int index, String defaultValue) {
 		if (!isInRange(index)) return defaultValue;
 		Object o = get(index);
 		if (o instanceof String) return (String) o;
 		return defaultValue;
 	}
 	public byte[] getRaw(int index) throws FormatException {
 		if (!isInRange(index)) throw new FormatException();
 		Object o = get(index);
 		if (o instanceof byte[]) return (byte[]) o;
 		if (o instanceof Bytes) return ((Bytes) o).getBytes();
 		throw new FormatException();
 	}
 	@Nullable
 	public byte[] getOptionalRaw(int index) throws FormatException {
 		if (!isInRange(index)) throw new FormatException();
 		Object o = get(index);
 		if (o == null || o == NULL_VALUE) return null;
 		if (o instanceof byte[]) return (byte[]) o;
@@ -133,6 +160,7 @@ public class BdfList extends Vector<Object> {
 	}
 	public byte[] getRaw(int index, byte[] defaultValue) {
 		if (!isInRange(index)) return defaultValue;
 		Object o = get(index);
 		if (o instanceof byte[]) return (byte[]) o;
 		if (o instanceof Bytes) return ((Bytes) o).getBytes();
@@ -140,12 +168,15 @@ public class BdfList extends Vector<Object> {
 	}
 	public BdfList getList(int index) throws FormatException {
 		if (!isInRange(index)) throw new FormatException();
 		Object o = get(index);
 		if (o instanceof BdfList) return (BdfList) o;
 		throw new FormatException();
 	}
 	@Nullable
 	public BdfList getOptionalList(int index) throws FormatException {
 		if (!isInRange(index)) throw new FormatException();
 		Object o = get(index);
 		if (o == null || o == NULL_VALUE) return null;
 		if (o instanceof BdfList) return (BdfList) o;
@@ -153,19 +184,23 @@ public class BdfList extends Vector<Object> {
 	}
 	public BdfList getList(int index, BdfList defaultValue) {
 		if (!isInRange(index)) return defaultValue;
 		Object o = get(index);
 		if (o instanceof BdfList) return (BdfList) o;
 		return defaultValue;
 	}
 	public BdfDictionary getDictionary(int index) throws FormatException {
 		if (!isInRange(index)) throw new FormatException();
 		Object o = get(index);
 		if (o instanceof BdfDictionary) return (BdfDictionary) o;
 		throw new FormatException();
 	}
 	@Nullable
 	public BdfDictionary getOptionalDictionary(int index)
 			throws FormatException {
 		if (!isInRange(index)) throw new FormatException();
 		Object o = get(index);
 		if (o == null || o == NULL_VALUE) return null;
 		if (o instanceof BdfDictionary) return (BdfDictionary) o;
@@ -173,6 +208,7 @@ public class BdfList extends Vector<Object> {
 	}
 	public BdfDictionary getDictionary(int index, BdfDictionary defaultValue) {
 		if (!isInRange(index)) return defaultValue;
 		Object o = get(index);
 		if (o instanceof BdfDictionary) return (BdfDictionary) o;
 		return defaultValue;
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfReader.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfReader.java
@@ -1,47 +1,75 @@
-package org.briarproject.api.data;
+package org.briarproject.bramble.api.data;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import java.io.IOException;
@NotNullByDefault
 public interface BdfReader {
 	int DEFAULT_NESTED_LIMIT = 5;
 	boolean eof() throws IOException;
 	void close() throws IOException;
 	boolean hasNull() throws IOException;
 	void readNull() throws IOException;
 	void skipNull() throws IOException;
 	boolean hasBoolean() throws IOException;
 	boolean readBoolean() throws IOException;
 	void skipBoolean() throws IOException;
 	boolean hasLong() throws IOException;
 	long readLong() throws IOException;
 	void skipLong() throws IOException;
 	boolean hasDouble() throws IOException;
 	double readDouble() throws IOException;
 	void skipDouble() throws IOException;
 	boolean hasString() throws IOException;
 	String readString(int maxLength) throws IOException;
 	void skipString() throws IOException;
 	boolean hasRaw() throws IOException;
 	byte[] readRaw(int maxLength) throws IOException;
 	void skipRaw() throws IOException;
 	boolean hasList() throws IOException;
 	BdfList readList() throws IOException;
 	void readListStart() throws IOException;
 	boolean hasListEnd() throws IOException;
 	void readListEnd() throws IOException;
 	void skipList() throws IOException;
 	boolean hasDictionary() throws IOException;
 	BdfDictionary readDictionary() throws IOException;
 	void readDictionaryStart() throws IOException;
 	boolean hasDictionaryEnd() throws IOException;
 	void readDictionaryEnd() throws IOException;
 	void skipDictionary() throws IOException;
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfReaderFactory.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfReaderFactory.java
@@ -0,0 +1,13 @@
 package org.briarproject.bramble.api.data;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import java.io.InputStream;
@NotNullByDefault
 public interface BdfReaderFactory {
 	BdfReader createReader(InputStream in);
 	BdfReader createReader(InputStream in, int nestedLimit);
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfWriter.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfWriter.java
@@ -1,4 +1,4 @@
-package org.briarproject.api.data;
+package org.briarproject.bramble.api.data;
 import java.io.IOException;
 import java.util.Collection;
@@ -7,20 +7,30 @@ import java.util.Map;
 public interface BdfWriter {
 	void flush() throws IOException;
 	void close() throws IOException;
 	void writeNull() throws IOException;
 	void writeBoolean(boolean b) throws IOException;
 	void writeLong(long l) throws IOException;
 	void writeDouble(double d) throws IOException;
 	void writeString(String s) throws IOException;
 	void writeRaw(byte[] b) throws IOException;
 	void writeList(Collection<?> c) throws IOException;
 	void writeListStart() throws IOException;
 	void writeListEnd() throws IOException;
 	void writeDictionary(Map<?, ?> m) throws IOException;
 	void writeDictionaryStart() throws IOException;
 	void writeDictionaryEnd() throws IOException;
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfWriterFactory.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/data/BdfWriterFactory.java
@@ -0,0 +1,11 @@
 package org.briarproject.bramble.api.data;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import java.io.OutputStream;
@NotNullByDefault
 public interface BdfWriterFactory {
 	BdfWriter createWriter(OutputStream out);
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/data/MetadataEncoder.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/data/MetadataEncoder.java
@@ -0,0 +1,11 @@
 package org.briarproject.bramble.api.data;
 import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.db.Metadata;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@NotNullByDefault
 public interface MetadataEncoder {
 	Metadata encode(BdfDictionary d) throws FormatException;
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/data/MetadataParser.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/data/MetadataParser.java
@@ -0,0 +1,11 @@
 package org.briarproject.bramble.api.data;
 import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.db.Metadata;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@NotNullByDefault
 public interface MetadataParser {
 	BdfDictionary parse(Metadata m) throws FormatException;
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/ContactExistsException.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/ContactExistsException.java
@@ -1,10 +1,8 @@
-package org.briarproject.api.db;
+package org.briarproject.bramble.api.db;
 /**
 * Thrown when a duplicate contact is added to the database. This exception may
 * occur due to concurrent updates and does not indicate a database error.
 */
 public class ContactExistsException extends DbException {
 	private static final long serialVersionUID = -6658762011691502411L;
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/DataTooNewException.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/DataTooNewException.java
@@ -0,0 +1,7 @@
 package org.briarproject.bramble.api.db;
 /**
 * Thrown when the database uses a newer schema than the current code.
 */
 public class DataTooNewException extends DbException {
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/DataTooOldException.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/DataTooOldException.java
@@ -0,0 +1,8 @@
 package org.briarproject.bramble.api.db;
 /**
 * Thrown when the database uses an older schema than the current code and
 * cannot be migrated.
 */
 public class DataTooOldException extends DbException {
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseComponent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseComponent.java
@@ -1,40 +1,50 @@
-package org.briarproject.api.db;
+package org.briarproject.bramble.api.db;
-import org.briarproject.api.DeviceId;
+import org.briarproject.bramble.api.contact.Contact;
-import org.briarproject.api.TransportId;
+import org.briarproject.bramble.api.contact.ContactId;
-import org.briarproject.api.contact.Contact;
+import org.briarproject.bramble.api.identity.Author;
-import org.briarproject.api.contact.ContactId;
+import org.briarproject.bramble.api.identity.AuthorId;
-import org.briarproject.api.identity.Author;
+import org.briarproject.bramble.api.identity.LocalAuthor;
-import org.briarproject.api.identity.AuthorId;
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.api.identity.LocalAuthor;
+import org.briarproject.bramble.api.plugin.TransportId;
-import org.briarproject.api.settings.Settings;
+import org.briarproject.bramble.api.settings.Settings;
-import org.briarproject.api.sync.Ack;
+import org.briarproject.bramble.api.sync.Ack;
-import org.briarproject.api.sync.ClientId;
+import org.briarproject.bramble.api.sync.ClientId;
-import org.briarproject.api.sync.Group;
+import org.briarproject.bramble.api.sync.Group;
-import org.briarproject.api.sync.GroupId;
+import org.briarproject.bramble.api.sync.Group.Visibility;
-import org.briarproject.api.sync.Message;
+import org.briarproject.bramble.api.sync.GroupId;
-import org.briarproject.api.sync.MessageId;
+import org.briarproject.bramble.api.sync.Message;
-import org.briarproject.api.sync.MessageStatus;
+import org.briarproject.bramble.api.sync.MessageId;
-import org.briarproject.api.sync.Offer;
+import org.briarproject.bramble.api.sync.MessageStatus;
-import org.briarproject.api.sync.Request;
+import org.briarproject.bramble.api.sync.Offer;
-import org.briarproject.api.transport.TransportKeys;
+import org.briarproject.bramble.api.sync.Request;
-import org.jetbrains.annotations.Nullable;
+import org.briarproject.bramble.api.transport.KeySet;
 import org.briarproject.bramble.api.transport.KeySetId;
 import org.briarproject.bramble.api.transport.TransportKeys;
 import java.util.Collection;
 import java.util.Map;
-import static org.briarproject.api.sync.ValidationManager.State;
+import javax.annotation.Nullable;
 import static org.briarproject.bramble.api.sync.ValidationManager.State;
 /**
 * Encapsulates the database implementation and exposes high-level operations
 * to other components.
 */
@NotNullByDefault
 public interface DatabaseComponent {
 	/**
 	 * Opens the database and returns true if the database already existed.
 	 *
 	 * @throws DataTooNewException if the data uses a newer schema than the
 	 * current code
 	 * @throws DataTooOldException if the data uses an older schema than the
 	 * current code and cannot be migrated
 	 */
-	boolean open() throws DbException;
+	boolean open(@Nullable MigrationListener listener) throws DbException;
 	/**
 	 * Waits for any open transactions to finish and closes the database.
@@ -52,11 +62,17 @@ public interface DatabaseComponent {
 	Transaction startTransaction(boolean readOnly) throws DbException;
 	/**
-	 * Ends a transaction. If the transaction is marked as complete, the
+	 * Commits a transaction to the database.
 	 * transaction is committed and any events attached to the transaction are
 	 * broadcast; otherwise the transaction is aborted.
 	 */
-	void endTransaction(Transaction txn) throws DbException;
+	void commitTransaction(Transaction txn) throws DbException;
 	/**
 	 * Ends a transaction. If the transaction has not been committed,
 	 * it will be aborted. If the transaction has been committed,
 	 * any events attached to the transaction are broadcast.
 	 * The database lock will be released in either case.
 	 */
 	void endTransaction(Transaction txn);
 	/**
 	 * Stores a contact associated with the given local and remote pseudonyms,
@@ -88,10 +104,17 @@ public interface DatabaseComponent {
 			throws DbException;
 	/**
-	 * Stores transport keys for a newly added contact.
+	 * Stores the given transport keys, optionally binding them to the given
 	 * contact, and returns a key set ID.
 	 */
-	void addTransportKeys(Transaction txn, ContactId c, TransportKeys k)
+	KeySetId addTransportKeys(Transaction txn, @Nullable ContactId c,
-			throws DbException;
+			TransportKeys k) throws DbException;
 	/**
 	 * Binds the given keys for the given transport to the given contact.
 	 */
 	void bindTransportKeys(Transaction txn, ContactId c, TransportId t,
 			KeySetId k) throws DbException;
 	/**
 	 * Returns true if the database contains the given contact for the given
@@ -112,8 +135,9 @@ public interface DatabaseComponent {
 			throws DbException;
 	/**
-	 * Deletes the message with the given ID. The message ID and any other
+	 * Deletes the message with the given ID. Unlike
-	 * associated data are not deleted.
+	 * {@link #removeMessage(Transaction, MessageId)}, the message ID,
 	 * dependencies, metadata, and any other associated state are not deleted.
 	 */
 	void deleteMessage(Transaction txn, MessageId m) throws DbException;
@@ -198,13 +222,6 @@ public interface DatabaseComponent {
 	Collection<ContactId> getContacts(Transaction txn, AuthorId a)
 			throws DbException;
 	/**
 	 * Returns the unique ID for this device.
 	 * <p/>
 	 * Read-only.
 	 */
 	DeviceId getDeviceId(Transaction txn) throws DbException;
 	/**
 	 * Returns the group with the given ID.
 	 * <p/>
@@ -224,7 +241,17 @@ public interface DatabaseComponent {
 	 * <p/>
 	 * Read-only.
 	 */
-	Collection<Group> getGroups(Transaction txn, ClientId c) throws DbException;
+	Collection<Group> getGroups(Transaction txn, ClientId c, int majorVersion)
 			throws DbException;
 	/**
 	 * Returns the given group's visibility to the given contact, or
 	 * {@link Visibility INVISIBLE} if the group is not in the database.
 	 * <p/>
 	 * Read-only.
 	 */
 	Visibility getGroupVisibility(Transaction txn, ContactId c, GroupId g)
 			throws DbException;
 	/**
 	 * Returns the local pseudonym with the given ID.
@@ -241,21 +268,37 @@ public interface DatabaseComponent {
 	Collection<LocalAuthor> getLocalAuthors(Transaction txn) throws DbException;
 	/**
-	 * Returns the IDs of any messages that need to be validated by the given
+	 * Returns the IDs of all delivered messages in the given group.
 	 * client.
 	 * <p/>
 	 * Read-only.
 	 */
-	Collection<MessageId> getMessagesToValidate(Transaction txn, ClientId c)
+	Collection<MessageId> getMessageIds(Transaction txn, GroupId g)
 		throws DbException;
 	/**
 	 * Returns the IDs of any messages that need to be validated.
 	 * <p/>
 	 * Read-only.
 	 */
 	Collection<MessageId> getMessagesToValidate(Transaction txn)
 			throws DbException;
 	/**
-	 * Returns the IDs of any messages that are valid but pending delivery due
+	 * Returns the IDs of any messages that are pending delivery due to
-	 * to dependencies on other messages for the given client.
+	 * dependencies on other messages.
 	 * <p/>
 	 * Read-only.
 	 */
-	Collection<MessageId> getPendingMessages(Transaction txn, ClientId c)
+	Collection<MessageId> getPendingMessages(Transaction txn)
 			throws DbException;
 	/**
 	 * Returns the IDs of any messages that have shared dependents but have
 	 * not yet been shared themselves.
 	 * <p/>
 	 * Read-only.
 	 */
 	Collection<MessageId> getMessagesToShare(Transaction txn)
 			throws DbException;
 	/**
@@ -276,9 +319,9 @@ public interface DatabaseComponent {
 			throws DbException;
 	/**
-	 * Returns the metadata for any messages in the given group with metadata
+	 * Returns the metadata for any delivered messages in the given group with
-	 * that matches all entries in the given query. If the query is empty, the
+	 * metadata that matches all entries in the given query. If the query is
-	 * metadata for all messages is returned.
+	 * empty, the metadata for all delivered messages is returned.
 	 * <p/>
 	 * Read-only.
 	 */
@@ -294,8 +337,8 @@ public interface DatabaseComponent {
 			throws DbException;
 	/**
-	 * Returns the metadata for the given delivered and pending message.
+	 * Returns the metadata for the given delivered or pending message.
-	 * This is meant to be only used by the ValidationManager
+	 * This is only meant to be used by the ValidationManager.
 	 * <p/>
 	 * Read-only.
 	 */
@@ -303,8 +346,8 @@ public interface DatabaseComponent {
 			throws DbException;
 	/**
-	 * Returns the status of all messages in the given group with respect to
+	 * Returns the status of all delivered messages in the given group with
-	 * the given contact.
+	 * respect to the given contact.
 	 * <p/>
 	 * Read-only.
 	 */
@@ -313,12 +356,8 @@ public interface DatabaseComponent {
 	/**
 	 * Returns the IDs and states of all dependencies of the given message.
-	 * Missing dependencies have the state {@link
+	 * For missing dependencies and dependencies in other groups, the state
-	 * org.briarproject.api.sync.ValidationManager.State UNKNOWN}.
+	 * {@link State UNKNOWN} is returned.
 	 * Dependencies in other groups have the state {@link
 	 * org.briarproject.api.sync.ValidationManager.State INVALID}.
 	 * Note that these states are not set on the dependencies themselves; the
 	 * returned states should only be taken in the context of the given message.
 	 * <p/>
 	 * Read-only.
 	 */
@@ -326,9 +365,9 @@ public interface DatabaseComponent {
 			throws DbException;
 	/**
-	 * Returns all IDs of messages that depend on the given message.
+	 * Returns the IDs and states of all dependents of the given message.
-	 * Messages in other groups that declare a dependency on the given message
+	 * Dependents in other groups are not returned. If the given message is
-	 * will be returned even though such dependencies are invalid.
+	 * missing, no dependents are returned.
 	 * <p/>
 	 * Read-only.
 	 */
@@ -343,14 +382,24 @@ public interface DatabaseComponent {
 	State getMessageState(Transaction txn, MessageId m) throws DbException;
 	/**
-	 * Returns the status of the given message with respect to the given
+	 * Returns the status of the given delivered message with respect to the
-	 * contact.
+	 * given contact.
 	 * <p/>
 	 * Read-only.
 	 */
 	MessageStatus getMessageStatus(Transaction txn, ContactId c, MessageId m)
 			throws DbException;
 	/*
 	 * Returns the next time (in milliseconds since the Unix epoch) when a
 	 * message is due to be sent to the given contact. The returned value may
 	 * be zero if a message is due to be sent immediately, or Long.MAX_VALUE if
 	 * no messages are scheduled to be sent.
 	 * <p/>
 	 * Read-only.
 	 */
 	long getNextSendTime(Transaction txn, ContactId c) throws DbException;
 	/**
 	 * Returns all settings in the given namespace.
 	 * <p/>
@@ -363,22 +412,13 @@ public interface DatabaseComponent {
 	 * <p/>
 	 * Read-only.
 	 */
-	Map<ContactId, TransportKeys> getTransportKeys(Transaction txn,
+	Collection<KeySet> getTransportKeys(Transaction txn, TransportId t)
-			TransportId t) throws DbException;
+			throws DbException;
 	/**
-	 * Increments the outgoing stream counter for the given contact and
+	 * Increments the outgoing stream counter for the given transport keys.
 	 * transport in the given rotation period .
 	 */
-	void incrementStreamCounter(Transaction txn, ContactId c, TransportId t,
+	void incrementStreamCounter(Transaction txn, TransportId t, KeySetId k)
 			long rotationPeriod) throws DbException;
 	/**
 	 * Returns true if the given group is visible to the given contact.
 	 * <p/>
 	 * Read-only.
 	 */
 	boolean isVisibleToContact(Transaction txn, ContactId c, GroupId g)
 			throws DbException;
 	/**
@@ -439,11 +479,22 @@ public interface DatabaseComponent {
 	 */
 	void removeLocalAuthor(Transaction txn, AuthorId a) throws DbException;
 	/**
 	 * Removes a message (and all associated state) from the database.
 	 */
 	void removeMessage(Transaction txn, MessageId m) throws DbException;
 	/**
 	 * Removes a transport (and all associated state) from the database.
 	 */
 	void removeTransport(Transaction txn, TransportId t) throws DbException;
 	/**
 	 * Removes the given transport keys from the database.
 	 */
 	void removeTransportKeys(Transaction txn, TransportId t, KeySetId k)
 		throws DbException;
 	/**
 	 * Marks the given contact as verified.
 	 */
@@ -456,10 +507,15 @@ public interface DatabaseComponent {
 			throws DbException;
 	/**
-	 * Marks the given message as shared or unshared.
+	 * Sets the given group's visibility to the given contact.
 	 */
-	void setMessageShared(Transaction txn, MessageId m, boolean shared)
+	void setGroupVisibility(Transaction txn, ContactId c, GroupId g,
-			throws DbException;
+			Visibility v) throws DbException;
 	/**
 	 * Marks the given message as shared.
 	 */
 	void setMessageShared(Transaction txn, MessageId m) throws DbException;
 	/**
 	 * Sets the validation and delivery state of the given message.
@@ -474,21 +530,21 @@ public interface DatabaseComponent {
 			Collection<MessageId> dependencies) throws DbException;
 	/**
-	 * Sets the reordering window for the given contact and transport in the
+	 * Sets the reordering window for the given key set and transport in the
 	 * given rotation period.
 	 */
-	void setReorderingWindow(Transaction txn, ContactId c, TransportId t,
+	void setReorderingWindow(Transaction txn, KeySetId k, TransportId t,
 			long rotationPeriod, long base, byte[] bitmap) throws DbException;
 	/**
-	 * Makes a group visible or invisible to a contact.
+	 * Marks the given transport keys as usable for outgoing streams.
 	 */
-	void setVisibleToContact(Transaction txn, ContactId c, GroupId g,
+	void setTransportKeysActive(Transaction txn, TransportId t, KeySetId k)
-			boolean visible) throws DbException;
+		throws DbException;
 	/**
 	 * Stores the given transport keys, deleting any keys they have replaced.
 	 */
-	void updateTransportKeys(Transaction txn,
+	void updateTransportKeys(Transaction txn, Collection<KeySet> keys)
-			Map<ContactId, TransportKeys> keys) throws DbException;
+			throws DbException;
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseConfig.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseConfig.java
@@ -0,0 +1,28 @@
 package org.briarproject.bramble.api.db;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import java.io.File;
 import javax.annotation.Nullable;
@NotNullByDefault
 public interface DatabaseConfig {
 	boolean databaseExists();
 	File getDatabaseDirectory();
 	void setEncryptionKey(SecretKey key);
 	@Nullable
 	SecretKey getEncryptionKey();
 	void setLocalAuthorName(String nickname);
 	@Nullable
 	String getLocalAuthorName();
 	long getMaxSize();
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseExecutor.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/DatabaseExecutor.java
@@ -0,0 +1,26 @@
 package org.briarproject.bramble.api.db;
 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 database tasks. Also used for
 * annotating methods that should run on the database 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 run indefinitely. Tasks submitted during shutdown are
 * discarded.
 */
@Qualifier
@Target({FIELD, METHOD, PARAMETER})
@Retention(RUNTIME)
 public @interface DatabaseExecutor {
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/DbClosedException.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/DbClosedException.java
@@ -0,0 +1,7 @@
 package org.briarproject.bramble.api.db;
 /**
 * Thrown when a database operation is attempted and the database is closed.
 */
 public class DbClosedException extends DbException {
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/DbException.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/DbException.java
@@ -0,0 +1,11 @@
 package org.briarproject.bramble.api.db;
 public class DbException extends Exception {
 	public DbException() {
 	}
 	public DbException(Throwable t) {
 		super(t);
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/Metadata.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/Metadata.java
@@ -0,0 +1,14 @@
 package org.briarproject.bramble.api.db;
 import java.util.TreeMap;
 import javax.annotation.concurrent.NotThreadSafe;
@NotThreadSafe
 public class Metadata extends TreeMap<String, byte[]> {
 	/**
 	 * Special value to indicate that a key is being removed.
 	 */
 	public static final byte[] REMOVE = new byte[0];
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/MigrationListener.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/MigrationListener.java
@@ -0,0 +1,11 @@
 package org.briarproject.bramble.api.db;
 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 onMigrationRun();
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/NoSuchContactException.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/NoSuchContactException.java
@@ -1,4 +1,4 @@
-package org.briarproject.api.db;
+package org.briarproject.bramble.api.db;
 /**
 * Thrown when a database operation is attempted for a contact that is not in
@@ -6,6 +6,4 @@ package org.briarproject.api.db;
 * not indicate a database error.
 */
 public class NoSuchContactException extends DbException {
 	private static final long serialVersionUID = -7048538231308207386L;
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/NoSuchGroupException.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/NoSuchGroupException.java
@@ -1,4 +1,4 @@
-package org.briarproject.api.db;
+package org.briarproject.bramble.api.db;
 /**
 * Thrown when a database operation is attempted for a group that is not in the
@@ -6,6 +6,4 @@ package org.briarproject.api.db;
 * indicate a database error.
 */
 public class NoSuchGroupException extends DbException {
 	private static final long serialVersionUID = -5494178507342571697L;
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/NoSuchLocalAuthorException.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/NoSuchLocalAuthorException.java
@@ -1,4 +1,4 @@
-package org.briarproject.api.db;
+package org.briarproject.bramble.api.db;
 /**
 * Thrown when a database operation is attempted for a pseudonym that is not in
@@ -6,6 +6,4 @@ package org.briarproject.api.db;
 * not indicate a database error.
 */
 public class NoSuchLocalAuthorException extends DbException {
 	private static final long serialVersionUID = 494398665376703860L;
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/NoSuchMessageException.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/NoSuchMessageException.java
@@ -1,4 +1,4 @@
-package org.briarproject.api.db;
+package org.briarproject.bramble.api.db;
 /**
 * Thrown when a database operation is attempted for a message that is not in
@@ -6,6 +6,4 @@ package org.briarproject.api.db;
 * not indicate a database error.
 */
 public class NoSuchMessageException extends DbException {
 	private static final long serialVersionUID = 9191508339698803848L;
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/NoSuchTransportException.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/NoSuchTransportException.java
@@ -1,4 +1,4 @@
-package org.briarproject.api.db;
+package org.briarproject.bramble.api.db;
 /**
 * Thrown when a database operation is attempted for a transport that is not in
@@ -6,6 +6,4 @@ package org.briarproject.api.db;
 * not indicate a database error.
 */
 public class NoSuchTransportException extends DbException {
 	private static final long serialVersionUID = -6274982612759573100L;
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/db/Transaction.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/db/Transaction.java
@@ -1,21 +1,24 @@
-package org.briarproject.api.db;
+package org.briarproject.bramble.api.db;
-import org.briarproject.api.event.Event;
+import org.briarproject.bramble.api.event.Event;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import javax.annotation.concurrent.NotThreadSafe;
 /**
 * A wrapper around a database transaction. Transactions are not thread-safe.
 */
@NotThreadSafe
 public class Transaction {
 	private final Object txn;
 	private final boolean readOnly;
 	private List<Event> events = null;
-	private boolean complete = false;
+	private boolean committed = false;
 	public Transaction(Object txn, boolean readOnly) {
 		this.txn = txn;
@@ -42,7 +45,7 @@ public class Transaction {
 	 * committed.
 	 */
 	public void attach(Event e) {
-		if (events == null) events = new ArrayList<Event>();
+		if (events == null) events = new ArrayList<>();
 		events.add(e);
 	}
@@ -55,18 +58,18 @@ public class Transaction {
 	}
 	/**
-	 * Returns true if the transaction is ready to be committed.
+	 * Returns true if the transaction has been committed.
 	 */
-	public boolean isComplete() {
+	public boolean isCommitted() {
-		return complete;
+		return committed;
 	}
 	/**
-	 * Marks the transaction as ready to be committed. This method must not be
+	 * Marks the transaction as committed. This method should only be called
-	 * called more than once.
+	 * by the DatabaseComponent. It must not be called more than once.
 	 */
-	public void setComplete() {
+	public void setCommitted() {
-		if (complete) throw new IllegalStateException();
+		if (committed) throw new IllegalStateException();
-		complete = true;
+		committed = true;
 	}
 }
--- a/Show More
+++ b/Show More