Bump version numbers for beta release.

Merge branch '1007-samsung-transition-npe-fix' into 'maintenance-0.16'
Backport: Another attempt at fixing an infamous Samsung activity transition NPE See merge request akwizgran/briar!678
2026-02-13 19:29:06 +01:00 · 2018-01-29 16:48:21 +00:00 · 2018-01-29 14:53:46 +00:00 · 2018-01-29 12:36:21 -02:00 · 2018-01-29 10:45:12 -02:00 · 2018-01-23 17:36:18 +00:00
525 changed files with 16473 additions and 26876 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,6 @@ local.properties
 .idea/*
 !.idea/runConfigurations/
 !.idea/codeStyleSettings.xml
 !.idea/codeStyles
 .gradle
 build/
 *.iml
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,8 @@ cache:
 before_script:
  - set -e
  - export GRADLE_USER_HOME=$PWD/.gradle
  # Accept the license for the Android build tools
  - echo y | /opt/android-sdk/tools/bin/sdkmanager "build-tools;26.0.2"
  # Download OpenJDK 6 so we can compile against its standard library
  - JDK_FILE=openjdk-6-jre-headless_6b38-1.13.10-1~deb7u1_amd64.deb
  - if [ ! -d openjdk ]
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,261 +0,0 @@
 <component name="ProjectCodeStyleConfiguration">
  <code_scheme name="Project" version="173">
    <option name="RIGHT_MARGIN" value="100" />
    <AndroidXmlCodeStyleSettings>
      <option name="USE_CUSTOM_SETTINGS" value="true" />
    </AndroidXmlCodeStyleSettings>
    <JavaCodeStyleSettings>
      <option name="ANNOTATION_PARAMETER_WRAP" value="1" />
      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
      <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
        <value />
      </option>
      <option name="IMPORT_LAYOUT_TABLE">
        <value>
          <package name="android" withSubpackages="true" static="false" />
          <emptyLine />
          <package name="com" withSubpackages="true" static="false" />
          <emptyLine />
          <package name="junit" withSubpackages="true" static="false" />
          <emptyLine />
          <package name="net" withSubpackages="true" static="false" />
          <emptyLine />
          <package name="org" withSubpackages="true" static="false" />
          <emptyLine />
          <package name="java" withSubpackages="true" static="false" />
          <emptyLine />
          <package name="javax" withSubpackages="true" static="false" />
          <emptyLine />
          <package name="" withSubpackages="true" static="false" />
          <emptyLine />
          <package name="" withSubpackages="true" static="true" />
          <emptyLine />
        </value>
      </option>
      <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
      <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
    </JavaCodeStyleSettings>
    <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
@@ -1,5 +0,0 @@
 <component name="ProjectCodeStyleConfiguration">
  <state>
    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
  </state>
 </component>
--- a/.idea/runConfigurations/H2_Performance_Test.xml
+++ b/.idea/runConfigurations/H2_Performance_Test.xml
@@ -1,23 +0,0 @@
 <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
@@ -1,23 +0,0 @@
 <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/bramble-android/build.gradle
+++ b/bramble-android/build.gradle
@@ -1,21 +1,19 @@
 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'
+	buildToolsVersion '26.0.2'
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 26
-		versionCode 10001
+		versionCode 1617
-		versionName "1.0.1"
+		versionName "0.16.17"
 		consumerProguardFiles 'proguard-rules.txt'
 	}
@@ -36,79 +34,22 @@ dependencies {
 dependencyVerification {
 	verify = [
-			'com.android.tools.analytics-library:protos:26.1.2:protos-26.1.2.jar:52672a0b42b572a06aecc3535d5068eb46c0e15d129b9f1085d3c16a1da5cdbb',
+			'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
 			'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.h2database:h2:1.4.192:h2-1.4.192.jar:225b22e9857235c46c93861410b60b8c81c10dc8985f4faf188985ba5445126c',
-			'com.google.j2objc:j2objc-annotations:1.1:j2objc-annotations-1.1.jar:40ceb7157feb263949e0f503fe5f71689333a621021aa20ce0d0acee3badaa0f',
+			'com.madgag.spongycastle:core:1.58.0.0:core-1.58.0.0.jar:199617dd5698c5a9312b898c0a4cec7ce9dd8649d07f65d91629f58229d72728',
 			'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',
+			'org.bitlet:weupnp:0.1.4:weupnp-0.1.4.jar:88df7e6504929d00bdb832863761385c68ab92af945b04f0770b126270a444fb',
-			'net.sf.jopt-simple:jopt-simple:4.9:jopt-simple-4.9.jar:26c5856e954b5f864db76f13b86919b59c6eecf9fd930b96baa8884626baf2f5',
+			'org.jacoco:org.jacoco.agent:0.7.4.201502262128:org.jacoco.agent-0.7.4.201502262128-runtime.jar:e357a0f1d573c2f702a273992b1b6cb661734f66311854efb3778a888515c5b5',
-			'net.sf.kxml:kxml2:2.3.0:kxml2-2.3.0.jar:f264dd9f79a1fde10ce5ecc53221eff24be4c9331c830b7d52f2f08a7b633de2',
+			'org.jacoco:org.jacoco.agent:0.7.4.201502262128:org.jacoco.agent-0.7.4.201502262128.jar:47b4bec6df11a1118da3953da8b9fa1e7079d6fec857faa1a3cf912e53a6fd4e',
-			'org.apache.commons:commons-compress:1.12:commons-compress-1.12.jar:2c1542faf343185b7cab9c3d55c8ae5471d6d095d3887a4adefdbdf2984dc0b6',
+			'org.jacoco:org.jacoco.ant:0.7.4.201502262128:org.jacoco.ant-0.7.4.201502262128.jar:013ce2a68ba57a3c59215ae0dec4df3498c078062a38c3b94c841fc14450f283',
-			'org.apache.httpcomponents:httpclient:4.2.6:httpclient-4.2.6.jar:362e9324ee7c697e21279e20077b52737ddef3f1b2c1a7abe5ad34b465145550',
+			'org.jacoco:org.jacoco.core:0.7.4.201502262128:org.jacoco.core-0.7.4.201502262128.jar:ec4c74554312fac5116350164786f91b35c9e082fa4ea598bfa42b5db05d7abb',
-			'org.apache.httpcomponents:httpcore:4.2.5:httpcore-4.2.5.jar:e5e82da4cc66c8d917bbf743e3c0752efe8522735e7fc9dbddb65bccea81cfe9',
+			'org.jacoco:org.jacoco.report:0.7.4.201502262128:org.jacoco.report-0.7.4.201502262128.jar:7a3554c605e088e7e323b1084656243f0444fa353e2f2dee1f1a4204eb64ff09',
-			'org.apache.httpcomponents:httpmime:4.1:httpmime-4.1.jar:31629566148e8a47688ae43b420abc3ecd783ed15b33bebc00824bf24c9b15aa',
+			'org.ow2.asm:asm-debug-all:5.0.1:asm-debug-all-5.0.1.jar:4734de5b515a454b0096db6971fb068e5f70e6f10bbee2b3bd2fdfe5d978ed57',
 			'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',
 	]
 }
@@ -125,68 +66,30 @@ def torBinaries = [
 		"geoip"      : '8239b98374493529a29096e45fc5877d4d6fdad0146ad8380b291f90d61484ea'
 ]
-def verifyOrDeleteBinary(name, chksum, alreadyVerified) {
+def downloadBinary(name) {
-	return tasks.create("verifyOrDeleteBinary${name}", VerifyOrDelete) {
+	return tasks.create("downloadBinary${name}", Download) {
 		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 {
+		onlyIfNewer true
 			!dest.exists()
 		}
 	}
 }
 def verifyBinary(name, chksum) {
 	boolean[] alreadyVerified = [false]
 	return tasks.create([
 			name     : "verifyBinary${name}",
 			type     : Verify,
-			dependsOn: downloadBinary(name, chksum, alreadyVerified)]) {
+			dependsOn: downloadBinary(name)]) {
 		src "${torBinaryDir}/${name}.zip"
 		algorithm 'SHA-256'
 		checksum chksum
 		onlyIf {
 			!alreadyVerified[0]
 		}
 	}
 }
 project.afterEvaluate {
-	torBinaries.every { name, checksum ->
+	torBinaries.every { key, value ->
-		preBuild.dependsOn.add(verifyBinary(name, checksum))
+		preBuild.dependsOn.add(verifyBinary(key, value))
 	}
 }
 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/proguard-rules.txt
+++ b/bramble-android/proguard-rules.txt
@@ -8,10 +8,6 @@
 -dontwarn dagger.**
 -dontnote dagger.**
 -keep class net.i2p.crypto.eddsa.** { *; }
 -keep class org.whispersystems.curve25519.** { *; }
 -dontwarn sun.misc.Unsafe
 -dontnote com.google.common.**
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/AndroidPluginModule.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/AndroidPluginModule.java
@@ -14,7 +14,7 @@ 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.droidtooth.DroidtoothPluginFactory;
 import org.briarproject.bramble.plugin.tcp.AndroidLanTcpPluginFactory;
 import org.briarproject.bramble.plugin.tor.TorPluginFactory;
@@ -41,14 +41,13 @@ public class AndroidPluginModule {
 			Application app, LocationUtils locationUtils, DevReporter reporter,
 			EventBus eventBus) {
 		Context appContext = app.getApplicationContext();
-		DuplexPluginFactory bluetooth =
+		DuplexPluginFactory bluetooth = new DroidtoothPluginFactory(ioExecutor,
-				new AndroidBluetoothPluginFactory(ioExecutor, androidExecutor,
+				androidExecutor, appContext, random, eventBus, backoffFactory);
 						appContext, random, eventBus, backoffFactory);
 		DuplexPluginFactory tor = new TorPluginFactory(ioExecutor, scheduler,
 				appContext, locationUtils, reporter, eventBus,
 				torSocketFactory, backoffFactory);
 		DuplexPluginFactory lan = new AndroidLanTcpPluginFactory(ioExecutor,
-				scheduler, backoffFactory, appContext);
+				backoffFactory, appContext);
 		Collection<DuplexPluginFactory> duplex =
 				Arrays.asList(bluetooth, tor, lan);
 		@NotNullByDefault
--- 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
@@ -1,209 +0,0 @@
 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/droidtooth/DroidtoothPlugin.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/droidtooth/DroidtoothPlugin.java
@@ -0,0 +1,490 @@
 package org.briarproject.bramble.plugin.droidtooth;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothServerSocket;
 import android.bluetooth.BluetoothSocket;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.data.BdfList;
 import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.event.EventListener;
 import org.briarproject.bramble.api.keyagreement.KeyAgreementConnection;
 import org.briarproject.bramble.api.keyagreement.KeyAgreementListener;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.api.plugin.Backoff;
 import org.briarproject.bramble.api.plugin.PluginException;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPlugin;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
 import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
 import org.briarproject.bramble.api.plugin.event.DisableBluetoothEvent;
 import org.briarproject.bramble.api.plugin.event.EnableBluetoothEvent;
 import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.api.system.AndroidExecutor;
 import org.briarproject.bramble.util.AndroidUtils;
 import org.briarproject.bramble.util.StringUtils;
 import java.io.Closeable;
 import java.io.IOException;
 import java.security.SecureRandom;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.UUID;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Logger;
 import javax.annotation.Nullable;
 import static android.bluetooth.BluetoothAdapter.ACTION_SCAN_MODE_CHANGED;
 import static android.bluetooth.BluetoothAdapter.ACTION_STATE_CHANGED;
 import static android.bluetooth.BluetoothAdapter.EXTRA_SCAN_MODE;
 import static android.bluetooth.BluetoothAdapter.EXTRA_STATE;
 import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE;
 import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE;
 import static android.bluetooth.BluetoothAdapter.SCAN_MODE_NONE;
 import static android.bluetooth.BluetoothAdapter.STATE_OFF;
 import static android.bluetooth.BluetoothAdapter.STATE_ON;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.api.keyagreement.KeyAgreementConstants.TRANSPORT_ID_BLUETOOTH;
 import static org.briarproject.bramble.api.plugin.BluetoothConstants.ID;
 import static org.briarproject.bramble.api.plugin.BluetoothConstants.PREF_BT_ENABLE;
 import static org.briarproject.bramble.api.plugin.BluetoothConstants.PROP_ADDRESS;
 import static org.briarproject.bramble.api.plugin.BluetoothConstants.PROP_UUID;
 import static org.briarproject.bramble.api.plugin.BluetoothConstants.UUID_BYTES;
 import static org.briarproject.bramble.util.PrivacyUtils.scrubMacAddress;
@MethodsNotNullByDefault
@ParametersNotNullByDefault
 class DroidtoothPlugin implements DuplexPlugin, EventListener {
 	private static final Logger LOG =
 			Logger.getLogger(DroidtoothPlugin.class.getName());
 	private final Executor ioExecutor;
 	private final AndroidExecutor androidExecutor;
 	private final Context appContext;
 	private final SecureRandom secureRandom;
 	private final Backoff backoff;
 	private final DuplexPluginCallback callback;
 	private final int maxLatency;
 	private final AtomicBoolean used = new AtomicBoolean(false);
 	private volatile boolean running = false;
 	private volatile boolean wasEnabledByUs = false;
 	private volatile BluetoothStateReceiver receiver = null;
 	private volatile BluetoothServerSocket socket = null;
 	// Non-null if the plugin started successfully
 	private volatile BluetoothAdapter adapter = null;
 	DroidtoothPlugin(Executor ioExecutor, AndroidExecutor androidExecutor,
 			Context appContext, SecureRandom secureRandom, Backoff backoff,
 			DuplexPluginCallback callback, int maxLatency) {
 		this.ioExecutor = ioExecutor;
 		this.androidExecutor = androidExecutor;
 		this.appContext = appContext;
 		this.secureRandom = secureRandom;
 		this.backoff = backoff;
 		this.callback = callback;
 		this.maxLatency = maxLatency;
 	}
 	@Override
 	public TransportId getId() {
 		return ID;
 	}
 	@Override
 	public int getMaxLatency() {
 		return maxLatency;
 	}
 	@Override
 	public int getMaxIdleTime() {
 		// Bluetooth detects dead connections so we don't need keepalives
 		return Integer.MAX_VALUE;
 	}
 	@Override
 	public void start() throws PluginException {
 		if (used.getAndSet(true)) throw new IllegalStateException();
 		// BluetoothAdapter.getDefaultAdapter() must be called on a thread
 		// with a message queue, so submit it to the AndroidExecutor
 		try {
 			adapter = androidExecutor.runOnBackgroundThread(
 					BluetoothAdapter::getDefaultAdapter).get();
 		} catch (InterruptedException e) {
 			Thread.currentThread().interrupt();
 			LOG.warning("Interrupted while getting BluetoothAdapter");
 			throw new PluginException(e);
 		} catch (ExecutionException e) {
 			throw new PluginException(e);
 		}
 		if (adapter == null) {
 			LOG.info("Bluetooth is not supported");
 			throw new PluginException();
 		}
 		running = true;
 		// Listen for changes to the Bluetooth state
 		IntentFilter filter = new IntentFilter();
 		filter.addAction(ACTION_STATE_CHANGED);
 		filter.addAction(ACTION_SCAN_MODE_CHANGED);
 		receiver = new BluetoothStateReceiver();
 		appContext.registerReceiver(receiver, filter);
 		// If Bluetooth is enabled, bind a socket
 		if (adapter.isEnabled()) {
 			bind();
 		} else {
 			// Enable Bluetooth if settings allow
 			if (callback.getSettings().getBoolean(PREF_BT_ENABLE, false)) {
 				enableAdapter();
 			} else {
 				LOG.info("Not enabling Bluetooth");
 			}
 		}
 	}
 	private void bind() {
 		ioExecutor.execute(() -> {
 			if (!isRunning()) return;
 			String address = AndroidUtils.getBluetoothAddress(appContext,
 					adapter);
 			if (LOG.isLoggable(INFO))
 				LOG.info("Local address " + scrubMacAddress(address));
 			if (!StringUtils.isNullOrEmpty(address)) {
 				// Advertise the Bluetooth address to contacts
 				TransportProperties p = new TransportProperties();
 				p.put(PROP_ADDRESS, address);
 				callback.mergeLocalProperties(p);
 			}
 			// Bind a server socket to accept connections from contacts
 			BluetoothServerSocket ss;
 			try {
 				ss = adapter.listenUsingInsecureRfcommWithServiceRecord(
 						"RFCOMM", getUuid());
 			} catch (IOException e) {
 				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 				return;
 			}
 			if (!isRunning()) {
 				tryToClose(ss);
 				return;
 			}
 			LOG.info("Socket bound");
 			socket = ss;
 			backoff.reset();
 			callback.transportEnabled();
 			acceptContactConnections();
 		});
 	}
 	private UUID getUuid() {
 		String uuid = callback.getLocalProperties().get(PROP_UUID);
 		if (uuid == null) {
 			byte[] random = new byte[UUID_BYTES];
 			secureRandom.nextBytes(random);
 			uuid = UUID.nameUUIDFromBytes(random).toString();
 			TransportProperties p = new TransportProperties();
 			p.put(PROP_UUID, uuid);
 			callback.mergeLocalProperties(p);
 		}
 		return UUID.fromString(uuid);
 	}
 	private void tryToClose(@Nullable BluetoothServerSocket ss) {
 		try {
 			if (ss != null) ss.close();
 		} catch (IOException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 		} finally {
 			callback.transportDisabled();
 		}
 	}
 	private void acceptContactConnections() {
 		while (isRunning()) {
 			BluetoothSocket s;
 			try {
 				s = socket.accept();
 			} catch (IOException e) {
 				// This is expected when the socket is closed
 				if (LOG.isLoggable(INFO)) LOG.info(e.toString());
 				return;
 			}
 			if (LOG.isLoggable(INFO)) {
 				String address = s.getRemoteDevice().getAddress();
 				LOG.info("Connection from " + scrubMacAddress(address));
 			}
 			backoff.reset();
 			callback.incomingConnectionCreated(wrapSocket(s));
 		}
 	}
 	private DuplexTransportConnection wrapSocket(BluetoothSocket s) {
 		return new DroidtoothTransportConnection(this, s);
 	}
 	private void enableAdapter() {
 		if (adapter != null && !adapter.isEnabled()) {
 			if (adapter.enable()) {
 				LOG.info("Enabling Bluetooth");
 				wasEnabledByUs = true;
 			} else {
 				LOG.info("Could not enable Bluetooth");
 			}
 		}
 	}
 	@Override
 	public void stop() {
 		running = false;
 		if (receiver != null) appContext.unregisterReceiver(receiver);
 		tryToClose(socket);
 		disableAdapter();
 	}
 	private void disableAdapter() {
 		if (adapter != null && adapter.isEnabled() && wasEnabledByUs) {
 			if (adapter.disable()) LOG.info("Disabling Bluetooth");
 			else LOG.info("Could not disable Bluetooth");
 		}
 	}
 	@Override
 	public boolean isRunning() {
 		return running && adapter != null && adapter.isEnabled();
 	}
 	@Override
 	public boolean shouldPoll() {
 		return true;
 	}
 	@Override
 	public int getPollingInterval() {
 		return backoff.getPollingInterval();
 	}
 	@Override
 	public void poll(Collection<ContactId> connected) {
 		if (!isRunning()) return;
 		backoff.increment();
 		// Try to connect to known devices in parallel
 		Map<ContactId, TransportProperties> remote =
 				callback.getRemoteProperties();
 		for (Entry<ContactId, TransportProperties> e : remote.entrySet()) {
 			ContactId c = e.getKey();
 			if (connected.contains(c)) continue;
 			String address = e.getValue().get(PROP_ADDRESS);
 			if (StringUtils.isNullOrEmpty(address)) continue;
 			String uuid = e.getValue().get(PROP_UUID);
 			if (StringUtils.isNullOrEmpty(uuid)) continue;
 			ioExecutor.execute(() -> {
 				if (!running) return;
 				BluetoothSocket s = connect(address, uuid);
 				if (s != null) {
 					backoff.reset();
 					callback.outgoingConnectionCreated(c, wrapSocket(s));
 				}
 			});
 		}
 	}
 	@Nullable
 	private BluetoothSocket connect(String address, String uuid) {
 		// Validate the address
 		if (!BluetoothAdapter.checkBluetoothAddress(address)) {
 			if (LOG.isLoggable(WARNING))
 				// not scrubbing here to be able to figure out the problem
 				LOG.warning("Invalid address " + address);
 			return null;
 		}
 		// Validate the UUID
 		UUID u;
 		try {
 			u = UUID.fromString(uuid);
 		} catch (IllegalArgumentException e) {
 			if (LOG.isLoggable(WARNING)) LOG.warning("Invalid UUID " + uuid);
 			return null;
 		}
 		// Try to connect
 		BluetoothDevice d = adapter.getRemoteDevice(address);
 		BluetoothSocket s = null;
 		try {
 			s = d.createInsecureRfcommSocketToServiceRecord(u);
 			if (LOG.isLoggable(INFO))
 				LOG.info("Connecting to " + scrubMacAddress(address));
 			s.connect();
 			if (LOG.isLoggable(INFO))
 				LOG.info("Connected to " + scrubMacAddress(address));
 			return s;
 		} catch (IOException e) {
 			if (LOG.isLoggable(INFO)) {
 				LOG.info("Failed to connect to " + scrubMacAddress(address)
 						+ ": " + e);
 			}
 			tryToClose(s);
 			return null;
 		}
 	}
 	private void tryToClose(@Nullable Closeable c) {
 		try {
 			if (c != null) c.close();
 		} catch (IOException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 		}
 	}
 	@Override
 	public DuplexTransportConnection createConnection(ContactId c) {
 		if (!isRunning()) return null;
 		TransportProperties p = callback.getRemoteProperties(c);
 		String address = p.get(PROP_ADDRESS);
 		if (StringUtils.isNullOrEmpty(address)) return null;
 		String uuid = p.get(PROP_UUID);
 		if (StringUtils.isNullOrEmpty(uuid)) return null;
 		BluetoothSocket s = connect(address, uuid);
 		if (s == null) return null;
 		return new DroidtoothTransportConnection(this, s);
 	}
 	@Override
 	public boolean supportsKeyAgreement() {
 		return true;
 	}
 	@Override
 	public KeyAgreementListener createKeyAgreementListener(byte[] commitment) {
 		if (!isRunning()) return null;
 		// There's no point listening if we can't discover our own address
 		String address = AndroidUtils.getBluetoothAddress(appContext, adapter);
 		if (address.isEmpty()) return null;
 		// No truncation necessary because COMMIT_LENGTH = 16
 		UUID uuid = UUID.nameUUIDFromBytes(commitment);
 		if (LOG.isLoggable(INFO)) LOG.info("Key agreement UUID " + uuid);
 		// Bind a server socket for receiving key agreement connections
 		BluetoothServerSocket ss;
 		try {
 			ss = adapter.listenUsingInsecureRfcommWithServiceRecord(
 					"RFCOMM", uuid);
 		} catch (IOException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 			return null;
 		}
 		BdfList descriptor = new BdfList();
 		descriptor.add(TRANSPORT_ID_BLUETOOTH);
 		descriptor.add(StringUtils.macToBytes(address));
 		return new BluetoothKeyAgreementListener(descriptor, ss);
 	}
 	@Override
 	public DuplexTransportConnection createKeyAgreementConnection(
 			byte[] commitment, BdfList descriptor, long timeout) {
 		if (!isRunning()) return null;
 		String address;
 		try {
 			address = parseAddress(descriptor);
 		} catch (FormatException e) {
 			LOG.info("Invalid address in key agreement descriptor");
 			return null;
 		}
 		// No truncation necessary because COMMIT_LENGTH = 16
 		UUID uuid = UUID.nameUUIDFromBytes(commitment);
 		if (LOG.isLoggable(INFO))
 			LOG.info("Connecting to key agreement UUID " + uuid);
 		BluetoothSocket s = connect(address, uuid.toString());
 		if (s == null) return null;
 		return new DroidtoothTransportConnection(this, s);
 	}
 	private String parseAddress(BdfList descriptor) throws FormatException {
 		byte[] mac = descriptor.getRaw(1);
 		if (mac.length != 6) throw new FormatException();
 		return StringUtils.macToString(mac);
 	}
 	@Override
 	public void eventOccurred(Event e) {
 		if (e instanceof EnableBluetoothEvent) {
 			enableAdapterAsync();
 		} else if (e instanceof DisableBluetoothEvent) {
 			disableAdapterAsync();
 		}
 	}
 	private void enableAdapterAsync() {
 		ioExecutor.execute(this::enableAdapter);
 	}
 	private void disableAdapterAsync() {
 		ioExecutor.execute(this::disableAdapter);
 	}
 	private class BluetoothStateReceiver extends BroadcastReceiver {
 		@Override
 		public void onReceive(Context ctx, Intent intent) {
 			int state = intent.getIntExtra(EXTRA_STATE, 0);
 			if (state == STATE_ON) {
 				LOG.info("Bluetooth enabled");
 				bind();
 			} else if (state == STATE_OFF) {
 				LOG.info("Bluetooth disabled");
 				tryToClose(socket);
 			}
 			int scanMode = intent.getIntExtra(EXTRA_SCAN_MODE, 0);
 			if (scanMode == SCAN_MODE_NONE) {
 				LOG.info("Scan mode: None");
 			} else if (scanMode == SCAN_MODE_CONNECTABLE) {
 				LOG.info("Scan mode: Connectable");
 			} else if (scanMode == SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
 				LOG.info("Scan mode: Discoverable");
 			}
 		}
 	}
 	private class BluetoothKeyAgreementListener extends KeyAgreementListener {
 		private final BluetoothServerSocket ss;
 		private BluetoothKeyAgreementListener(BdfList descriptor,
 				BluetoothServerSocket ss) {
 			super(descriptor);
 			this.ss = ss;
 		}
 		@Override
 		public Callable<KeyAgreementConnection> listen() {
 			return () -> {
 				BluetoothSocket s = ss.accept();
 				if (LOG.isLoggable(INFO))
 					LOG.info(ID.getString() + ": Incoming connection");
 				return new KeyAgreementConnection(
 						new DroidtoothTransportConnection(
 								DroidtoothPlugin.this, s), ID);
 			};
 		}
 		@Override
 		public void close() {
 			try {
 				ss.close();
 			} catch (IOException e) {
 				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 			}
 		}
 	}
 }
--- 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
@@ -1,4 +1,4 @@
-package org.briarproject.bramble.plugin.bluetooth;
+package org.briarproject.bramble.plugin.droidtooth;
 import android.content.Context;
@@ -21,7 +21,7 @@ import static org.briarproject.bramble.api.plugin.BluetoothConstants.ID;
@Immutable
@NotNullByDefault
-public class AndroidBluetoothPluginFactory implements DuplexPluginFactory {
+public class DroidtoothPluginFactory implements DuplexPluginFactory {
 	private static final int MAX_LATENCY = 30 * 1000; // 30 seconds
 	private static final int MIN_POLLING_INTERVAL = 60 * 1000; // 1 minute
@@ -35,7 +35,7 @@ public class AndroidBluetoothPluginFactory implements DuplexPluginFactory {
 	private final EventBus eventBus;
 	private final BackoffFactory backoffFactory;
-	public AndroidBluetoothPluginFactory(Executor ioExecutor,
+	public DroidtoothPluginFactory(Executor ioExecutor,
 			AndroidExecutor androidExecutor, Context appContext,
 			SecureRandom secureRandom, EventBus eventBus,
 			BackoffFactory backoffFactory) {
@@ -59,13 +59,11 @@ public class AndroidBluetoothPluginFactory implements DuplexPluginFactory {
 	@Override
 	public DuplexPlugin createPlugin(DuplexPluginCallback callback) {
 		BluetoothConnectionLimiter connectionLimiter =
 				new BluetoothConnectionLimiterImpl();
 		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
 				MAX_POLLING_INTERVAL, BACKOFF_BASE);
-		AndroidBluetoothPlugin plugin = new AndroidBluetoothPlugin(
+		DroidtoothPlugin plugin = new DroidtoothPlugin(ioExecutor,
-				connectionLimiter, ioExecutor, androidExecutor, appContext,
+				androidExecutor, appContext, secureRandom, backoff, callback,
-				secureRandom, backoff, callback, MAX_LATENCY);
+				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
@@ -1,4 +1,4 @@
-package org.briarproject.bramble.plugin.bluetooth;
+package org.briarproject.bramble.plugin.droidtooth;
 import android.bluetooth.BluetoothSocket;
@@ -11,17 +11,12 @@ import java.io.InputStream;
 import java.io.OutputStream;
@NotNullByDefault
-class AndroidBluetoothTransportConnection
+class DroidtoothTransportConnection extends AbstractDuplexTransportConnection {
 		extends AbstractDuplexTransportConnection {
 	private final BluetoothConnectionLimiter connectionManager;
 	private final BluetoothSocket socket;
-	AndroidBluetoothTransportConnection(Plugin plugin,
+	DroidtoothTransportConnection(Plugin plugin, BluetoothSocket socket) {
 			BluetoothConnectionLimiter connectionManager,
 			BluetoothSocket socket) {
 		super(plugin);
 		this.connectionManager = connectionManager;
 		this.socket = socket;
 	}
@@ -37,10 +32,6 @@ class AndroidBluetoothTransportConnection
 	@Override
 	protected void closeConnection(boolean exception) throws IOException {
-		try {
+		socket.close();
 			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
@@ -5,84 +5,37 @@ 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,
+	AndroidLanTcpPlugin(Executor ioExecutor, Backoff backoff,
-			Backoff backoff, Context appContext, DuplexPluginCallback callback,
+			Context appContext, DuplexPluginCallback callback, int maxLatency,
-			int maxLatency, int maxIdleTime) {
+			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
@@ -91,9 +44,7 @@ class AndroidLanTcpPlugin extends LanTcpPlugin {
 		running = true;
 		// Register to receive network status events
 		networkStateReceiver = new NetworkStateReceiver();
-		IntentFilter filter = new IntentFilter();
+		IntentFilter filter = new IntentFilter(CONNECTIVITY_ACTION);
 		filter.addAction(CONNECTIVITY_ACTION);
 		filter.addAction(WIFI_AP_STATE_CHANGED_ACTION);
 		appContext.registerReceiver(networkStateReceiver, filter);
 	}
@@ -105,92 +56,21 @@ class AndroidLanTcpPlugin extends LanTcpPlugin {
 		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)) {
+			Object o = ctx.getSystemService(CONNECTIVITY_SERVICE);
-				// The state change may be broadcast before the AP address is
+			ConnectivityManager cm = (ConnectivityManager) o;
-				// visible, so delay handling the event
+			NetworkInfo net = cm.getActiveNetworkInfo();
-				scheduler.schedule(this::handleConnectivityChange, 1, SECONDS);
+			if (net != null && net.getType() == TYPE_WIFI && net.isConnected()) {
-			} else {
+				LOG.info("Connected to Wi-Fi");
 				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()) {
+			} else {
-				LOG.info("Not connected to wifi");
+				LOG.info("Not connected to Wi-Fi");
 				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
@@ -11,7 +11,6 @@ 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;
@@ -28,15 +27,12 @@ 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,
-			ScheduledExecutorService scheduler, BackoffFactory backoffFactory,
+			BackoffFactory backoffFactory, Context appContext) {
 			Context appContext) {
 		this.ioExecutor = ioExecutor;
 		this.scheduler = scheduler;
 		this.backoffFactory = backoffFactory;
 		this.appContext = appContext;
 	}
@@ -55,7 +51,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, scheduler, backoff,
+		return new AndroidLanTcpPlugin(ioExecutor, backoff, appContext,
-				appContext, callback, MAX_LATENCY, MAX_IDLE_TIME);
+				callback, MAX_LATENCY, MAX_IDLE_TIME);
 	}
 }
--- 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
@@ -16,7 +16,6 @@ import android.os.PowerManager;
 import net.freehaven.tor.control.EventHandler;
 import net.freehaven.tor.control.TorControlConnection;
 import org.briarproject.bramble.PoliteExecutor;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.data.BdfList;
 import org.briarproject.bramble.api.event.Event;
@@ -64,6 +63,8 @@ import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
 import java.util.zip.ZipInputStream;
@@ -110,7 +111,7 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	private static final Logger LOG =
 			Logger.getLogger(TorPlugin.class.getName());
-	private final Executor ioExecutor, connectionStatusExecutor;
+	private final Executor ioExecutor;
 	private final ScheduledExecutorService scheduler;
 	private final Context appContext;
 	private final LocationUtils locationUtils;
@@ -124,6 +125,7 @@ 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 Lock connectionStatusLock;
 	private final AtomicReference<Future<?>> connectivityCheck =
 			new AtomicReference<>();
 	private final AtomicBoolean used = new AtomicBoolean(false);
@@ -165,9 +167,7 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		// 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
+		connectionStatusLock = new ReentrantLock();
 		connectionStatusExecutor = new PoliteExecutor("TorPlugin",
 				ioExecutor, 1);
 	}
 	@Override
@@ -614,7 +614,7 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	@Override
 	public DuplexTransportConnection createKeyAgreementConnection(
-			byte[] commitment, BdfList descriptor) {
+			byte[] commitment, BdfList descriptor, long timeout) {
 		throw new UnsupportedOperationException();
 	}
@@ -697,46 +697,56 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	}
 	private void updateConnectionStatus() {
-		connectionStatusExecutor.execute(() -> {
+		ioExecutor.execute(() -> {
 			if (!running) return;
 			Object o = appContext.getSystemService(CONNECTIVITY_SERVICE);
 			ConnectivityManager cm = (ConnectivityManager) o;
 			NetworkInfo net = cm.getActiveNetworkInfo();
 			boolean online = net != null && net.isConnected();
 			boolean wifi = online && net.getType() == TYPE_WIFI;
 			String country = locationUtils.getCurrentCountry();
 			boolean blocked = TorNetworkMetadata.isTorProbablyBlocked(
 					country);
 			Settings s = callback.getSettings();
 			int network = s.getInt(PREF_TOR_NETWORK, PREF_TOR_NETWORK_ALWAYS);
 			if (LOG.isLoggable(INFO)) {
 				LOG.info("Online: " + online + ", wifi: " + wifi);
 				if ("".equals(country)) LOG.info("Country code unknown");
 				else LOG.info("Country code: " + country);
 			}
 			try {
-				if (!online) {
+				connectionStatusLock.lock();
-					LOG.info("Disabling network, device is offline");
+				updateConnectionStatusLocked();
-					enableNetwork(false);
+			} finally {
-				} else if (blocked) {
+				connectionStatusLock.unlock();
 					LOG.info("Disabling network, country is blocked");
 					enableNetwork(false);
 				} else if (network == PREF_TOR_NETWORK_NEVER
 						|| (network == PREF_TOR_NETWORK_WIFI && !wifi)) {
 					LOG.info("Disabling network due to data setting");
 					enableNetwork(false);
 				} else {
 					LOG.info("Enabling network");
 					enableNetwork(true);
 				}
 			} catch (IOException e) {
 				if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 			}
 		});
 	}
 	// Locking: connectionStatusLock
 	private void updateConnectionStatusLocked() {
 		Object o = appContext.getSystemService(CONNECTIVITY_SERVICE);
 		ConnectivityManager cm = (ConnectivityManager) o;
 		NetworkInfo net = cm.getActiveNetworkInfo();
 		boolean online = net != null && net.isConnected();
 		boolean wifi = online && net.getType() == TYPE_WIFI;
 		String country = locationUtils.getCurrentCountry();
 		boolean blocked = TorNetworkMetadata.isTorProbablyBlocked(
 				country);
 		Settings s = callback.getSettings();
 		int network = s.getInt(PREF_TOR_NETWORK, PREF_TOR_NETWORK_ALWAYS);
 		if (LOG.isLoggable(INFO)) {
 			LOG.info("Online: " + online + ", wifi: " + wifi);
 			if ("".equals(country)) LOG.info("Country code unknown");
 			else LOG.info("Country code: " + country);
 		}
 		try {
 			if (!online) {
 				LOG.info("Disabling network, device is offline");
 				enableNetwork(false);
 			} else if (blocked) {
 				LOG.info("Disabling network, country is blocked");
 				enableNetwork(false);
 			} else if (network == PREF_TOR_NETWORK_NEVER
 					|| (network == PREF_TOR_NETWORK_WIFI && !wifi)) {
 				LOG.info("Disabling network due to data setting");
 				enableNetwork(false);
 			} else {
 				LOG.info("Enabling network");
 				enableNetwork(true);
 			}
 		} catch (IOException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 		}
 	}
 	private void scheduleConnectionStatusUpdate() {
 		Future<?> newConnectivityCheck =
 				scheduler.schedule(this::updateConnectionStatus, 1, MINUTES);
@@ -778,7 +788,7 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		private synchronized void enableNetwork(boolean enable) {
 			networkEnabled = enable;
-			if (!enable) circuitBuilt = false;
+			circuitBuilt = false;
 		}
 		private synchronized boolean isConnected() {
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/Multiset.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/Multiset.java
@@ -1,101 +0,0 @@
 package org.briarproject.bramble.api;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Set;
 import javax.annotation.concurrent.NotThreadSafe;
@NotThreadSafe
@NotNullByDefault
 public class Multiset<T> {
 	private final Map<T, Integer> map = new HashMap<>();
 	private int total = 0;
 	/**
 	 * Returns how many items the multiset contains in total.
 	 */
 	public int getTotal() {
 		return total;
 	}
 	/**
 	 * Returns how many unique items the multiset contains.
 	 */
 	public int getUnique() {
 		return map.size();
 	}
 	/**
 	 * Returns how many of the given item the multiset contains.
 	 */
 	public int getCount(T t) {
 		Integer count = map.get(t);
 		return count == null ? 0 : count;
 	}
 	/**
 	 * Adds the given item to the multiset and returns how many of the item
 	 * the multiset now contains.
 	 */
 	public int add(T t) {
 		Integer count = map.get(t);
 		if (count == null) count = 0;
 		map.put(t, count + 1);
 		total++;
 		return count + 1;
 	}
 	/**
 	 * Removes the given item from the multiset and returns how many of the
 	 * item the multiset now contains.
 	 * @throws NoSuchElementException if the item is not in the multiset.
 	 */
 	public int remove(T t) {
 		Integer count = map.get(t);
 		if (count == null) throw new NoSuchElementException();
 		if (count == 1) map.remove(t);
 		else map.put(t, count - 1);
 		total--;
 		return count - 1;
 	}
 	/**
 	 * Removes all occurrences of the given item from the multiset.
 	 */
 	public int removeAll(T t) {
 		Integer count = map.remove(t);
 		if (count == null) return 0;
 		total -= count;
 		return count;
 	}
 	/**
 	 * Returns true if the multiset contains any occurrences of the given item.
 	 */
 	public boolean contains(T t) {
 		return map.containsKey(t);
 	}
 	/**
 	 * Removes all items from the multiset.
 	 */
 	public void clear() {
 		map.clear();
 		total = 0;
 	}
 	/**
 	 * Returns the set of unique items the multiset contains. The returned set
 	 * is unmodifiable.
 	 */
 	public Set<T> keySet() {
 		return Collections.unmodifiableSet(map.keySet());
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/UnsupportedVersionException.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/UnsupportedVersionException.java
@@ -1,9 +0,0 @@
 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/ClientHelper.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/client/ClientHelper.java
@@ -5,10 +5,7 @@ import org.briarproject.bramble.api.data.BdfDictionary;
 import org.briarproject.bramble.api.data.BdfList;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageId;
@@ -90,30 +87,16 @@ public interface ClientHelper {
 	BdfDictionary toDictionary(byte[] b, int off, int len)
 			throws FormatException;
 	BdfDictionary toDictionary(TransportProperties transportProperties);
 	BdfDictionary toDictionary(Map<TransportId, TransportProperties> map);
 	BdfList toList(byte[] b, int off, int len) throws FormatException;
 	BdfList toList(byte[] b) throws FormatException;
 	BdfList toList(Message m) throws FormatException;
 	BdfList toList(Author a);
 	byte[] sign(String label, BdfList toSign, byte[] privateKey)
 			throws FormatException, GeneralSecurityException;
-	void verifySignature(byte[] signature, String label, BdfList signed,
+	void verifySignature(String label, byte[] sig, byte[] publicKey,
-			byte[] publicKey) throws FormatException, GeneralSecurityException;
+			BdfList signed) 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
@@ -12,19 +12,18 @@ public interface ContactGroupFactory {
 	/**
 	 * Creates a group that is not shared with any contacts.
 	 */
-	Group createLocalGroup(ClientId clientId, int majorVersion);
+	Group createLocalGroup(ClientId clientId);
 	/**
 	 * Creates a group for the given client to share with the given contact.
 	 */
-	Group createContactGroup(ClientId clientId, int majorVersion,
+	Group createContactGroup(ClientId clientId, Contact contact);
 			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,
+	Group createContactGroup(ClientId clientId, AuthorId authorId1,
-			AuthorId authorId1, AuthorId authorId2);
+			AuthorId authorId2);
 }
--- 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
@@ -12,32 +12,6 @@ import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
@NotNullByDefault
 public interface ContactExchangeTask {
 	/**
 	 * The current version of the contact exchange protocol.
 	 */
 	byte PROTOCOL_VERSION = 1;
 	/**
 	 * Label for deriving Alice's header key from the master secret.
 	 */
 	String ALICE_KEY_LABEL =
 			"org.briarproject.bramble.contact/ALICE_HEADER_KEY";
 	/**
 	 * Label for deriving Bob's header key from the master secret.
 	 */
 	String BOB_KEY_LABEL = "org.briarproject.bramble.contact/BOB_HEADER_KEY";
 	/**
 	 * Label for deriving Alice's key binding nonce from the master secret.
 	 */
 	String ALICE_NONCE_LABEL = "org.briarproject.bramble.contact/ALICE_NONCE";
 	/**
 	 * Label for deriving Bob's key binding nonce from the master secret.
 	 */
 	String BOB_NONCE_LABEL = "org.briarproject.bramble.contact/BOB_NONCE";
 	/**
 	 * Exchanges contact information with a remote peer.
 	 */
--- 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
@@ -6,7 +6,7 @@ import javax.annotation.concurrent.Immutable;
 /**
 * Type-safe wrapper for an integer that uniquely identifies a contact within
- * the scope of the local device.
+ * the scope of a single node.
 */
@Immutable
@NotNullByDefault
--- 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
@@ -5,7 +5,6 @@ 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;
@@ -14,36 +13,26 @@ import java.util.Collection;
 public interface ContactManager {
 	/**
-	 * Registers a hook to be called whenever a contact is added or removed.
+	 * Registers a hook to be called whenever a contact is added.
 	 * This method should be called before
 	 * {@link LifecycleManager#startServices(String)}.
 	 */
-	void registerContactHook(ContactHook hook);
+	void registerAddContactHook(AddContactHook hook);
 	/**
-	 * Stores a contact associated with the given local and remote pseudonyms,
+	 * Registers a hook to be called whenever a contact is removed.
-	 * derives and stores transport keys for each transport, and returns an ID
+	 */
-	 * for the contact.
+	void registerRemoveContactHook(RemoveContactHook hook);
-	 *
+
-	 * @param alice true if the local party is Alice
+	/**
 	 * Stores a contact within the given transaction associated with the given
 	 * local and remote pseudonyms, and returns an ID for the contact.
 	 */
 	ContactId addContact(Transaction txn, Author remote, AuthorId local,
 			SecretKey master, long timestamp, boolean alice, boolean verified,
 			boolean active) throws DbException;
 	/**
 	 * Stores a contact associated with the given local and remote pseudonyms
 	 * 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
+	 * and returns an ID for the contact.
 	 * 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,
@@ -105,10 +94,11 @@ public interface ContactManager {
 	boolean contactExists(AuthorId remoteAuthorId, AuthorId localAuthorId)
 			throws DbException;
-	interface ContactHook {
+	interface AddContactHook {
 		void addingContact(Transaction txn, Contact c) throws DbException;
 	}
 	interface RemoveContactHook {
 		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
@@ -1,9 +0,0 @@
 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/crypto/CryptoComponent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/crypto/CryptoComponent.java
@@ -1,13 +1,11 @@
 package org.briarproject.bramble.api.crypto;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.transport.TransportKeys;
 import java.security.GeneralSecurityException;
 import java.security.SecureRandom;
 import javax.annotation.Nullable;
@NotNullByDefault
 public interface CryptoComponent {
 	SecretKey generateSecretKey();
@@ -25,83 +23,153 @@ public interface CryptoComponent {
 	KeyParser getMessageKeyParser();
 	/**
-	 * Derives another secret key from the given secret key.
+	 * Derives a stream header key from the given master secret.
-	 *
+	 * @param alice whether the key is for use by Alice or Bob.
 	 * @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);
+	SecretKey deriveHeaderKey(SecretKey master, boolean alice);
 	/**
 	 * Derives a message authentication code key from the given master secret.
 	 * @param alice whether the key is for use by Alice or Bob.
 	 */
 	SecretKey deriveMacKey(SecretKey master, boolean alice);
 	/**
 	 * Derives a nonce from the given master secret for one of the parties to
 	 * sign.
 	 * @param alice whether the nonce is for use by Alice or Bob.
 	 */
 	byte[] deriveSignatureNonce(SecretKey master, boolean alice);
 	/**
 	 * Derives a commitment to the provided public key.
 	 * <p/>
 	 * Part of BQP.
 	 *
 	 * @param publicKey the public key
 	 * @return the commitment to the provided public key.
 	 */
 	byte[] deriveKeyCommitment(byte[] publicKey);
 	/**
 	 * Derives a common shared secret from two public keys and one of the
 	 * corresponding private keys.
 	 * <p/>
 	 * Part of BQP.
 	 *
-	 * @param label a namespaced label indicating the purpose of this shared
+	 * @param theirPublicKey the ephemeral public key of the remote party
-	 * secret, to prevent it from being repurposed or colliding with a shared
+	 * @param ourKeyPair our ephemeral keypair
-	 * secret derived for another purpose
+	 * @param alice true if ourKeyPair belongs to Alice
 	 * @param theirPublicKey the public key of the remote party
 	 * @param ourKeyPair the key pair of the local party
 	 * @return the shared secret
 	 * @throws GeneralSecurityException
 	 */
-	SecretKey deriveSharedSecret(String label, PublicKey theirPublicKey,
+	SecretKey deriveSharedSecret(byte[] theirPublicKey, KeyPair ourKeyPair,
-			KeyPair ourKeyPair, byte[]... inputs)
+			boolean alice) throws GeneralSecurityException;
 			throws GeneralSecurityException;
 	/**
-	 * Signs the given byte[] with the given private key.
+	 * Derives the content of a confirmation record.
 	 * <p/>
 	 * Part of BQP.
 	 *
-	 * @param label a namespaced label indicating the purpose of this
+	 * @param sharedSecret the common shared secret
-	 * signature, to prevent it from being repurposed or colliding with a
+	 * @param theirPayload the commit payload from the remote party
-	 * signature created for another purpose
+	 * @param ourPayload the commit payload we sent
 	 * @param theirPublicKey the ephemeral public key of the remote party
 	 * @param ourKeyPair our ephemeral keypair
 	 * @param alice true if ourKeyPair belongs to Alice
 	 * @param aliceRecord true if the confirmation record is for use by Alice
 	 * @return the confirmation record
 	 */
 	byte[] deriveConfirmationRecord(SecretKey sharedSecret,
 			byte[] theirPayload, byte[] ourPayload,
 			byte[] theirPublicKey, KeyPair ourKeyPair,
 			boolean alice, boolean aliceRecord);
 	/**
 	 * Derives a master secret from the given shared secret.
 	 * <p/>
 	 * Part of BQP.
 	 *
 	 * @param sharedSecret the common shared secret
 	 * @return the master secret
 	 */
 	SecretKey deriveMasterSecret(SecretKey sharedSecret);
 	/**
 	 * Derives a master secret from two public keys and one of the corresponding
 	 * private keys.
 	 * <p/>
 	 * This is a helper method that calls
 	 * deriveMasterSecret(deriveSharedSecret(theirPublicKey, ourKeyPair, alice))
 	 *
 	 * @param theirPublicKey the ephemeral public key of the remote party
 	 * @param ourKeyPair our ephemeral keypair
 	 * @param alice true if ourKeyPair belongs to Alice
 	 * @return the shared secret
 	 * @throws GeneralSecurityException
 	 */
 	SecretKey deriveMasterSecret(byte[] theirPublicKey, KeyPair ourKeyPair,
 			boolean alice) throws GeneralSecurityException;
 	/**
 	 * Derives initial transport keys for the given transport in the given
 	 * rotation period from the given master secret.
 	 * @param alice whether the keys are for use by Alice or Bob.
 	 */
 	TransportKeys deriveTransportKeys(TransportId t, SecretKey master,
 			long rotationPeriod, boolean alice);
 	/**
 	 * Rotates the given transport keys to the given rotation period. If the
 	 * keys are for a future rotation period they are not rotated.
 	 */
 	TransportKeys rotateTransportKeys(TransportKeys k, long rotationPeriod);
 	/** Encodes the pseudo-random tag that is used to recognise a stream. */
 	void encodeTag(byte[] tag, SecretKey tagKey, int protocolVersion,
 			long streamNumber);
 	/**
 	 * Signs the given byte[] with the given PrivateKey.
 	 *
 	 * @param label A label specific to this signature
 	 *              to ensure that the signature cannot be repurposed
 	 */
 	byte[] sign(String label, byte[] toSign, byte[] privateKey)
 			throws GeneralSecurityException;
 	/**
-	 * Verifies that the given signature is valid for the signed data
+	 * Verifies that the given signature is valid for the signedData
-	 * and the given public key.
+	 * and the given publicKey.
 	 *
-	 * @param label a namespaced label indicating the purpose of this
+	 * @param label A label that was specific to this signature
-	 * signature, to prevent it from being repurposed or colliding with a
+	 *              to ensure that the signature cannot be repurposed
 	 * signature created for another purpose
 	 * @return true if the signature was valid, false otherwise.
 	 */
-	boolean verifySignature(byte[] signature, String label, byte[] signed,
+	boolean verify(String label, byte[] signedData, byte[] publicKey,
-			byte[] publicKey) throws GeneralSecurityException;
+			byte[] signature) throws GeneralSecurityException;
 	/**
 	 * Returns the hash of the given inputs. The inputs are unambiguously
 	 * combined by prefixing each input with its length.
 	 *
-	 * @param label a namespaced label indicating the purpose of this hash, to
+	 * @param label A label specific to this hash to ensure that hashes
-	 * prevent it from being repurposed or colliding with a hash created for
+	 *              calculated for distinct purposes don't collide.
 	 * another purpose
 	 */
 	byte[] hash(String label, byte[]... inputs);
 	/**
 	 * Returns the length of hashes produced by
 	 * the {@link CryptoComponent#hash(String, byte[]...)} method.
 	 */
 	int getHashLength();
 	/**
 	 * Returns a message authentication code with the given key over the
 	 * given inputs. The inputs are unambiguously combined by prefixing each
 	 * input with its length.
 	 *
 	 * @param label a namespaced label indicating the purpose of this MAC, to
 	 * prevent it from being repurposed or colliding with a MAC created for
 	 * another purpose
 	 */
-	byte[] mac(String label, SecretKey macKey, byte[]... inputs);
+	byte[] mac(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
@@ -117,7 +185,6 @@ public interface CryptoComponent {
 	 * given password. Returns null if the ciphertext cannot be decrypted and
 	 * authenticated (for example, if the password is wrong).
 	 */
 	@Nullable
 	byte[] decryptWithPassword(byte[] ciphertext, String password);
 	/**
--- 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
@@ -1,25 +0,0 @@
 package org.briarproject.bramble.api.crypto;
 public interface CryptoConstants {
 	/**
 	 * The maximum length of an agreement public key in bytes.
 	 */
 	int MAX_AGREEMENT_PUBLIC_KEY_BYTES = 32;
 	/**
 	 * The maximum length of a signature public key in bytes.
 	 */
 	int MAX_SIGNATURE_PUBLIC_KEY_BYTES = 32;
 	/**
 	 * The maximum length of a signature in bytes.
 	 */
 	int MAX_SIGNATURE_BYTES = 64;
 	/**
 	 * The length of a MAC in bytes.
 	 */
 	int MAC_BYTES = SecretKey.LENGTH;
 }
--- 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
@@ -1,50 +0,0 @@
 package org.briarproject.bramble.api.crypto;
 /**
 * Crypto operations for the key agreement protocol - see
 * https://code.briarproject.org/akwizgran/briar-spec/blob/master/protocols/BQP.md
 */
 public interface KeyAgreementCrypto {
 	/**
 	 * Hash label for public key commitment.
 	 */
 	String COMMIT_LABEL = "org.briarproject.bramble.keyagreement/COMMIT";
 	/**
 	 * Key derivation label for confirmation record.
 	 */
 	String CONFIRMATION_KEY_LABEL =
 			"org.briarproject.bramble.keyagreement/CONFIRMATION_KEY";
 	/**
 	 * MAC label for confirmation record.
 	 */
 	String CONFIRMATION_MAC_LABEL =
 			"org.briarproject.bramble.keyagreement/CONFIRMATION_MAC";
 	/**
 	 * Derives a commitment to the provided public key.
 	 *
 	 * @param publicKey the public key
 	 * @return the commitment to the provided public key.
 	 */
 	byte[] deriveKeyCommitment(PublicKey publicKey);
 	/**
 	 * Derives the content of a confirmation record.
 	 *
 	 * @param sharedSecret the common shared secret
 	 * @param theirPayload the key exchange payload of the remote party
 	 * @param ourPayload the key exchange payload of the local party
 	 * @param theirPublicKey the ephemeral public key of the remote party
 	 * @param ourKeyPair our ephemeral key pair of the local party
 	 * @param alice true if the local party is Alice
 	 * @param aliceRecord true if the confirmation record is for use by Alice
 	 * @return the confirmation record
 	 */
 	byte[] deriveConfirmationRecord(SecretKey sharedSecret,
 			byte[] theirPayload, byte[] ourPayload,
 			PublicKey theirPublicKey, KeyPair ourKeyPair,
 			boolean alice, boolean aliceRecord);
 }
--- 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
@@ -1,33 +0,0 @@
 package org.briarproject.bramble.api.crypto;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.transport.TransportKeys;
 /**
 * Crypto operations for the transport security protocol - see
 * https://code.briarproject.org/akwizgran/briar-spec/blob/master/protocols/BTP.md
 */
 public interface TransportCrypto {
 	/**
 	 * Derives initial transport keys for the given transport in the given
 	 * rotation period from the given master secret.
 	 *
 	 * @param alice whether the keys are for use by Alice or Bob.
 	 * @param active whether the keys are usable for outgoing streams.
 	 */
 	TransportKeys deriveTransportKeys(TransportId t, SecretKey master,
 			long rotationPeriod, boolean alice, boolean active);
 	/**
 	 * Rotates the given transport keys to the given rotation period. If the
 	 * keys are for the given period or any later period they are not rotated.
 	 */
 	TransportKeys rotateTransportKeys(TransportKeys k, long rotationPeriod);
 	/**
 	 * Encodes the pseudo-random tag that is used to recognise a stream.
 	 */
 	void encodeTag(byte[] tag, SecretKey tagKey, int protocolVersion,
 			long streamNumber);
 }
--- 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
@@ -24,9 +24,9 @@ public class BdfDictionary extends TreeMap<String, Object> {
 	 * );
 	 * </pre>
 	 */
-	public static BdfDictionary of(Entry<String, ?>... entries) {
+	public static BdfDictionary of(Entry<String, Object>... entries) {
 		BdfDictionary d = new BdfDictionary();
-		for (Entry<String, ?> e : entries) d.put(e.getKey(), e.getValue());
+		for (Entry<String, Object> e : entries) d.put(e.getKey(), e.getValue());
 		return d;
 	}
@@ -34,7 +34,7 @@ public class BdfDictionary extends TreeMap<String, Object> {
 		super();
 	}
-	public BdfDictionary(Map<String, ?> m) {
+	public BdfDictionary(Map<String, Object> m) {
 		super(m);
 	}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/data/ObjectReader.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/data/ObjectReader.java
@@ -0,0 +1,11 @@
 package org.briarproject.bramble.api.data;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import java.io.IOException;
@NotNullByDefault
 public interface ObjectReader<T> {
 	T readObject(BdfReader r) throws IOException;
 }
--- 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
@@ -1,7 +0,0 @@
 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
@@ -1,8 +0,0 @@
 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
@@ -18,8 +18,7 @@ import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.bramble.api.sync.MessageStatus;
 import org.briarproject.bramble.api.sync.Offer;
 import org.briarproject.bramble.api.sync.Request;
-import org.briarproject.bramble.api.transport.KeySet;
+import org.briarproject.bramble.api.sync.ValidationManager;
 import org.briarproject.bramble.api.transport.KeySetId;
 import org.briarproject.bramble.api.transport.TransportKeys;
 import java.util.Collection;
@@ -38,13 +37,8 @@ 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(@Nullable MigrationListener listener) throws DbException;
+	boolean open() throws DbException;
 	/**
 	 * Waits for any open transactions to finish and closes the database.
@@ -104,17 +98,10 @@ public interface DatabaseComponent {
 			throws DbException;
 	/**
-	 * Stores the given transport keys, optionally binding them to the given
+	 * Stores transport keys for a newly added contact.
 	 * contact, and returns a key set ID.
 	 */
-	KeySetId addTransportKeys(Transaction txn, @Nullable ContactId c,
+	void addTransportKeys(Transaction txn, ContactId c, TransportKeys k)
-			TransportKeys k) throws DbException;
+			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
@@ -136,8 +123,8 @@ public interface DatabaseComponent {
 	/**
 	 * Deletes the message with the given ID. Unlike
-	 * {@link #removeMessage(Transaction, MessageId)}, the message ID,
+	 * {@link #removeMessage(Transaction, MessageId)}, the message ID and any
-	 * dependencies, metadata, and any other associated state are not deleted.
+	 * other associated data are not deleted.
 	 */
 	void deleteMessage(Transaction txn, MessageId m) throws DbException;
@@ -241,8 +228,7 @@ public interface DatabaseComponent {
 	 * <p/>
 	 * Read-only.
 	 */
-	Collection<Group> getGroups(Transaction txn, ClientId c, int majorVersion)
+	Collection<Group> getGroups(Transaction txn, ClientId c) throws DbException;
 			throws DbException;
 	/**
 	 * Returns the given group's visibility to the given contact, or
@@ -268,38 +254,31 @@ public interface DatabaseComponent {
 	Collection<LocalAuthor> getLocalAuthors(Transaction txn) throws DbException;
 	/**
-	 * Returns the IDs of all delivered messages in the given group.
+	 * Returns the IDs of any messages that need to be validated by the given
 	 * client.
 	 * <p/>
 	 * Read-only.
 	 */
-	Collection<MessageId> getMessageIds(Transaction txn, GroupId g)
+	Collection<MessageId> getMessagesToValidate(Transaction txn, ClientId c)
 		throws DbException;
 	/**
 	 * Returns the IDs of any messages that need to be validated.
 	 * <p/>
 	 * Read-only.
 	 */
 	Collection<MessageId> getMessagesToValidate(Transaction txn)
 			throws DbException;
 	/**
-	 * Returns the IDs of any messages that are pending delivery due to
+	 * Returns the IDs of any messages that are valid but pending delivery due
-	 * dependencies on other messages.
+	 * to dependencies on other messages for the given client.
 	 * <p/>
 	 * Read-only.
 	 */
-	Collection<MessageId> getPendingMessages(Transaction txn)
+	Collection<MessageId> getPendingMessages(Transaction txn, ClientId c)
 			throws DbException;
 	/**
-	 * Returns the IDs of any messages that have shared dependents but have
+	 * Returns the IDs of any messages from the given client
-	 * not yet been shared themselves.
+	 * that have a shared dependent, but are still not shared themselves.
 	 * <p/>
 	 * Read-only.
 	 */
-	Collection<MessageId> getMessagesToShare(Transaction txn)
+	Collection<MessageId> getMessagesToShare(Transaction txn,
-			throws DbException;
+			ClientId c) throws DbException;
 	/**
 	 * Returns the message with the given ID, in serialised form, or null if
@@ -319,9 +298,9 @@ public interface DatabaseComponent {
 			throws DbException;
 	/**
-	 * Returns the metadata for any delivered messages in the given group with
+	 * Returns the metadata for any messages in the given group with metadata
-	 * metadata that matches all entries in the given query. If the query is
+	 * that matches all entries in the given query. If the query is empty, the
-	 * empty, the metadata for all delivered messages is returned.
+	 * metadata for all messages is returned.
 	 * <p/>
 	 * Read-only.
 	 */
@@ -337,8 +316,8 @@ public interface DatabaseComponent {
 			throws DbException;
 	/**
-	 * Returns the metadata for the given delivered or pending message.
+	 * Returns the metadata for the given delivered and pending message.
-	 * This is only meant to be used by the ValidationManager.
+	 * This is meant to be only used by the ValidationManager
 	 * <p/>
 	 * Read-only.
 	 */
@@ -346,8 +325,8 @@ public interface DatabaseComponent {
 			throws DbException;
 	/**
-	 * Returns the status of all delivered messages in the given group with
+	 * Returns the status of all messages in the given group with respect to
-	 * respect to the given contact.
+	 * the given contact.
 	 * <p/>
 	 * Read-only.
 	 */
@@ -356,8 +335,12 @@ public interface DatabaseComponent {
 	/**
 	 * Returns the IDs and states of all dependencies of the given message.
-	 * For missing dependencies and dependencies in other groups, the state
+	 * Missing dependencies have the state
-	 * {@link State UNKNOWN} is returned.
+	 * {@link ValidationManager.State UNKNOWN}.
 	 * Dependencies in other groups have the state
 	 * {@link ValidationManager.State INVALID}.
 	 * Note that these states are not set on the dependencies themselves; the
 	 * returned states should only be taken in the context of the given message.
 	 * <p/>
 	 * Read-only.
 	 */
@@ -365,9 +348,9 @@ public interface DatabaseComponent {
 			throws DbException;
 	/**
-	 * Returns the IDs and states of all dependents of the given message.
+	 * Returns all IDs of messages that depend on the given message.
-	 * Dependents in other groups are not returned. If the given message is
+	 * Messages in other groups that declare a dependency on the given message
-	 * missing, no dependents are returned.
+	 * will be returned even though such dependencies are invalid.
 	 * <p/>
 	 * Read-only.
 	 */
@@ -382,24 +365,14 @@ public interface DatabaseComponent {
 	State getMessageState(Transaction txn, MessageId m) throws DbException;
 	/**
-	 * Returns the status of the given delivered message with respect to the
+	 * Returns the status of the given message with respect to the given
-	 * given contact.
+	 * 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/>
@@ -412,14 +385,15 @@ public interface DatabaseComponent {
 	 * <p/>
 	 * Read-only.
 	 */
-	Collection<KeySet> getTransportKeys(Transaction txn, TransportId t)
+	Map<ContactId, TransportKeys> getTransportKeys(Transaction txn,
-			throws DbException;
+			TransportId t) throws DbException;
 	/**
-	 * Increments the outgoing stream counter for the given transport keys.
+	 * Increments the outgoing stream counter for the given contact and
 	 * transport in the given rotation period .
 	 */
-	void incrementStreamCounter(Transaction txn, TransportId t, KeySetId k)
+	void incrementStreamCounter(Transaction txn, ContactId c, TransportId t,
-			throws DbException;
+			long rotationPeriod) throws DbException;
 	/**
 	 * Merges the given metadata with the existing metadata for the given
@@ -489,12 +463,6 @@ public interface DatabaseComponent {
 	 */
 	void removeTransport(Transaction txn, TransportId t) throws DbException;
 	/**
 	 * Removes the given transport keys from the database.
 	 */
 	void removeTransportKeys(Transaction txn, TransportId t, KeySetId k)
 		throws DbException;
 	/**
 	 * Marks the given contact as verified.
 	 */
@@ -530,21 +498,15 @@ public interface DatabaseComponent {
 			Collection<MessageId> dependencies) throws DbException;
 	/**
-	 * Sets the reordering window for the given key set and transport in the
+	 * Sets the reordering window for the given contact and transport in the
 	 * given rotation period.
 	 */
-	void setReorderingWindow(Transaction txn, KeySetId k, TransportId t,
+	void setReorderingWindow(Transaction txn, ContactId c, TransportId t,
 			long rotationPeriod, long base, byte[] bitmap) throws DbException;
 	/**
 	 * Marks the given transport keys as usable for outgoing streams.
 	 */
 	void setTransportKeysActive(Transaction txn, TransportId t, KeySetId k)
 		throws DbException;
 	/**
 	 * Stores the given transport keys, deleting any keys they have replaced.
 	 */
-	void updateTransportKeys(Transaction txn, Collection<KeySet> keys)
+	void updateTransportKeys(Transaction txn,
-			throws DbException;
+			Map<ContactId, TransportKeys> keys) throws DbException;
 }
--- 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
@@ -1,11 +0,0 @@
 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/identity/Author.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/identity/Author.java
@@ -1,13 +1,11 @@
 package org.briarproject.bramble.api.identity;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.bramble.util.StringUtils;
+
 import java.io.UnsupportedEncodingException;
 import javax.annotation.concurrent.Immutable;
 import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
 import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
 /**
 * A pseudonym for a user.
 */
@@ -19,25 +17,20 @@ public class Author {
 		NONE, ANONYMOUS, UNKNOWN, UNVERIFIED, VERIFIED, OURSELVES
 	}
 	/**
 	 * The current version of the author structure.
 	 */
 	public static final int FORMAT_VERSION = 1;
 	private final AuthorId id;
 	private final int formatVersion;
 	private final String name;
 	private final byte[] publicKey;
-	public Author(AuthorId id, int formatVersion, String name,
+	public Author(AuthorId id, String name, byte[] publicKey) {
-			byte[] publicKey) {
+		int length;
-		int nameLength = StringUtils.toUtf8(name).length;
+		try {
-		if (nameLength == 0 || nameLength > MAX_AUTHOR_NAME_LENGTH)
+			length = name.getBytes("UTF-8").length;
-			throw new IllegalArgumentException();
+		} catch (UnsupportedEncodingException e) {
-		if (publicKey.length == 0 || publicKey.length > MAX_PUBLIC_KEY_LENGTH)
+			throw new RuntimeException(e);
 		}
 		if (length == 0 || length > AuthorConstants.MAX_AUTHOR_NAME_LENGTH)
 			throw new IllegalArgumentException();
 		this.id = id;
 		this.formatVersion = formatVersion;
 		this.name = name;
 		this.publicKey = publicKey;
 	}
@@ -49,13 +42,6 @@ public class Author {
 		return id;
 	}
 	/**
 	 * Returns the version of the author structure used to create the author.
 	 */
 	public int getFormatVersion() {
 		return formatVersion;
 	}
 	/**
 	 * Returns the author's name.
 	 */
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/identity/AuthorConstants.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/identity/AuthorConstants.java
@@ -1,8 +1,5 @@
 package org.briarproject.bramble.api.identity;
 import static org.briarproject.bramble.api.crypto.CryptoConstants.MAX_SIGNATURE_BYTES;
 import static org.briarproject.bramble.api.crypto.CryptoConstants.MAX_SIGNATURE_PUBLIC_KEY_BYTES;
 public interface AuthorConstants {
 	/**
@@ -11,14 +8,26 @@ public interface AuthorConstants {
 	int MAX_AUTHOR_NAME_LENGTH = 50;
 	/**
-	 * The maximum length of a public key in bytes. This applies to the
+	 * The maximum length of a public key in bytes.
-	 * signature algorithm used by the current {@link Author format version}.
+	 * <p>
 	 * Public keys use SEC1 format: 0x04 x y, where x and y are unsigned
 	 * big-endian integers.
 	 * <p>
 	 * For a 256-bit elliptic curve, the maximum length is 2 * 256 / 8 + 1.
 	 */
-	int MAX_PUBLIC_KEY_LENGTH = MAX_SIGNATURE_PUBLIC_KEY_BYTES;
+	int MAX_PUBLIC_KEY_LENGTH = 65;
 	/**
-	 * The maximum length of a signature in bytes. This applies to the
+	 * The maximum length of a signature in bytes.
-	 * signature algorithm used by the current {@link Author format version}.
+	 * <p>
 	 * A signature is an ASN.1 DER sequence containing two integers, r and s.
 	 * The format is 0x30 len1 0x02 len2 r 0x02 len3 s, where len1 is
 	 * len(0x02 len2 r 0x02 len3 s) as a DER length, len2 is len(r) as a DER
 	 * length, len3 is len(s) as a DER length, and r and s are signed
 	 * big-endian integers of minimal length.
 	 * <p>
 	 * For a 256-bit elliptic curve, the lengths are one byte each, so the
 	 * maximum length is 2 * 256 / 8 + 8.
 	 */
-	int MAX_SIGNATURE_LENGTH = MAX_SIGNATURE_BYTES;
+	int MAX_SIGNATURE_LENGTH = 72;
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/identity/AuthorFactory.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/identity/AuthorFactory.java
@@ -5,27 +5,8 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@NotNullByDefault
 public interface AuthorFactory {
 	/**
 	 * Creates an author with the current format version and the given name and
 	 * public key.
 	 */
 	Author createAuthor(String name, byte[] publicKey);
 	/**
 	 * Creates an author with the given format version, name and public key.
 	 */
 	Author createAuthor(int formatVersion, String name, byte[] publicKey);
 	/**
 	 * Creates a local author with the current format version and the given
 	 * name and keys.
 	 */
 	LocalAuthor createLocalAuthor(String name, byte[] publicKey,
 			byte[] privateKey);
 	/**
 	 * Creates a local author with the given format version, name and keys.
 	 */
 	LocalAuthor createLocalAuthor(int formatVersion, String name,
 			byte[] publicKey, byte[] privateKey);
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/identity/AuthorId.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/identity/AuthorId.java
@@ -16,7 +16,7 @@ public class AuthorId extends UniqueId {
 	/**
 	 * Label for hashing authors to calculate their identities.
 	 */
-	public static final String LABEL = "org.briarproject.bramble/AUTHOR_ID";
+	public static final String LABEL = "org.briarproject.bramble.AUTHOR_ID";
 	public AuthorId(byte[] id) {
 		super(id);
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/identity/LocalAuthor.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/identity/LocalAuthor.java
@@ -14,9 +14,9 @@ public class LocalAuthor extends Author {
 	private final byte[] privateKey;
 	private final long created;
-	public LocalAuthor(AuthorId id, int formatVersion, String name,
+	public LocalAuthor(AuthorId id, String name, byte[] publicKey,
-			byte[] publicKey, byte[] privateKey, long created) {
+			byte[] privateKey, long created) {
-		super(id, formatVersion, name, publicKey);
+		super(id, name, publicKey);
 		this.privateKey = privateKey;
 		this.created = created;
 	}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementConstants.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementConstants.java
@@ -3,9 +3,9 @@ package org.briarproject.bramble.api.keyagreement;
 public interface KeyAgreementConstants {
 	/**
-	 * The current version of the BQP protocol. Version number 89 is reserved.
+	 * The current version of the BQP protocol.
 	 */
-	byte PROTOCOL_VERSION = 4;
+	byte PROTOCOL_VERSION = 2;
 	/**
 	 * The length of the record header in bytes.
@@ -22,10 +22,7 @@ public interface KeyAgreementConstants {
 	 */
 	int COMMIT_LENGTH = 16;
-	/**
+	long CONNECTION_TIMEOUT = 20 * 1000; // Milliseconds
 	 * The connection timeout in milliseconds.
 	 */
 	long CONNECTION_TIMEOUT = 20 * 1000;
 	/**
 	 * The transport identifier for Bluetooth.
@@ -36,16 +33,4 @@ public interface KeyAgreementConstants {
 	 * The transport identifier for LAN.
 	 */
 	int TRANSPORT_ID_LAN = 1;
 	/**
 	 * Label for deriving the shared secret.
 	 */
 	String SHARED_SECRET_LABEL =
 			"org.briarproject.bramble.keyagreement/SHARED_SECRET";
 	/**
 	 * Label for deriving the master secret.
 	 */
 	String MASTER_SECRET_LABEL =
 			"org.briarproject.bramble.keyagreement/MASTER_SECRET";
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementListener.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementListener.java
@@ -2,7 +2,7 @@ package org.briarproject.bramble.api.keyagreement;
 import org.briarproject.bramble.api.data.BdfList;
-import java.io.IOException;
+import java.util.concurrent.Callable;
 /**
 * An class for managing a particular key agreement listener.
@@ -24,11 +24,11 @@ public abstract class KeyAgreementListener {
 	}
 	/**
-	 * Blocks until an incoming connection is received and returns it.
+	 * Starts listening for incoming connections, and returns a Callable that
-	 *
+	 * will return a KeyAgreementConnection when an incoming connection is
-	 * @throws IOException if an error occurs or {@link #close()} is called.
+	 * received.
 	 */
-	public abstract KeyAgreementConnection accept() throws IOException;
+	public abstract Callable<KeyAgreementConnection> listen();
 	/**
 	 * Closes the underlying server socket.
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementTaskFactory.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/KeyAgreementTaskFactory.java
@@ -0,0 +1,15 @@
 package org.briarproject.bramble.api.keyagreement;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 /**
 * Manages tasks for conducting key agreements with remote peers.
 */
@NotNullByDefault
 public interface KeyAgreementTaskFactory {
 	/**
 	 * Gets the current key agreement task.
 	 */
 	KeyAgreementTask createTask();
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementStoppedListeningEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/keyagreement/event/KeyAgreementStoppedListeningEvent.java
@@ -1,9 +0,0 @@
 package org.briarproject.bramble.api.keyagreement.event;
 import org.briarproject.bramble.api.event.Event;
 /**
 * An event that is broadcast when a BQP task stops listening.
 */
 public class KeyAgreementStoppedListeningEvent extends Event {
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/lifecycle/LifecycleManager.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/lifecycle/LifecycleManager.java
@@ -21,42 +21,21 @@ public interface LifecycleManager {
 	 * The result of calling {@link #startServices(String)}.
 	 */
 	enum StartResult {
-		ALREADY_RUNNING,
+		ALREADY_RUNNING, DB_ERROR, SERVICE_ERROR, SUCCESS
 		DB_ERROR,
 		DATA_TOO_OLD_ERROR,
 		DATA_TOO_NEW_ERROR,
 		SERVICE_ERROR,
 		SUCCESS
 	}
 	/**
-	 * The state the lifecycle can be in.
+	 * Registers a {@link Service} to be started and stopped.
 	 * Returned by {@link #getLifecycleState()}
 	 */
 	enum LifecycleState {
 		STARTING, MIGRATING_DATABASE, STARTING_SERVICES, RUNNING, STOPPING;
 		public boolean isAfter(LifecycleState state) {
 			return ordinal() > state.ordinal();
 		}
 	}
 	/**
 	 * Registers a {@link Service} to be started and stopped. This method
 	 * should be called before {@link #startServices(String)}.
 	 */
 	void registerService(Service s);
 	/**
-	 * Registers a {@link Client} to be started. This method should be called
+	 * Registers a {@link Client} to be started.
 	 * before {@link #startServices(String)}.
 	 */
 	void registerClient(Client c);
 	/**
-	 * Registers an {@link ExecutorService} to be shut down. This method
+	 * Registers an {@link ExecutorService} to be shut down.
 	 * should be called before {@link #startServices(String)}.
 	 */
 	void registerForShutdown(ExecutorService e);
@@ -92,10 +71,4 @@ public interface LifecycleManager {
 	 * the {@link DatabaseComponent} to be closed before returning.
 	 */
 	void waitForShutdown() throws InterruptedException;
 	/**
 	 * Returns the current state of the lifecycle.
 	 */
 	LifecycleState getLifecycleState();
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/lifecycle/event/LifecycleEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/lifecycle/event/LifecycleEvent.java
@@ -1,20 +0,0 @@
 package org.briarproject.bramble.api.lifecycle.event;
 import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState;
 /**
 * An event that is broadcast when the app enters a new lifecycle state.
 */
 public class LifecycleEvent extends Event {
 	private final LifecycleState state;
 	public LifecycleEvent(LifecycleState state) {
 		this.state = state;
 	}
 	public LifecycleState getLifecycleState() {
 		return state;
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/lifecycle/event/ShutdownEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/lifecycle/event/ShutdownEvent.java
@@ -0,0 +1,9 @@
 package org.briarproject.bramble.api.lifecycle.event;
 import org.briarproject.bramble.api.event.Event;
 /**
 * An event that is broadcast when the app is shutting down.
 */
 public class ShutdownEvent extends Event {
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TransportId.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TransportId.java
@@ -1,23 +1,22 @@
 package org.briarproject.bramble.api.plugin;
-import org.briarproject.bramble.util.StringUtils;
+import java.nio.charset.Charset;
 /**
- * Type-safe wrapper for a namespaced string that uniquely identifies a
+ * Type-safe wrapper for a string that uniquely identifies a transport plugin.
 * transport plugin.
 */
 public class TransportId {
 	/**
-	 * The maximum length of a transport identifier in UTF-8 bytes.
+	 * The maximum length of transport identifier in UTF-8 bytes.
 	 */
-	public static int MAX_TRANSPORT_ID_LENGTH = 100;
+	public static int MAX_TRANSPORT_ID_LENGTH = 64;
 	private final String id;
 	public TransportId(String id) {
-		int length = StringUtils.toUtf8(id).length;
+		byte[] b = id.getBytes(Charset.forName("UTF-8"));
-		if (length == 0 || length > MAX_TRANSPORT_ID_LENGTH)
+		if (b.length == 0 || b.length > MAX_TRANSPORT_ID_LENGTH)
 			throw new IllegalArgumentException();
 		this.id = id;
 	}
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/DuplexPlugin.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/duplex/DuplexPlugin.java
@@ -36,9 +36,9 @@ public interface DuplexPlugin extends Plugin {
 	/**
 	 * Attempts to connect to the remote peer specified in the given descriptor.
-	 * Returns null if no connection can be established.
+	 * Returns null if no connection can be established within the given time.
 	 */
 	@Nullable
 	DuplexTransportConnection createKeyAgreementConnection(
-			byte[] remoteCommitment, BdfList descriptor);
+			byte[] remoteCommitment, BdfList descriptor, long timeout);
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/BluetoothEnabledEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/BluetoothEnabledEvent.java
@@ -1,15 +0,0 @@
 package org.briarproject.bramble.api.plugin.event;
 import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import javax.annotation.concurrent.Immutable;
 /**
 * An event that informs the Bluetooth plugin that we have enabled the
 * Bluetooth adapter.
 */
@Immutable
@NotNullByDefault
 public class BluetoothEnabledEvent extends Event {
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/EnableBluetoothEvent.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/plugin/event/EnableBluetoothEvent.java
@@ -6,7 +6,7 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import javax.annotation.concurrent.Immutable;
 /**
- * An event that asks the Bluetooth plugin to enable the Bluetooth adapter.
+ * An event asks the Bluetooth plugin to enable the Bluetooth adapter.
 */
@Immutable
@NotNullByDefault
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/properties/TransportPropertyManager.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/properties/TransportPropertyManager.java
@@ -15,17 +15,7 @@ public interface TransportPropertyManager {
 	/**
 	 * The unique ID of the transport property client.
 	 */
-	ClientId CLIENT_ID = new ClientId("org.briarproject.bramble.properties");
+	ClientId CLIENT_ID = new ClientId("org.briarproject.briar.properties");
 	/**
 	 * The current major version of the transport property client.
 	 */
 	int MAJOR_VERSION = 0;
 	/**
 	 * The current minor version of the transport property client.
 	 */
 	int MINOR_VERSION = 0;
 	/**
 	 * Stores the given properties received while adding a contact - they will
@@ -42,8 +32,8 @@ public interface TransportPropertyManager {
 	/**
 	 * Returns the local transport properties for all transports.
-	 * <p/>
+	 * <br/>
-	 * Read-only.
+	 * TODO: Transaction can be read-only when code is simplified
 	 */
 	Map<TransportId, TransportProperties> getLocalProperties(Transaction txn)
 			throws DbException;
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/record/Record.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/record/Record.java
@@ -1,36 +0,0 @@
 package org.briarproject.bramble.api.record;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import javax.annotation.concurrent.Immutable;
@Immutable
@NotNullByDefault
 public class Record {
 	public static final int RECORD_HEADER_BYTES = 4;
 	public static final int MAX_RECORD_PAYLOAD_BYTES = 48 * 1024; // 48 KiB
 	private final byte protocolVersion, recordType;
 	private final byte[] payload;
 	public Record(byte protocolVersion, byte recordType, byte[] payload) {
 		if (payload.length > MAX_RECORD_PAYLOAD_BYTES)
 			throw new IllegalArgumentException();
 		this.protocolVersion = protocolVersion;
 		this.recordType = recordType;
 		this.payload = payload;
 	}
 	public byte getProtocolVersion() {
 		return protocolVersion;
 	}
 	public byte getRecordType() {
 		return recordType;
 	}
 	public byte[] getPayload() {
 		return payload;
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/record/RecordReader.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/record/RecordReader.java
@@ -1,20 +0,0 @@
 package org.briarproject.bramble.api.record;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import java.io.EOFException;
 import java.io.IOException;
@NotNullByDefault
 public interface RecordReader {
 	/**
 	 * Reads and returns the next record.
 	 *
 	 * @throws EOFException if the end of the stream is reached without reading
 	 * a complete record
 	 */
 	Record readRecord() throws IOException;
 	void close() throws IOException;
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/record/RecordReaderFactory.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/record/RecordReaderFactory.java
@@ -1,8 +0,0 @@
 package org.briarproject.bramble.api.record;
 import java.io.InputStream;
 public interface RecordReaderFactory {
 	RecordReader createRecordReader(InputStream in);
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/record/RecordWriter.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/record/RecordWriter.java
@@ -1,15 +0,0 @@
 package org.briarproject.bramble.api.record;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import java.io.IOException;
@NotNullByDefault
 public interface RecordWriter {
 	void writeRecord(Record r) throws IOException;
 	void flush() throws IOException;
 	void close() throws IOException;
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/record/RecordWriterFactory.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/record/RecordWriterFactory.java
@@ -1,8 +0,0 @@
 package org.briarproject.bramble.api.record;
 import java.io.OutputStream;
 public interface RecordWriterFactory {
 	RecordWriter createRecordWriter(OutputStream out);
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/ClientId.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/ClientId.java
@@ -1,29 +1,19 @@
 package org.briarproject.bramble.api.sync;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.util.StringUtils;
 import javax.annotation.concurrent.Immutable;
 /**
- * Type-safe wrapper for a namespaced string that uniquely identifies a sync
+ * Wrapper for a name-spaced string that uniquely identifies a sync client.
 * client.
 */
@Immutable
@NotNullByDefault
 public class ClientId implements Comparable<ClientId> {
 	/**
 	 * The maximum length of a client identifier in UTF-8 bytes.
 	 */
 	public static int MAX_CLIENT_ID_LENGTH = 100;
 	private final String id;
 	public ClientId(String id) {
 		int length = StringUtils.toUtf8(id).length;
 		if (length == 0 || length > MAX_CLIENT_ID_LENGTH)
 			throw new IllegalArgumentException();
 		this.id = id;
 	}
@@ -46,8 +36,4 @@ public class ClientId implements Comparable<ClientId> {
 		return id.hashCode();
 	}
 	@Override
 	public String toString() {
 		return id;
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Group.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Group.java
@@ -5,43 +5,20 @@ import static org.briarproject.bramble.api.sync.SyncConstants.MAX_GROUP_DESCRIPT
 public class Group {
 	public enum Visibility {
-
+		INVISIBLE, // The group is not visible
-		INVISIBLE(0), // The group is not visible
+		VISIBLE, // The group is visible but messages are not shared
-		VISIBLE(1), // The group is visible, messages are accepted but not sent
+		SHARED // The group is visible and messages are shared
 		SHARED(2); // The group is visible, messages are accepted and sent
 		private final int value;
 		Visibility(int value) {
 			this.value = value;
 		}
 		public int getValue() {
 			return value;
 		}
 		public static Visibility min(Visibility a, Visibility b) {
 			return a.getValue() < b.getValue() ? a : b;
 		}
 	}
 	/**
 	 * The current version of the group format.
 	 */
 	public static final int FORMAT_VERSION = 1;
 	private final GroupId id;
 	private final ClientId clientId;
 	private final int majorVersion;
 	private final byte[] descriptor;
-	public Group(GroupId id, ClientId clientId, int majorVersion,
+	public Group(GroupId id, ClientId clientId, byte[] descriptor) {
 			byte[] descriptor) {
 		if (descriptor.length > MAX_GROUP_DESCRIPTOR_LENGTH)
 			throw new IllegalArgumentException();
 		this.id = id;
 		this.clientId = clientId;
 		this.majorVersion = majorVersion;
 		this.descriptor = descriptor;
 	}
@@ -59,13 +36,6 @@ public class Group {
 		return clientId;
 	}
 	/**
 	 * Returns the major version of the client to which the group belongs.
 	 */
 	public int getMajorVersion() {
 		return majorVersion;
 	}
 	/**
 	 * Returns the group's descriptor.
 	 */
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/GroupFactory.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/GroupFactory.java
@@ -6,7 +6,7 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 public interface GroupFactory {
 	/**
-	 * Creates a group with the given client ID, major version and descriptor.
+	 * Creates a group with the given client ID and descriptor.
 	 */
-	Group createGroup(ClientId c, int majorVersion, byte[] descriptor);
+	Group createGroup(ClientId c, byte[] descriptor);
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/GroupId.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/GroupId.java
@@ -15,7 +15,7 @@ public class GroupId extends UniqueId {
 	/**
 	 * Label for hashing groups to calculate their identifiers.
 	 */
-	public static final String LABEL = "org.briarproject.bramble/GROUP_ID";
+	public static final String LABEL = "org.briarproject.bramble.GROUP_ID";
 	public GroupId(byte[] id) {
 		super(id);
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Message.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/Message.java
@@ -5,11 +5,6 @@ import static org.briarproject.bramble.api.sync.SyncConstants.MESSAGE_HEADER_LEN
 public class Message {
 	/**
 	 * The current version of the message format.
 	 */
 	public static final int FORMAT_VERSION = 1;
 	private final MessageId id;
 	private final GroupId groupId;
 	private final long timestamp;
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/MessageFactory.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/MessageFactory.java
@@ -7,7 +7,5 @@ public interface MessageFactory {
 	Message createMessage(GroupId g, long timestamp, byte[] body);
 	Message createMessage(byte[] raw);
 	Message createMessage(MessageId m, byte[] raw);
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/MessageId.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/MessageId.java
@@ -16,13 +16,7 @@ public class MessageId extends UniqueId {
 	/**
 	 * Label for hashing messages to calculate their identifiers.
 	 */
-	public static final String ID_LABEL = "org.briarproject.bramble/MESSAGE_ID";
+	public static final String LABEL = "org.briarproject.bramble.MESSAGE_ID";
 	/**
 	 * Label for hashing blocks of messages.
 	 */
 	public static final String BLOCK_LABEL =
 			"org.briarproject.bramble/MESSAGE_BLOCK";
 	public MessageId(byte[] id) {
 		super(id);
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordReader.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordReader.java
@@ -5,7 +5,7 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import java.io.IOException;
@NotNullByDefault
-public interface SyncRecordReader {
+public interface RecordReader {
 	boolean eof() throws IOException;
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordReaderFactory.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordReaderFactory.java
@@ -5,7 +5,7 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import java.io.InputStream;
@NotNullByDefault
-public interface SyncRecordReaderFactory {
+public interface RecordReaderFactory {
-	SyncRecordReader createRecordReader(InputStream in);
+	RecordReader createRecordReader(InputStream in);
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordWriter.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordWriter.java
@@ -5,7 +5,7 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import java.io.IOException;
@NotNullByDefault
-public interface SyncRecordWriter {
+public interface RecordWriter {
 	void writeAck(Ack a) throws IOException;
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordWriterFactory.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncRecordWriterFactory.java
@@ -5,7 +5,7 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import java.io.OutputStream;
@NotNullByDefault
-public interface SyncRecordWriterFactory {
+public interface RecordWriterFactory {
-	SyncRecordWriter createRecordWriter(OutputStream out);
+	RecordWriter createRecordWriter(OutputStream out);
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncConstants.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/SyncConstants.java
@@ -2,8 +2,6 @@ package org.briarproject.bramble.api.sync;
 import org.briarproject.bramble.api.UniqueId;
 import static org.briarproject.bramble.api.record.Record.MAX_RECORD_PAYLOAD_BYTES;
 public interface SyncConstants {
 	/**
@@ -12,8 +10,16 @@ public interface SyncConstants {
 	byte PROTOCOL_VERSION = 0;
 	/**
-	 * The maximum length of a group descriptor in bytes.
+	 * The length of the record header in bytes.
 	 */
 	int RECORD_HEADER_LENGTH = 4;
 	/**
 	 * The maximum length of the record payload in bytes.
 	 */
 	int MAX_RECORD_PAYLOAD_LENGTH = 48 * 1024; // 48 KiB
 	/** The maximum length of a group descriptor in bytes. */
 	int MAX_GROUP_DESCRIPTOR_LENGTH = 16 * 1024; // 16 KiB
 	/**
@@ -34,5 +40,5 @@ public interface SyncConstants {
 	/**
 	 * The maximum number of message IDs in an ack, offer or request record.
 	 */
-	int MAX_MESSAGE_IDS = MAX_RECORD_PAYLOAD_BYTES / UniqueId.LENGTH;
+	int MAX_MESSAGE_IDS = MAX_RECORD_PAYLOAD_LENGTH / UniqueId.LENGTH;
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/sync/ValidationManager.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/sync/ValidationManager.java
@@ -3,7 +3,6 @@ package org.briarproject.bramble.api.sync;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Metadata;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 /**
@@ -34,20 +33,15 @@ public interface ValidationManager {
 	}
 	/**
-	 * Registers the message validator for the given client. This method
+	 * Sets the message validator for the given client.
 	 * should be called before {@link LifecycleManager#startServices(String)}.
 	 */
-	void registerMessageValidator(ClientId c, int majorVersion,
+	void registerMessageValidator(ClientId c, MessageValidator v);
 			MessageValidator v);
 	/**
-	 * Registers the incoming message hook for the given client. The hook will
+	 * Sets the incoming message hook for the given client. The hook will be
-	 * be called once for each incoming message that passes validation. This
+	 * called once for each incoming message that passes validation.
 	 * method should be called before
 	 * {@link LifecycleManager#startServices(String)}.
 	 */
-	void registerIncomingMessageHook(ClientId c, int majorVersion,
+	void registerIncomingMessageHook(ClientId c, IncomingMessageHook hook);
 			IncomingMessageHook hook);
 	interface MessageValidator {
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/transport/KeyManager.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/transport/KeyManager.java
@@ -6,8 +6,6 @@ import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.plugin.TransportId;
 import java.util.Map;
 import javax.annotation.Nullable;
 /**
@@ -18,55 +16,13 @@ public interface KeyManager {
 	/**
 	 * Informs the key manager that a new contact has been added. Derives and
-	 * stores a set of transport keys for communicating with the contact over
+	 * stores transport keys for communicating with the contact.
 	 * each transport.
 	 * <p/>
 	 * {@link StreamContext StreamContexts} for the contact can be created
 	 * after this method has returned.
 	 *
 	 * @param alice true if the local party is Alice
 	 */
 	void addContact(Transaction txn, ContactId c, SecretKey master,
 			long timestamp, boolean alice) throws DbException;
 	/**
 	 * Derives and stores a set of unbound transport keys for each transport
 	 * and returns the key set IDs.
 	 * <p/>
 	 * The keys must be bound before they can be used for incoming streams,
 	 * and also activated before they can be used for outgoing streams.
 	 *
 	 * @param alice true if the local party is Alice
 	 */
 	Map<TransportId, KeySetId> addUnboundKeys(Transaction txn, SecretKey master,
 			long timestamp, boolean alice) throws DbException;
 	/**
 	 * Binds the given transport keys to the given contact.
 	 */
 	void bindKeys(Transaction txn, ContactId c, Map<TransportId, KeySetId> keys)
 			throws DbException;
 	/**
 	 * Marks the given transport keys as usable for outgoing streams. Keys must
 	 * be bound before they are activated.
 	 */
 	void activateKeys(Transaction txn, Map<TransportId, KeySetId> keys)
 			throws DbException;
 	/**
 	 * Removes the given transport keys, which must not have been bound, from
 	 * the manager and the database.
 	 */
 	void removeKeys(Transaction txn, Map<TransportId, KeySetId> keys)
 			throws DbException;
 	/**
 	 * Returns true if we have keys that can be used for outgoing streams to
 	 * the given contact over the given transport.
 	 */
 	boolean canSendOutgoingStreams(ContactId c, TransportId t);
 	/**
 	 * Returns a {@link StreamContext} for sending a stream to the given
 	 * contact over the given transport, or null if an error occurs or the
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/transport/KeySet.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/transport/KeySet.java
@@ -1,51 +0,0 @@
 package org.briarproject.bramble.api.transport;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 /**
 * A set of transport keys for communicating with a contact. If the keys have
 * not yet been bound to a contact, {@link #getContactId()}} returns null.
 */
@Immutable
@NotNullByDefault
 public class KeySet {
 	private final KeySetId keySetId;
 	@Nullable
 	private final ContactId contactId;
 	private final TransportKeys transportKeys;
 	public KeySet(KeySetId keySetId, @Nullable ContactId contactId,
 			TransportKeys transportKeys) {
 		this.keySetId = keySetId;
 		this.contactId = contactId;
 		this.transportKeys = transportKeys;
 	}
 	public KeySetId getKeySetId() {
 		return keySetId;
 	}
 	@Nullable
 	public ContactId getContactId() {
 		return contactId;
 	}
 	public TransportKeys getTransportKeys() {
 		return transportKeys;
 	}
 	@Override
 	public int hashCode() {
 		return keySetId.hashCode();
 	}
 	@Override
 	public boolean equals(Object o) {
 		return o instanceof KeySet && keySetId.equals(((KeySet) o).keySetId);
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/transport/KeySetId.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/transport/KeySetId.java
@@ -1,36 +0,0 @@
 package org.briarproject.bramble.api.transport;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import javax.annotation.concurrent.Immutable;
 /**
 * Type-safe wrapper for an integer that uniquely identifies a set of transport
 * keys within the scope of the local device.
 * <p/>
 * Key sets created on a given device must have increasing identifiers.
 */
@Immutable
@NotNullByDefault
 public class KeySetId {
 	private final int id;
 	public KeySetId(int id) {
 		this.id = id;
 	}
 	public int getInt() {
 		return id;
 	}
 	@Override
 	public int hashCode() {
 		return id;
 	}
 	@Override
 	public boolean equals(Object o) {
 		return o instanceof KeySetId && id == ((KeySetId) o).id;
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/transport/OutgoingKeys.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/transport/OutgoingKeys.java
@@ -10,20 +10,18 @@ public class OutgoingKeys {
 	private final SecretKey tagKey, headerKey;
 	private final long rotationPeriod, streamCounter;
 	private final boolean active;
 	public OutgoingKeys(SecretKey tagKey, SecretKey headerKey,
-			long rotationPeriod, boolean active) {
+			long rotationPeriod) {
-		this(tagKey, headerKey, rotationPeriod, 0, active);
+		this(tagKey, headerKey, rotationPeriod, 0);
 	}
 	public OutgoingKeys(SecretKey tagKey, SecretKey headerKey,
-			long rotationPeriod, long streamCounter, boolean active) {
+			long rotationPeriod, long streamCounter) {
 		this.tagKey = tagKey;
 		this.headerKey = headerKey;
 		this.rotationPeriod = rotationPeriod;
 		this.streamCounter = streamCounter;
 		this.active = active;
 	}
 	public SecretKey getTagKey() {
@@ -41,8 +39,4 @@ public class OutgoingKeys {
 	public long getStreamCounter() {
 		return streamCounter;
 	}
 	public boolean isActive() {
 		return active;
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/transport/TransportConstants.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/transport/TransportConstants.java
@@ -7,7 +7,7 @@ public interface TransportConstants {
 	/**
 	 * The current version of the transport protocol.
 	 */
-	int PROTOCOL_VERSION = 4;
+	int PROTOCOL_VERSION = 3;
 	/**
 	 * The length of the pseudo-random tag in bytes.
@@ -80,32 +80,4 @@ public interface TransportConstants {
 	 * The size of the reordering window.
 	 */
 	int REORDERING_WINDOW_SIZE = 32;
 	/**
 	 * Label for deriving Alice's initial tag key from the master secret.
 	 */
 	String ALICE_TAG_LABEL = "org.briarproject.bramble.transport/ALICE_TAG_KEY";
 	/**
 	 * Label for deriving Bob's initial tag key from the master secret.
 	 */
 	String BOB_TAG_LABEL = "org.briarproject.bramble.transport/BOB_TAG_KEY";
 	/**
 	 * Label for deriving Alice's initial header key from the master secret.
 	 */
 	String ALICE_HEADER_LABEL =
 			"org.briarproject.bramble.transport/ALICE_HEADER_KEY";
 	/**
 	 * Label for deriving Bob's initial header key from the master secret.
 	 */
 	String BOB_HEADER_LABEL =
 			"org.briarproject.bramble.transport/BOB_HEADER_KEY";
 	/**
 	 * Label for deriving the next period's key in key rotation.
 	 */
 	String ROTATE_LABEL = "org.briarproject.bramble.transport/ROTATE";
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/versioning/ClientMajorVersion.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/versioning/ClientMajorVersion.java
@@ -1,50 +0,0 @@
 package org.briarproject.bramble.api.versioning;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.ClientId;
 import javax.annotation.concurrent.Immutable;
@Immutable
@NotNullByDefault
 public class ClientMajorVersion implements Comparable<ClientMajorVersion> {
 	private final ClientId clientId;
 	private final int majorVersion;
 	public ClientMajorVersion(ClientId clientId, int majorVersion) {
 		this.clientId = clientId;
 		this.majorVersion = majorVersion;
 	}
 	public ClientId getClientId() {
 		return clientId;
 	}
 	public int getMajorVersion() {
 		return majorVersion;
 	}
 	@Override
 	public boolean equals(Object o) {
 		if (o instanceof ClientMajorVersion) {
 			ClientMajorVersion cv = (ClientMajorVersion) o;
 			return clientId.equals(cv.clientId)
 					&& majorVersion == cv.majorVersion;
 		}
 		return false;
 	}
 	@Override
 	public int hashCode() {
 		return (clientId.hashCode() << 16) + majorVersion;
 	}
 	@Override
 	public int compareTo(ClientMajorVersion cv) {
 		int compare = clientId.compareTo(cv.clientId);
 		if (compare != 0) return compare;
 		return majorVersion - cv.majorVersion;
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/versioning/ClientVersioningManager.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/versioning/ClientVersioningManager.java
@@ -1,45 +0,0 @@
 package org.briarproject.bramble.api.versioning;
 import org.briarproject.bramble.api.contact.Contact;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.ClientId;
 import org.briarproject.bramble.api.sync.Group.Visibility;
@NotNullByDefault
 public interface ClientVersioningManager {
 	/**
 	 * The unique ID of the versioning client.
 	 */
 	ClientId CLIENT_ID = new ClientId("org.briarproject.bramble.versioning");
 	/**
 	 * The current major version of the versioning client.
 	 */
 	int MAJOR_VERSION = 0;
 	/**
 	 * Registers a client that will be advertised to contacts. The hook will
 	 * be called when the visibility of the client changes. This method should
 	 * be called before {@link LifecycleManager#startServices(String)}.
 	 */
 	void registerClient(ClientId clientId, int majorVersion, int minorVersion,
 			ClientVersioningHook hook);
 	/**
 	 * Returns the visibility of the given client with respect to the given
 	 * contact.
 	 */
 	Visibility getClientVisibility(Transaction txn, ContactId contactId,
 			ClientId clientId, int majorVersion) throws DbException;
 	interface ClientVersioningHook {
 		void onClientVisibilityChanging(Transaction txn, Contact c,
 				Visibility v) throws DbException;
 	}
 }
--- a/bramble-api/src/main/java/org/briarproject/bramble/util/StringUtils.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/util/StringUtils.java
@@ -126,10 +126,6 @@ public class StringUtils {
 		return toUtf8(s).length > maxLength;
 	}
 	public static boolean isValidMac(String mac) {
 		return MAC.matcher(mac).matches();
 	}
 	public static byte[] macToBytes(String mac) {
 		if (!MAC.matcher(mac).matches()) throw new IllegalArgumentException();
 		return fromHexString(mac.replaceAll(":", ""));
--- a/bramble-api/src/test/java/org/briarproject/bramble/test/TestUtils.java
+++ b/bramble-api/src/test/java/org/briarproject/bramble/test/TestUtils.java
@@ -5,8 +5,6 @@ import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorId;
 import org.briarproject.bramble.api.identity.LocalAuthor;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.api.sync.ClientId;
 import org.briarproject.bramble.api.sync.Group;
 import org.briarproject.bramble.api.sync.GroupId;
@@ -15,21 +13,11 @@ import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.bramble.util.IoUtils;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicInteger;
 import static org.briarproject.bramble.api.identity.Author.FORMAT_VERSION;
 import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
 import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
 import static org.briarproject.bramble.api.plugin.TransportId.MAX_TRANSPORT_ID_LENGTH;
 import static org.briarproject.bramble.api.properties.TransportPropertyConstants.MAX_PROPERTY_LENGTH;
 import static org.briarproject.bramble.api.sync.ClientId.MAX_CLIENT_ID_LENGTH;
 import static org.briarproject.bramble.api.sync.SyncConstants.MAX_GROUP_DESCRIPTOR_LENGTH;
 import static org.briarproject.bramble.api.sync.SyncConstants.MAX_MESSAGE_BODY_LENGTH;
 import static org.briarproject.bramble.api.sync.SyncConstants.MESSAGE_HEADER_LENGTH;
@@ -61,33 +49,6 @@ public class TestUtils {
 		return getRandomBytes(UniqueId.LENGTH);
 	}
 	public static ClientId getClientId() {
 		return new ClientId(getRandomString(MAX_CLIENT_ID_LENGTH));
 	}
 	public static TransportId getTransportId() {
 		return new TransportId(getRandomString(MAX_TRANSPORT_ID_LENGTH));
 	}
 	public static TransportProperties getTransportProperties(int number) {
 		TransportProperties tp = new TransportProperties();
 		for (int i = 0; i < number; i++) {
 			tp.put(getRandomString(1 + random.nextInt(MAX_PROPERTY_LENGTH)),
 					getRandomString(1 + random.nextInt(MAX_PROPERTY_LENGTH))
 			);
 		}
 		return tp;
 	}
 	public static Map<TransportId, TransportProperties> getTransportPropertiesMap(
 			int number) {
 		Map<TransportId, TransportProperties> map = new HashMap<>();
 		for (int i = 0; i < number; i++) {
 			map.put(getTransportId(), getTransportProperties(number));
 		}
 		return map;
 	}
 	public static SecretKey getSecretKey() {
 		return new SecretKey(getRandomBytes(SecretKey.LENGTH));
 	}
@@ -102,8 +63,7 @@ public class TestUtils {
 		byte[] publicKey = getRandomBytes(MAX_PUBLIC_KEY_LENGTH);
 		byte[] privateKey = getRandomBytes(MAX_PUBLIC_KEY_LENGTH);
 		long created = System.currentTimeMillis();
-		return new LocalAuthor(id, FORMAT_VERSION, name, publicKey, privateKey,
+		return new LocalAuthor(id, name, publicKey, privateKey, created);
 				created);
 	}
 	public static Author getAuthor() {
@@ -114,19 +74,18 @@ public class TestUtils {
 		AuthorId id = new AuthorId(getRandomId());
 		String name = getRandomString(nameLength);
 		byte[] publicKey = getRandomBytes(MAX_PUBLIC_KEY_LENGTH);
-		return new Author(id, FORMAT_VERSION, name, publicKey);
+		return new Author(id, name, publicKey);
 	}
-	public static Group getGroup(ClientId clientId, int majorVersion) {
+	public static Group getGroup(ClientId clientId) {
 		int descriptorLength = 1 + random.nextInt(MAX_GROUP_DESCRIPTOR_LENGTH);
-		return getGroup(clientId, majorVersion, descriptorLength);
+		return getGroup(clientId, descriptorLength);
 	}
-	public static Group getGroup(ClientId clientId, int majorVersion,
+	public static Group getGroup(ClientId clientId, int descriptorLength) {
 			int descriptorLength) {
 		GroupId groupId = new GroupId(getRandomId());
 		byte[] descriptor = getRandomBytes(descriptorLength);
-		return new Group(groupId, clientId, majorVersion, descriptor);
+		return new Group(groupId, clientId, descriptor);
 	}
 	public static Message getMessage(GroupId groupId) {
@@ -140,38 +99,4 @@ public class TestUtils {
 		long timestamp = System.currentTimeMillis();
 		return new Message(id, groupId, timestamp, raw);
 	}
 	public static double getMedian(Collection<? extends Number> samples) {
 		int size = samples.size();
 		if (size == 0) throw new IllegalArgumentException();
 		List<Double> sorted = new ArrayList<>(size);
 		for (Number n : samples) sorted.add(n.doubleValue());
 		Collections.sort(sorted);
 		if (size % 2 == 1) return sorted.get(size / 2);
 		double low = sorted.get(size / 2 - 1), high = sorted.get(size / 2);
 		return (low + high) / 2;
 	}
 	public static double getMean(Collection<? extends Number> samples) {
 		if (samples.isEmpty()) throw new IllegalArgumentException();
 		double sum = 0;
 		for (Number n : samples) sum += n.doubleValue();
 		return sum / samples.size();
 	}
 	public static double getVariance(Collection<? extends Number> samples) {
 		if (samples.size() < 2) throw new IllegalArgumentException();
 		double mean = getMean(samples);
 		double sumSquareDiff = 0;
 		for (Number n : samples) {
 			double diff = n.doubleValue() - mean;
 			sumSquareDiff += diff * diff;
 		}
 		return sumSquareDiff / (samples.size() - 1);
 	}
 	public static double getStandardDeviation(
 			Collection<? extends Number> samples) {
 		return Math.sqrt(getVariance(samples));
 	}
 }
--- a/bramble-core/build.gradle
+++ b/bramble-core/build.gradle
@@ -9,15 +9,12 @@ apply plugin: 'witness'
 dependencies {
 	implementation project(path: ':bramble-api', configuration: 'default')
 	implementation 'com.madgag.spongycastle:core:1.58.0.0'
-	implementation 'com.h2database:h2:1.4.192' // The last version that supports Java 1.6
+	implementation 'com.h2database:h2:1.4.192' // This is the last version that supports Java 1.6
 	implementation 'org.bitlet:weupnp:0.1.4'
 	implementation 'net.i2p.crypto:eddsa:0.2.0'
 	implementation 'org.whispersystems:curve25519-java:0.4.1'
 	apt 'com.google.dagger:dagger-compiler:2.0.2'
 	testImplementation project(path: ':bramble-api', configuration: 'testOutput')
 	testImplementation 'org.hsqldb:hsqldb:2.3.5' // The last version that supports Java 1.6
 	testImplementation 'junit:junit:4.12'
 	testImplementation "org.jmock:jmock:2.8.2"
 	testImplementation "org.jmock:jmock-junit4:2.8.2"
@@ -31,6 +28,7 @@ dependencies {
 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-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',
@@ -39,21 +37,18 @@ dependencyVerification {
 			'com.madgag.spongycastle:core:1.58.0.0:core-1.58.0.0.jar:199617dd5698c5a9312b898c0a4cec7ce9dd8649d07f65d91629f58229d72728',
 			'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
 			'junit:junit:4.12:junit-4.12.jar:59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a',
 			'net.i2p.crypto:eddsa:0.2.0:eddsa-0.2.0.jar:a7cb1b85c16e2f0730b9204106929a1d9aaae1df728adc7041a8b8b605692140',
 			'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.bitlet:weupnp:0.1.4:weupnp-0.1.4.jar:88df7e6504929d00bdb832863761385c68ab92af945b04f0770b126270a444fb',
 			'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.hsqldb:hsqldb:2.3.5:hsqldb-2.3.5.jar:6676a6977ac98997a80f827ddbd3fe8ca1e0853dad1492512135fd1a222ccfad',
 			'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',
 			'org.whispersystems:curve25519-java:0.4.1:curve25519-java-0.4.1.jar:7dd659d8822c06c3aea1a47f18fac9e5761e29cab8100030b877db445005f03e',
 	]
 }
--- a/bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreEagerSingletons.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreEagerSingletons.java
@@ -1,7 +1,7 @@
 package org.briarproject.bramble;
 import org.briarproject.bramble.contact.ContactModule;
-import org.briarproject.bramble.crypto.CryptoExecutorModule;
+import org.briarproject.bramble.crypto.CryptoModule;
 import org.briarproject.bramble.db.DatabaseExecutorModule;
 import org.briarproject.bramble.identity.IdentityModule;
 import org.briarproject.bramble.lifecycle.LifecycleModule;
@@ -10,13 +10,12 @@ import org.briarproject.bramble.properties.PropertiesModule;
 import org.briarproject.bramble.sync.SyncModule;
 import org.briarproject.bramble.system.SystemModule;
 import org.briarproject.bramble.transport.TransportModule;
 import org.briarproject.bramble.versioning.VersioningModule;
 public interface BrambleCoreEagerSingletons {
 	void inject(ContactModule.EagerSingletons init);
-	void inject(CryptoExecutorModule.EagerSingletons init);
+	void inject(CryptoModule.EagerSingletons init);
 	void inject(DatabaseExecutorModule.EagerSingletons init);
@@ -33,6 +32,4 @@ public interface BrambleCoreEagerSingletons {
 	void inject(SystemModule.EagerSingletons init);
 	void inject(TransportModule.EagerSingletons init);
 	void inject(VersioningModule.EagerSingletons init);
 }
--- a/bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreModule.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/BrambleCoreModule.java
@@ -2,7 +2,6 @@ package org.briarproject.bramble;
 import org.briarproject.bramble.client.ClientModule;
 import org.briarproject.bramble.contact.ContactModule;
 import org.briarproject.bramble.crypto.CryptoExecutorModule;
 import org.briarproject.bramble.crypto.CryptoModule;
 import org.briarproject.bramble.data.DataModule;
 import org.briarproject.bramble.db.DatabaseExecutorModule;
@@ -13,7 +12,6 @@ import org.briarproject.bramble.keyagreement.KeyAgreementModule;
 import org.briarproject.bramble.lifecycle.LifecycleModule;
 import org.briarproject.bramble.plugin.PluginModule;
 import org.briarproject.bramble.properties.PropertiesModule;
 import org.briarproject.bramble.record.RecordModule;
 import org.briarproject.bramble.reliability.ReliabilityModule;
 import org.briarproject.bramble.reporting.ReportingModule;
 import org.briarproject.bramble.settings.SettingsModule;
@@ -21,7 +19,6 @@ import org.briarproject.bramble.socks.SocksModule;
 import org.briarproject.bramble.sync.SyncModule;
 import org.briarproject.bramble.system.SystemModule;
 import org.briarproject.bramble.transport.TransportModule;
 import org.briarproject.bramble.versioning.VersioningModule;
 import dagger.Module;
@@ -29,7 +26,6 @@ import dagger.Module;
 		ClientModule.class,
 		ContactModule.class,
 		CryptoModule.class,
 		CryptoExecutorModule.class,
 		DataModule.class,
 		DatabaseModule.class,
 		DatabaseExecutorModule.class,
@@ -39,21 +35,19 @@ import dagger.Module;
 		LifecycleModule.class,
 		PluginModule.class,
 		PropertiesModule.class,
 		RecordModule.class,
 		ReliabilityModule.class,
 		ReportingModule.class,
 		SettingsModule.class,
 		SocksModule.class,
 		SyncModule.class,
 		SystemModule.class,
-		TransportModule.class,
+		TransportModule.class
 		VersioningModule.class
 })
 public class BrambleCoreModule {
 	public static void initEagerSingletons(BrambleCoreEagerSingletons c) {
 		c.inject(new ContactModule.EagerSingletons());
-		c.inject(new CryptoExecutorModule.EagerSingletons());
+		c.inject(new CryptoModule.EagerSingletons());
 		c.inject(new DatabaseExecutorModule.EagerSingletons());
 		c.inject(new IdentityModule.EagerSingletons());
 		c.inject(new LifecycleModule.EagerSingletons());
@@ -62,6 +56,5 @@ public class BrambleCoreModule {
 		c.inject(new SyncModule.EagerSingletons());
 		c.inject(new SystemModule.EagerSingletons());
 		c.inject(new TransportModule.EagerSingletons());
 		c.inject(new VersioningModule.EagerSingletons());
 	}
 }
--- a/bramble-core/src/main/java/org/briarproject/bramble/client/ClientHelperImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/client/ClientHelperImpl.java
@@ -15,11 +15,7 @@ import org.briarproject.bramble.api.db.DatabaseComponent;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Metadata;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorFactory;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageFactory;
@@ -36,14 +32,7 @@ import java.util.Map.Entry;
 import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
 import static org.briarproject.bramble.api.identity.Author.FORMAT_VERSION;
 import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
 import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
 import static org.briarproject.bramble.api.properties.TransportPropertyConstants.MAX_PROPERTIES_PER_TRANSPORT;
 import static org.briarproject.bramble.api.properties.TransportPropertyConstants.MAX_PROPERTY_LENGTH;
 import static org.briarproject.bramble.api.sync.SyncConstants.MESSAGE_HEADER_LENGTH;
 import static org.briarproject.bramble.util.ValidationUtils.checkLength;
 import static org.briarproject.bramble.util.ValidationUtils.checkSize;
@Immutable
@NotNullByDefault
@@ -62,14 +51,12 @@ class ClientHelperImpl implements ClientHelper {
 	private final MetadataParser metadataParser;
 	private final MetadataEncoder metadataEncoder;
 	private final CryptoComponent crypto;
 	private final AuthorFactory authorFactory;
 	@Inject
 	ClientHelperImpl(DatabaseComponent db, MessageFactory messageFactory,
 			BdfReaderFactory bdfReaderFactory,
 			BdfWriterFactory bdfWriterFactory, MetadataParser metadataParser,
-			MetadataEncoder metadataEncoder, CryptoComponent crypto,
+			MetadataEncoder metadataEncoder, CryptoComponent crypto) {
 			AuthorFactory authorFactory) {
 		this.db = db;
 		this.messageFactory = messageFactory;
 		this.bdfReaderFactory = bdfReaderFactory;
@@ -77,7 +64,6 @@ class ClientHelperImpl implements ClientHelper {
 		this.metadataParser = metadataParser;
 		this.metadataEncoder = metadataEncoder;
 		this.crypto = crypto;
 		this.authorFactory = authorFactory;
 	}
 	@Override
@@ -328,20 +314,6 @@ class ClientHelperImpl implements ClientHelper {
 		}
 	}
 	@Override
 	public BdfDictionary toDictionary(TransportProperties transportProperties) {
 		return new BdfDictionary(transportProperties);
 	}
 	@Override
 	public BdfDictionary toDictionary(
 			Map<TransportId, TransportProperties> map) {
 		BdfDictionary d = new BdfDictionary();
 		for (Entry<TransportId, TransportProperties> e : map.entrySet())
 			d.put(e.getKey().getString(), new BdfDictionary(e.getValue()));
 		return d;
 	}
 	@Override
 	public BdfList toList(byte[] b, int off, int len) throws FormatException {
 		ByteArrayInputStream in = new ByteArrayInputStream(b, off, len);
@@ -369,11 +341,6 @@ class ClientHelperImpl implements ClientHelper {
 				raw.length - MESSAGE_HEADER_LENGTH);
 	}
 	@Override
 	public BdfList toList(Author a) {
 		return BdfList.of(a.getFormatVersion(), a.getName(), a.getPublicKey());
 	}
 	@Override
 	public byte[] sign(String label, BdfList toSign, byte[] privateKey)
 			throws FormatException, GeneralSecurityException {
@@ -381,53 +348,11 @@ class ClientHelperImpl implements ClientHelper {
 	}
 	@Override
-	public void verifySignature(byte[] signature, String label, BdfList signed,
+	public void verifySignature(String label, byte[] sig, byte[] publicKey,
-			byte[] publicKey) throws FormatException, GeneralSecurityException {
+			BdfList signed) throws FormatException, GeneralSecurityException {
-		if (!crypto.verifySignature(signature, label, toByteArray(signed),
+		if (!crypto.verify(label, toByteArray(signed), publicKey, sig)) {
 				publicKey)) {
 			throw new GeneralSecurityException("Invalid signature");
 		}
 	}
 	@Override
 	public Author parseAndValidateAuthor(BdfList author)
 			throws FormatException {
 		checkSize(author, 3);
 		int formatVersion = author.getLong(0).intValue();
 		if (formatVersion != FORMAT_VERSION) throw new FormatException();
 		String name = author.getString(1);
 		checkLength(name, 1, MAX_AUTHOR_NAME_LENGTH);
 		byte[] publicKey = author.getRaw(2);
 		checkLength(publicKey, 1, MAX_PUBLIC_KEY_LENGTH);
 		return authorFactory.createAuthor(formatVersion, name, publicKey);
 	}
 	@Override
 	public TransportProperties parseAndValidateTransportProperties(
 			BdfDictionary properties) throws FormatException {
 		checkSize(properties, 0, MAX_PROPERTIES_PER_TRANSPORT);
 		TransportProperties p = new TransportProperties();
 		for (String key : properties.keySet()) {
 			checkLength(key, 1, MAX_PROPERTY_LENGTH);
 			String value = properties.getString(key);
 			checkLength(value, 1, MAX_PROPERTY_LENGTH);
 			p.put(key, value);
 		}
 		return p;
 	}
 	@Override
 	public Map<TransportId, TransportProperties> parseAndValidateTransportPropertiesMap(
 			BdfDictionary properties) throws FormatException {
 		Map<TransportId, TransportProperties> tpMap = new HashMap<>();
 		for (String key : properties.keySet()) {
 			TransportId transportId = new TransportId(key);
 			TransportProperties transportProperties =
 					parseAndValidateTransportProperties(
 							properties.getDictionary(key));
 			tpMap.put(transportId, transportProperties);
 		}
 		return tpMap;
 	}
 }
--- a/bramble-core/src/main/java/org/briarproject/bramble/client/ClientModule.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/client/ClientModule.java
@@ -2,6 +2,14 @@ package org.briarproject.bramble.client;
 import org.briarproject.bramble.api.client.ClientHelper;
 import org.briarproject.bramble.api.client.ContactGroupFactory;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.data.BdfReaderFactory;
 import org.briarproject.bramble.api.data.BdfWriterFactory;
 import org.briarproject.bramble.api.data.MetadataEncoder;
 import org.briarproject.bramble.api.data.MetadataParser;
 import org.briarproject.bramble.api.db.DatabaseComponent;
 import org.briarproject.bramble.api.sync.GroupFactory;
 import org.briarproject.bramble.api.sync.MessageFactory;
 import dagger.Module;
 import dagger.Provides;
@@ -10,14 +18,19 @@ import dagger.Provides;
 public class ClientModule {
 	@Provides
-	ClientHelper provideClientHelper(ClientHelperImpl clientHelper) {
+	ClientHelper provideClientHelper(DatabaseComponent db,
-		return clientHelper;
+			MessageFactory messageFactory, BdfReaderFactory bdfReaderFactory,
 			BdfWriterFactory bdfWriterFactory, MetadataParser metadataParser,
 			MetadataEncoder metadataEncoder, CryptoComponent cryptoComponent) {
 		return new ClientHelperImpl(db, messageFactory, bdfReaderFactory,
 				bdfWriterFactory, metadataParser, metadataEncoder,
 				cryptoComponent);
 	}
 	@Provides
-	ContactGroupFactory provideContactGroupFactory(
+	ContactGroupFactory provideContactGroupFactory(GroupFactory groupFactory,
-			ContactGroupFactoryImpl contactGroupFactory) {
+			ClientHelper clientHelper) {
-		return contactGroupFactory;
+		return new ContactGroupFactoryImpl(groupFactory, clientHelper);
 	}
 }
--- a/bramble-core/src/main/java/org/briarproject/bramble/client/ContactGroupFactoryImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/client/ContactGroupFactoryImpl.java
@@ -32,25 +32,23 @@ class ContactGroupFactoryImpl implements ContactGroupFactory {
 	}
 	@Override
-	public Group createLocalGroup(ClientId clientId, int majorVersion) {
+	public Group createLocalGroup(ClientId clientId) {
-		return groupFactory.createGroup(clientId, majorVersion,
+		return groupFactory.createGroup(clientId, LOCAL_GROUP_DESCRIPTOR);
 				LOCAL_GROUP_DESCRIPTOR);
 	}
 	@Override
-	public Group createContactGroup(ClientId clientId, int majorVersion,
+	public Group createContactGroup(ClientId clientId, Contact contact) {
 			Contact contact) {
 		AuthorId local = contact.getLocalAuthorId();
 		AuthorId remote = contact.getAuthor().getId();
 		byte[] descriptor = createGroupDescriptor(local, remote);
-		return groupFactory.createGroup(clientId, majorVersion, descriptor);
+		return groupFactory.createGroup(clientId, descriptor);
 	}
 	@Override
-	public Group createContactGroup(ClientId clientId, int majorVersion,
+	public Group createContactGroup(ClientId clientId, AuthorId authorId1,
-			AuthorId authorId1, AuthorId authorId2) {
+			AuthorId authorId2) {
 		byte[] descriptor = createGroupDescriptor(authorId1, authorId2);
-		return groupFactory.createGroup(clientId, majorVersion, descriptor);
+		return groupFactory.createGroup(clientId, descriptor);
 	}
 	private byte[] createGroupDescriptor(AuthorId local, AuthorId remote) {
--- a/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactExchangeTaskImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactExchangeTaskImpl.java
@@ -1,20 +1,23 @@
 package org.briarproject.bramble.contact;
 import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.client.ClientHelper;
 import org.briarproject.bramble.api.contact.ContactExchangeListener;
 import org.briarproject.bramble.api.contact.ContactExchangeTask;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.contact.ContactManager;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.data.BdfDictionary;
 import org.briarproject.bramble.api.data.BdfList;
 import org.briarproject.bramble.api.data.BdfReader;
 import org.briarproject.bramble.api.data.BdfReaderFactory;
 import org.briarproject.bramble.api.data.BdfWriter;
 import org.briarproject.bramble.api.data.BdfWriterFactory;
 import org.briarproject.bramble.api.db.ContactExistsException;
 import org.briarproject.bramble.api.db.DatabaseComponent;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.AuthorFactory;
 import org.briarproject.bramble.api.identity.LocalAuthor;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
@@ -23,30 +26,29 @@ import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.plugin.duplex.DuplexTransportConnection;
 import org.briarproject.bramble.api.properties.TransportProperties;
 import org.briarproject.bramble.api.properties.TransportPropertyManager;
 import org.briarproject.bramble.api.record.Record;
 import org.briarproject.bramble.api.record.RecordReader;
 import org.briarproject.bramble.api.record.RecordReaderFactory;
 import org.briarproject.bramble.api.record.RecordWriter;
 import org.briarproject.bramble.api.record.RecordWriterFactory;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.api.transport.StreamReaderFactory;
 import org.briarproject.bramble.api.transport.StreamWriterFactory;
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.security.GeneralSecurityException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.logging.Logger;
 import javax.inject.Inject;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
-import static org.briarproject.bramble.api.contact.RecordTypes.CONTACT_INFO;
+import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
 import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
 import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_SIGNATURE_LENGTH;
-import static org.briarproject.bramble.util.ValidationUtils.checkLength;
+import static org.briarproject.bramble.api.plugin.TransportId.MAX_TRANSPORT_ID_LENGTH;
-import static org.briarproject.bramble.util.ValidationUtils.checkSize;
+import static org.briarproject.bramble.api.properties.TransportPropertyConstants.MAX_PROPERTIES_PER_TRANSPORT;
 import static org.briarproject.bramble.api.properties.TransportPropertyConstants.MAX_PROPERTY_LENGTH;
@MethodsNotNullByDefault
@ParametersNotNullByDefault
@@ -59,9 +61,9 @@ class ContactExchangeTaskImpl extends Thread implements ContactExchangeTask {
 			"org.briarproject.briar.contact/EXCHANGE";
 	private final DatabaseComponent db;
-	private final ClientHelper clientHelper;
+	private final AuthorFactory authorFactory;
-	private final RecordReaderFactory recordReaderFactory;
+	private final BdfReaderFactory bdfReaderFactory;
-	private final RecordWriterFactory recordWriterFactory;
+	private final BdfWriterFactory bdfWriterFactory;
 	private final Clock clock;
 	private final ConnectionManager connectionManager;
 	private final ContactManager contactManager;
@@ -78,17 +80,17 @@ class ContactExchangeTaskImpl extends Thread implements ContactExchangeTask {
 	private volatile boolean alice;
 	@Inject
-	ContactExchangeTaskImpl(DatabaseComponent db, ClientHelper clientHelper,
+	ContactExchangeTaskImpl(DatabaseComponent db,
-			RecordReaderFactory recordReaderFactory,
+			AuthorFactory authorFactory, BdfReaderFactory bdfReaderFactory,
-			RecordWriterFactory recordWriterFactory, Clock clock,
+			BdfWriterFactory bdfWriterFactory, Clock clock,
 			ConnectionManager connectionManager, ContactManager contactManager,
 			TransportPropertyManager transportPropertyManager,
 			CryptoComponent crypto, StreamReaderFactory streamReaderFactory,
 			StreamWriterFactory streamWriterFactory) {
 		this.db = db;
-		this.clientHelper = clientHelper;
+		this.authorFactory = authorFactory;
-		this.recordReaderFactory = recordReaderFactory;
+		this.bdfReaderFactory = bdfReaderFactory;
-		this.recordWriterFactory = recordWriterFactory;
+		this.bdfWriterFactory = bdfWriterFactory;
 		this.clock = clock;
 		this.connectionManager = connectionManager;
 		this.contactManager = contactManager;
@@ -123,174 +125,184 @@ class ContactExchangeTaskImpl extends Thread implements ContactExchangeTask {
 		} catch (IOException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 			listener.contactExchangeFailed();
-			tryToClose(conn);
+			tryToClose(conn, true);
 			return;
 		}
 		// Get the local transport properties
-		Map<TransportId, TransportProperties> localProperties;
+		Map<TransportId, TransportProperties> localProperties, remoteProperties;
 		try {
 			localProperties = transportPropertyManager.getLocalProperties();
 		} catch (DbException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 			listener.contactExchangeFailed();
-			tryToClose(conn);
+			tryToClose(conn, true);
 			return;
 		}
 		// Derive the header keys for the transport streams
-		SecretKey aliceHeaderKey = crypto.deriveKey(ALICE_KEY_LABEL,
+		SecretKey aliceHeaderKey = crypto.deriveHeaderKey(masterSecret, true);
-				masterSecret, new byte[] {PROTOCOL_VERSION});
+		SecretKey bobHeaderKey = crypto.deriveHeaderKey(masterSecret, false);
 		SecretKey bobHeaderKey = crypto.deriveKey(BOB_KEY_LABEL, masterSecret,
 				new byte[] {PROTOCOL_VERSION});
 		// Create the readers
 		InputStream streamReader =
 				streamReaderFactory.createContactExchangeStreamReader(in,
 						alice ? bobHeaderKey : aliceHeaderKey);
-		RecordReader recordReader =
+		BdfReader r = bdfReaderFactory.createReader(streamReader);
 				recordReaderFactory.createRecordReader(streamReader);
 		// Create the writers
 		OutputStream streamWriter =
 				streamWriterFactory.createContactExchangeStreamWriter(out,
 						alice ? aliceHeaderKey : bobHeaderKey);
-		RecordWriter recordWriter =
+		BdfWriter w = bdfWriterFactory.createWriter(streamWriter);
 				recordWriterFactory.createRecordWriter(streamWriter);
 		// Derive the nonces to be signed
-		byte[] aliceNonce = crypto.mac(ALICE_NONCE_LABEL, masterSecret,
+		byte[] aliceNonce = crypto.deriveSignatureNonce(masterSecret, true);
-				new byte[] {PROTOCOL_VERSION});
+		byte[] bobNonce = crypto.deriveSignatureNonce(masterSecret, false);
 		byte[] bobNonce = crypto.mac(BOB_NONCE_LABEL, masterSecret,
 				new byte[] {PROTOCOL_VERSION});
 		byte[] localNonce = alice ? aliceNonce : bobNonce;
 		byte[] remoteNonce = alice ? bobNonce : aliceNonce;
-		// Sign the nonce
+		// Exchange pseudonyms, signed nonces, and timestamps
 		byte[] localSignature = sign(localAuthor, localNonce);
 		// Exchange contact info
 		long localTimestamp = clock.currentTimeMillis();
-		ContactInfo remoteInfo;
+		Author remoteAuthor;
 		long remoteTimestamp;
 		try {
 			if (alice) {
-				sendContactInfo(recordWriter, localAuthor, localProperties,
+				sendPseudonym(w, aliceNonce);
-						localSignature, localTimestamp);
+				sendTimestamp(w, localTimestamp);
-				recordWriter.flush();
+				sendTransportProperties(w, localProperties);
-				remoteInfo = receiveContactInfo(recordReader);
+				w.flush();
 				remoteAuthor = receivePseudonym(r, bobNonce);
 				remoteTimestamp = receiveTimestamp(r);
 				remoteProperties = receiveTransportProperties(r);
 			} else {
-				remoteInfo = receiveContactInfo(recordReader);
+				remoteAuthor = receivePseudonym(r, aliceNonce);
-				sendContactInfo(recordWriter, localAuthor, localProperties,
+				remoteTimestamp = receiveTimestamp(r);
-						localSignature, localTimestamp);
+				remoteProperties = receiveTransportProperties(r);
-				recordWriter.flush();
+				sendPseudonym(w, bobNonce);
 				sendTimestamp(w, localTimestamp);
 				sendTransportProperties(w, localProperties);
 				w.flush();
 			}
-			// Close the outgoing stream
+			// Close the outgoing stream and expect EOF on the incoming stream
-			recordWriter.close();
+			w.close();
-			// Skip any remaining records from the incoming stream
+			if (!r.eof()) LOG.warning("Unexpected data at end of connection");
-			try {
+		} catch (GeneralSecurityException | IOException e) {
 				while (true) recordReader.readRecord();
 			} catch (EOFException expected) {
 				LOG.info("End of stream");
 			}
 		} catch (IOException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 			listener.contactExchangeFailed();
-			tryToClose(conn);
+			tryToClose(conn, true);
 			return;
 		}
 		// Verify the contact's signature
 		if (!verify(remoteInfo.author, remoteNonce, remoteInfo.signature)) {
 			LOG.warning("Invalid signature");
 			listener.contactExchangeFailed();
 			tryToClose(conn);
 			return;
 		}
 		// The agreed timestamp is the minimum of the peers' timestamps
-		long timestamp = Math.min(localTimestamp, remoteInfo.timestamp);
+		long timestamp = Math.min(localTimestamp, remoteTimestamp);
 		try {
 			// Add the contact
-			ContactId contactId = addContact(remoteInfo.author, timestamp,
+			ContactId contactId = addContact(remoteAuthor, masterSecret,
-					remoteInfo.properties);
+					timestamp, alice, remoteProperties);
 			// Reuse the connection as a transport connection
 			connectionManager.manageOutgoingConnection(contactId, transportId,
 					conn);
 			// Pseudonym exchange succeeded
 			LOG.info("Pseudonym exchange succeeded");
-			listener.contactExchangeSucceeded(remoteInfo.author);
+			listener.contactExchangeSucceeded(remoteAuthor);
 		} catch (ContactExistsException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-			tryToClose(conn);
+			tryToClose(conn, true);
-			listener.duplicateContact(remoteInfo.author);
+			listener.duplicateContact(remoteAuthor);
 		} catch (DbException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
-			tryToClose(conn);
+			tryToClose(conn, true);
 			listener.contactExchangeFailed();
 		}
 	}
-	private byte[] sign(LocalAuthor author, byte[] nonce) {
+	private void sendPseudonym(BdfWriter w, byte[] nonce)
-		try {
+			throws GeneralSecurityException, IOException {
-			return crypto.sign(SIGNING_LABEL_EXCHANGE, nonce,
+		// Sign the nonce
-					author.getPrivateKey());
+		byte[] privateKey = localAuthor.getPrivateKey();
-		} catch (GeneralSecurityException e) {
+		byte[] sig = crypto.sign(SIGNING_LABEL_EXCHANGE, nonce, privateKey);
-			throw new AssertionError();
+
 		// Write the name, public key and signature
 		w.writeListStart();
 		w.writeString(localAuthor.getName());
 		w.writeRaw(localAuthor.getPublicKey());
 		w.writeRaw(sig);
 		w.writeListEnd();
 		LOG.info("Sent pseudonym");
 	}
 	private Author receivePseudonym(BdfReader r, byte[] nonce)
 			throws GeneralSecurityException, IOException {
 		// Read the name, public key and signature
 		r.readListStart();
 		String name = r.readString(MAX_AUTHOR_NAME_LENGTH);
 		byte[] publicKey = r.readRaw(MAX_PUBLIC_KEY_LENGTH);
 		byte[] sig = r.readRaw(MAX_SIGNATURE_LENGTH);
 		r.readListEnd();
 		LOG.info("Received pseudonym");
 		// Verify the signature
 		if (!crypto.verify(SIGNING_LABEL_EXCHANGE, nonce, publicKey, sig)) {
 			if (LOG.isLoggable(INFO))
 				LOG.info("Invalid signature");
 			throw new GeneralSecurityException();
 		}
 		return authorFactory.createAuthor(name, publicKey);
 	}
-	private boolean verify(Author author, byte[] nonce, byte[] signature) {
+	private void sendTimestamp(BdfWriter w, long timestamp)
 		try {
 			return crypto.verifySignature(signature, SIGNING_LABEL_EXCHANGE,
 					nonce, author.getPublicKey());
 		} catch (GeneralSecurityException e) {
 			return false;
 		}
 	}
 	private void sendContactInfo(RecordWriter recordWriter, Author author,
 			Map<TransportId, TransportProperties> properties, byte[] signature,
 			long timestamp) throws IOException {
 		BdfList authorList = clientHelper.toList(author);
 		BdfDictionary props = clientHelper.toDictionary(properties);
 		BdfList payload = BdfList.of(authorList, props, signature, timestamp);
 		recordWriter.writeRecord(new Record(PROTOCOL_VERSION, CONTACT_INFO,
 				clientHelper.toByteArray(payload)));
 		LOG.info("Sent contact info");
 	}
 	private ContactInfo receiveContactInfo(RecordReader recordReader)
 			throws IOException {
-		Record record;
+		w.writeLong(timestamp);
-		do {
+		LOG.info("Sent timestamp");
 			record = recordReader.readRecord();
 			if (record.getProtocolVersion() != PROTOCOL_VERSION)
 				throw new FormatException();
 		} while (record.getRecordType() != CONTACT_INFO);
 		LOG.info("Received contact info");
 		BdfList payload = clientHelper.toList(record.getPayload());
 		checkSize(payload, 4);
 		Author author = clientHelper.parseAndValidateAuthor(payload.getList(0));
 		BdfDictionary props = payload.getDictionary(1);
 		Map<TransportId, TransportProperties> properties =
 				clientHelper.parseAndValidateTransportPropertiesMap(props);
 		byte[] signature = payload.getRaw(2);
 		checkLength(signature, 1, MAX_SIGNATURE_LENGTH);
 		long timestamp = payload.getLong(3);
 		if (timestamp < 0) throw new FormatException();
 		return new ContactInfo(author, properties, signature, timestamp);
 	}
-	private ContactId addContact(Author remoteAuthor, long timestamp,
+	private long receiveTimestamp(BdfReader r) throws IOException {
 		long timestamp = r.readLong();
 		if (timestamp < 0) throw new FormatException();
 		LOG.info("Received timestamp");
 		return timestamp;
 	}
 	private void sendTransportProperties(BdfWriter w,
 			Map<TransportId, TransportProperties> local) throws IOException {
 		w.writeListStart();
 		for (Entry<TransportId, TransportProperties> e : local.entrySet())
 			w.writeList(BdfList.of(e.getKey().getString(), e.getValue()));
 		w.writeListEnd();
 	}
 	private Map<TransportId, TransportProperties> receiveTransportProperties(
 			BdfReader r) throws IOException {
 		Map<TransportId, TransportProperties> remote = new HashMap<>();
 		r.readListStart();
 		while (!r.hasListEnd()) {
 			r.readListStart();
 			String id = r.readString(MAX_TRANSPORT_ID_LENGTH);
 			if (id.isEmpty()) throw new FormatException();
 			TransportProperties p = new TransportProperties();
 			r.readDictionaryStart();
 			while (!r.hasDictionaryEnd()) {
 				if (p.size() == MAX_PROPERTIES_PER_TRANSPORT)
 					throw new FormatException();
 				String key = r.readString(MAX_PROPERTY_LENGTH);
 				String value = r.readString(MAX_PROPERTY_LENGTH);
 				p.put(key, value);
 			}
 			r.readDictionaryEnd();
 			r.readListEnd();
 			remote.put(new TransportId(id), p);
 		}
 		r.readListEnd();
 		return remote;
 	}
 	private ContactId addContact(Author remoteAuthor, SecretKey master,
 			long timestamp, boolean alice,
 			Map<TransportId, TransportProperties> remoteProperties)
 			throws DbException {
 		ContactId contactId;
 		Transaction txn = db.startTransaction(false);
 		try {
 			contactId = contactManager.addContact(txn, remoteAuthor,
-					localAuthor.getId(), masterSecret, timestamp, alice,
+					localAuthor.getId(), master, timestamp, alice, true, true);
 					true, true);
 			transportPropertyManager.addRemoteProperties(txn, contactId,
 					remoteProperties);
 			db.commitTransaction(txn);
@@ -300,30 +312,14 @@ class ContactExchangeTaskImpl extends Thread implements ContactExchangeTask {
 		return contactId;
 	}
-	private void tryToClose(DuplexTransportConnection conn) {
+	private void tryToClose(DuplexTransportConnection conn,
 			boolean exception) {
 		try {
 			LOG.info("Closing connection");
-			conn.getReader().dispose(true, true);
+			conn.getReader().dispose(exception, true);
-			conn.getWriter().dispose(true);
+			conn.getWriter().dispose(exception);
 		} catch (IOException e) {
 			if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
 		}
 	}
 	private static class ContactInfo {
 		private final Author author;
 		private final Map<TransportId, TransportProperties> properties;
 		private final byte[] signature;
 		private final long timestamp;
 		private ContactInfo(Author author,
 				Map<TransportId, TransportProperties> properties,
 				byte[] signature, long timestamp) {
 			this.author = author;
 			this.properties = properties;
 			this.signature = signature;
 			this.timestamp = timestamp;
 		}
 	}
 }
--- a/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactManagerImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/contact/ContactManagerImpl.java
@@ -27,37 +27,36 @@ class ContactManagerImpl implements ContactManager {
 	private final DatabaseComponent db;
 	private final KeyManager keyManager;
-	private final List<ContactHook> hooks;
+	private final List<AddContactHook> addHooks;
 	private final List<RemoveContactHook> removeHooks;
 	@Inject
 	ContactManagerImpl(DatabaseComponent db, KeyManager keyManager) {
 		this.db = db;
 		this.keyManager = keyManager;
-		hooks = new CopyOnWriteArrayList<>();
+		addHooks = new CopyOnWriteArrayList<>();
 		removeHooks = new CopyOnWriteArrayList<>();
 	}
 	@Override
-	public void registerContactHook(ContactHook hook) {
+	public void registerAddContactHook(AddContactHook hook) {
-		hooks.add(hook);
+		addHooks.add(hook);
 	}
 	@Override
 	public void registerRemoveContactHook(RemoveContactHook hook) {
 		removeHooks.add(hook);
 	}
 	@Override
 	public ContactId addContact(Transaction txn, Author remote, AuthorId local,
-			SecretKey master, long timestamp, boolean alice, boolean verified,
+			SecretKey master,long timestamp, boolean alice, boolean verified,
 			boolean active) throws DbException {
 		ContactId c = db.addContact(txn, remote, local, verified, active);
 		keyManager.addContact(txn, c, master, timestamp, alice);
 		Contact contact = db.getContact(txn, c);
-		for (ContactHook hook : hooks) hook.addingContact(txn, contact);
+		for (AddContactHook hook : addHooks)
-		return c;
+			hook.addingContact(txn, contact);
 	}
 	@Override
 	public ContactId addContact(Transaction txn, Author remote, AuthorId local,
 			boolean verified, boolean active) throws DbException {
 		ContactId c = db.addContact(txn, remote, local, verified, active);
 		Contact contact = db.getContact(txn, c);
 		for (ContactHook hook : hooks) hook.addingContact(txn, contact);
 		return c;
 	}
@@ -157,7 +156,7 @@ class ContactManagerImpl implements ContactManager {
 	@Override
 	public boolean contactExists(AuthorId remoteAuthorId,
 			AuthorId localAuthorId) throws DbException {
-		boolean exists;
+		boolean exists = false;
 		Transaction txn = db.startTransaction(true);
 		try {
 			exists = contactExists(txn, remoteAuthorId, localAuthorId);
@@ -172,7 +171,8 @@ class ContactManagerImpl implements ContactManager {
 	public void removeContact(Transaction txn, ContactId c)
 			throws DbException {
 		Contact contact = db.getContact(txn, c);
-		for (ContactHook hook : hooks) hook.removingContact(txn, contact);
+		for (RemoveContactHook hook : removeHooks)
 			hook.removingContact(txn, contact);
 		db.removeContact(txn, c);
 	}
--- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/Blake2sDigest.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/Blake2sDigest.java
@@ -0,0 +1,547 @@
 package org.briarproject.bramble.crypto;
 /*
  The BLAKE2 cryptographic hash function was designed by Jean-
  Philippe Aumasson, Samuel Neves, Zooko Wilcox-O'Hearn, and Christian
  Winnerlein.
  Reference Implementation and Description can be found at: https://blake2.net/
  RFC: https://tools.ietf.org/html/rfc7693
  This implementation does not support the Tree Hashing Mode.
  For unkeyed hashing, developers adapting BLAKE2 to ASN.1 - based
  message formats SHOULD use the OID tree at x = 1.3.6.1.4.1.1722.12.2.
         Algorithm     | Target | Collision | Hash | Hash ASN.1 |
            Identifier |  Arch  |  Security |  nn  | OID Suffix |
        ---------------+--------+-----------+------+------------+
         id-blake2s128 | 32-bit |   2**64   |  16  |   x.2.4    |
         id-blake2s160 | 32-bit |   2**80   |  20  |   x.2.5    |
         id-blake2s224 | 32-bit |   2**112  |  28  |   x.2.7    |
         id-blake2s256 | 32-bit |   2**128  |  32  |   x.2.8    |
        ---------------+--------+-----------+------+------------+
  Based on the BouncyCastle implementation of BLAKE2b. License:
  Copyright (c) 2000 - 2015 The Legion of the Bouncy Castle Inc.
  (http://www.bouncycastle.org)
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
  The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
 */
 import org.spongycastle.crypto.ExtendedDigest;
 import org.spongycastle.util.Arrays;
 /**
 * Implementation of the cryptographic hash function BLAKE2s.
 * <p/>
 * BLAKE2s offers a built-in keying mechanism to be used directly
 * for authentication ("Prefix-MAC") rather than a HMAC construction.
 * <p/>
 * BLAKE2s offers a built-in support for a salt for randomized hashing
 * and a personal string for defining a unique hash function for each application.
 * <p/>
 * BLAKE2s is optimized for 32-bit platforms and produces digests of any size
 * between 1 and 32 bytes.
 */
 public class Blake2sDigest implements ExtendedDigest {
 	/** BLAKE2s Initialization Vector **/
 	private static final int blake2s_IV[] =
 			// Produced from the square root of primes 2, 3, 5, 7, 11, 13, 17, 19.
 			// The same as SHA-256 IV.
 			{
 					0x6a09e667, 0xbb67ae85, 0x3c6ef372,
 					0xa54ff53a, 0x510e527f, 0x9b05688c,
 					0x1f83d9ab, 0x5be0cd19
 			};
 	/** Message word permutations **/
 	private static final byte[][] blake2s_sigma =
 			{
 					{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
 					{ 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 },
 					{ 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 },
 					{ 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 },
 					{ 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 },
 					{ 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 },
 					{ 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 },
 					{ 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 },
 					{ 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 },
 					{ 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 }
 			};
 	private static final int ROUNDS = 10; // to use for Catenas H'
 	private static final int BLOCK_LENGTH_BYTES = 64;// bytes
 	// General parameters:
 	private int digestLength = 32; // 1- 32 bytes
 	private int keyLength = 0; // 0 - 32 bytes for keyed hashing for MAC
 	private byte[] salt = null;
 	private byte[] personalization = null;
 	private byte[] key = null;
 	// Tree hashing parameters:
 	// Because this class does not implement the Tree Hashing Mode,
 	// these parameters can be treated as constants (see init() function)
 	/*
 	 * private int fanout = 1; // 0-255
 	 * private int depth = 1; // 1 - 255
 	 * private int leafLength= 0;
 	 * private long nodeOffset = 0L;
 	 * private int nodeDepth = 0;
 	 * private int innerHashLength = 0;
 	 */
 	/**
 	 * Whenever this buffer overflows, it will be processed in the compress()
 	 * function. For performance issues, long messages will not use this buffer.
 	 */
 	private byte[] buffer = null;
 	/** Position of last inserted byte **/
 	private int bufferPos = 0;// a value from 0 up to BLOCK_LENGTH_BYTES
 	/** Internal state, in the BLAKE2 paper it is called v **/
 	private int[] internalState = new int[16];
 	/** State vector, in the BLAKE2 paper it is called h **/
 	private int[] chainValue = null;
 	// counter (counts bytes): Length up to 2^64 are supported
 	/** holds least significant bits of counter **/
 	private int t0 = 0;
 	/** holds most significant bits of counter **/
 	private int t1 = 0;
 	/** finalization flag, for last block: ~0 **/
 	private int f0 = 0;
 	// For Tree Hashing Mode, not used here:
 	// private long f1 = 0L; // finalization flag, for last node: ~0L
 	/**
 	 * BLAKE2s-256 for hashing.
 	 */
 	public Blake2sDigest() {
 		this(256);
 	}
 	public Blake2sDigest(Blake2sDigest digest) {
 		this.bufferPos = digest.bufferPos;
 		this.buffer = Arrays.clone(digest.buffer);
 		this.keyLength = digest.keyLength;
 		this.key = Arrays.clone(digest.key);
 		this.digestLength = digest.digestLength;
 		this.chainValue = Arrays.clone(digest.chainValue);
 		this.personalization = Arrays.clone(digest.personalization);
 	}
 	/**
 	 * BLAKE2s for hashing.
 	 *
 	 * @param digestBits the desired digest length in bits. Must be one of
 	 *                     [128, 160, 224, 256].
 	 */
 	public Blake2sDigest(int digestBits) {
 		if (digestBits != 128 && digestBits != 160 &&
 				digestBits != 224 && digestBits != 256) {
 			throw new IllegalArgumentException(
 					"BLAKE2s digest restricted to one of [128, 160, 224, 256]");
 		}
 		buffer = new byte[BLOCK_LENGTH_BYTES];
 		keyLength = 0;
 		digestLength = digestBits / 8;
 		init();
 	}
 	/**
 	 * BLAKE2s for authentication ("Prefix-MAC mode").
 	 * <p/>
 	 * After calling the doFinal() method, the key will remain to be used for
 	 * further computations of this instance. The key can be overwritten using
 	 * the clearKey() method.
 	 *
 	 * @param key a key up to 32 bytes or null
 	 */
 	public Blake2sDigest(byte[] key) {
 		buffer = new byte[BLOCK_LENGTH_BYTES];
 		if (key != null) {
 			if (key.length > 32) {
 				throw new IllegalArgumentException(
 						"Keys > 32 are not supported");
 			}
 			this.key = new byte[key.length];
 			System.arraycopy(key, 0, this.key, 0, key.length);
 			keyLength = key.length;
 			System.arraycopy(key, 0, buffer, 0, key.length);
 			bufferPos = BLOCK_LENGTH_BYTES; // zero padding
 		}
 		digestLength = 32;
 		init();
 	}
 	/**
 	 * BLAKE2s with key, required digest length, salt and personalization.
 	 * <p/>
 	 * After calling the doFinal() method, the key, the salt and the personal
 	 * string will remain and might be used for further computations with this
 	 * instance. The key can be overwritten using the clearKey() method, the
 	 * salt (pepper) can be overwritten using the clearSalt() method.
 	 *
 	 * @param key a key up to 32 bytes or null
 	 * @param digestBytes from 1 up to 32 bytes
 	 * @param salt 8 bytes or null
 	 * @param personalization 8 bytes or null
 	 */
 	public Blake2sDigest(byte[] key, int digestBytes, byte[] salt,
 			byte[] personalization) {
 		buffer = new byte[BLOCK_LENGTH_BYTES];
 		if (digestBytes < 1 || digestBytes > 32) {
 			throw new IllegalArgumentException(
 					"Invalid digest length (required: 1 - 32)");
 		}
 		digestLength = digestBytes;
 		if (salt != null) {
 			if (salt.length != 8) {
 				throw new IllegalArgumentException(
 						"Salt length must be exactly 8 bytes");
 			}
 			this.salt = new byte[8];
 			System.arraycopy(salt, 0, this.salt, 0, salt.length);
 		}
 		if (personalization != null) {
 			if (personalization.length != 8) {
 				throw new IllegalArgumentException(
 						"Personalization length must be exactly 8 bytes");
 			}
 			this.personalization = new byte[8];
 			System.arraycopy(personalization, 0, this.personalization, 0,
 					personalization.length);
 		}
 		if (key != null) {
 			if (key.length > 32) {
 				throw new IllegalArgumentException(
 						"Keys > 32 bytes are not supported");
 			}
 			this.key = new byte[key.length];
 			System.arraycopy(key, 0, this.key, 0, key.length);
 			keyLength = key.length;
 			System.arraycopy(key, 0, buffer, 0, key.length);
 			bufferPos = BLOCK_LENGTH_BYTES; // zero padding
 		}
 		init();
 	}
 	// initialize chainValue
 	private void init() {
 		if (chainValue == null) {
 			chainValue = new int[8];
 			chainValue[0] = blake2s_IV[0]
 					^ (digestLength | (keyLength << 8) | 0x1010000);
 			// 0x1010000 = ((fanout << 16) | (depth << 24));
 			// with fanout = 1; depth = 0;
 			chainValue[1] = blake2s_IV[1];// ^ leafLength; with leafLength = 0;
 			chainValue[2] = blake2s_IV[2];// ^ nodeOffset; with nodeOffset = 0;
 			chainValue[3] = blake2s_IV[3];// ^ ( (nodeOffset << 32) |
 			// (nodeDepth << 16) | (innerHashLength << 24) );
 			// with nodeDepth = 0; innerHashLength = 0;
 			chainValue[4] = blake2s_IV[4];
 			chainValue[5] = blake2s_IV[5];
 			if (salt != null) {
 				chainValue[4] ^= (bytes2int(salt, 0));
 				chainValue[5] ^= (bytes2int(salt, 4));
 			}
 			chainValue[6] = blake2s_IV[6];
 			chainValue[7] = blake2s_IV[7];
 			if (personalization != null) {
 				chainValue[6] ^= (bytes2int(personalization, 0));
 				chainValue[7] ^= (bytes2int(personalization, 4));
 			}
 		}
 	}
 	private void initializeInternalState() {
 		// initialize v:
 		System.arraycopy(chainValue, 0, internalState, 0, chainValue.length);
 		System.arraycopy(blake2s_IV, 0, internalState, chainValue.length, 4);
 		internalState[12] = t0 ^ blake2s_IV[4];
 		internalState[13] = t1 ^ blake2s_IV[5];
 		internalState[14] = f0 ^ blake2s_IV[6];
 		internalState[15] = blake2s_IV[7];// ^ f1 with f1 = 0
 	}
 	/**
 	 * Update the message digest with a single byte.
 	 *
 	 * @param b the input byte to be entered.
 	 */
 	public void update(byte b) {
 		int remainingLength; // left bytes of buffer
 		// process the buffer if full else add to buffer:
 		remainingLength = BLOCK_LENGTH_BYTES - bufferPos;
 		if (remainingLength == 0) { // full buffer
 			t0 += BLOCK_LENGTH_BYTES;
 			if (t0 == 0) { // if message > 2^32
 				t1++;
 			}
 			compress(buffer, 0);
 			Arrays.fill(buffer, (byte)0);// clear buffer
 			buffer[0] = b;
 			bufferPos = 1;
 		} else {
 			buffer[bufferPos] = b;
 			bufferPos++;
 		}
 	}
 	/**
 	 * Update the message digest with a block of bytes.
 	 *
 	 * @param message the byte array containing the data.
 	 * @param offset the offset into the byte array where the data starts.
 	 * @param len the length of the data.
 	 */
 	public void update(byte[] message, int offset, int len) {
 		if (message == null || len == 0)
 			return;
 		int remainingLength = 0; // left bytes of buffer
 		if (bufferPos != 0) { // commenced, incomplete buffer
 			// complete the buffer:
 			remainingLength = BLOCK_LENGTH_BYTES - bufferPos;
 			if (remainingLength < len) { // full buffer + at least 1 byte
 				System.arraycopy(message, offset, buffer, bufferPos,
 						remainingLength);
 				t0 += BLOCK_LENGTH_BYTES;
 				if (t0 == 0) { // if message > 2^32
 					t1++;
 				}
 				compress(buffer, 0);
 				bufferPos = 0;
 				Arrays.fill(buffer, (byte) 0);// clear buffer
 			} else {
 				System.arraycopy(message, offset, buffer, bufferPos, len);
 				bufferPos += len;
 				return;
 			}
 		}
 		// process blocks except last block (also if last block is full)
 		int messagePos;
 		int blockWiseLastPos = offset + len - BLOCK_LENGTH_BYTES;
 		for (messagePos = offset + remainingLength;
 				messagePos < blockWiseLastPos;
 				messagePos += BLOCK_LENGTH_BYTES) { // block wise 64 bytes
 			// without buffer:
 			t0 += BLOCK_LENGTH_BYTES;
 			if (t0 == 0) {
 				t1++;
 			}
 			compress(message, messagePos);
 		}
 		// fill the buffer with left bytes, this might be a full block
 		System.arraycopy(message, messagePos, buffer, 0, offset + len
 				- messagePos);
 		bufferPos += offset + len - messagePos;
 	}
 	/**
 	 * Close the digest, producing the final digest value. The doFinal() call
 	 * leaves the digest reset. Key, salt and personal string remain.
 	 *
 	 * @param out the array the digest is to be copied into.
 	 * @param outOffset the offset into the out array the digest is to start at.
 	 */
 	public int doFinal(byte[] out, int outOffset) {
 		f0 = 0xFFFFFFFF;
 		t0 += bufferPos;
 		// bufferPos may be < 64, so (t0 == 0) does not work
 		// for 2^32 < message length > 2^32 - 63
 		if ((t0 < 0) && (bufferPos > -t0)) {
 			t1++;
 		}
 		compress(buffer, 0);
 		Arrays.fill(buffer, (byte) 0);// Holds eventually the key if input is null
 		Arrays.fill(internalState, 0);
 		for (int i = 0; i < chainValue.length && (i * 4 < digestLength); i++) {
 			byte[] bytes = int2bytes(chainValue[i]);
 			if (i * 4 < digestLength - 4) {
 				System.arraycopy(bytes, 0, out, outOffset + i * 4, 4);
 			} else {
 				System.arraycopy(bytes, 0, out, outOffset + i * 4,
 						digestLength - (i * 4));
 			}
 		}
 		Arrays.fill(chainValue, 0);
 		reset();
 		return digestLength;
 	}
 	/**
 	 * Reset the digest back to its initial state. The key, the salt and the
 	 * personal string will remain for further computations.
 	 */
 	public void reset() {
 		bufferPos = 0;
 		f0 = 0;
 		t0 = 0;
 		t1 = 0;
 		chainValue = null;
 		if (key != null) {
 			Arrays.fill(buffer, (byte) 0);
 			System.arraycopy(key, 0, buffer, 0, key.length);
 			bufferPos = BLOCK_LENGTH_BYTES; // zero padding
 		}
 		init();
 	}
 	private void compress(byte[] message, int messagePos) {
 		initializeInternalState();
 		int[] m = new int[16];
 		for (int j = 0; j < 16; j++) {
 			m[j] = bytes2int(message, messagePos + j * 4);
 		}
 		for (int round = 0; round < ROUNDS; round++) {
 			// G apply to columns of internalState:m[blake2s_sigma[round][2 *
 			// blockPos]] /+1
 			G(m[blake2s_sigma[round][0]], m[blake2s_sigma[round][1]], 0, 4, 8,
 					12);
 			G(m[blake2s_sigma[round][2]], m[blake2s_sigma[round][3]], 1, 5, 9,
 					13);
 			G(m[blake2s_sigma[round][4]], m[blake2s_sigma[round][5]], 2, 6, 10,
 					14);
 			G(m[blake2s_sigma[round][6]], m[blake2s_sigma[round][7]], 3, 7, 11,
 					15);
 			// G apply to diagonals of internalState:
 			G(m[blake2s_sigma[round][8]], m[blake2s_sigma[round][9]], 0, 5, 10,
 					15);
 			G(m[blake2s_sigma[round][10]], m[blake2s_sigma[round][11]], 1, 6,
 					11, 12);
 			G(m[blake2s_sigma[round][12]], m[blake2s_sigma[round][13]], 2, 7,
 					8, 13);
 			G(m[blake2s_sigma[round][14]], m[blake2s_sigma[round][15]], 3, 4,
 					9, 14);
 		}
 		// update chain values:
 		for (int offset = 0; offset < chainValue.length; offset++) {
 			chainValue[offset] = chainValue[offset] ^ internalState[offset]
 					^ internalState[offset + 8];
 		}
 	}
 	private void G(int m1, int m2, int posA, int posB, int posC, int posD) {
 		internalState[posA] = internalState[posA] + internalState[posB] + m1;
 		internalState[posD] = rotr32(internalState[posD] ^ internalState[posA],
 				16);
 		internalState[posC] = internalState[posC] + internalState[posD];
 		internalState[posB] = rotr32(internalState[posB] ^ internalState[posC],
 				12);
 		internalState[posA] = internalState[posA] + internalState[posB] + m2;
 		internalState[posD] = rotr32(internalState[posD] ^ internalState[posA],
 				8);
 		internalState[posC] = internalState[posC] + internalState[posD];
 		internalState[posB] = rotr32(internalState[posB] ^ internalState[posC],
 				7);
 	}
 	private int rotr32(int x, int rot) {
 		return x >>> rot | (x << (32 - rot));
 	}
 	// convert one int value in byte array
 	// little-endian byte order!
 	private byte[] int2bytes(int intValue) {
 		return new byte[] {
 				(byte) intValue, (byte) (intValue >> 8),
 				(byte) (intValue >> 16), (byte) (intValue >> 24)
 		};
 	}
 	// little-endian byte order!
 	private int bytes2int(byte[] byteArray, int offset) {
 		return (((int) byteArray[offset] & 0xFF)
 				| (((int) byteArray[offset + 1] & 0xFF) << 8)
 				| (((int) byteArray[offset + 2] & 0xFF) << 16)
 				| (((int) byteArray[offset + 3] & 0xFF) << 24));
 	}
 	/**
 	 * Return the algorithm name.
 	 *
 	 * @return the algorithm name
 	 */
 	public String getAlgorithmName() {
 		return "BLAKE2s";
 	}
 	/**
 	 * Return the size in bytes of the digest produced by this message digest.
 	 *
 	 * @return the size in bytes of the digest produced by this message digest.
 	 */
 	public int getDigestSize() {
 		return digestLength;
 	}
 	/**
 	 * Return the size in bytes of the internal buffer the digest applies its
 	 * compression function to.
 	 *
 	 * @return byte length of the digest's internal buffer.
 	 */
 	public int getByteLength() {
 		return BLOCK_LENGTH_BYTES;
 	}
 	/**
 	 * Overwrite the key if it is no longer used (zeroization).
 	 */
 	public void clearKey() {
 		if (key != null) {
 			Arrays.fill(key, (byte) 0);
 			Arrays.fill(buffer,  (byte) 0);
 		}
 	}
 	/**
 	 * Overwrite the salt (pepper) if it is secret and no longer used
 	 * (zeroization).
 	 */
 	public void clearSalt() {
 		if (salt != null) {
 			Arrays.fill(salt, (byte) 0);
 		}
 	}
 }
--- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/CryptoComponentImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/CryptoComponentImpl.java
@@ -1,59 +1,107 @@
 package org.briarproject.bramble.crypto;
 import net.i2p.crypto.eddsa.EdDSAPrivateKey;
 import net.i2p.crypto.eddsa.EdDSAPublicKey;
 import net.i2p.crypto.eddsa.KeyPairGenerator;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.crypto.KeyPair;
 import org.briarproject.bramble.api.crypto.KeyParser;
 import org.briarproject.bramble.api.crypto.PrivateKey;
 import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.crypto.SecretKey;
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.bramble.api.system.SecureRandomProvider;
 import org.briarproject.bramble.api.transport.IncomingKeys;
 import org.briarproject.bramble.api.transport.OutgoingKeys;
 import org.briarproject.bramble.api.transport.TransportKeys;
 import org.briarproject.bramble.util.ByteUtils;
 import org.briarproject.bramble.util.StringUtils;
 import org.spongycastle.crypto.AsymmetricCipherKeyPair;
 import org.spongycastle.crypto.CipherParameters;
 import org.spongycastle.crypto.CryptoException;
 import org.spongycastle.crypto.Digest;
-import org.spongycastle.crypto.digests.Blake2bDigest;
+import org.spongycastle.crypto.agreement.ECDHCBasicAgreement;
-import org.whispersystems.curve25519.Curve25519;
+import org.spongycastle.crypto.digests.SHA256Digest;
-import org.whispersystems.curve25519.Curve25519KeyPair;
+import org.spongycastle.crypto.generators.ECKeyPairGenerator;
 import org.spongycastle.crypto.generators.PKCS5S2ParametersGenerator;
 import org.spongycastle.crypto.params.ECKeyGenerationParameters;
 import org.spongycastle.crypto.params.ECPrivateKeyParameters;
 import org.spongycastle.crypto.params.ECPublicKeyParameters;
 import org.spongycastle.crypto.params.KeyParameter;
 import java.nio.charset.Charset;
 import java.security.GeneralSecurityException;
 import java.security.NoSuchAlgorithmException;
 import java.security.Provider;
 import java.security.SecureRandom;
 import java.security.Security;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Logger;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 import static java.util.logging.Level.INFO;
 import static org.briarproject.bramble.api.keyagreement.KeyAgreementConstants.COMMIT_LENGTH;
 import static org.briarproject.bramble.api.transport.TransportConstants.TAG_LENGTH;
 import static org.briarproject.bramble.crypto.EllipticCurveConstants.PARAMETERS;
 import static org.briarproject.bramble.util.ByteUtils.INT_16_BYTES;
 import static org.briarproject.bramble.util.ByteUtils.INT_32_BYTES;
 import static org.briarproject.bramble.util.ByteUtils.INT_64_BYTES;
 import static org.briarproject.bramble.util.ByteUtils.MAX_16_BIT_UNSIGNED;
 import static org.briarproject.bramble.util.ByteUtils.MAX_32_BIT_UNSIGNED;
@NotNullByDefault
 class CryptoComponentImpl implements CryptoComponent {
 	private static final Logger LOG =
 			Logger.getLogger(CryptoComponentImpl.class.getName());
 	private static final int AGREEMENT_KEY_PAIR_BITS = 256;
 	private static final int SIGNATURE_KEY_PAIR_BITS = 256;
 	private static final int STORAGE_IV_BYTES = 24; // 196 bits
 	private static final int PBKDF_SALT_BYTES = 32; // 256 bits
-	private static final int PBKDF_FORMAT_SCRYPT = 0;
+	private static final int PBKDF_TARGET_MILLIS = 500;
 	private static final int PBKDF_SAMPLES = 30;
 	private static final int HASH_SIZE = 256 / 8;
 	private static byte[] ascii(String s) {
 		return s.getBytes(Charset.forName("US-ASCII"));
 	}
 	// KDF labels for contact exchange stream header key derivation
 	private static final byte[] A_INVITE = ascii("ALICE_INVITATION_KEY");
 	private static final byte[] B_INVITE = ascii("BOB_INVITATION_KEY");
 	// KDF labels for contact exchange signature nonce derivation
 	private static final byte[] A_SIG_NONCE = ascii("ALICE_SIGNATURE_NONCE");
 	private static final byte[] B_SIG_NONCE = ascii("BOB_SIGNATURE_NONCE");
 	// Hash label for BQP public key commitment derivation
 	private static final String COMMIT =
 			"org.briarproject.bramble.COMMIT";
 	// Hash label for shared secret derivation
 	private static final String SHARED_SECRET =
 			"org.briarproject.bramble.SHARED_SECRET";
 	// KDF label for BQP confirmation key derivation
 	private static final byte[] CONFIRMATION_KEY = ascii("CONFIRMATION_KEY");
 	// KDF label for master key derivation
 	private static final byte[] MASTER_KEY = ascii("MASTER_KEY");
 	// KDF labels for tag key derivation
 	private static final byte[] A_TAG = ascii("ALICE_TAG_KEY");
 	private static final byte[] B_TAG = ascii("BOB_TAG_KEY");
 	// KDF labels for header key derivation
 	private static final byte[] A_HEADER = ascii("ALICE_HEADER_KEY");
 	private static final byte[] B_HEADER = ascii("BOB_HEADER_KEY");
 	// KDF labels for MAC key derivation
 	private static final byte[] A_MAC = ascii("ALICE_MAC_KEY");
 	private static final byte[] B_MAC = ascii("BOB_MAC_KEY");
 	// KDF label for key rotation
 	private static final byte[] ROTATE = ascii("ROTATE");
 	private final SecureRandom secureRandom;
-	private final PasswordBasedKdf passwordBasedKdf;
+	private final ECKeyPairGenerator agreementKeyPairGenerator;
-	private final Curve25519 curve25519;
+	private final ECKeyPairGenerator signatureKeyPairGenerator;
 	private final KeyPairGenerator signatureKeyPairGenerator;
 	private final KeyParser agreementKeyParser, signatureKeyParser;
 	private final MessageEncrypter messageEncrypter;
 	@Inject
-	CryptoComponentImpl(SecureRandomProvider secureRandomProvider,
+	CryptoComponentImpl(SecureRandomProvider secureRandomProvider) {
 			PasswordBasedKdf passwordBasedKdf) {
 		if (LOG.isLoggable(INFO)) {
 			SecureRandom defaultSecureRandom = new SecureRandom();
 			String name = defaultSecureRandom.getProvider().getName();
@@ -73,13 +121,16 @@ class CryptoComponentImpl implements CryptoComponent {
 			}
 		}
 		secureRandom = new SecureRandom();
-		this.passwordBasedKdf = passwordBasedKdf;
+		ECKeyGenerationParameters params = new ECKeyGenerationParameters(
-		curve25519 = Curve25519.getInstance("java");
+				PARAMETERS, secureRandom);
-		signatureKeyPairGenerator = new KeyPairGenerator();
+		agreementKeyPairGenerator = new ECKeyPairGenerator();
-		signatureKeyPairGenerator.initialize(SIGNATURE_KEY_PAIR_BITS,
+		agreementKeyPairGenerator.init(params);
-				secureRandom);
+		signatureKeyPairGenerator = new ECKeyPairGenerator();
-		agreementKeyParser = new Curve25519KeyParser();
+		signatureKeyPairGenerator.init(params);
-		signatureKeyParser = new EdKeyParser();
+		agreementKeyParser = new Sec1KeyParser(PARAMETERS,
 				AGREEMENT_KEY_PAIR_BITS);
 		signatureKeyParser = new Sec1KeyParser(PARAMETERS,
 				SIGNATURE_KEY_PAIR_BITS);
 		messageEncrypter = new MessageEncrypter(secureRandom);
 	}
@@ -123,17 +174,16 @@ class CryptoComponentImpl implements CryptoComponent {
 	// Package access for testing
 	byte[] performRawKeyAgreement(PrivateKey priv, PublicKey pub)
 			throws GeneralSecurityException {
-		if (!(priv instanceof Curve25519PrivateKey))
+		if (!(priv instanceof Sec1PrivateKey))
 			throw new IllegalArgumentException();
-		if (!(pub instanceof Curve25519PublicKey))
+		if (!(pub instanceof Sec1PublicKey))
 			throw new IllegalArgumentException();
 		ECPrivateKeyParameters ecPriv = ((Sec1PrivateKey) priv).getKey();
 		ECPublicKeyParameters ecPub = ((Sec1PublicKey) pub).getKey();
 		long now = System.currentTimeMillis();
-		byte[] secret = curve25519.calculateAgreement(pub.getEncoded(),
+		ECDHCBasicAgreement agreement = new ECDHCBasicAgreement();
-				priv.getEncoded());
+		agreement.init(ecPriv);
-		// If the shared secret is all zeroes, the public key is invalid
+		byte[] secret = agreement.calculateAgreement(ecPub).toByteArray();
 		byte allZero = 0;
 		for (byte b : secret) allZero |= b;
 		if (allZero == 0) throw new GeneralSecurityException();
 		long duration = System.currentTimeMillis() - now;
 		if (LOG.isLoggable(INFO))
 			LOG.info("Deriving shared secret took " + duration + " ms");
@@ -142,10 +192,18 @@ class CryptoComponentImpl implements CryptoComponent {
 	@Override
 	public KeyPair generateAgreementKeyPair() {
-		Curve25519KeyPair keyPair = curve25519.generateKeyPair();
+		AsymmetricCipherKeyPair keyPair =
-		PublicKey pub = new Curve25519PublicKey(keyPair.getPublicKey());
+				agreementKeyPairGenerator.generateKeyPair();
-		PrivateKey priv = new Curve25519PrivateKey(keyPair.getPrivateKey());
+		// Return a wrapper that uses the SEC 1 encoding
-		return new KeyPair(pub, priv);
+		ECPublicKeyParameters ecPublicKey =
 				(ECPublicKeyParameters) keyPair.getPublic();
 		PublicKey publicKey = new Sec1PublicKey(ecPublicKey
 		);
 		ECPrivateKeyParameters ecPrivateKey =
 				(ECPrivateKeyParameters) keyPair.getPrivate();
 		PrivateKey privateKey = new Sec1PrivateKey(ecPrivateKey,
 				AGREEMENT_KEY_PAIR_BITS);
 		return new KeyPair(publicKey, privateKey);
 	}
 	@Override
@@ -155,12 +213,17 @@ class CryptoComponentImpl implements CryptoComponent {
 	@Override
 	public KeyPair generateSignatureKeyPair() {
-		java.security.KeyPair keyPair =
+		AsymmetricCipherKeyPair keyPair =
 				signatureKeyPairGenerator.generateKeyPair();
-		EdDSAPublicKey edPublicKey = (EdDSAPublicKey) keyPair.getPublic();
+		// Return a wrapper that uses the SEC 1 encoding
-		PublicKey publicKey = new EdPublicKey(edPublicKey.getAbyte());
+		ECPublicKeyParameters ecPublicKey =
-		EdDSAPrivateKey edPrivateKey = (EdDSAPrivateKey) keyPair.getPrivate();
+				(ECPublicKeyParameters) keyPair.getPublic();
-		PrivateKey privateKey = new EdPrivateKey(edPrivateKey.getSeed());
+		PublicKey publicKey = new Sec1PublicKey(ecPublicKey
 		);
 		ECPrivateKeyParameters ecPrivateKey =
 				(ECPrivateKeyParameters) keyPair.getPrivate();
 		PrivateKey privateKey = new Sec1PrivateKey(ecPrivateKey,
 				SIGNATURE_KEY_PAIR_BITS);
 		return new KeyPair(publicKey, privateKey);
 	}
@@ -175,47 +238,205 @@ class CryptoComponentImpl implements CryptoComponent {
 	}
 	@Override
-	public SecretKey deriveKey(String label, SecretKey k, byte[]... inputs) {
+	public SecretKey deriveHeaderKey(SecretKey master,
-		byte[] mac = mac(label, k, inputs);
+			boolean alice) {
-		if (mac.length != SecretKey.LENGTH) throw new IllegalStateException();
+		return new SecretKey(macKdf(master, alice ? A_INVITE : B_INVITE));
 		return new SecretKey(mac);
 	}
 	@Override
-	public SecretKey deriveSharedSecret(String label, PublicKey theirPublicKey,
+	public SecretKey deriveMacKey(SecretKey master, boolean alice) {
-			KeyPair ourKeyPair, byte[]... inputs)
+		return new SecretKey(macKdf(master, alice ? A_MAC : B_MAC));
-			throws GeneralSecurityException {
+	}
 	@Override
 	public byte[] deriveSignatureNonce(SecretKey master,
 			boolean alice) {
 		return macKdf(master, alice ? A_SIG_NONCE : B_SIG_NONCE);
 	}
 	@Override
 	public byte[] deriveKeyCommitment(byte[] publicKey) {
 		byte[] hash = hash(COMMIT, publicKey);
 		// The output is the first COMMIT_LENGTH bytes of the hash
 		byte[] commitment = new byte[COMMIT_LENGTH];
 		System.arraycopy(hash, 0, commitment, 0, COMMIT_LENGTH);
 		return commitment;
 	}
 	@Override
 	public SecretKey deriveSharedSecret(byte[] theirPublicKey,
 			KeyPair ourKeyPair, boolean alice) throws GeneralSecurityException {
 		PrivateKey ourPriv = ourKeyPair.getPrivate();
-		byte[][] hashInputs = new byte[inputs.length + 1][];
+		PublicKey theirPub = agreementKeyParser.parsePublicKey(theirPublicKey);
-		hashInputs[0] = performRawKeyAgreement(ourPriv, theirPublicKey);
+		byte[] raw = performRawKeyAgreement(ourPriv, theirPub);
-		System.arraycopy(inputs, 0, hashInputs, 1, inputs.length);
+		byte[] alicePub, bobPub;
-		byte[] hash = hash(label, hashInputs);
+		if (alice) {
-		if (hash.length != SecretKey.LENGTH) throw new IllegalStateException();
+			alicePub = ourKeyPair.getPublic().getEncoded();
-		return new SecretKey(hash);
+			bobPub = theirPublicKey;
 		} else {
 			alicePub = theirPublicKey;
 			bobPub = ourKeyPair.getPublic().getEncoded();
 		}
 		return new SecretKey(hash(SHARED_SECRET, raw, alicePub, bobPub));
 	}
 	@Override
 	public byte[] deriveConfirmationRecord(SecretKey sharedSecret,
 			byte[] theirPayload, byte[] ourPayload, byte[] theirPublicKey,
 			KeyPair ourKeyPair, boolean alice, boolean aliceRecord) {
 		SecretKey ck = new SecretKey(macKdf(sharedSecret, CONFIRMATION_KEY));
 		byte[] alicePayload, alicePub, bobPayload, bobPub;
 		if (alice) {
 			alicePayload = ourPayload;
 			alicePub = ourKeyPair.getPublic().getEncoded();
 			bobPayload = theirPayload;
 			bobPub = theirPublicKey;
 		} else {
 			alicePayload = theirPayload;
 			alicePub = theirPublicKey;
 			bobPayload = ourPayload;
 			bobPub = ourKeyPair.getPublic().getEncoded();
 		}
 		if (aliceRecord)
 			return macKdf(ck, alicePayload, alicePub, bobPayload, bobPub);
 		else
 			return macKdf(ck, bobPayload, bobPub, alicePayload, alicePub);
 	}
 	@Override
 	public SecretKey deriveMasterSecret(SecretKey sharedSecret) {
 		return new SecretKey(macKdf(sharedSecret, MASTER_KEY));
 	}
 	@Override
 	public SecretKey deriveMasterSecret(byte[] theirPublicKey,
 			KeyPair ourKeyPair, boolean alice) throws GeneralSecurityException {
 		return deriveMasterSecret(deriveSharedSecret(
 				theirPublicKey, ourKeyPair, alice));
 	}
 	@Override
 	public TransportKeys deriveTransportKeys(TransportId t,
 			SecretKey master, long rotationPeriod, boolean alice) {
 		// Keys for the previous period are derived from the master secret
 		SecretKey inTagPrev = deriveTagKey(master, t, !alice);
 		SecretKey inHeaderPrev = deriveHeaderKey(master, t, !alice);
 		SecretKey outTagPrev = deriveTagKey(master, t, alice);
 		SecretKey outHeaderPrev = deriveHeaderKey(master, t, alice);
 		// Derive the keys for the current and next periods
 		SecretKey inTagCurr = rotateKey(inTagPrev, rotationPeriod);
 		SecretKey inHeaderCurr = rotateKey(inHeaderPrev, rotationPeriod);
 		SecretKey inTagNext = rotateKey(inTagCurr, rotationPeriod + 1);
 		SecretKey inHeaderNext = rotateKey(inHeaderCurr, rotationPeriod + 1);
 		SecretKey outTagCurr = rotateKey(outTagPrev, rotationPeriod);
 		SecretKey outHeaderCurr = rotateKey(outHeaderPrev, rotationPeriod);
 		// Initialise the reordering windows and stream counters
 		IncomingKeys inPrev = new IncomingKeys(inTagPrev, inHeaderPrev,
 				rotationPeriod - 1);
 		IncomingKeys inCurr = new IncomingKeys(inTagCurr, inHeaderCurr,
 				rotationPeriod);
 		IncomingKeys inNext = new IncomingKeys(inTagNext, inHeaderNext,
 				rotationPeriod + 1);
 		OutgoingKeys outCurr = new OutgoingKeys(outTagCurr, outHeaderCurr,
 				rotationPeriod);
 		// Collect and return the keys
 		return new TransportKeys(t, inPrev, inCurr, inNext, outCurr);
 	}
 	@Override
 	public TransportKeys rotateTransportKeys(TransportKeys k,
 			long rotationPeriod) {
 		if (k.getRotationPeriod() >= rotationPeriod) return k;
 		IncomingKeys inPrev = k.getPreviousIncomingKeys();
 		IncomingKeys inCurr = k.getCurrentIncomingKeys();
 		IncomingKeys inNext = k.getNextIncomingKeys();
 		OutgoingKeys outCurr = k.getCurrentOutgoingKeys();
 		long startPeriod = outCurr.getRotationPeriod();
 		// Rotate the keys
 		for (long p = startPeriod + 1; p <= rotationPeriod; p++) {
 			inPrev = inCurr;
 			inCurr = inNext;
 			SecretKey inNextTag = rotateKey(inNext.getTagKey(), p + 1);
 			SecretKey inNextHeader = rotateKey(inNext.getHeaderKey(), p + 1);
 			inNext = new IncomingKeys(inNextTag, inNextHeader, p + 1);
 			SecretKey outCurrTag = rotateKey(outCurr.getTagKey(), p);
 			SecretKey outCurrHeader = rotateKey(outCurr.getHeaderKey(), p);
 			outCurr = new OutgoingKeys(outCurrTag, outCurrHeader, p);
 		}
 		// Collect and return the keys
 		return new TransportKeys(k.getTransportId(), inPrev, inCurr, inNext,
 				outCurr);
 	}
 	private SecretKey rotateKey(SecretKey k, long rotationPeriod) {
 		byte[] period = new byte[INT_64_BYTES];
 		ByteUtils.writeUint64(rotationPeriod, period, 0);
 		return new SecretKey(macKdf(k, ROTATE, period));
 	}
 	private SecretKey deriveTagKey(SecretKey master, TransportId t,
 			boolean alice) {
 		byte[] id = StringUtils.toUtf8(t.getString());
 		return new SecretKey(macKdf(master, alice ? A_TAG : B_TAG, id));
 	}
 	private SecretKey deriveHeaderKey(SecretKey master, TransportId t,
 			boolean alice) {
 		byte[] id = StringUtils.toUtf8(t.getString());
 		return new SecretKey(macKdf(master, alice ? A_HEADER : B_HEADER, id));
 	}
 	@Override
 	public void encodeTag(byte[] tag, SecretKey tagKey, int protocolVersion,
 			long streamNumber) {
 		if (tag.length < TAG_LENGTH) throw new IllegalArgumentException();
 		if (protocolVersion < 0 || protocolVersion > MAX_16_BIT_UNSIGNED)
 			throw new IllegalArgumentException();
 		if (streamNumber < 0 || streamNumber > MAX_32_BIT_UNSIGNED)
 			throw new IllegalArgumentException();
 		// Initialise the PRF
 		Digest prf = new Blake2sDigest(tagKey.getBytes());
 		// The output of the PRF must be long enough to use as a tag
 		int macLength = prf.getDigestSize();
 		if (macLength < TAG_LENGTH) throw new IllegalStateException();
 		// The input is the protocol version as a 16-bit integer, followed by
 		// the stream number as a 64-bit integer
 		byte[] protocolVersionBytes = new byte[INT_16_BYTES];
 		ByteUtils.writeUint16(protocolVersion, protocolVersionBytes, 0);
 		prf.update(protocolVersionBytes, 0, protocolVersionBytes.length);
 		byte[] streamNumberBytes = new byte[INT_64_BYTES];
 		ByteUtils.writeUint64(streamNumber, streamNumberBytes, 0);
 		prf.update(streamNumberBytes, 0, streamNumberBytes.length);
 		byte[] mac = new byte[macLength];
 		prf.doFinal(mac, 0);
 		// The output is the first TAG_LENGTH bytes of the MAC
 		System.arraycopy(mac, 0, tag, 0, TAG_LENGTH);
 	}
 	@Override
 	public byte[] sign(String label, byte[] toSign, byte[] privateKey)
 			throws GeneralSecurityException {
-		PrivateKey key = signatureKeyParser.parsePrivateKey(privateKey);
+		Signature signature = new SignatureImpl(secureRandom);
-		Signature sig = new EdSignature();
+		KeyParser keyParser = getSignatureKeyParser();
-		sig.initSign(key);
+		PrivateKey key = keyParser.parsePrivateKey(privateKey);
-		updateSignature(sig, label, toSign);
+		signature.initSign(key);
-		return sig.sign();
+		updateSignature(signature, label, toSign);
 		return signature.sign();
 	}
 	@Override
-	public boolean verifySignature(byte[] signature, String label,
+	public boolean verify(String label, byte[] signedData, byte[] publicKey,
-			byte[] signed, byte[] publicKey) throws GeneralSecurityException {
+			byte[] signature) throws GeneralSecurityException {
-		PublicKey key = signatureKeyParser.parsePublicKey(publicKey);
+		Signature sig = new SignatureImpl(secureRandom);
-		Signature sig = new EdSignature();
+		KeyParser keyParser = getSignatureKeyParser();
 		PublicKey key = keyParser.parsePublicKey(publicKey);
 		sig.initVerify(key);
-		updateSignature(sig, label, signed);
+		updateSignature(sig, label, signedData);
 		return sig.verify(signature);
 	}
 	private void updateSignature(Signature signature, String label,
-			byte[] toSign) throws GeneralSecurityException {
+			byte[] toSign) {
 		byte[] labelBytes = StringUtils.toUtf8(label);
 		byte[] length = new byte[INT_32_BYTES];
 		ByteUtils.writeUint32(labelBytes.length, length, 0);
@@ -229,7 +450,7 @@ class CryptoComponentImpl implements CryptoComponent {
 	@Override
 	public byte[] hash(String label, byte[]... inputs) {
 		byte[] labelBytes = StringUtils.toUtf8(label);
-		Digest digest = new Blake2bDigest(256);
+		Digest digest = new Blake2sDigest();
 		byte[] length = new byte[INT_32_BYTES];
 		ByteUtils.writeUint32(labelBytes.length, length, 0);
 		digest.update(length, 0, length.length);
@@ -245,13 +466,14 @@ class CryptoComponentImpl implements CryptoComponent {
 	}
 	@Override
-	public byte[] mac(String label, SecretKey macKey, byte[]... inputs) {
+	public int getHashLength() {
-		byte[] labelBytes = StringUtils.toUtf8(label);
+		return HASH_SIZE;
-		Digest mac = new Blake2bDigest(macKey.getBytes(), 32, null, null);
+	}
 	@Override
 	public byte[] mac(SecretKey macKey, byte[]... inputs) {
 		Digest mac = new Blake2sDigest(macKey.getBytes());
 		byte[] length = new byte[INT_32_BYTES];
 		ByteUtils.writeUint32(labelBytes.length, length, 0);
 		mac.update(length, 0, length.length);
 		mac.update(labelBytes, 0, labelBytes.length);
 		for (byte[] input : inputs) {
 			ByteUtils.writeUint32(input.length, length, 0);
 			mac.update(length, 0, length.length);
@@ -262,17 +484,6 @@ class CryptoComponentImpl implements CryptoComponent {
 		return output;
 	}
 	@Override
 	public boolean verifyMac(byte[] mac, String label, SecretKey macKey,
 			byte[]... inputs) {
 		byte[] expected = mac(label, macKey, inputs);
 		if (mac.length != expected.length) return false;
 		// Constant-time comparison
 		int cmp = 0;
 		for (int i = 0; i < mac.length; i++) cmp |= mac[i] ^ expected[i];
 		return cmp == 0;
 	}
 	@Override
 	public byte[] encryptWithPassword(byte[] input, String password) {
 		AuthenticatedCipher cipher = new XSalsa20Poly1305AuthenticatedCipher();
@@ -281,33 +492,23 @@ class CryptoComponentImpl implements CryptoComponent {
 		byte[] salt = new byte[PBKDF_SALT_BYTES];
 		secureRandom.nextBytes(salt);
 		// Calibrate the KDF
-		int cost = passwordBasedKdf.chooseCostParameter();
+		int iterations = chooseIterationCount(PBKDF_TARGET_MILLIS);
 		// Derive the key from the password
-		SecretKey key = passwordBasedKdf.deriveKey(password, salt, cost);
+		SecretKey key = new SecretKey(pbkdf2(password, salt, iterations));
 		// Generate a random IV
 		byte[] iv = new byte[STORAGE_IV_BYTES];
 		secureRandom.nextBytes(iv);
-		// The output contains the format version, salt, cost parameter, IV,
+		// The output contains the salt, iterations, IV, ciphertext and MAC
-		// ciphertext and MAC
+		int outputLen = salt.length + INT_32_BYTES + iv.length + input.length
-		int outputLen = 1 + salt.length + INT_32_BYTES + iv.length
+				+ macBytes;
 				+ input.length + macBytes;
 		byte[] output = new byte[outputLen];
-		int outputOff = 0;
+		System.arraycopy(salt, 0, output, 0, salt.length);
-		// Format version
+		ByteUtils.writeUint32(iterations, output, salt.length);
-		output[outputOff] = PBKDF_FORMAT_SCRYPT;
+		System.arraycopy(iv, 0, output, salt.length + INT_32_BYTES, iv.length);
 		outputOff++;
 		// Salt
 		System.arraycopy(salt, 0, output, outputOff, salt.length);
 		outputOff += salt.length;
 		// Cost parameter
 		ByteUtils.writeUint32(cost, output, outputOff);
 		outputOff += INT_32_BYTES;
 		// IV
 		System.arraycopy(iv, 0, output, outputOff, iv.length);
 		outputOff += iv.length;
 		// Initialise the cipher and encrypt the plaintext
 		try {
 			cipher.init(true, key, iv);
 			int outputOff = salt.length + INT_32_BYTES + iv.length;
 			cipher.process(input, 0, input.length, output, outputOff);
 			return output;
 		} catch (GeneralSecurityException e) {
@@ -316,36 +517,22 @@ class CryptoComponentImpl implements CryptoComponent {
 	}
 	@Override
 	@Nullable
 	public byte[] decryptWithPassword(byte[] input, String password) {
 		AuthenticatedCipher cipher = new XSalsa20Poly1305AuthenticatedCipher();
 		int macBytes = cipher.getMacBytes();
-		// The input contains the format version, salt, cost parameter, IV,
+		// The input contains the salt, iterations, IV, ciphertext and MAC
-		// ciphertext and MAC
+		if (input.length < PBKDF_SALT_BYTES + INT_32_BYTES + STORAGE_IV_BYTES
-		if (input.length < 1 + PBKDF_SALT_BYTES + INT_32_BYTES
+				+ macBytes)
 				+ STORAGE_IV_BYTES + macBytes)
 			return null; // Invalid input
 		int inputOff = 0;
 		// Format version
 		byte formatVersion = input[inputOff];
 		inputOff++;
 		if (formatVersion != PBKDF_FORMAT_SCRYPT)
 			return null; // Unknown format
 		// Salt
 		byte[] salt = new byte[PBKDF_SALT_BYTES];
-		System.arraycopy(input, inputOff, salt, 0, salt.length);
+		System.arraycopy(input, 0, salt, 0, salt.length);
-		inputOff += salt.length;
+		long iterations = ByteUtils.readUint32(input, salt.length);
-		// Cost parameter
+		if (iterations < 0 || iterations > Integer.MAX_VALUE)
-		long cost = ByteUtils.readUint32(input, inputOff);
+			return null; // Invalid iteration count
 		inputOff += INT_32_BYTES;
 		if (cost < 2 || cost > Integer.MAX_VALUE)
 			return null; // Invalid cost parameter
 		// IV
 		byte[] iv = new byte[STORAGE_IV_BYTES];
-		System.arraycopy(input, inputOff, iv, 0, iv.length);
+		System.arraycopy(input, salt.length + INT_32_BYTES, iv, 0, iv.length);
 		inputOff += iv.length;
 		// Derive the key from the password
-		SecretKey key = passwordBasedKdf.deriveKey(password, salt, (int) cost);
+		SecretKey key = new SecretKey(pbkdf2(password, salt, (int) iterations));
 		// Initialise the cipher
 		try {
 			cipher.init(false, key, iv);
@@ -354,6 +541,7 @@ class CryptoComponentImpl implements CryptoComponent {
 		}
 		// Try to decrypt the ciphertext (may be invalid)
 		try {
 			int inputOff = salt.length + INT_32_BYTES + iv.length;
 			int inputLen = input.length - inputOff;
 			byte[] output = new byte[inputLen - macBytes];
 			cipher.process(input, inputOff, inputLen, output, 0);
@@ -376,4 +564,88 @@ class CryptoComponentImpl implements CryptoComponent {
 	public String asciiArmour(byte[] b, int lineLength) {
 		return AsciiArmour.wrap(b, lineLength);
 	}
 	// Key derivation function based on a pseudo-random function - see
 	// NIST SP 800-108, section 5.1
 	private byte[] macKdf(SecretKey key, byte[]... inputs) {
 		// Initialise the PRF
 		Digest prf = new Blake2sDigest(key.getBytes());
 		// The output of the PRF must be long enough to use as a key
 		int macLength = prf.getDigestSize();
 		if (macLength < SecretKey.LENGTH) throw new IllegalStateException();
 		// Calculate the PRF over the concatenated length-prefixed inputs
 		byte[] length = new byte[INT_32_BYTES];
 		for (byte[] input : inputs) {
 			ByteUtils.writeUint32(input.length, length, 0);
 			prf.update(length, 0, length.length);
 			prf.update(input, 0, input.length);
 		}
 		byte[] mac = new byte[macLength];
 		prf.doFinal(mac, 0);
 		// The output is the first SecretKey.LENGTH bytes of the MAC
 		if (mac.length == SecretKey.LENGTH) return mac;
 		byte[] truncated = new byte[SecretKey.LENGTH];
 		System.arraycopy(mac, 0, truncated, 0, truncated.length);
 		return truncated;
 	}
 	// Password-based key derivation function - see PKCS#5 v2.1, section 5.2
 	private byte[] pbkdf2(String password, byte[] salt, int iterations) {
 		byte[] utf8 = StringUtils.toUtf8(password);
 		Digest digest = new SHA256Digest();
 		PKCS5S2ParametersGenerator gen = new PKCS5S2ParametersGenerator(digest);
 		gen.init(utf8, salt, iterations);
 		int keyLengthInBits = SecretKey.LENGTH * 8;
 		CipherParameters p = gen.generateDerivedParameters(keyLengthInBits);
 		return ((KeyParameter) p).getKey();
 	}
 	// Package access for testing
 	int chooseIterationCount(int targetMillis) {
 		List<Long> quickSamples = new ArrayList<>(PBKDF_SAMPLES);
 		List<Long> slowSamples = new ArrayList<>(PBKDF_SAMPLES);
 		long iterationNanos = 0, initNanos = 0;
 		while (iterationNanos <= 0 || initNanos <= 0) {
 			// Sample the running time with one iteration and two iterations
 			for (int i = 0; i < PBKDF_SAMPLES; i++) {
 				quickSamples.add(sampleRunningTime(1));
 				slowSamples.add(sampleRunningTime(2));
 			}
 			// Calculate the iteration time and the initialisation time
 			long quickMedian = median(quickSamples);
 			long slowMedian = median(slowSamples);
 			iterationNanos = slowMedian - quickMedian;
 			initNanos = quickMedian - iterationNanos;
 			if (LOG.isLoggable(INFO)) {
 				LOG.info("Init: " + initNanos + ", iteration: "
 						+ iterationNanos);
 			}
 		}
 		long targetNanos = targetMillis * 1000L * 1000L;
 		long iterations = (targetNanos - initNanos) / iterationNanos;
 		if (LOG.isLoggable(INFO)) LOG.info("Target iterations: " + iterations);
 		if (iterations < 1) return 1;
 		if (iterations > Integer.MAX_VALUE) return Integer.MAX_VALUE;
 		return (int) iterations;
 	}
 	private long sampleRunningTime(int iterations) {
 		byte[] password = {'p', 'a', 's', 's', 'w', 'o', 'r', 'd'};
 		byte[] salt = new byte[PBKDF_SALT_BYTES];
 		int keyLengthInBits = SecretKey.LENGTH * 8;
 		long start = System.nanoTime();
 		Digest digest = new SHA256Digest();
 		PKCS5S2ParametersGenerator gen = new PKCS5S2ParametersGenerator(digest);
 		gen.init(password, salt, iterations);
 		gen.generateDerivedParameters(keyLengthInBits);
 		return System.nanoTime() - start;
 	}
 	private long median(List<Long> list) {
 		int size = list.size();
 		if (size == 0) throw new IllegalArgumentException();
 		Collections.sort(list);
 		if (size % 2 == 1) return list.get(size / 2);
 		return list.get(size / 2 - 1) + list.get(size / 2) / 2;
 	}
 }
--- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/CryptoExecutorModule.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/CryptoExecutorModule.java
@@ -1,67 +0,0 @@
 package org.briarproject.bramble.crypto;
 import org.briarproject.bramble.TimeLoggingExecutor;
 import org.briarproject.bramble.api.crypto.CryptoExecutor;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.ThreadPoolExecutor;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import dagger.Module;
 import dagger.Provides;
 import static java.util.concurrent.TimeUnit.SECONDS;
@Module
 public class CryptoExecutorModule {
 	public static class EagerSingletons {
 		@Inject
 		@CryptoExecutor
 		ExecutorService cryptoExecutor;
 	}
 	/**
 	 * The maximum number of executor threads.
 	 * <p>
 	 * The number of available processors can change during the lifetime of the
 	 * JVM, so this is just a reasonable guess.
 	 */
 	private static final int MAX_EXECUTOR_THREADS =
 			Math.max(1, Runtime.getRuntime().availableProcessors() - 1);
 	private final ExecutorService cryptoExecutor;
 	public CryptoExecutorModule() {
 		// Use an unbounded queue
 		BlockingQueue<Runnable> queue = new LinkedBlockingQueue<>();
 		// Discard tasks that are submitted during shutdown
 		RejectedExecutionHandler policy =
 				new ThreadPoolExecutor.DiscardPolicy();
 		// Create a limited # of threads and keep them in the pool for 60 secs
 		cryptoExecutor = new TimeLoggingExecutor("CryptoExecutor", 0,
 				MAX_EXECUTOR_THREADS, 60, SECONDS, queue, policy);
 	}
 	@Provides
 	@Singleton
 	@CryptoExecutor
 	ExecutorService provideCryptoExecutorService(
 			LifecycleManager lifecycleManager) {
 		lifecycleManager.registerForShutdown(cryptoExecutor);
 		return cryptoExecutor;
 	}
 	@Provides
 	@CryptoExecutor
 	Executor provideCryptoExecutor() {
 		return cryptoExecutor;
 	}
 }
--- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/CryptoModule.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/CryptoModule.java
@@ -1,24 +1,62 @@
 package org.briarproject.bramble.crypto;
 import org.briarproject.bramble.TimeLoggingExecutor;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
-import org.briarproject.bramble.api.crypto.KeyAgreementCrypto;
+import org.briarproject.bramble.api.crypto.CryptoExecutor;
 import org.briarproject.bramble.api.crypto.PasswordStrengthEstimator;
 import org.briarproject.bramble.api.crypto.StreamDecrypterFactory;
 import org.briarproject.bramble.api.crypto.StreamEncrypterFactory;
-import org.briarproject.bramble.api.crypto.TransportCrypto;
+import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.system.SecureRandomProvider;
 import java.security.SecureRandom;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.ThreadPoolExecutor;
 import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.inject.Singleton;
 import dagger.Module;
 import dagger.Provides;
 import static java.util.concurrent.TimeUnit.SECONDS;
@Module
 public class CryptoModule {
 	public static class EagerSingletons {
 		@Inject
 		@CryptoExecutor
 		ExecutorService cryptoExecutor;
 	}
 	/**
 	 * The maximum number of executor threads.
 	 * <p>
 	 * The number of available processors can change during the lifetime of the
 	 * JVM, so this is just a reasonable guess.
 	 */
 	private static final int MAX_EXECUTOR_THREADS =
 			Math.max(1, Runtime.getRuntime().availableProcessors() - 1);
 	private final ExecutorService cryptoExecutor;
 	public CryptoModule() {
 		// Use an unbounded queue
 		BlockingQueue<Runnable> queue = new LinkedBlockingQueue<>();
 		// Discard tasks that are submitted during shutdown
 		RejectedExecutionHandler policy =
 				new ThreadPoolExecutor.DiscardPolicy();
 		// Create a limited # of threads and keep them in the pool for 60 secs
 		cryptoExecutor = new TimeLoggingExecutor("CryptoExecutor", 0,
 				MAX_EXECUTOR_THREADS, 60, SECONDS, queue, policy);
 	}
 	@Provides
 	AuthenticatedCipher provideAuthenticatedCipher() {
 		return new XSalsa20Poly1305AuthenticatedCipher();
@@ -27,9 +65,8 @@ public class CryptoModule {
 	@Provides
 	@Singleton
 	CryptoComponent provideCryptoComponent(
-			SecureRandomProvider secureRandomProvider,
+			SecureRandomProvider secureRandomProvider) {
-			ScryptKdf passwordBasedKdf) {
+		return new CryptoComponentImpl(secureRandomProvider);
 		return new CryptoComponentImpl(secureRandomProvider, passwordBasedKdf);
 	}
 	@Provides
@@ -37,12 +74,6 @@ public class CryptoModule {
 		return new PasswordStrengthEstimatorImpl();
 	}
 	@Provides
 	TransportCrypto provideTransportCrypto(
 			TransportCryptoImpl transportCrypto) {
 		return transportCrypto;
 	}
 	@Provides
 	StreamDecrypterFactory provideStreamDecrypterFactory(
 			Provider<AuthenticatedCipher> cipherProvider) {
@@ -50,17 +81,24 @@ public class CryptoModule {
 	}
 	@Provides
-	StreamEncrypterFactory provideStreamEncrypterFactory(
+	StreamEncrypterFactory provideStreamEncrypterFactory(CryptoComponent crypto,
 			CryptoComponent crypto, TransportCrypto transportCrypto,
 			Provider<AuthenticatedCipher> cipherProvider) {
-		return new StreamEncrypterFactoryImpl(crypto, transportCrypto,
+		return new StreamEncrypterFactoryImpl(crypto, cipherProvider);
 				cipherProvider);
 	}
 	@Provides
-	KeyAgreementCrypto provideKeyAgreementCrypto(
+	@Singleton
-			KeyAgreementCryptoImpl keyAgreementCrypto) {
+	@CryptoExecutor
-		return keyAgreementCrypto;
+	ExecutorService getCryptoExecutorService(
 			LifecycleManager lifecycleManager) {
 		lifecycleManager.registerForShutdown(cryptoExecutor);
 		return cryptoExecutor;
 	}
 	@Provides
 	@CryptoExecutor
 	Executor getCryptoExecutor() {
 		return cryptoExecutor;
 	}
 	@Provides
--- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/Curve25519KeyParser.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/Curve25519KeyParser.java
@@ -1,35 +0,0 @@
 package org.briarproject.bramble.crypto;
 import org.briarproject.bramble.api.crypto.KeyParser;
 import org.briarproject.bramble.api.crypto.PrivateKey;
 import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import java.security.GeneralSecurityException;
@NotNullByDefault
 class Curve25519KeyParser implements KeyParser {
 	@Override
 	public PublicKey parsePublicKey(byte[] encodedKey)
 			throws GeneralSecurityException {
 		if (encodedKey.length != 32) throw new GeneralSecurityException();
 		return new Curve25519PublicKey(encodedKey);
 	}
 	@Override
 	public PrivateKey parsePrivateKey(byte[] encodedKey)
 			throws GeneralSecurityException {
 		if (encodedKey.length != 32) throw new GeneralSecurityException();
 		return new Curve25519PrivateKey(clamp(encodedKey));
 	}
 	static byte[] clamp(byte[] b) {
 		byte[] clamped = new byte[32];
 		System.arraycopy(b, 0, clamped, 0, 32);
 		clamped[0] &= 248;
 		clamped[31] &= 127;
 		clamped[31] |= 64;
 		return clamped;
 	}
 }
--- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/Curve25519PrivateKey.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/Curve25519PrivateKey.java
@@ -1,18 +0,0 @@
 package org.briarproject.bramble.crypto;
 import org.briarproject.bramble.api.Bytes;
 import org.briarproject.bramble.api.crypto.PrivateKey;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@NotNullByDefault
 class Curve25519PrivateKey extends Bytes implements PrivateKey {
 	Curve25519PrivateKey(byte[] bytes) {
 		super(bytes);
 	}
 	@Override
 	public byte[] getEncoded() {
 		return getBytes();
 	}
 }
--- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/Curve25519PublicKey.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/Curve25519PublicKey.java
@@ -1,18 +0,0 @@
 package org.briarproject.bramble.crypto;
 import org.briarproject.bramble.api.Bytes;
 import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@NotNullByDefault
 class Curve25519PublicKey extends Bytes implements PublicKey {
 	Curve25519PublicKey(byte[] bytes) {
 		super(bytes);
 	}
 	@Override
 	public byte[] getEncoded() {
 		return getBytes();
 	}
 }
--- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/EdKeyParser.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/EdKeyParser.java
@@ -1,26 +0,0 @@
 package org.briarproject.bramble.crypto;
 import org.briarproject.bramble.api.crypto.KeyParser;
 import org.briarproject.bramble.api.crypto.PrivateKey;
 import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import java.security.GeneralSecurityException;
@NotNullByDefault
 class EdKeyParser implements KeyParser {
 	@Override
 	public PublicKey parsePublicKey(byte[] encodedKey)
 			throws GeneralSecurityException {
 		if (encodedKey.length != 32) throw new GeneralSecurityException();
 		return new EdPublicKey(encodedKey);
 	}
 	@Override
 	public PrivateKey parsePrivateKey(byte[] encodedKey)
 			throws GeneralSecurityException {
 		if (encodedKey.length != 32) throw new GeneralSecurityException();
 		return new EdPrivateKey(encodedKey);
 	}
 }
--- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/EdPrivateKey.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/EdPrivateKey.java
@@ -1,18 +0,0 @@
 package org.briarproject.bramble.crypto;
 import org.briarproject.bramble.api.Bytes;
 import org.briarproject.bramble.api.crypto.PrivateKey;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@NotNullByDefault
 class EdPrivateKey extends Bytes implements PrivateKey {
 	EdPrivateKey(byte[] bytes) {
 		super(bytes);
 	}
 	@Override
 	public byte[] getEncoded() {
 		return getBytes();
 	}
 }
--- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/EdPublicKey.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/EdPublicKey.java
@@ -1,18 +0,0 @@
 package org.briarproject.bramble.crypto;
 import org.briarproject.bramble.api.Bytes;
 import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@NotNullByDefault
 class EdPublicKey extends Bytes implements PublicKey {
 	EdPublicKey(byte[] bytes) {
 		super(bytes);
 	}
 	@Override
 	public byte[] getEncoded() {
 		return getBytes();
 	}
 }
--- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/EdSignature.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/EdSignature.java
@@ -1,83 +0,0 @@
 package org.briarproject.bramble.crypto;
 import net.i2p.crypto.eddsa.EdDSAPrivateKey;
 import net.i2p.crypto.eddsa.EdDSAPublicKey;
 import net.i2p.crypto.eddsa.EdDSASecurityProvider;
 import net.i2p.crypto.eddsa.spec.EdDSANamedCurveSpec;
 import net.i2p.crypto.eddsa.spec.EdDSANamedCurveTable;
 import net.i2p.crypto.eddsa.spec.EdDSAPrivateKeySpec;
 import net.i2p.crypto.eddsa.spec.EdDSAPublicKeySpec;
 import org.briarproject.bramble.api.crypto.PrivateKey;
 import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import java.security.GeneralSecurityException;
 import java.security.NoSuchAlgorithmException;
 import java.security.Provider;
 import static net.i2p.crypto.eddsa.EdDSAEngine.SIGNATURE_ALGORITHM;
@NotNullByDefault
 class EdSignature implements Signature {
 	private static final Provider PROVIDER = new EdDSASecurityProvider();
 	private static final EdDSANamedCurveSpec CURVE_SPEC =
 			EdDSANamedCurveTable.getByName("Ed25519");
 	private final java.security.Signature signature;
 	EdSignature() {
 		try {
 			signature = java.security.Signature
 					.getInstance(SIGNATURE_ALGORITHM, PROVIDER);
 		} catch (NoSuchAlgorithmException e) {
 			throw new AssertionError(e);
 		}
 	}
 	@Override
 	public void initSign(PrivateKey k) throws GeneralSecurityException {
 		if (!(k instanceof EdPrivateKey))
 			throw new IllegalArgumentException();
 		EdDSAPrivateKey privateKey = new EdDSAPrivateKey(
 				new EdDSAPrivateKeySpec(k.getEncoded(), CURVE_SPEC));
 		signature.initSign(privateKey);
 	}
 	@Override
 	public void initVerify(PublicKey k) throws GeneralSecurityException {
 		if (!(k instanceof EdPublicKey))
 			throw new IllegalArgumentException();
 		EdDSAPublicKey publicKey = new EdDSAPublicKey(
 				new EdDSAPublicKeySpec(k.getEncoded(), CURVE_SPEC));
 		signature.initVerify(publicKey);
 	}
 	@Override
 	public void update(byte b) throws GeneralSecurityException {
 		signature.update(b);
 	}
 	@Override
 	public void update(byte[] b) throws GeneralSecurityException {
 		signature.update(b);
 	}
 	@Override
 	public void update(byte[] b, int off, int len)
 			throws GeneralSecurityException {
 		signature.update(b, off, len);
 	}
 	@Override
 	public byte[] sign() throws GeneralSecurityException {
 		return signature.sign();
 	}
 	@Override
 	public boolean verify(byte[] sig) throws GeneralSecurityException {
 		return signature.verify(sig);
 	}
 }
--- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/EllipticCurveConstants.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/EllipticCurveConstants.java
@@ -0,0 +1,32 @@
 package org.briarproject.bramble.crypto;
 import org.spongycastle.asn1.teletrust.TeleTrusTNamedCurves;
 import org.spongycastle.asn1.x9.X9ECParameters;
 import org.spongycastle.crypto.params.ECDomainParameters;
 import org.spongycastle.math.ec.ECCurve;
 import org.spongycastle.math.ec.ECMultiplier;
 import org.spongycastle.math.ec.ECPoint;
 import org.spongycastle.math.ec.MontgomeryLadderMultiplier;
 import java.math.BigInteger;
 /**
 * Parameters for curve brainpoolp256r1 - see RFC 5639.
 */
 class EllipticCurveConstants {
 	static final ECDomainParameters PARAMETERS;
 	static {
 		// Start with the default implementation of the curve
 		X9ECParameters x9 = TeleTrusTNamedCurves.getByName("brainpoolp256r1");
 		// Use a constant-time multiplier
 		ECMultiplier monty = new MontgomeryLadderMultiplier();
 		ECCurve curve = x9.getCurve().configure().setMultiplier(monty).create();
 		BigInteger gX = x9.getG().getAffineXCoord().toBigInteger();
 		BigInteger gY = x9.getG().getAffineYCoord().toBigInteger();
 		ECPoint g = curve.createPoint(gX, gY);
 		// Convert to ECDomainParameters using the new multiplier
 		PARAMETERS = new ECDomainParameters(curve, g, x9.getN(), x9.getH());
 	}
 }
--- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/KeyAgreementCryptoImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/KeyAgreementCryptoImpl.java
@@ -1,56 +0,0 @@
 package org.briarproject.bramble.crypto;
 import org.briarproject.bramble.api.crypto.CryptoComponent;
 import org.briarproject.bramble.api.crypto.KeyAgreementCrypto;
 import org.briarproject.bramble.api.crypto.KeyPair;
 import org.briarproject.bramble.api.crypto.PublicKey;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import javax.inject.Inject;
 import static org.briarproject.bramble.api.keyagreement.KeyAgreementConstants.COMMIT_LENGTH;
 class KeyAgreementCryptoImpl implements KeyAgreementCrypto {
 	private final CryptoComponent crypto;
 	@Inject
 	KeyAgreementCryptoImpl(CryptoComponent crypto) {
 		this.crypto = crypto;
 	}
 	@Override
 	public byte[] deriveKeyCommitment(PublicKey publicKey) {
 		byte[] hash = crypto.hash(COMMIT_LABEL, publicKey.getEncoded());
 		// The output is the first COMMIT_LENGTH bytes of the hash
 		byte[] commitment = new byte[COMMIT_LENGTH];
 		System.arraycopy(hash, 0, commitment, 0, COMMIT_LENGTH);
 		return commitment;
 	}
 	@Override
 	public byte[] deriveConfirmationRecord(SecretKey sharedSecret,
 			byte[] theirPayload, byte[] ourPayload, PublicKey theirPublicKey,
 			KeyPair ourKeyPair, boolean alice, boolean aliceRecord) {
 		SecretKey ck = crypto.deriveKey(CONFIRMATION_KEY_LABEL, sharedSecret);
 		byte[] alicePayload, alicePub, bobPayload, bobPub;
 		if (alice) {
 			alicePayload = ourPayload;
 			alicePub = ourKeyPair.getPublic().getEncoded();
 			bobPayload = theirPayload;
 			bobPub = theirPublicKey.getEncoded();
 		} else {
 			alicePayload = theirPayload;
 			alicePub = theirPublicKey.getEncoded();
 			bobPayload = ourPayload;
 			bobPub = ourKeyPair.getPublic().getEncoded();
 		}
 		if (aliceRecord) {
 			return crypto.mac(CONFIRMATION_MAC_LABEL, ck, alicePayload,
 					alicePub, bobPayload, bobPub);
 		} else {
 			return crypto.mac(CONFIRMATION_MAC_LABEL, ck, bobPayload, bobPub,
 					alicePayload, alicePub);
 		}
 	}
 }
--- a/bramble-core/src/main/java/org/briarproject/bramble/crypto/PasswordBasedKdf.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/crypto/PasswordBasedKdf.java
@@ -1,10 +0,0 @@
 package org.briarproject.bramble.crypto;
 import org.briarproject.bramble.api.crypto.SecretKey;
 interface PasswordBasedKdf {
 	int chooseCostParameter();
 	SecretKey deriveKey(String password, byte[] salt, int cost);
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
akwizgran	347c2f22c1	Bump version numbers for beta release.	2018-01-29 16:48:21 +00:00
Torsten Grote	a8ea191ffb	Merge branch '1007-samsung-transition-npe-fix' into 'maintenance-0.16' Backport: Another attempt at fixing an infamous Samsung activity transition NPE See merge request akwizgran/briar!678	2018-01-29 14:53:46 +00:00
Torsten Grote	2a4c22757b	Another attempt at fixing an infamous Samsung activity transition NPE	2018-01-29 12:36:21 -02:00
Torsten Grote	28ebbbc7d1	Backport translation updates New translations: br, nl, he, sv, cs, ja	2018-01-29 10:45:12 -02:00
akwizgran	5e7d08f05d	Merge branch 'change-password-activity' into 'maintenance-0.16' Backport: ChangePasswordActivity should extend BriarActivity See merge request akwizgran/briar!673	2018-01-23 17:36:18 +00:00
akwizgran	ea005748dc	Merge branch 'tor-plugin-detect-connectivity-loss' into 'maintenance-0.16' Backport: Tor plugin should detect connectivity loss See merge request akwizgran/briar!672	2018-01-23 17:29:28 +00:00
akwizgran	b021bfab5e	ChangePasswordActivity should extend BriarActivity.	2018-01-23 17:22:43 +00:00
akwizgran	29cd105a1d	Use scheduler service to schedule connectivity checks.	2018-01-23 17:16:59 +00:00
akwizgran	be2e68e96c	Listen for a wider range of connectivity-related events.	2018-01-23 17:15:53 +00:00
akwizgran	9dd3f81bb7	Use Tor's OR connection events to detect lost connectivity.	2018-01-23 17:15:53 +00:00
akwizgran	5d918591d4	Merge branch '1145-avoid-unnecessary-db-queries' into 'maintenance-0.16' Backport: Avoid unnecessary DB queries when starting clients See merge request akwizgran/briar!669	2018-01-16 15:33:14 +00:00
akwizgran	f1c027fa4d	Avoid unnecessary DB queries when starting clients.	2018-01-16 15:23:31 +00:00
akwizgran	d2d3ccf68d	Merge branch 'prefer-project-modules' into 'maintenance-0.16' Backport: Prefer project modules over prebuilt dependencies See merge request akwizgran/briar!668	2018-01-12 17:55:05 +00:00
akwizgran	f4efed54d5	Prefer project modules over prebuilt dependencies.	2018-01-12 17:35:59 +00:00
akwizgran	459538e40c	Bump version numbers for beta release.	2017-12-22 14:43:03 +00:00
akwizgran	183f501761	Merge branch '1132-upgrade-tor-0.2.9.14' into 'maintenance-0.16' Beta: Upgrade Tor to 0.2.9.14, GeoIP to 2017-11-06 See merge request akwizgran/briar!657	2017-12-22 14:10:52 +00:00
akwizgran	65ee5f539b	Upgrade Tor to 0.2.9.14, GeoIP to 2017-11-06.	2017-12-22 13:52:45 +00:00
akwizgran	604339326c	Merge branch '1129-send-on-ctrl-enter' into 'maintenance-0.16' Beta: Send message on ctrl + enter See merge request akwizgran/briar!656	2017-12-22 11:49:55 +00:00
sbkaf	0acec1343f	send message on ctrl + enter	2017-12-22 11:32:15 +00:00
akwizgran	0434756bbd	Merge branch '1133-extend-expiry-period' into 'maintenance-0.16' Extend expiry date, show extension notification See merge request akwizgran/briar!655	2017-12-22 11:23:40 +00:00
akwizgran	e233433140	Extend expiry date, show extension notification.	2017-12-22 10:58:11 +00:00
akwizgran	c63f285f53	Bumped version numbers for beta release.	2017-12-07 14:13:11 +00:00
akwizgran	0800188718	Merge branch '1112-screen-filter-crash' into 'maintenance-0.16' Beta: Don't show screen filter dialog after onSaveInstanceState(). See merge request !650	2017-12-07 13:29:27 +00:00
akwizgran	6188e48beb	Don't show screen filter dialog after onSaveInstanceState().	2017-12-07 13:07:07 +00:00
akwizgran	5726e29b56	Merge branch '1088-huawei-whitelisting' into 'maintenance-0.16' Beta: Add button for Huawei's power manager to setup wizard See merge request !648	2017-12-07 13:05:34 +00:00
Torsten Grote	5d70399de0	Add button for Huawei's power manager to setup wizard	2017-12-05 15:26:14 -02:00
akwizgran	73202dde5e	Merge branch '1127-notification-channels' into 'maintenance-0.16' Beta: Use channels for all notifications See merge request !647	2017-12-05 17:03:37 +00:00
akwizgran	a98ac8233c	Sort order of channel IDs affects UI of Settings app.	2017-12-05 16:49:31 +00:00
akwizgran	bee3e244fc	Use channels for all notifications.	2017-12-05 16:49:31 +00:00
akwizgran	da25999a15	Merge branch '1120-crash-removing-shutdown-hook' into 'maintenance-0.16' Beta: Don't remove shutdown hook when closing DB See merge request !645	2017-12-05 14:58:56 +00:00
akwizgran	62049df342	Don't remove shutdown hook when closing DB.	2017-12-05 14:46:07 +00:00
akwizgran	024e5aa90f	Bumped version numbers for beta release.	2017-12-04 14:43:27 +00:00
akwizgran	6d791481d5	Merge branch '1007-samsung-transition-npe-beta' into 'maintenance-0.16' Beta: Don't set scene transition for Samsung devices running Android 7.0 See merge request !641	2017-12-04 14:35:39 +00:00
Torsten Grote	0a807d0893	Don't set scene transition for Samsung devices running Android 7.0	2017-12-04 10:58:20 -02:00
akwizgran	23596bbdd4	Merge branch origin/maintenance-0.16 into maintenance-0.16	2017-12-01 17:19:42 +00:00
Torsten Grote	fe79954138	Merge branch 'briar-beta-app-name' into 'maintenance-0.16' Change app name for beta debug builds See merge request !636	2017-12-01 16:43:45 +00:00
akwizgran	9902c023ca	Bump version number for beta release.	2017-12-01 16:30:18 +00:00
akwizgran	e8baee6734	Specify 7 characters for Git revision. (cherry picked from commit `f0d8532`)	2017-12-01 16:29:45 +00:00
akwizgran	a8dc029e56	Change app name for beta debug builds.	2017-12-01 16:21:20 +00:00
akwizgran	74e3fee7aa	Merge branch '1124-notification-channel-crash-beta' into 'maintenance-0.16' Beta: Use NotificationChannel for foreground service to avoid crash on Android 8.1 See merge request !635	2017-12-01 16:00:53 +00:00
Torsten Grote	05aac696b7	Use NotificationChannel for foreground service to avoid crash on Android 8.1 This also seems to address #1075 at least on an emulator	2017-12-01 13:47:02 -02:00