WIP: FakeTestData proof-of-concept

Closes #1377

.gitlab-ci.yml

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

.idea/runConfigurations/All_tests.xml

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

.idea/runConfigurations/All_tests_in_bramble_java.xml

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

bramble-android/build.gradle

@@ -1,5 +1,6 @@
 apply plugin: 'com.android.library'
 apply plugin: 'witness'
+apply from: 'witness.gradle'
 
 android {
 	compileSdkVersion 27
@@ -8,8 +9,8 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 26
-		versionCode 10013
-		versionName "1.0.13"
+		versionCode 10101
+		versionName "1.1.1"
 		consumerProguardFiles 'proguard-rules.txt'
 
 		testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -27,7 +28,6 @@ configurations {
 
 dependencies {
 	implementation project(path: ':bramble-core', configuration: 'default')
-	implementation 'org.briarproject:jtorctl:0.3'
 	tor 'org.briarproject:tor-android:0.2.9.16@zip'
 
 	annotationProcessor 'com.google.dagger:dagger-compiler:2.0.2'
@@ -41,108 +41,6 @@ dependencies {
 	testImplementation "org.jmock:jmock-legacy:2.8.2"
 	testImplementation "org.hamcrest:hamcrest-library:1.3"
 	testImplementation "org.hamcrest:hamcrest-core:1.3"
-
-	androidTestImplementation project(path: ':bramble-api', configuration: 'testOutput')
-	androidTestImplementation project(path: ':bramble-core', configuration: 'testOutput')
-	androidTestImplementation 'com.android.support.test:runner:1.0.2'
-	androidTestAnnotationProcessor 'com.google.dagger:dagger-compiler:2.0.2'
-	androidTestCompileOnly 'javax.annotation:jsr250-api:1.0'
-}
-
-dependencyVerification {
-	verify = [
-			'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861',
-			'com.android.support.test:monitor:1.0.2:monitor-1.0.2.aar:38ef4fa98a32dc55550ff49bb36a583e178b3a9b830fcb8dcc27bfc4254bc2bc',
-			'com.android.support.test:runner:1.0.2:runner-1.0.2.aar:f04b9ae342975ba1cb3e4a06e13426e3e6b8a73faa45acba604493d83c9a4f00',
-			'com.android.support:support-annotations:27.1.1:support-annotations-27.1.1.jar:3365960206c3d2b09e845f555e7f88f8effc8d2f00b369e66c4be384029299cf',
-			'com.android.tools.analytics-library:protos:26.1.3:protos-26.1.3.jar:818c9f256f141d9dafec03a1aa2b94d240b2c140acfd7ee31a8b3e6c2b9479e3',
-			'com.android.tools.analytics-library:shared:26.1.3:shared-26.1.3.jar:7110706c7ada96c8b6f5ca80c478291bc7899d46277de2c48527e045442401a3',
-			'com.android.tools.analytics-library:tracker:26.1.3:tracker-26.1.3.jar:4155424bf2ce4872da83332579a1707252bc66cbd77c5144fdc4483d0f2e1418',
-			'com.android.tools.build:apksig:3.1.3:apksig-3.1.3.jar:7e1f8e675a6e768e5b56405e41d6c3cc05befe62e601b04177de1029902c9c89',
-			'com.android.tools.build:builder-model:3.1.3:builder-model-3.1.3.jar:06ad1c422d679fc698451479cb40ba863849d67bfd1de23f6d2c16d78b024b0b',
-			'com.android.tools.build:builder-test-api:3.1.3:builder-test-api-3.1.3.jar:4d989f780436794f0f8b2f50e9e079b786571eac90f26c208ab2ae6d4012f389',
-			'com.android.tools.build:builder:3.1.3:builder-3.1.3.jar:8a1092012c89d0ec1ee2eff09c5708c71ef4482a6862df8d3a44a67fccace01c',
-			'com.android.tools.build:gradle-api:3.1.3:gradle-api-3.1.3.jar:01e4df521456aef66514336f1d492346730dd1fb8f6433a89f62da834941ed72',
-			'com.android.tools.build:manifest-merger:26.1.3:manifest-merger-26.1.3.jar:1e4fc7e932adb4607082409800e5e6fccb42e6c5360ae5990094bf522f3ada55',
-			'com.android.tools.ddms:ddmlib:26.1.3:ddmlib-26.1.3.jar:c54931cd68df5d1ea2923b3b320eae47cd2307a5a916bb8674c0acf93cd1d3cd',
-			'com.android.tools.external.com-intellij:intellij-core:26.1.3:intellij-core-26.1.3.jar:af67f5535fef2e1a28b1007a4acb8c5deb6a1e33b8afe7b11d012c9e778ebcec',
-			'com.android.tools.external.com-intellij:kotlin-compiler:26.1.3:kotlin-compiler-26.1.3.jar:c746d2859dc11cc05c84b692b3498d3a621e0929511f8440ee009c6557838fd4',
-			'com.android.tools.external.org-jetbrains:uast:26.1.3:uast-26.1.3.jar:3f3f6651d0c7685a77ecb22e9c82d6b49fdf24322c17360768dc530678f43265',
-			'com.android.tools.layoutlib:layoutlib-api:26.1.3:layoutlib-api-26.1.3.jar:10bc73ce706c45629872d6a999dbe12116df64e24f47ff93b7b13121ff57b4b0',
-			'com.android.tools.lint:lint-api:26.1.3:lint-api-26.1.3.jar:6f97323f9af8deda86278717885b5c927f3766757db89709f52d11d42b6fb751',
-			'com.android.tools.lint:lint-checks:26.1.3:lint-checks-26.1.3.jar:73c3d53784c9ce3e6d5968506581918e0179645d20809927ca4a001dd766b001',
-			'com.android.tools.lint:lint-gradle-api:26.1.3:lint-gradle-api-26.1.3.jar:7ca3c4866ec21dc21d53a9d86f752b77ace6f6c610a0c9dc877313856c733d9d',
-			'com.android.tools.lint:lint-gradle:26.1.3:lint-gradle-26.1.3.jar:db0c354b8f4b6f6637e31f91c564785a59ff896325331fcbc3de7458e0b6c067',
-			'com.android.tools.lint:lint-kotlin:26.1.3:lint-kotlin-26.1.3.jar:94e2b0f4565a241561cfb8fc1222bb3f132a3b98d2a90421dbb72ee8358e7d68',
-			'com.android.tools.lint:lint:26.1.3:lint-26.1.3.jar:8d5f32c989c6d191d712e90ad3ca2d1c409313599551d04d834caa44d26c78df',
-			'com.android.tools:annotations:26.1.3:annotations-26.1.3.jar:c950430b24ac5d58fc97e7283b8f0115f99587e76e08b4e1e2aaa780f2d77323',
-			'com.android.tools:common:26.1.3:common-26.1.3.jar:7c31a90581a148ab219f615a59667f0dded7fa39b248529784474da3c2274ef2',
-			'com.android.tools:dvlib:26.1.3:dvlib-26.1.3.jar:0cae87906f53d3f1088366a916ed180a7312b6d9919b90797f238875c8492855',
-			'com.android.tools:repository:26.1.3:repository-26.1.3.jar:52d4539cc68db91b261e2a33b2c8206b26e05539078758dc28cfb3854adb4f59',
-			'com.android.tools:sdk-common:26.1.3:sdk-common-26.1.3.jar:1948603ca9ff22c7ebb3178000bffa3a9dd2ca1cc5cb0c793cae08468b8fcfc1',
-			'com.android.tools:sdklib:26.1.3:sdklib-26.1.3.jar:4adcfaad9514607098d2c51503c39811112d3050f4d1e744c01c7f08f591032b',
-			'com.google.code.findbugs:jsr305:1.3.9:jsr305-1.3.9.jar:905721a0eea90a81534abb7ee6ef4ea2e5e645fa1def0a5cd88402df1b46c9ed',
-			'com.google.code.gson:gson:2.7:gson-2.7.jar:2d43eb5ea9e133d2ee2405cc14f5ee08951b8361302fdd93494a3a997b508d32',
-			'com.google.dagger:dagger-compiler:2.0.2:dagger-compiler-2.0.2.jar:b74bc9de063dd4c6400b232231f2ef5056145b8fbecbf5382012007dd1c071b3',
-			'com.google.dagger:dagger-producers:2.0-beta:dagger-producers-2.0-beta.jar:99ec15e8a0507ba569e7655bc1165ee5e5ca5aa914b3c8f7e2c2458f724edd6b',
-			'com.google.dagger:dagger:2.0.2:dagger-2.0.2.jar:84c0282ed8be73a29e0475d639da030b55dee72369e58dd35ae7d4fe6243dcf9',
-			'com.google.errorprone:error_prone_annotations:2.0.18:error_prone_annotations-2.0.18.jar:cb4cfad870bf563a07199f3ebea5763f0dec440fcda0b318640b1feaa788656b',
-			'com.google.guava:guava:18.0:guava-18.0.jar:d664fbfc03d2e5ce9cab2a44fb01f1d0bf9dfebeccc1a473b1f9ea31f79f6f99',
-			'com.google.guava:guava:22.0:guava-22.0.jar:1158e94c7de4da480873f0b4ab4a1da14c0d23d4b1902cc94a58a6f0f9ab579e',
-			'com.google.j2objc:j2objc-annotations:1.1:j2objc-annotations-1.1.jar:40ceb7157feb263949e0f503fe5f71689333a621021aa20ce0d0acee3badaa0f',
-			'com.google.jimfs:jimfs:1.1:jimfs-1.1.jar:c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd',
-			'com.google.protobuf:protobuf-java:3.4.0:protobuf-java-3.4.0.jar:dce7e66b32456a1b1198da0caff3a8acb71548658391e798c79369241e6490a4',
-			'com.googlecode.json-simple:json-simple:1.1:json-simple-1.1.jar:2d9484f4c649f708f47f9a479465fc729770ee65617dca3011836602264f6439',
-			'com.squareup:javawriter:2.5.0:javawriter-2.5.0.jar:fcfb09fb0ea0aa97d3cfe7ea792398081348e468f126b3603cb3803f240197f0',
-			'com.sun.activation:javax.activation:1.2.0:javax.activation-1.2.0.jar:993302b16cd7056f21e779cc577d175a810bb4900ef73cd8fbf2b50f928ba9ce',
-			'com.sun.istack:istack-commons-runtime:2.21:istack-commons-runtime-2.21.jar:c33e67a0807095f02a0e2da139412dd7c4f9cc1a4c054b3e434f96831ba950f4',
-			'com.sun.xml.fastinfoset:FastInfoset:1.2.13:FastInfoset-1.2.13.jar:27a77db909f3c2833c0b1a37c55af1db06045118ad2eed96ce567b6632bce038',
-			'commons-codec:commons-codec:1.6:commons-codec-1.6.jar:54b34e941b8e1414bd3e40d736efd3481772dc26db3296f6aa45cec9f6203d86',
-			'commons-logging:commons-logging:1.1.1:commons-logging-1.1.1.jar:ce6f913cad1f0db3aad70186d65c5bc7ffcc9a99e3fe8e0b137312819f7c362f',
-			'it.unimi.dsi:fastutil:7.2.0:fastutil-7.2.0.jar:74fa208043740642f7e6eb09faba15965218ad2f50ce3020efb100136e4b591c',
-			'javax.annotation:jsr250-api:1.0:jsr250-api-1.0.jar:a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f',
-			'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
-			'javax.xml.bind:jaxb-api:2.2.12-b140109.1041:jaxb-api-2.2.12-b140109.1041.jar:b5e60cd8b7b5ff01ce4a74c5dd008f4fbd14ced3495d0b47b85cfedc182211f2',
-			'junit:junit:4.12:junit-4.12.jar:59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a',
-			'net.sf.jopt-simple:jopt-simple:4.9:jopt-simple-4.9.jar:26c5856e954b5f864db76f13b86919b59c6eecf9fd930b96baa8884626baf2f5',
-			'net.sf.kxml:kxml2:2.3.0:kxml2-2.3.0.jar:f264dd9f79a1fde10ce5ecc53221eff24be4c9331c830b7d52f2f08a7b633de2',
-			'org.apache.ant:ant-launcher:1.9.4:ant-launcher-1.9.4.jar:7bccea20b41801ca17bcbc909a78c835d0f443f12d639c77bd6ae3d05861608d',
-			'org.apache.ant:ant:1.9.4:ant-1.9.4.jar:649ae0730251de07b8913f49286d46bba7b92d47c5f332610aa426c4f02161d8',
-			'org.apache.commons:commons-compress:1.12:commons-compress-1.12.jar:2c1542faf343185b7cab9c3d55c8ae5471d6d095d3887a4adefdbdf2984dc0b6',
-			'org.apache.httpcomponents:httpclient:4.2.6:httpclient-4.2.6.jar:362e9324ee7c697e21279e20077b52737ddef3f1b2c1a7abe5ad34b465145550',
-			'org.apache.httpcomponents:httpcore:4.2.5:httpcore-4.2.5.jar:e5e82da4cc66c8d917bbf743e3c0752efe8522735e7fc9dbddb65bccea81cfe9',
-			'org.apache.httpcomponents:httpmime:4.1:httpmime-4.1.jar:31629566148e8a47688ae43b420abc3ecd783ed15b33bebc00824bf24c9b15aa',
-			'org.beanshell:bsh:1.3.0:bsh-1.3.0.jar:9b04edc75d19db54f1b4e8b5355e9364384c6cf71eb0a1b9724c159d779879f8',
-			'org.bouncycastle:bcpkix-jdk15on:1.56:bcpkix-jdk15on-1.56.jar:7043dee4e9e7175e93e0b36f45b1ec1ecb893c5f755667e8b916eb8dd201c6ca',
-			'org.bouncycastle:bcprov-jdk15on:1.56:bcprov-jdk15on-1.56.jar:963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349',
-			'org.briarproject:jtorctl:0.3:jtorctl-0.3.jar:f2939238a097898998432effe93b0334d97a787972ab3a91a8973a1d309fc864',
-			'org.briarproject:tor-android:0.2.9.16:tor-android-0.2.9.16.zip:515e33dda6a30853c885a2de2c79ae1ab9ad8b6db44f5db8890333ec2e24f4ae',
-			'org.codehaus.groovy:groovy-all:2.4.12:groovy-all-2.4.12.jar:6a56af4bd48903d56bec62821876cadefafd007360cc6bd0d8f7aa8d72b38be4',
-			'org.codehaus.mojo:animal-sniffer-annotations:1.14:animal-sniffer-annotations-1.14.jar:2068320bd6bad744c3673ab048f67e30bef8f518996fa380033556600669905d',
-			'org.glassfish.jaxb:jaxb-core:2.2.11:jaxb-core-2.2.11.jar:37bcaee8ebb04362c8352a5bf6221b86967ecdab5164c696b10b9a2bb587b2aa',
-			'org.glassfish.jaxb:jaxb-runtime:2.2.11:jaxb-runtime-2.2.11.jar:a874f2351cfba8e2946be3002d10c18a6da8f21b52ba2acf52f2b85d5520ed70',
-			'org.glassfish.jaxb:txw2:2.2.11:txw2-2.2.11.jar:272a3ccad45a4511351920cd2a8633c53cab8d5220c7a92954da5526bb5eafea',
-			'org.hamcrest:hamcrest-core:1.3:hamcrest-core-1.3.jar:66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9',
-			'org.hamcrest:hamcrest-library:1.3:hamcrest-library-1.3.jar:711d64522f9ec410983bd310934296da134be4254a125080a0416ec178dfad1c',
-			'org.jetbrains.kotlin:kotlin-reflect:1.2.0:kotlin-reflect-1.2.0.jar:4f48a872bad6e4d9c053f4ad610d11e4012ad7e58dc19a03dd5eb811f36069dd',
-			'org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.0:kotlin-stdlib-jre7-1.2.0.jar:c7a20fb951d437797afe8980aff6c1e5a03f310c661ba58ba1d4fa90cb0f2926',
-			'org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.0:kotlin-stdlib-jre8-1.2.0.jar:633524eee6ef1941f7cb1dab7ee3927b0a221ceee9047aeb5515f4cbb990c82a',
-			'org.jetbrains.kotlin:kotlin-stdlib:1.2.0:kotlin-stdlib-1.2.0.jar:05cfd9f5ac0b41910703a8925f7211a495909b27a2ffdd1c5106f1689aeafcd4',
-			'org.jetbrains.trove4j:trove4j:20160824:trove4j-20160824.jar:1917871c8deb468307a584680c87a44572f5a8b0b98c6d397fc0f5f86596dbe7',
-			'org.jetbrains:annotations:13.0:annotations-13.0.jar:ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478',
-			'org.jmock:jmock-junit4:2.8.2:jmock-junit4-2.8.2.jar:f7ee4df4f7bd7b7f1cafad3b99eb74d579f109d5992ff625347352edb55e674c',
-			'org.jmock:jmock-legacy:2.8.2:jmock-legacy-2.8.2.jar:f2b985a5c08a9edb7f37612330c058809da3f6a6d63ce792426ebf8ff0d6d31b',
-			'org.jmock:jmock-testjar:2.8.2:jmock-testjar-2.8.2.jar:8900860f72c474e027cf97fe78dcbf154a1aa7fc62b6845c5fb4e4f3c7bc8760',
-			'org.jmock:jmock:2.8.2:jmock-2.8.2.jar:6c73cb4a2e6dbfb61fd99c9a768539c170ab6568e57846bd60dbf19596b65b16',
-			'org.jvnet.staxex:stax-ex:1.7.7:stax-ex-1.7.7.jar:a31ff7d77163c0deb09e7fee59ad35ae44c2cee2cc8552a116ccd1583d813fb4',
-			'org.objenesis:objenesis:2.1:objenesis-2.1.jar:c74330cc6b806c804fd37e74487b4fe5d7c2750c5e15fbc6efa13bdee1bdef80',
-			'org.ow2.asm:asm-analysis:5.1:asm-analysis-5.1.jar:a34658f5c5de4b573eef21131cc32cc25f7b66407944f312b28ec2e56abb1fa9',
-			'org.ow2.asm:asm-commons:5.1:asm-commons-5.1.jar:97b3786e1f55e74bddf8ad102bf50e33bbcbc1f6b7fd7b36f0bbbb25cd4981be',
-			'org.ow2.asm:asm-tree:5.1:asm-tree-5.1.jar:c0de2bbc4cb8297419659813ecd4ed1d077ed1dd5c1f5544cc5143e493e84c10',
-			'org.ow2.asm:asm-util:5.1:asm-util-5.1.jar:ee032c39ae5e3cd099148fbba9a2124f9ed613e5cb93e03ee0fa8808ce364040',
-			'org.ow2.asm:asm:5.0.4:asm-5.0.4.jar:896618ed8ae62702521a78bc7be42b7c491a08e6920a15f89a3ecdec31e9a220',
-			'org.ow2.asm:asm:5.1:asm-5.1.jar:d2da399a9967c69f0a21739256fa79d284222c223082cacadc17372244764b54',
-	]
 }
 
 project.afterEvaluate {

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,88 @@
+package org.briarproject.bramble.plugin.tor;
+
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.PowerManager;
+
+import org.briarproject.bramble.api.network.NetworkManager;
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.bramble.api.plugin.Backoff;
+import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
+import org.briarproject.bramble.api.system.Clock;
+import org.briarproject.bramble.api.system.LocationUtils;
+import org.briarproject.bramble.api.system.ResourceProvider;
+import org.briarproject.bramble.util.RenewableWakeLock;
+
+import java.io.IOException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ScheduledExecutorService;
+
+import javax.net.SocketFactory;
+
+import static android.content.Context.MODE_PRIVATE;
+import static android.content.Context.POWER_SERVICE;
+import static android.os.PowerManager.PARTIAL_WAKE_LOCK;
+import static java.util.concurrent.TimeUnit.MINUTES;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+class AndroidTorPlugin extends TorPlugin {
+
+	// This tag may prevent Huawei's power manager from killing us
+	private static final String WAKE_LOCK_TAG = "LocationManagerService";
+
+	private final Context appContext;
+	private final RenewableWakeLock wakeLock;
+
+	AndroidTorPlugin(Executor ioExecutor, ScheduledExecutorService scheduler,
+			Context appContext, NetworkManager networkManager,
+			LocationUtils locationUtils, SocketFactory torSocketFactory,
+			Clock clock, ResourceProvider resourceProvider,
+			CircumventionProvider circumventionProvider, Backoff backoff,
+			DuplexPluginCallback callback, String architecture, int maxLatency,
+			int maxIdleTime) {
+		super(ioExecutor, networkManager, locationUtils, torSocketFactory,
+				clock, resourceProvider, circumventionProvider, backoff,
+				callback, architecture, maxLatency, maxIdleTime,
+				appContext.getDir("tor", MODE_PRIVATE));
+		this.appContext = appContext;
+		PowerManager pm = (PowerManager)
+				appContext.getSystemService(POWER_SERVICE);
+		assert pm != null;
+		wakeLock = new RenewableWakeLock(pm, scheduler, PARTIAL_WAKE_LOCK,
+				WAKE_LOCK_TAG, 1, MINUTES);
+	}
+
+	@Override
+	protected int getProcessId() {
+		return android.os.Process.myPid();
+	}
+
+	@Override
+	protected long getLastUpdateTime() {
+		try {
+			PackageManager pm = appContext.getPackageManager();
+			PackageInfo pi = pm.getPackageInfo(appContext.getPackageName(), 0);
+			return pi.lastUpdateTime;
+		} catch (NameNotFoundException e) {
+			throw new AssertionError(e);
+		}
+	}
+
+	@Override
+	protected void enableNetwork(boolean enable) throws IOException {
+		if (!running) return;
+		if (enable) wakeLock.acquire();
+		super.enableNetwork(enable);
+		if (!enable) wakeLock.release();
+	}
+
+	@Override
+	public void stop() {
+		super.stop();
+		wakeLock.release();
+	}
+}

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

@@ -15,6 +15,7 @@ import org.briarproject.bramble.api.plugin.duplex.DuplexPluginCallback;
 import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.api.system.LocationUtils;
+import org.briarproject.bramble.api.system.ResourceProvider;
 import org.briarproject.bramble.util.AndroidUtils;
 
 import java.util.concurrent.Executor;
@@ -26,10 +27,10 @@ import javax.net.SocketFactory;
 
 @Immutable
 @NotNullByDefault
-public class TorPluginFactory implements DuplexPluginFactory {
+public class AndroidTorPluginFactory implements DuplexPluginFactory {
 
 	private static final Logger LOG =
-			Logger.getLogger(TorPluginFactory.class.getName());
+			Logger.getLogger(AndroidTorPluginFactory.class.getName());
 
 	private static final int MAX_LATENCY = 30 * 1000; // 30 seconds
 	private static final int MAX_IDLE_TIME = 30 * 1000; // 30 seconds
@@ -45,14 +46,15 @@ public class TorPluginFactory implements DuplexPluginFactory {
 	private final EventBus eventBus;
 	private final SocketFactory torSocketFactory;
 	private final BackoffFactory backoffFactory;
+	private final ResourceProvider resourceProvider;
 	private final CircumventionProvider circumventionProvider;
 	private final Clock clock;
 
-	public TorPluginFactory(Executor ioExecutor,
+	public AndroidTorPluginFactory(Executor ioExecutor,
 			ScheduledExecutorService scheduler, Context appContext,
 			NetworkManager networkManager, LocationUtils locationUtils,
 			EventBus eventBus, SocketFactory torSocketFactory,
-			BackoffFactory backoffFactory,
+			BackoffFactory backoffFactory, ResourceProvider resourceProvider,
 			CircumventionProvider circumventionProvider, Clock clock) {
 		this.ioExecutor = ioExecutor;
 		this.scheduler = scheduler;
@@ -62,6 +64,7 @@ public class TorPluginFactory implements DuplexPluginFactory {
 		this.eventBus = eventBus;
 		this.torSocketFactory = torSocketFactory;
 		this.backoffFactory = backoffFactory;
+		this.resourceProvider = resourceProvider;
 		this.circumventionProvider = circumventionProvider;
 		this.clock = clock;
 	}
@@ -99,10 +102,10 @@ public class TorPluginFactory implements DuplexPluginFactory {
 
 		Backoff backoff = backoffFactory.createBackoff(MIN_POLLING_INTERVAL,
 				MAX_POLLING_INTERVAL, BACKOFF_BASE);
-		TorPlugin plugin = new TorPlugin(ioExecutor, scheduler, appContext,
-				networkManager, locationUtils, torSocketFactory, clock,
-				circumventionProvider, backoff, callback, architecture,
-				MAX_LATENCY, MAX_IDLE_TIME);
+		AndroidTorPlugin plugin = new AndroidTorPlugin(ioExecutor, scheduler,
+				appContext, networkManager, locationUtils, torSocketFactory,
+				clock, resourceProvider, circumventionProvider, backoff,
+				callback, architecture, MAX_LATENCY, MAX_IDLE_TIME);
 		eventBus.addListener(plugin);
 		return plugin;
 	}

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

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

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

@@ -1,9 +1,8 @@
 package org.briarproject.bramble.system;
 
-import android.app.Application;
-
 import org.briarproject.bramble.api.system.AndroidExecutor;
 import org.briarproject.bramble.api.system.LocationUtils;
+import org.briarproject.bramble.api.system.ResourceProvider;
 import org.briarproject.bramble.api.system.SecureRandomProvider;
 
 import javax.inject.Singleton;
@@ -16,18 +15,26 @@ public class AndroidSystemModule {
 
 	@Provides
 	@Singleton
-	SecureRandomProvider provideSecureRandomProvider(Application app) {
-		return new AndroidSecureRandomProvider(app);
+	SecureRandomProvider provideSecureRandomProvider(
+			AndroidSecureRandomProvider provider) {
+		return provider;
 	}
 
 	@Provides
-	LocationUtils provideLocationUtils(Application app) {
-		return new AndroidLocationUtils(app);
+	LocationUtils provideLocationUtils(AndroidLocationUtils locationUtils) {
+		return locationUtils;
 	}
 
 	@Provides
 	@Singleton
-	AndroidExecutor provideAndroidExecutor(Application app) {
-		return new AndroidExecutorImpl(app);
+	AndroidExecutor provideAndroidExecutor(
+			AndroidExecutorImpl androidExecutor) {
+		return androidExecutor;
+	}
+
+	@Provides
+	@Singleton
+	ResourceProvider provideResourceProvider(AndroidResourceProvider provider) {
+		return provider;
 	}
 }

bramble-android/witness.gradle

@@ -0,0 +1,91 @@
+dependencyVerification {
+    verify = [
+        'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861',
+        'com.android.tools.analytics-library:protos:26.1.3:protos-26.1.3.jar:818c9f256f141d9dafec03a1aa2b94d240b2c140acfd7ee31a8b3e6c2b9479e3',
+        'com.android.tools.analytics-library:shared:26.1.3:shared-26.1.3.jar:7110706c7ada96c8b6f5ca80c478291bc7899d46277de2c48527e045442401a3',
+        'com.android.tools.analytics-library:tracker:26.1.3:tracker-26.1.3.jar:4155424bf2ce4872da83332579a1707252bc66cbd77c5144fdc4483d0f2e1418',
+        'com.android.tools.build:apksig:3.1.3:apksig-3.1.3.jar:7e1f8e675a6e768e5b56405e41d6c3cc05befe62e601b04177de1029902c9c89',
+        'com.android.tools.build:builder-model:3.1.3:builder-model-3.1.3.jar:06ad1c422d679fc698451479cb40ba863849d67bfd1de23f6d2c16d78b024b0b',
+        'com.android.tools.build:builder-test-api:3.1.3:builder-test-api-3.1.3.jar:4d989f780436794f0f8b2f50e9e079b786571eac90f26c208ab2ae6d4012f389',
+        'com.android.tools.build:builder:3.1.3:builder-3.1.3.jar:8a1092012c89d0ec1ee2eff09c5708c71ef4482a6862df8d3a44a67fccace01c',
+        'com.android.tools.build:gradle-api:3.1.3:gradle-api-3.1.3.jar:01e4df521456aef66514336f1d492346730dd1fb8f6433a89f62da834941ed72',
+        'com.android.tools.build:manifest-merger:26.1.3:manifest-merger-26.1.3.jar:1e4fc7e932adb4607082409800e5e6fccb42e6c5360ae5990094bf522f3ada55',
+        'com.android.tools.ddms:ddmlib:26.1.3:ddmlib-26.1.3.jar:c54931cd68df5d1ea2923b3b320eae47cd2307a5a916bb8674c0acf93cd1d3cd',
+        'com.android.tools.external.com-intellij:intellij-core:26.1.3:intellij-core-26.1.3.jar:af67f5535fef2e1a28b1007a4acb8c5deb6a1e33b8afe7b11d012c9e778ebcec',
+        'com.android.tools.external.com-intellij:kotlin-compiler:26.1.3:kotlin-compiler-26.1.3.jar:c746d2859dc11cc05c84b692b3498d3a621e0929511f8440ee009c6557838fd4',
+        'com.android.tools.external.org-jetbrains:uast:26.1.3:uast-26.1.3.jar:3f3f6651d0c7685a77ecb22e9c82d6b49fdf24322c17360768dc530678f43265',
+        'com.android.tools.layoutlib:layoutlib-api:26.1.3:layoutlib-api-26.1.3.jar:10bc73ce706c45629872d6a999dbe12116df64e24f47ff93b7b13121ff57b4b0',
+        'com.android.tools.lint:lint-api:26.1.3:lint-api-26.1.3.jar:6f97323f9af8deda86278717885b5c927f3766757db89709f52d11d42b6fb751',
+        'com.android.tools.lint:lint-checks:26.1.3:lint-checks-26.1.3.jar:73c3d53784c9ce3e6d5968506581918e0179645d20809927ca4a001dd766b001',
+        'com.android.tools.lint:lint-gradle-api:26.1.3:lint-gradle-api-26.1.3.jar:7ca3c4866ec21dc21d53a9d86f752b77ace6f6c610a0c9dc877313856c733d9d',
+        'com.android.tools.lint:lint-gradle:26.1.3:lint-gradle-26.1.3.jar:db0c354b8f4b6f6637e31f91c564785a59ff896325331fcbc3de7458e0b6c067',
+        'com.android.tools.lint:lint-kotlin:26.1.3:lint-kotlin-26.1.3.jar:94e2b0f4565a241561cfb8fc1222bb3f132a3b98d2a90421dbb72ee8358e7d68',
+        'com.android.tools.lint:lint:26.1.3:lint-26.1.3.jar:8d5f32c989c6d191d712e90ad3ca2d1c409313599551d04d834caa44d26c78df',
+        'com.android.tools:annotations:26.1.3:annotations-26.1.3.jar:c950430b24ac5d58fc97e7283b8f0115f99587e76e08b4e1e2aaa780f2d77323',
+        'com.android.tools:common:26.1.3:common-26.1.3.jar:7c31a90581a148ab219f615a59667f0dded7fa39b248529784474da3c2274ef2',
+        'com.android.tools:dvlib:26.1.3:dvlib-26.1.3.jar:0cae87906f53d3f1088366a916ed180a7312b6d9919b90797f238875c8492855',
+        'com.android.tools:repository:26.1.3:repository-26.1.3.jar:52d4539cc68db91b261e2a33b2c8206b26e05539078758dc28cfb3854adb4f59',
+        'com.android.tools:sdk-common:26.1.3:sdk-common-26.1.3.jar:1948603ca9ff22c7ebb3178000bffa3a9dd2ca1cc5cb0c793cae08468b8fcfc1',
+        'com.android.tools:sdklib:26.1.3:sdklib-26.1.3.jar:4adcfaad9514607098d2c51503c39811112d3050f4d1e744c01c7f08f591032b',
+        'com.google.code.findbugs:jsr305:1.3.9:jsr305-1.3.9.jar:905721a0eea90a81534abb7ee6ef4ea2e5e645fa1def0a5cd88402df1b46c9ed',
+        'com.google.code.gson:gson:2.7:gson-2.7.jar:2d43eb5ea9e133d2ee2405cc14f5ee08951b8361302fdd93494a3a997b508d32',
+        'com.google.dagger:dagger-compiler:2.0.2:dagger-compiler-2.0.2.jar:b74bc9de063dd4c6400b232231f2ef5056145b8fbecbf5382012007dd1c071b3',
+        'com.google.dagger:dagger-producers:2.0-beta:dagger-producers-2.0-beta.jar:99ec15e8a0507ba569e7655bc1165ee5e5ca5aa914b3c8f7e2c2458f724edd6b',
+        'com.google.dagger:dagger:2.0.2:dagger-2.0.2.jar:84c0282ed8be73a29e0475d639da030b55dee72369e58dd35ae7d4fe6243dcf9',
+        'com.google.errorprone:error_prone_annotations:2.0.18:error_prone_annotations-2.0.18.jar:cb4cfad870bf563a07199f3ebea5763f0dec440fcda0b318640b1feaa788656b',
+        'com.google.guava:guava:18.0:guava-18.0.jar:d664fbfc03d2e5ce9cab2a44fb01f1d0bf9dfebeccc1a473b1f9ea31f79f6f99',
+        'com.google.guava:guava:22.0:guava-22.0.jar:1158e94c7de4da480873f0b4ab4a1da14c0d23d4b1902cc94a58a6f0f9ab579e',
+        'com.google.j2objc:j2objc-annotations:1.1:j2objc-annotations-1.1.jar:40ceb7157feb263949e0f503fe5f71689333a621021aa20ce0d0acee3badaa0f',
+        'com.google.jimfs:jimfs:1.1:jimfs-1.1.jar:c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd',
+        'com.google.protobuf:protobuf-java:3.4.0:protobuf-java-3.4.0.jar:dce7e66b32456a1b1198da0caff3a8acb71548658391e798c79369241e6490a4',
+        'com.googlecode.json-simple:json-simple:1.1:json-simple-1.1.jar:2d9484f4c649f708f47f9a479465fc729770ee65617dca3011836602264f6439',
+        'com.squareup:javawriter:2.5.0:javawriter-2.5.0.jar:fcfb09fb0ea0aa97d3cfe7ea792398081348e468f126b3603cb3803f240197f0',
+        'com.sun.activation:javax.activation:1.2.0:javax.activation-1.2.0.jar:993302b16cd7056f21e779cc577d175a810bb4900ef73cd8fbf2b50f928ba9ce',
+        'com.sun.istack:istack-commons-runtime:2.21:istack-commons-runtime-2.21.jar:c33e67a0807095f02a0e2da139412dd7c4f9cc1a4c054b3e434f96831ba950f4',
+        'com.sun.xml.fastinfoset:FastInfoset:1.2.13:FastInfoset-1.2.13.jar:27a77db909f3c2833c0b1a37c55af1db06045118ad2eed96ce567b6632bce038',
+        'commons-codec:commons-codec:1.6:commons-codec-1.6.jar:54b34e941b8e1414bd3e40d736efd3481772dc26db3296f6aa45cec9f6203d86',
+        'commons-logging:commons-logging:1.1.1:commons-logging-1.1.1.jar:ce6f913cad1f0db3aad70186d65c5bc7ffcc9a99e3fe8e0b137312819f7c362f',
+        'it.unimi.dsi:fastutil:7.2.0:fastutil-7.2.0.jar:74fa208043740642f7e6eb09faba15965218ad2f50ce3020efb100136e4b591c',
+        'javax.annotation:jsr250-api:1.0:jsr250-api-1.0.jar:a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f',
+        'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
+        'javax.xml.bind:jaxb-api:2.2.12-b140109.1041:jaxb-api-2.2.12-b140109.1041.jar:b5e60cd8b7b5ff01ce4a74c5dd008f4fbd14ced3495d0b47b85cfedc182211f2',
+        'junit:junit:4.12:junit-4.12.jar:59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a',
+        'net.sf.jopt-simple:jopt-simple:4.9:jopt-simple-4.9.jar:26c5856e954b5f864db76f13b86919b59c6eecf9fd930b96baa8884626baf2f5',
+        'net.sf.kxml:kxml2:2.3.0:kxml2-2.3.0.jar:f264dd9f79a1fde10ce5ecc53221eff24be4c9331c830b7d52f2f08a7b633de2',
+        'org.apache.ant:ant-launcher:1.9.4:ant-launcher-1.9.4.jar:7bccea20b41801ca17bcbc909a78c835d0f443f12d639c77bd6ae3d05861608d',
+        'org.apache.ant:ant:1.9.4:ant-1.9.4.jar:649ae0730251de07b8913f49286d46bba7b92d47c5f332610aa426c4f02161d8',
+        'org.apache.commons:commons-compress:1.12:commons-compress-1.12.jar:2c1542faf343185b7cab9c3d55c8ae5471d6d095d3887a4adefdbdf2984dc0b6',
+        'org.apache.httpcomponents:httpclient:4.2.6:httpclient-4.2.6.jar:362e9324ee7c697e21279e20077b52737ddef3f1b2c1a7abe5ad34b465145550',
+        'org.apache.httpcomponents:httpcore:4.2.5:httpcore-4.2.5.jar:e5e82da4cc66c8d917bbf743e3c0752efe8522735e7fc9dbddb65bccea81cfe9',
+        'org.apache.httpcomponents:httpmime:4.1:httpmime-4.1.jar:31629566148e8a47688ae43b420abc3ecd783ed15b33bebc00824bf24c9b15aa',
+        'org.beanshell:bsh:1.3.0:bsh-1.3.0.jar:9b04edc75d19db54f1b4e8b5355e9364384c6cf71eb0a1b9724c159d779879f8',
+        'org.bouncycastle:bcpkix-jdk15on:1.56:bcpkix-jdk15on-1.56.jar:7043dee4e9e7175e93e0b36f45b1ec1ecb893c5f755667e8b916eb8dd201c6ca',
+        'org.bouncycastle:bcprov-jdk15on:1.56:bcprov-jdk15on-1.56.jar:963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349',
+        'org.briarproject:tor-android:0.2.9.16:tor-android-0.2.9.16.zip:515e33dda6a30853c885a2de2c79ae1ab9ad8b6db44f5db8890333ec2e24f4ae',
+        'org.codehaus.groovy:groovy-all:2.4.12:groovy-all-2.4.12.jar:6a56af4bd48903d56bec62821876cadefafd007360cc6bd0d8f7aa8d72b38be4',
+        'org.codehaus.mojo:animal-sniffer-annotations:1.14:animal-sniffer-annotations-1.14.jar:2068320bd6bad744c3673ab048f67e30bef8f518996fa380033556600669905d',
+        'org.glassfish.jaxb:jaxb-core:2.2.11:jaxb-core-2.2.11.jar:37bcaee8ebb04362c8352a5bf6221b86967ecdab5164c696b10b9a2bb587b2aa',
+        'org.glassfish.jaxb:jaxb-runtime:2.2.11:jaxb-runtime-2.2.11.jar:a874f2351cfba8e2946be3002d10c18a6da8f21b52ba2acf52f2b85d5520ed70',
+        'org.glassfish.jaxb:txw2:2.2.11:txw2-2.2.11.jar:272a3ccad45a4511351920cd2a8633c53cab8d5220c7a92954da5526bb5eafea',
+        'org.hamcrest:hamcrest-core:1.3:hamcrest-core-1.3.jar:66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9',
+        'org.hamcrest:hamcrest-library:1.3:hamcrest-library-1.3.jar:711d64522f9ec410983bd310934296da134be4254a125080a0416ec178dfad1c',
+        'org.jetbrains.kotlin:kotlin-reflect:1.2.0:kotlin-reflect-1.2.0.jar:4f48a872bad6e4d9c053f4ad610d11e4012ad7e58dc19a03dd5eb811f36069dd',
+        'org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.0:kotlin-stdlib-jre7-1.2.0.jar:c7a20fb951d437797afe8980aff6c1e5a03f310c661ba58ba1d4fa90cb0f2926',
+        'org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.0:kotlin-stdlib-jre8-1.2.0.jar:633524eee6ef1941f7cb1dab7ee3927b0a221ceee9047aeb5515f4cbb990c82a',
+        'org.jetbrains.kotlin:kotlin-stdlib:1.2.0:kotlin-stdlib-1.2.0.jar:05cfd9f5ac0b41910703a8925f7211a495909b27a2ffdd1c5106f1689aeafcd4',
+        'org.jetbrains.trove4j:trove4j:20160824:trove4j-20160824.jar:1917871c8deb468307a584680c87a44572f5a8b0b98c6d397fc0f5f86596dbe7',
+        'org.jetbrains:annotations:13.0:annotations-13.0.jar:ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478',
+        'org.jmock:jmock-junit4:2.8.2:jmock-junit4-2.8.2.jar:f7ee4df4f7bd7b7f1cafad3b99eb74d579f109d5992ff625347352edb55e674c',
+        'org.jmock:jmock-legacy:2.8.2:jmock-legacy-2.8.2.jar:f2b985a5c08a9edb7f37612330c058809da3f6a6d63ce792426ebf8ff0d6d31b',
+        'org.jmock:jmock-testjar:2.8.2:jmock-testjar-2.8.2.jar:8900860f72c474e027cf97fe78dcbf154a1aa7fc62b6845c5fb4e4f3c7bc8760',
+        'org.jmock:jmock:2.8.2:jmock-2.8.2.jar:6c73cb4a2e6dbfb61fd99c9a768539c170ab6568e57846bd60dbf19596b65b16',
+        'org.jvnet.staxex:stax-ex:1.7.7:stax-ex-1.7.7.jar:a31ff7d77163c0deb09e7fee59ad35ae44c2cee2cc8552a116ccd1583d813fb4',
+        'org.objenesis:objenesis:2.1:objenesis-2.1.jar:c74330cc6b806c804fd37e74487b4fe5d7c2750c5e15fbc6efa13bdee1bdef80',
+        'org.ow2.asm:asm-analysis:5.1:asm-analysis-5.1.jar:a34658f5c5de4b573eef21131cc32cc25f7b66407944f312b28ec2e56abb1fa9',
+        'org.ow2.asm:asm-commons:5.1:asm-commons-5.1.jar:97b3786e1f55e74bddf8ad102bf50e33bbcbc1f6b7fd7b36f0bbbb25cd4981be',
+        'org.ow2.asm:asm-tree:5.1:asm-tree-5.1.jar:c0de2bbc4cb8297419659813ecd4ed1d077ed1dd5c1f5544cc5143e493e84c10',
+        'org.ow2.asm:asm-util:5.1:asm-util-5.1.jar:ee032c39ae5e3cd099148fbba9a2124f9ed613e5cb93e03ee0fa8808ce364040',
+        'org.ow2.asm:asm:5.0.4:asm-5.0.4.jar:896618ed8ae62702521a78bc7be42b7c491a08e6920a15f89a3ecdec31e9a220',
+        'org.ow2.asm:asm:5.1:asm-5.1.jar:d2da399a9967c69f0a21739256fa79d284222c223082cacadc17372244764b54',
+    ]
+}

bramble-api/build.gradle

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

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

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

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

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

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

@@ -151,13 +151,13 @@ public interface DatabaseComponent {
 			throws DbException;
 
 	/**
-	 * Returns a batch of raw messages for the given contact, with a total
-	 * length less than or equal to the given length, for transmission over a
+	 * Returns a batch of messages for the given contact, with a total length
+	 * less than or equal to the given length, for transmission over a
 	 * transport with the given maximum latency. Returns null if there are no
 	 * sendable messages that fit in the given length.
 	 */
 	@Nullable
-	Collection<byte[]> generateBatch(Transaction txn, ContactId c,
+	Collection<Message> generateBatch(Transaction txn, ContactId c,
 			int maxLength, int maxLatency) throws DbException;
 
 	/**
@@ -178,14 +178,14 @@ public interface DatabaseComponent {
 			throws DbException;
 
 	/**
-	 * Returns a batch of raw messages for the given contact, with a total
-	 * length less than or equal to the given length, for transmission over a
+	 * Returns a batch of messages for the given contact, with a total length
+	 * less than or equal to the given length, for transmission over a
 	 * transport with the given maximum latency. Only messages that have been
 	 * requested by the contact are returned. Returns null if there are no
 	 * sendable messages that fit in the given length.
 	 */
 	@Nullable
-	Collection<byte[]> generateRequestedBatch(Transaction txn, ContactId c,
+	Collection<Message> generateRequestedBatch(Transaction txn, ContactId c,
 			int maxLength, int maxLatency) throws DbException;
 
 	/**
@@ -263,6 +263,15 @@ public interface DatabaseComponent {
 	 */
 	Collection<LocalAuthor> getLocalAuthors(Transaction txn) throws DbException;
 
+	/**
+	 * Returns the message with the given ID.
+	 * <p/>
+	 * Read-only.
+	 *
+	 * @throws MessageDeletedException if the message has been deleted
+	 */
+	Message getMessage(Transaction txn, MessageId m) throws DbException;
+
 	/**
 	 * Returns the IDs of all delivered messages in the given group.
 	 * <p/>
@@ -297,15 +306,6 @@ public interface DatabaseComponent {
 	Collection<MessageId> getMessagesToShare(Transaction txn)
 			throws DbException;
 
-	/**
-	 * Returns the message with the given ID, in serialised form, or null if
-	 * the message has been deleted.
-	 * <p/>
-	 * Read-only.
-	 */
-	@Nullable
-	byte[] getRawMessage(Transaction txn, MessageId m) throws DbException;
-
 	/**
 	 * Returns the metadata for all delivered messages in the given group.
 	 * <p/>

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

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

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

@@ -7,16 +7,6 @@ public interface KeyAgreementConstants {
 	 */
 	byte PROTOCOL_VERSION = 4;
 
-	/**
-	 * The length of the record header in bytes.
-	 */
-	int RECORD_HEADER_LENGTH = 4;
-
-	/**
-	 * The offset of the payload length in the record header, in bytes.
-	 */
-	int RECORD_HEADER_PAYLOAD_LENGTH_OFFSET = 2;
-
 	/**
 	 * The length of the BQP key commitment in bytes.
 	 */

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

@@ -12,12 +12,13 @@ public interface TorConstants {
 	int CONNECT_TO_PROXY_TIMEOUT = 5000; // Milliseconds
 	int EXTRA_SOCKET_TIMEOUT = 30000; // Milliseconds
 
-	String PREF_TOR_NETWORK = "network";
+	String PREF_TOR_NETWORK = "network2";
 	String PREF_TOR_PORT = "port";
-	String PREF_TOR_DISABLE_BLOCKED = "disableWhenBlocked";
+	String PREF_TOR_MOBILE = "useMobileData";
 
-	int PREF_TOR_NETWORK_NEVER = 0;
-	int PREF_TOR_NETWORK_WIFI = 1;
-	int PREF_TOR_NETWORK_ALWAYS = 2;
+	int PREF_TOR_NETWORK_AUTOMATIC = 0;
+	int PREF_TOR_NETWORK_WITHOUT_BRIDGES = 1;
+	int PREF_TOR_NETWORK_WITH_BRIDGES = 2;
+	int PREF_TOR_NETWORK_NEVER = 3;
 
 }

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

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

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

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

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

@@ -1,6 +1,6 @@
 package org.briarproject.bramble.api.sync;
 
-import static org.briarproject.bramble.api.sync.SyncConstants.MAX_MESSAGE_LENGTH;
+import static org.briarproject.bramble.api.sync.SyncConstants.MAX_MESSAGE_BODY_LENGTH;
 import static org.briarproject.bramble.api.sync.SyncConstants.MESSAGE_HEADER_LENGTH;
 
 public class Message {
@@ -13,17 +13,15 @@ public class Message {
 	private final MessageId id;
 	private final GroupId groupId;
 	private final long timestamp;
-	private final byte[] raw;
+	private final byte[] body;
 
-	public Message(MessageId id, GroupId groupId, long timestamp, byte[] raw) {
-		if (raw.length <= MESSAGE_HEADER_LENGTH)
-			throw new IllegalArgumentException();
-		if (raw.length > MAX_MESSAGE_LENGTH)
+	public Message(MessageId id, GroupId groupId, long timestamp, byte[] body) {
+		if (body.length > MAX_MESSAGE_BODY_LENGTH)
 			throw new IllegalArgumentException();
 		this.id = id;
 		this.groupId = groupId;
 		this.timestamp = timestamp;
-		this.raw = raw;
+		this.body = body;
 	}
 
 	/**
@@ -50,15 +48,15 @@ public class Message {
 	/**
 	 * Returns the length of the raw message in bytes.
 	 */
-	public int getLength() {
-		return raw.length;
+	public int getRawLength() {
+		return MESSAGE_HEADER_LENGTH + body.length;
 	}
 
 	/**
-	 * Returns the raw message.
+	 * Returns the message body.
 	 */
-	public byte[] getRaw() {
-		return raw;
+	public byte[] getBody() {
+		return body;
 	}
 
 	@Override

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

@@ -9,5 +9,5 @@ public interface MessageFactory {
 
 	Message createMessage(byte[] raw);
 
-	Message createMessage(MessageId m, byte[] raw);
+	byte[] getRawMessage(Message m);
 }

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

@@ -9,7 +9,7 @@ public interface SyncRecordWriter {
 
 	void writeAck(Ack a) throws IOException;
 
-	void writeMessage(byte[] raw) throws IOException;
+	void writeMessage(Message m) throws IOException;
 
 	void writeOffer(Offer o) throws IOException;
 

bramble-api/src/main/java/org/briarproject/bramble/api/system/ResourceProvider.java

@@ -0,0 +1,11 @@
+package org.briarproject.bramble.api.system;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+import java.io.InputStream;
+
+@NotNullByDefault
+public interface ResourceProvider {
+
+	InputStream getResourceInputStream(String name, String extension);
+}

bramble-api/src/test/java/org/briarproject/bramble/test/ArrayClock.java

@@ -0,0 +1,23 @@
+package org.briarproject.bramble.test;
+
+import org.briarproject.bramble.api.system.Clock;
+
+public class ArrayClock implements Clock {
+
+	private final long[] times;
+	private int index = 0;
+
+	public ArrayClock(long... times) {
+		this.times = times;
+	}
+
+	@Override
+	public long currentTimeMillis() {
+		return times[index++];
+	}
+
+	@Override
+	public void sleep(long milliseconds) throws InterruptedException {
+		Thread.sleep(milliseconds);
+	}
+}

bramble-api/src/test/java/org/briarproject/bramble/test/TestUtils.java

@@ -24,6 +24,7 @@ import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import static java.util.Arrays.asList;
 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;
@@ -32,7 +33,6 @@ import static org.briarproject.bramble.api.properties.TransportPropertyConstants
 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;
 import static org.briarproject.bramble.util.StringUtils.getRandomString;
 
 public class TestUtils {
@@ -40,6 +40,7 @@ public class TestUtils {
 	private static final AtomicInteger nextTestDir =
 			new AtomicInteger((int) (Math.random() * 1000 * 1000));
 	private static final Random random = new Random();
+	private static final long timestamp = System.currentTimeMillis();
 
 	public static File getTestDirectory() {
 		int name = nextTestDir.getAndIncrement();
@@ -101,9 +102,8 @@ public class TestUtils {
 		String name = getRandomString(nameLength);
 		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,
-				created);
+				timestamp);
 	}
 
 	public static Author getAuthor() {
@@ -131,14 +131,13 @@ public class TestUtils {
 
 	public static Message getMessage(GroupId groupId) {
 		int bodyLength = 1 + random.nextInt(MAX_MESSAGE_BODY_LENGTH);
-		return getMessage(groupId, MESSAGE_HEADER_LENGTH + bodyLength);
+		return getMessage(groupId, bodyLength);
 	}
 
-	public static Message getMessage(GroupId groupId, int rawLength) {
+	public static Message getMessage(GroupId groupId, int bodyLength) {
 		MessageId id = new MessageId(getRandomId());
-		byte[] raw = getRandomBytes(rawLength);
-		long timestamp = System.currentTimeMillis();
-		return new Message(id, groupId, timestamp, raw);
+		byte[] body = getRandomBytes(bodyLength);
+		return new Message(id, groupId, timestamp, body);
 	}
 
 	public static double getMedian(Collection<? extends Number> samples) {
@@ -174,4 +173,10 @@ public class TestUtils {
 			Collection<? extends Number> samples) {
 		return Math.sqrt(getVariance(samples));
 	}
+
+	public static boolean isOptionalTestEnabled(Class testClass) {
+		String optionalTests = System.getenv("OPTIONAL_TESTS");
+		return optionalTests != null &&
+				asList(optionalTests.split(",")).contains(testClass.getName());
+	}
 }

bramble-api/witness.gradle

@@ -0,0 +1,24 @@
+dependencyVerification {
+    verify = [
+        'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861',
+        'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7',
+        'com.google.dagger:dagger:2.0.2:dagger-2.0.2.jar:84c0282ed8be73a29e0475d639da030b55dee72369e58dd35ae7d4fe6243dcf9',
+        'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
+        'junit:junit:4.12:junit-4.12.jar:59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a',
+        'org.apache.ant:ant-launcher:1.9.4:ant-launcher-1.9.4.jar:7bccea20b41801ca17bcbc909a78c835d0f443f12d639c77bd6ae3d05861608d',
+        'org.apache.ant:ant:1.9.4:ant-1.9.4.jar:649ae0730251de07b8913f49286d46bba7b92d47c5f332610aa426c4f02161d8',
+        'org.beanshell:bsh:1.3.0:bsh-1.3.0.jar:9b04edc75d19db54f1b4e8b5355e9364384c6cf71eb0a1b9724c159d779879f8',
+        'org.codehaus.mojo.signature:java16:1.1:java16-1.1.signature:53799223a2c98dba2d0add810bed76315460df285c69e4f397ae6098f87dd619',
+        'org.codehaus.mojo:animal-sniffer-ant-tasks:1.16:animal-sniffer-ant-tasks-1.16.jar:890040976fbe2d584619a6a61b1fd2e925b3b5eb342a85eb2762c467c0d64e90',
+        'org.codehaus.mojo:animal-sniffer:1.16:animal-sniffer-1.16.jar:72be8bcc226ba43b937c722a08a07852bfa1b11400089265d5df0ee7b38b1d52',
+        'org.hamcrest:hamcrest-core:1.3:hamcrest-core-1.3.jar:66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9',
+        'org.hamcrest:hamcrest-library:1.3:hamcrest-library-1.3.jar:711d64522f9ec410983bd310934296da134be4254a125080a0416ec178dfad1c',
+        'org.jmock:jmock-junit4:2.8.2:jmock-junit4-2.8.2.jar:f7ee4df4f7bd7b7f1cafad3b99eb74d579f109d5992ff625347352edb55e674c',
+        'org.jmock:jmock-legacy:2.8.2:jmock-legacy-2.8.2.jar:f2b985a5c08a9edb7f37612330c058809da3f6a6d63ce792426ebf8ff0d6d31b',
+        'org.jmock:jmock-testjar:2.8.2:jmock-testjar-2.8.2.jar:8900860f72c474e027cf97fe78dcbf154a1aa7fc62b6845c5fb4e4f3c7bc8760',
+        'org.jmock:jmock:2.8.2:jmock-2.8.2.jar:6c73cb4a2e6dbfb61fd99c9a768539c170ab6568e57846bd60dbf19596b65b16',
+        'org.objenesis:objenesis:2.1:objenesis-2.1.jar:c74330cc6b806c804fd37e74487b4fe5d7c2750c5e15fbc6efa13bdee1bdef80',
+        'org.ow2.asm:asm-all:5.2:asm-all-5.2.jar:7fbffbc1db3422e2101689fd88df8384b15817b52b9b2b267b9f6d2511dc198d',
+        'org.ow2.asm:asm:5.0.4:asm-5.0.4.jar:896618ed8ae62702521a78bc7be42b7c491a08e6920a15f89a3ecdec31e9a220',
+    ]
+}

bramble-core/build.gradle

@@ -6,6 +6,7 @@ apply plugin: 'ru.vyarus.animalsniffer'
 apply plugin: 'net.ltgt.apt'
 apply plugin: 'idea'
 apply plugin: 'witness'
+apply from: 'witness.gradle'
 
 dependencies {
 	implementation project(path: ':bramble-api', configuration: 'default')
@@ -14,6 +15,7 @@ dependencies {
 	implementation 'org.bitlet:weupnp:0.1.4'
 	implementation 'net.i2p.crypto:eddsa:0.2.0'
 	implementation 'org.whispersystems:curve25519-java:0.4.1'
+	implementation 'org.briarproject:jtorctl:0.3'
 
 	apt 'com.google.dagger:dagger-compiler:2.0.2'
 
@@ -31,40 +33,7 @@ dependencies {
 	signature 'org.codehaus.mojo.signature:java16:1.1@signature'
 }
 
-dependencyVerification {
-	verify = [
-			'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861',
-			'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.guava:guava:18.0:guava-18.0.jar:d664fbfc03d2e5ce9cab2a44fb01f1d0bf9dfebeccc1a473b1f9ea31f79f6f99',
-			'com.h2database:h2:1.4.192:h2-1.4.192.jar:225b22e9857235c46c93861410b60b8c81c10dc8985f4faf188985ba5445126c',
-			'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.codehaus.mojo.signature:java16:1.1:java16-1.1.signature:53799223a2c98dba2d0add810bed76315460df285c69e4f397ae6098f87dd619',
-			'org.codehaus.mojo:animal-sniffer-ant-tasks:1.16:animal-sniffer-ant-tasks-1.16.jar:890040976fbe2d584619a6a61b1fd2e925b3b5eb342a85eb2762c467c0d64e90',
-			'org.codehaus.mojo:animal-sniffer:1.16:animal-sniffer-1.16.jar:72be8bcc226ba43b937c722a08a07852bfa1b11400089265d5df0ee7b38b1d52',
-			'org.hamcrest:hamcrest-core:1.3:hamcrest-core-1.3.jar:66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9',
-			'org.hamcrest:hamcrest-library:1.3:hamcrest-library-1.3.jar:711d64522f9ec410983bd310934296da134be4254a125080a0416ec178dfad1c',
-			'org.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-all:5.2:asm-all-5.2.jar:7fbffbc1db3422e2101689fd88df8384b15817b52b9b2b267b9f6d2511dc198d',
-			'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',
-	]
-}
-
-// needed to make test output available to bramble-j2se
+// needed to make test output available to bramble-java
 configurations {
 	testOutput.extendsFrom(testCompile)
 }

bramble-core/src/main/java/org/briarproject/bramble/account/AccountManagerImpl.java

@@ -159,6 +159,8 @@ class AccountManagerImpl implements AccountManager {
 	@Override
 	public boolean createAccount(String name, String password) {
 		synchronized (stateChangeLock) {
+			if (hasDatabaseKey())
+				throw new AssertionError("Already have a database key");
 			LocalAuthor localAuthor = identityManager.createLocalAuthor(name);
 			identityManager.registerLocalAuthor(localAuthor);
 			SecretKey key = crypto.generateSecretKey();
@@ -181,6 +183,7 @@ class AccountManagerImpl implements AccountManager {
 			LOG.info("Deleting account");
 			IoUtils.deleteFileOrDir(databaseConfig.getDatabaseKeyDirectory());
 			IoUtils.deleteFileOrDir(databaseConfig.getDatabaseDirectory());
+			databaseKey = null;
 		}
 	}
 

bramble-core/src/main/java/org/briarproject/bramble/client/ClientHelperImpl.java

@@ -41,7 +41,6 @@ import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_N
 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;
 
@@ -127,9 +126,7 @@ class ClientHelperImpl implements ClientHelper {
 
 	@Override
 	public Message getMessage(Transaction txn, MessageId m) throws DbException {
-		byte[] raw = db.getRawMessage(txn, m);
-		if (raw == null) return null;
-		return messageFactory.createMessage(m, raw);
+		return db.getMessage(txn, m);
 	}
 
 	@Override
@@ -149,10 +146,7 @@ class ClientHelperImpl implements ClientHelper {
 	@Override
 	public BdfList getMessageAsList(Transaction txn, MessageId m)
 			throws DbException, FormatException {
-		byte[] raw = db.getRawMessage(txn, m);
-		if (raw == null) return null;
-		return toList(raw, MESSAGE_HEADER_LENGTH,
-				raw.length - MESSAGE_HEADER_LENGTH);
+		return toList(db.getMessage(txn, m).getBody());
 	}
 
 	@Override
@@ -364,9 +358,7 @@ class ClientHelperImpl implements ClientHelper {
 
 	@Override
 	public BdfList toList(Message m) throws FormatException {
-		byte[] raw = m.getRaw();
-		return toList(raw, MESSAGE_HEADER_LENGTH,
-				raw.length - MESSAGE_HEADER_LENGTH);
+		return toList(m.getBody());
 	}
 
 	@Override

bramble-core/src/main/java/org/briarproject/bramble/db/Database.java

@@ -6,6 +6,7 @@ import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.db.DataTooNewException;
 import org.briarproject.bramble.api.db.DataTooOldException;
 import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.db.MessageDeletedException;
 import org.briarproject.bramble.api.db.Metadata;
 import org.briarproject.bramble.api.db.MigrationListener;
 import org.briarproject.bramble.api.identity.Author;
@@ -297,6 +298,15 @@ interface Database<T> {
 	 */
 	Collection<LocalAuthor> getLocalAuthors(T txn) throws DbException;
 
+	/**
+	 * Returns the message with the given ID.
+	 * <p/>
+	 * Read-only.
+	 *
+	 * @throws MessageDeletedException if the message has been deleted
+	 */
+	Message getMessage(T txn, MessageId m) throws DbException;
+
 	/**
 	 * Returns the IDs and states of all dependencies of the given message.
 	 * For missing dependencies and dependencies in other groups, the state
@@ -411,7 +421,7 @@ interface Database<T> {
 	 * Read-only.
 	 */
 	Collection<MessageId> getMessagesToOffer(T txn, ContactId c,
-			int maxMessages) throws DbException;
+			int maxMessages, int maxLatency) throws DbException;
 
 	/**
 	 * Returns the IDs of some messages that are eligible to be requested from
@@ -428,8 +438,8 @@ interface Database<T> {
 	 * <p/>
 	 * Read-only.
 	 */
-	Collection<MessageId> getMessagesToSend(T txn, ContactId c, int maxLength)
-			throws DbException;
+	Collection<MessageId> getMessagesToSend(T txn, ContactId c, int maxLength,
+			int maxLatency) throws DbException;
 
 	/**
 	 * Returns the IDs of any messages that need to be validated.
@@ -464,15 +474,6 @@ interface Database<T> {
 	 */
 	long getNextSendTime(T txn, ContactId c) throws DbException;
 
-	/**
-	 * Returns the message with the given ID, in serialised form, or null if
-	 * the message has been deleted.
-	 * <p/>
-	 * Read-only.
-	 */
-	@Nullable
-	byte[] getRawMessage(T txn, MessageId m) throws DbException;
-
 	/**
 	 * Returns the IDs of some messages that are eligible to be sent to the
 	 * given contact and have been requested by the contact, up to the given
@@ -481,7 +482,7 @@ interface Database<T> {
 	 * Read-only.
 	 */
 	Collection<MessageId> getRequestedMessagesToSend(T txn, ContactId c,
-			int maxLength) throws DbException;
+			int maxLength, int maxLatency) throws DbException;
 
 	/**
 	 * Returns all settings in the given namespace.
@@ -646,11 +647,11 @@ interface Database<T> {
 			throws DbException;
 
 	/**
-	 * Updates the transmission count and expiry time of the given message
-	 * with respect to the given contact, using the latency of the transport
-	 * over which it was sent.
+	 * Updates the transmission count, expiry time and estimated time of arrival
+	 * of the given message with respect to the given contact, using the latency
+	 * of the transport over which it was sent.
 	 */
-	void updateExpiryTime(T txn, ContactId c, MessageId m, int maxLatency)
+	void updateExpiryTimeAndEta(T txn, ContactId c, MessageId m, int maxLatency)
 			throws DbException;
 
 	/**

bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseComponentImpl.java

@@ -307,17 +307,18 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 
 	@Nullable
 	@Override
-	public Collection<byte[]> generateBatch(Transaction transaction,
+	public Collection<Message> generateBatch(Transaction transaction,
 			ContactId c, int maxLength, int maxLatency) throws DbException {
 		if (transaction.isReadOnly()) throw new IllegalArgumentException();
 		T txn = unbox(transaction);
 		if (!db.containsContact(txn, c))
 			throw new NoSuchContactException();
-		Collection<MessageId> ids = db.getMessagesToSend(txn, c, maxLength);
-		List<byte[]> messages = new ArrayList<>(ids.size());
+		Collection<MessageId> ids =
+				db.getMessagesToSend(txn, c, maxLength, maxLatency);
+		List<Message> messages = new ArrayList<>(ids.size());
 		for (MessageId m : ids) {
-			messages.add(db.getRawMessage(txn, m));
-			db.updateExpiryTime(txn, c, m, maxLatency);
+			messages.add(db.getMessage(txn, m));
+			db.updateExpiryTimeAndEta(txn, c, m, maxLatency);
 		}
 		if (ids.isEmpty()) return null;
 		db.lowerRequestedFlag(txn, c, ids);
@@ -333,9 +334,11 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		T txn = unbox(transaction);
 		if (!db.containsContact(txn, c))
 			throw new NoSuchContactException();
-		Collection<MessageId> ids = db.getMessagesToOffer(txn, c, maxMessages);
+		Collection<MessageId> ids =
+				db.getMessagesToOffer(txn, c, maxMessages, maxLatency);
 		if (ids.isEmpty()) return null;
-		for (MessageId m : ids) db.updateExpiryTime(txn, c, m, maxLatency);
+		for (MessageId m : ids)
+			db.updateExpiryTimeAndEta(txn, c, m, maxLatency);
 		return new Offer(ids);
 	}
 
@@ -356,18 +359,18 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 
 	@Nullable
 	@Override
-	public Collection<byte[]> generateRequestedBatch(Transaction transaction,
+	public Collection<Message> generateRequestedBatch(Transaction transaction,
 			ContactId c, int maxLength, int maxLatency) throws DbException {
 		if (transaction.isReadOnly()) throw new IllegalArgumentException();
 		T txn = unbox(transaction);
 		if (!db.containsContact(txn, c))
 			throw new NoSuchContactException();
-		Collection<MessageId> ids = db.getRequestedMessagesToSend(txn, c,
-				maxLength);
-		List<byte[]> messages = new ArrayList<>(ids.size());
+		Collection<MessageId> ids =
+				db.getRequestedMessagesToSend(txn, c, maxLength, maxLatency);
+		List<Message> messages = new ArrayList<>(ids.size());
 		for (MessageId m : ids) {
-			messages.add(db.getRawMessage(txn, m));
-			db.updateExpiryTime(txn, c, m, maxLatency);
+			messages.add(db.getMessage(txn, m));
+			db.updateExpiryTimeAndEta(txn, c, m, maxLatency);
 		}
 		if (ids.isEmpty()) return null;
 		db.lowerRequestedFlag(txn, c, ids);
@@ -457,6 +460,15 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		return db.getLocalAuthors(txn);
 	}
 
+	@Override
+	public Message getMessage(Transaction transaction, MessageId m)
+			throws DbException {
+		T txn = unbox(transaction);
+		if (!db.containsMessage(txn, m))
+			throw new NoSuchMessageException();
+		return db.getMessage(txn, m);
+	}
+
 	@Override
 	public Collection<MessageId> getMessageIds(Transaction transaction,
 			GroupId g) throws DbException {
@@ -487,16 +499,6 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		return db.getMessagesToShare(txn);
 	}
 
-	@Nullable
-	@Override
-	public byte[] getRawMessage(Transaction transaction, MessageId m)
-			throws DbException {
-		T txn = unbox(transaction);
-		if (!db.containsMessage(txn, m))
-			throw new NoSuchMessageException();
-		return db.getRawMessage(txn, m);
-	}
-
 	@Override
 	public Map<MessageId, Metadata> getMessageMetadata(Transaction transaction,
 			GroupId g) throws DbException {
@@ -656,7 +658,7 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		merged.putAll(s);
 		if (!merged.equals(old)) {
 			db.mergeSettings(txn, s, namespace);
-			transaction.attach(new SettingsUpdatedEvent(namespace));
+			transaction.attach(new SettingsUpdatedEvent(namespace, merged));
 		}
 	}
 
@@ -856,7 +858,8 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		if (!db.containsMessage(txn, m))
 			throw new NoSuchMessageException();
 		if (db.getMessageState(txn, m) != DELIVERED)
-			throw new IllegalArgumentException("Shared undelivered message");
+			throw new IllegalArgumentException(
+					"Shared undelivered message");
 		db.setMessageShared(txn, m);
 		transaction.attach(new MessageSharedEvent(m));
 	}
@@ -882,7 +885,8 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 			throw new NoSuchMessageException();
 		State dependentState = db.getMessageState(txn, dependent.getId());
 		for (MessageId dependency : dependencies) {
-			db.addMessageDependency(txn, dependent, dependency, dependentState);
+			db.addMessageDependency(txn, dependent, dependency,
+					dependentState);
 		}
 	}
 
@@ -914,7 +918,8 @@ class DatabaseComponentImpl<T> implements DatabaseComponent {
 		T txn = unbox(transaction);
 		for (KeySet ks : keys) {
 			TransportId t = ks.getTransportKeys().getTransportId();
-			if (db.containsTransport(txn, t)) db.updateTransportKeys(txn, ks);
+			if (db.containsTransport(txn, t))
+				db.updateTransportKeys(txn, ks);
 		}
 	}
 }

bramble-core/src/main/java/org/briarproject/bramble/db/DatabaseModule.java

@@ -4,6 +4,7 @@ import org.briarproject.bramble.api.db.DatabaseComponent;
 import org.briarproject.bramble.api.db.DatabaseConfig;
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.lifecycle.ShutdownManager;
+import org.briarproject.bramble.api.sync.MessageFactory;
 import org.briarproject.bramble.api.system.Clock;
 
 import java.sql.Connection;
@@ -18,8 +19,9 @@ public class DatabaseModule {
 
 	@Provides
 	@Singleton
-	Database<Connection> provideDatabase(DatabaseConfig config, Clock clock) {
-		return new H2Database(config, clock);
+	Database<Connection> provideDatabase(DatabaseConfig config,
+			MessageFactory messageFactory, Clock clock) {
+		return new H2Database(config, messageFactory, clock);
 	}
 
 	@Provides

bramble-core/src/main/java/org/briarproject/bramble/db/H2Database.java

@@ -5,6 +5,7 @@ import org.briarproject.bramble.api.db.DatabaseConfig;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.MigrationListener;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.sync.MessageFactory;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.util.StringUtils;
 
@@ -36,9 +37,10 @@ class H2Database extends JdbcDatabase {
 	private volatile SecretKey key = null;
 
 	@Inject
-	H2Database(DatabaseConfig config, Clock clock) {
+	H2Database(DatabaseConfig config, MessageFactory messageFactory,
+			Clock clock) {
 		super(HASH_TYPE, SECRET_TYPE, BINARY_TYPE, COUNTER_TYPE, STRING_TYPE,
-				clock);
+				messageFactory, clock);
 		this.config = config;
 		File dir = config.getDatabaseDirectory();
 		String path = new File(dir, "db").getAbsolutePath();

bramble-core/src/main/java/org/briarproject/bramble/db/HyperSqlDatabase.java

@@ -5,6 +5,7 @@ import org.briarproject.bramble.api.db.DatabaseConfig;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.db.MigrationListener;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.sync.MessageFactory;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.util.StringUtils;
 
@@ -37,9 +38,10 @@ class HyperSqlDatabase extends JdbcDatabase {
 	private volatile SecretKey key = null;
 
 	@Inject
-	HyperSqlDatabase(DatabaseConfig config, Clock clock) {
+	HyperSqlDatabase(DatabaseConfig config, MessageFactory messageFactory,
+			Clock clock) {
 		super(HASH_TYPE, SECRET_TYPE, BINARY_TYPE, COUNTER_TYPE, STRING_TYPE,
-				clock);
+				messageFactory, clock);
 		this.config = config;
 		File dir = config.getDatabaseDirectory();
 		String path = new File(dir, "db").getAbsolutePath();

bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java

@@ -7,6 +7,7 @@ import org.briarproject.bramble.api.db.DataTooNewException;
 import org.briarproject.bramble.api.db.DataTooOldException;
 import org.briarproject.bramble.api.db.DbClosedException;
 import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.db.MessageDeletedException;
 import org.briarproject.bramble.api.db.Metadata;
 import org.briarproject.bramble.api.db.MigrationListener;
 import org.briarproject.bramble.api.identity.Author;
@@ -20,6 +21,7 @@ import org.briarproject.bramble.api.sync.Group;
 import org.briarproject.bramble.api.sync.Group.Visibility;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.Message;
+import org.briarproject.bramble.api.sync.MessageFactory;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.bramble.api.sync.MessageStatus;
 import org.briarproject.bramble.api.sync.ValidationManager.State;
@@ -36,6 +38,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -53,13 +56,13 @@ import java.util.logging.Logger;
 import javax.annotation.Nullable;
 
 import static java.sql.Types.INTEGER;
-import static java.util.Collections.singletonList;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.api.db.Metadata.REMOVE;
 import static org.briarproject.bramble.api.sync.Group.Visibility.INVISIBLE;
 import static org.briarproject.bramble.api.sync.Group.Visibility.SHARED;
 import static org.briarproject.bramble.api.sync.Group.Visibility.VISIBLE;
+import static org.briarproject.bramble.api.sync.SyncConstants.MESSAGE_HEADER_LENGTH;
 import static org.briarproject.bramble.api.sync.ValidationManager.State.DELIVERED;
 import static org.briarproject.bramble.api.sync.ValidationManager.State.PENDING;
 import static org.briarproject.bramble.api.sync.ValidationManager.State.UNKNOWN;
@@ -76,7 +79,7 @@ import static org.briarproject.bramble.util.LogUtils.logException;
 abstract class JdbcDatabase implements Database<Connection> {
 
 	// Package access for testing
-	static final int CODE_SCHEMA_VERSION = 39;
+	static final int CODE_SCHEMA_VERSION = 40;
 
 	// Rotation period offsets for incoming transport keys
 	private static final int OFFSET_PREV = -1;
@@ -216,6 +219,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 					+ " requested BOOLEAN NOT NULL,"
 					+ " expiry BIGINT NOT NULL,"
 					+ " txCount INT NOT NULL,"
+					+ " eta BIGINT NOT NULL,"
 					+ " PRIMARY KEY (messageId, contactId),"
 					+ " FOREIGN KEY (messageId)"
 					+ " REFERENCES messages (messageId)"
@@ -304,6 +308,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 	// Different database libraries use different names for certain types
 	private final String hashType, secretType, binaryType;
 	private final String counterType, stringType;
+	private final MessageFactory messageFactory;
 	private final Clock clock;
 
 	// Locking: connectionsLock
@@ -319,12 +324,14 @@ abstract class JdbcDatabase implements Database<Connection> {
 	private final Condition connectionsChanged = connectionsLock.newCondition();
 
 	JdbcDatabase(String hashType, String secretType, String binaryType,
-			String counterType, String stringType, Clock clock) {
+			String counterType, String stringType,
+			MessageFactory messageFactory, Clock clock) {
 		this.hashType = hashType;
 		this.secretType = secretType;
 		this.binaryType = binaryType;
 		this.counterType = counterType;
 		this.stringType = stringType;
+		this.messageFactory = messageFactory;
 		this.clock = clock;
 	}
 
@@ -391,7 +398,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 
 	// Package access for testing
 	List<Migration<Connection>> getMigrations() {
-		return singletonList(new Migration38_39());
+		return Arrays.asList(new Migration38_39(), new Migration39_40());
 	}
 
 	private void storeSchemaVersion(Connection txn, int version)
@@ -726,7 +733,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 			ps.setLong(3, m.getTimestamp());
 			ps.setInt(4, state.getValue());
 			ps.setBoolean(5, messageShared);
-			byte[] raw = m.getRaw();
+			byte[] raw = messageFactory.getRawMessage(m);
 			ps.setInt(6, raw.length);
 			ps.setBytes(7, raw);
 			int affected = ps.executeUpdate();
@@ -740,7 +747,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 				boolean offered = removeOfferedMessage(txn, c, m.getId());
 				boolean seen = offered || (sender != null && c.equals(sender));
 				addStatus(txn, m.getId(), c, m.getGroupId(), m.getTimestamp(),
-						m.getLength(), state, e.getValue(), messageShared,
+						raw.length, state, e.getValue(), messageShared,
 						false, seen);
 			}
 			// Update denormalised column in messageDependencies if dependency
@@ -799,8 +806,9 @@ abstract class JdbcDatabase implements Database<Connection> {
 		try {
 			String sql = "INSERT INTO statuses (messageId, contactId, groupId,"
 					+ " timestamp, length, state, groupShared, messageShared,"
-					+ " deleted, ack, seen, requested, expiry, txCount)"
-					+ " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, FALSE, 0, 0)";
+					+ " deleted, ack, seen, requested, expiry, txCount, eta)"
+					+ " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, FALSE, 0, 0,"
+					+ " 0)";
 			ps = txn.prepareStatement(sql);
 			ps.setBytes(1, m.getBytes());
 			ps.setInt(2, c.getInt());
@@ -1482,6 +1490,35 @@ abstract class JdbcDatabase implements Database<Connection> {
 		}
 	}
 
+	@Override
+	public Message getMessage(Connection txn, MessageId m) throws DbException {
+		PreparedStatement ps = null;
+		ResultSet rs = null;
+		try {
+			String sql = "SELECT groupId, timestamp, raw FROM messages"
+					+ " WHERE messageId = ?";
+			ps = txn.prepareStatement(sql);
+			ps.setBytes(1, m.getBytes());
+			rs = ps.executeQuery();
+			if (!rs.next()) throw new DbStateException();
+			GroupId g = new GroupId(rs.getBytes(1));
+			long timestamp = rs.getLong(2);
+			byte[] raw = rs.getBytes(3);
+			if (rs.next()) throw new DbStateException();
+			rs.close();
+			ps.close();
+			if (raw == null) throw new MessageDeletedException();
+			if (raw.length < MESSAGE_HEADER_LENGTH) throw new AssertionError();
+			byte[] body = new byte[raw.length - MESSAGE_HEADER_LENGTH];
+			System.arraycopy(raw, MESSAGE_HEADER_LENGTH, body, 0, body.length);
+			return new Message(m, g, timestamp, body);
+		} catch (SQLException e) {
+			tryToClose(rs);
+			tryToClose(ps);
+			throw new DbException(e);
+		}
+	}
+
 	@Override
 	public Collection<MessageId> getMessageIds(Connection txn, GroupId g)
 			throws DbException {
@@ -1834,8 +1871,9 @@ abstract class JdbcDatabase implements Database<Connection> {
 
 	@Override
 	public Collection<MessageId> getMessagesToOffer(Connection txn,
-			ContactId c, int maxMessages) throws DbException {
+			ContactId c, int maxMessages, int maxLatency) throws DbException {
 		long now = clock.currentTimeMillis();
+		long eta = now + maxLatency;
 		PreparedStatement ps = null;
 		ResultSet rs = null;
 		try {
@@ -1844,13 +1882,14 @@ abstract class JdbcDatabase implements Database<Connection> {
 					+ " AND groupShared = TRUE AND messageShared = TRUE"
 					+ " AND deleted = FALSE"
 					+ " AND seen = FALSE AND requested = FALSE"
-					+ " AND expiry < ?"
+					+ " AND (expiry <= ? OR eta > ?)"
 					+ " ORDER BY timestamp LIMIT ?";
 			ps = txn.prepareStatement(sql);
 			ps.setInt(1, c.getInt());
 			ps.setInt(2, DELIVERED.getValue());
 			ps.setLong(3, now);
-			ps.setInt(4, maxMessages);
+			ps.setLong(4, eta);
+			ps.setInt(5, maxMessages);
 			rs = ps.executeQuery();
 			List<MessageId> ids = new ArrayList<>();
 			while (rs.next()) ids.add(new MessageId(rs.getBytes(1)));
@@ -1891,8 +1930,9 @@ abstract class JdbcDatabase implements Database<Connection> {
 
 	@Override
 	public Collection<MessageId> getMessagesToSend(Connection txn, ContactId c,
-			int maxLength) throws DbException {
+			int maxLength, int maxLatency) throws DbException {
 		long now = clock.currentTimeMillis();
+		long eta = now + maxLatency;
 		PreparedStatement ps = null;
 		ResultSet rs = null;
 		try {
@@ -1901,12 +1941,13 @@ abstract class JdbcDatabase implements Database<Connection> {
 					+ " AND groupShared = TRUE AND messageShared = TRUE"
 					+ " AND deleted = FALSE"
 					+ " AND seen = FALSE"
-					+ " AND expiry < ?"
+					+ " AND (expiry <= ? OR eta > ?)"
 					+ " ORDER BY timestamp";
 			ps = txn.prepareStatement(sql);
 			ps.setInt(1, c.getInt());
 			ps.setInt(2, DELIVERED.getValue());
 			ps.setLong(3, now);
+			ps.setLong(4, eta);
 			rs = ps.executeQuery();
 			List<MessageId> ids = new ArrayList<>();
 			int total = 0;
@@ -2018,34 +2059,11 @@ abstract class JdbcDatabase implements Database<Connection> {
 		}
 	}
 
-	@Override
-	@Nullable
-	public byte[] getRawMessage(Connection txn, MessageId m)
-			throws DbException {
-		PreparedStatement ps = null;
-		ResultSet rs = null;
-		try {
-			String sql = "SELECT raw FROM messages WHERE messageId = ?";
-			ps = txn.prepareStatement(sql);
-			ps.setBytes(1, m.getBytes());
-			rs = ps.executeQuery();
-			if (!rs.next()) throw new DbStateException();
-			byte[] raw = rs.getBytes(1);
-			if (rs.next()) throw new DbStateException();
-			rs.close();
-			ps.close();
-			return raw;
-		} catch (SQLException e) {
-			tryToClose(rs);
-			tryToClose(ps);
-			throw new DbException(e);
-		}
-	}
-
 	@Override
 	public Collection<MessageId> getRequestedMessagesToSend(Connection txn,
-			ContactId c, int maxLength) throws DbException {
+			ContactId c, int maxLength, int maxLatency) throws DbException {
 		long now = clock.currentTimeMillis();
+		long eta = now + maxLatency;
 		PreparedStatement ps = null;
 		ResultSet rs = null;
 		try {
@@ -2054,12 +2072,13 @@ abstract class JdbcDatabase implements Database<Connection> {
 					+ " AND groupShared = TRUE AND messageShared = TRUE"
 					+ " AND deleted = FALSE"
 					+ " AND seen = FALSE AND requested = TRUE"
-					+ " AND expiry < ?"
+					+ " AND (expiry <= ? OR eta > ?)"
 					+ " ORDER BY timestamp";
 			ps = txn.prepareStatement(sql);
 			ps.setInt(1, c.getInt());
 			ps.setInt(2, DELIVERED.getValue());
 			ps.setLong(3, now);
+			ps.setLong(4, eta);
 			rs = ps.executeQuery();
 			List<MessageId> ids = new ArrayList<>();
 			int total = 0;
@@ -2870,7 +2889,7 @@ abstract class JdbcDatabase implements Database<Connection> {
 	}
 
 	@Override
-	public void updateExpiryTime(Connection txn, ContactId c, MessageId m,
+	public void updateExpiryTimeAndEta(Connection txn, ContactId c, MessageId m,
 			int maxLatency) throws DbException {
 		PreparedStatement ps = null;
 		ResultSet rs = null;
@@ -2886,13 +2905,16 @@ abstract class JdbcDatabase implements Database<Connection> {
 			if (rs.next()) throw new DbStateException();
 			rs.close();
 			ps.close();
-			sql = "UPDATE statuses SET expiry = ?, txCount = txCount + 1"
+			sql = "UPDATE statuses"
+					+ " SET expiry = ?, txCount = txCount + 1, eta = ?"
 					+ " WHERE messageId = ? AND contactId = ?";
 			ps = txn.prepareStatement(sql);
 			long now = clock.currentTimeMillis();
+			long eta = now + maxLatency;
 			ps.setLong(1, calculateExpiry(now, maxLatency, txCount));
-			ps.setBytes(2, m.getBytes());
-			ps.setInt(3, c.getInt());
+			ps.setLong(2, eta);
+			ps.setBytes(3, m.getBytes());
+			ps.setInt(4, c.getInt());
 			int affected = ps.executeUpdate();
 			if (affected != 1) throw new DbStateException();
 			ps.close();

bramble-core/src/main/java/org/briarproject/bramble/db/Migration39_40.java

@@ -0,0 +1,54 @@
+package org.briarproject.bramble.db;
+
+import org.briarproject.bramble.api.db.DbException;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.logging.Logger;
+
+import javax.annotation.Nullable;
+
+import static java.util.logging.Level.WARNING;
+import static org.briarproject.bramble.util.LogUtils.logException;
+
+class Migration39_40 implements Migration<Connection> {
+
+	private static final Logger LOG =
+			Logger.getLogger(Migration39_40.class.getName());
+
+	@Override
+	public int getStartVersion() {
+		return 39;
+	}
+
+	@Override
+	public int getEndVersion() {
+		return 40;
+	}
+
+	@Override
+	public void migrate(Connection txn) throws DbException {
+		Statement s = null;
+		try {
+			s = txn.createStatement();
+			s.execute("ALTER TABLE statuses"
+					+ " ADD eta BIGINT");
+			s.execute("UPDATE statuses SET eta = 0");
+			s.execute("ALTER TABLE statuses"
+					+ " ALTER COLUMN eta"
+					+ " SET NOT NULL");
+		} catch (SQLException e) {
+			tryToClose(s);
+			throw new DbException(e);
+		}
+	}
+
+	private void tryToClose(@Nullable Statement s) {
+		try {
+			if (s != null) s.close();
+		} catch (SQLException e) {
+			logException(LOG, WARNING, e);
+		}
+	}
+}

bramble-core/src/main/java/org/briarproject/bramble/keyagreement/KeyAgreementTaskImpl.java

@@ -102,6 +102,7 @@ class KeyAgreementTaskImpl extends Thread implements KeyAgreementTask,
 		KeyAgreementTransport transport =
 				connector.connect(remotePayload, alice);
 		if (transport == null) {
+			LOG.warning("Key agreement failed. Transport was null.");
 			// Notify caller that the connection failed
 			eventBus.broadcast(new KeyAgreementFailedEvent());
 			return;

bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java

@@ -21,6 +21,7 @@ import org.briarproject.bramble.api.plugin.event.BluetoothEnabledEvent;
 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.settings.Settings;
 import org.briarproject.bramble.api.settings.event.SettingsUpdatedEvent;
 import org.briarproject.bramble.util.StringUtils;
 
@@ -146,16 +147,15 @@ abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
 		}
 		updateProperties();
 		running = true;
-		loadSettings();
+		loadSettings(callback.getSettings());
 		if (shouldAllowContactConnections()) {
 			if (isAdapterEnabled()) bind();
 			else enableAdapter();
 		}
 	}
 
-	private void loadSettings() {
-		contactConnections =
-				callback.getSettings().getBoolean(PREF_BT_ENABLE, false);
+	private void loadSettings(Settings settings) {
+		contactConnections = settings.getBoolean(PREF_BT_ENABLE, false);
 	}
 
 	private boolean shouldAllowContactConnections() {
@@ -387,7 +387,7 @@ abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
 		} else if (e instanceof SettingsUpdatedEvent) {
 			SettingsUpdatedEvent s = (SettingsUpdatedEvent) e;
 			if (s.getNamespace().equals(ID.getString()))
-				ioExecutor.execute(this::onSettingsUpdated);
+				ioExecutor.execute(() -> onSettingsUpdated(s.getSettings()));
 		} else if (e instanceof KeyAgreementListeningEvent) {
 			ioExecutor.execute(connectionLimiter::keyAgreementStarted);
 		} else if (e instanceof KeyAgreementStoppedListeningEvent) {
@@ -395,9 +395,9 @@ abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
 		}
 	}
 
-	private void onSettingsUpdated() {
+	private void onSettingsUpdated(Settings settings) {
 		boolean wasAllowed = shouldAllowContactConnections();
-		loadSettings();
+		loadSettings(settings);
 		boolean isAllowed = shouldAllowContactConnections();
 		if (wasAllowed && !isAllowed) {
 			LOG.info("Contact connections disabled");

bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java

@@ -24,7 +24,7 @@ import java.net.SocketException;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
+import java.util.Enumeration;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -35,6 +35,9 @@ import java.util.regex.Pattern;
 
 import javax.annotation.Nullable;
 
+import static java.net.NetworkInterface.getNetworkInterfaces;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.list;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.util.LogUtils.logException;
@@ -303,16 +306,16 @@ abstract class TcpPlugin implements DuplexPlugin {
 	}
 
 	Collection<InetAddress> getLocalIpAddresses() {
-		List<NetworkInterface> ifaces;
 		try {
-			ifaces = Collections.list(NetworkInterface.getNetworkInterfaces());
+			Enumeration<NetworkInterface> ifaces = getNetworkInterfaces();
+			if (ifaces == null) return emptyList();
+			List<InetAddress> addrs = new ArrayList<>();
+			for (NetworkInterface iface : list(ifaces))
+				addrs.addAll(list(iface.getInetAddresses()));
+			return addrs;
 		} catch (SocketException e) {
 			logException(LOG, WARNING, e);
-			return Collections.emptyList();
+			return emptyList();
 		}
-		List<InetAddress> addrs = new ArrayList<>();
-		for (NetworkInterface iface : ifaces)
-			addrs.addAll(Collections.list(iface.getInetAddresses()));
-		return addrs;
 	}
 }

bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionModule.java

@@ -0,0 +1,17 @@
+package org.briarproject.bramble.plugin.tor;
+
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module
+public class CircumventionModule {
+
+	@Provides
+	@Singleton
+	CircumventionProvider provideCircumventionProvider(
+			CircumventionProviderImpl provider) {
+		return provider;
+	}
+}

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

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

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

@@ -1,12 +1,5 @@
 package org.briarproject.bramble.plugin.tor;
 
-import android.content.Context;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.res.Resources;
-import android.os.PowerManager;
-
 import net.freehaven.tor.control.EventHandler;
 import net.freehaven.tor.control.TorControlConnection;
 
@@ -33,8 +26,8 @@ import org.briarproject.bramble.api.settings.Settings;
 import org.briarproject.bramble.api.settings.event.SettingsUpdatedEvent;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.api.system.LocationUtils;
+import org.briarproject.bramble.api.system.ResourceProvider;
 import org.briarproject.bramble.util.IoUtils;
-import org.briarproject.bramble.util.RenewableWakeLock;
 import org.briarproject.bramble.util.StringUtils;
 
 import java.io.Closeable;
@@ -57,7 +50,6 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Scanner;
 import java.util.concurrent.Executor;
-import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
@@ -66,21 +58,17 @@ import java.util.zip.ZipInputStream;
 import javax.annotation.Nullable;
 import javax.net.SocketFactory;
 
-import static android.content.Context.MODE_PRIVATE;
-import static android.content.Context.POWER_SERVICE;
-import static android.os.PowerManager.PARTIAL_WAKE_LOCK;
-import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static net.freehaven.tor.control.TorControlCommands.HS_ADDRESS;
 import static net.freehaven.tor.control.TorControlCommands.HS_PRIVKEY;
 import static org.briarproject.bramble.api.plugin.TorConstants.CONTROL_PORT;
 import static org.briarproject.bramble.api.plugin.TorConstants.ID;
-import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_DISABLE_BLOCKED;
+import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_MOBILE;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK;
-import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_ALWAYS;
+import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_AUTOMATIC;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_NEVER;
-import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_WIFI;
+import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_WITH_BRIDGES;
 import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_PORT;
 import static org.briarproject.bramble.api.plugin.TorConstants.PROP_ONION;
 import static org.briarproject.bramble.util.LogUtils.logException;
@@ -88,7 +76,10 @@ import static org.briarproject.bramble.util.PrivacyUtils.scrubOnion;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
-class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
+abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
+
+	private static final Logger LOG =
+			Logger.getLogger(TorPlugin.class.getName());
 
 	private static final String[] EVENTS = {
 			"CIRC", "ORCONN", "HS_DESC", "NOTICE", "WARN", "ERR"
@@ -97,13 +88,8 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	private static final int COOKIE_TIMEOUT_MS = 3000;
 	private static final int COOKIE_POLLING_INTERVAL_MS = 200;
 	private static final Pattern ONION = Pattern.compile("[a-z2-7]{16}");
-	// This tag may prevent Huawei's power manager from killing us
-	private static final String WAKE_LOCK_TAG = "LocationManagerService";
-	private static final Logger LOG =
-			Logger.getLogger(TorPlugin.class.getName());
 
 	private final Executor ioExecutor, connectionStatusExecutor;
-	private final Context appContext;
 	private final NetworkManager networkManager;
 	private final LocationUtils locationUtils;
 	private final SocketFactory torSocketFactory;
@@ -112,53 +98,55 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	private final DuplexPluginCallback callback;
 	private final String architecture;
 	private final CircumventionProvider circumventionProvider;
+	private final ResourceProvider resourceProvider;
 	private final int maxLatency, maxIdleTime, socketTimeout;
-	private final ConnectionStatus connectionStatus;
 	private final File torDirectory, torFile, geoIpFile, configFile;
 	private final File doneFile, cookieFile;
-	private final RenewableWakeLock wakeLock;
+	private final ConnectionStatus connectionStatus;
 	private final AtomicBoolean used = new AtomicBoolean(false);
 
-	private volatile boolean running = false;
 	private volatile ServerSocket socket = null;
 	private volatile Socket controlSocket = null;
 	private volatile TorControlConnection controlConnection = null;
+	private volatile Settings settings = null;
 
-	TorPlugin(Executor ioExecutor, ScheduledExecutorService scheduler,
-			Context appContext, NetworkManager networkManager,
+	protected volatile boolean running = false;
+
+	protected abstract int getProcessId();
+
+	protected abstract long getLastUpdateTime();
+
+	TorPlugin(Executor ioExecutor, NetworkManager networkManager,
 			LocationUtils locationUtils, SocketFactory torSocketFactory,
-			Clock clock, CircumventionProvider circumventionProvider,
-			Backoff backoff, DuplexPluginCallback callback,
-			String architecture, int maxLatency, int maxIdleTime) {
+			Clock clock, ResourceProvider resourceProvider,
+			CircumventionProvider circumventionProvider, Backoff backoff,
+			DuplexPluginCallback callback, String architecture, int maxLatency,
+			int maxIdleTime, File torDirectory) {
 		this.ioExecutor = ioExecutor;
-		this.appContext = appContext;
 		this.networkManager = networkManager;
 		this.locationUtils = locationUtils;
 		this.torSocketFactory = torSocketFactory;
 		this.clock = clock;
+		this.resourceProvider = resourceProvider;
+		this.circumventionProvider = circumventionProvider;
 		this.backoff = backoff;
 		this.callback = callback;
 		this.architecture = architecture;
-		this.circumventionProvider = circumventionProvider;
 		this.maxLatency = maxLatency;
 		this.maxIdleTime = maxIdleTime;
 		if (maxIdleTime > Integer.MAX_VALUE / 2)
 			socketTimeout = Integer.MAX_VALUE;
 		else socketTimeout = maxIdleTime * 2;
-		connectionStatus = new ConnectionStatus();
-		torDirectory = appContext.getDir("tor", MODE_PRIVATE);
+		this.torDirectory = torDirectory;
 		torFile = new File(torDirectory, "tor");
 		geoIpFile = new File(torDirectory, "geoip");
 		configFile = new File(torDirectory, "torrc");
 		doneFile = new File(torDirectory, "done");
 		cookieFile = new File(torDirectory, ".tor/control_auth_cookie");
+		connectionStatus = new ConnectionStatus();
 		// Don't execute more than one connection status check at a time
 		connectionStatusExecutor =
 				new PoliteExecutor("TorPlugin", ioExecutor, 1);
-		PowerManager pm = (PowerManager)
-				appContext.getSystemService(POWER_SERVICE);
-		wakeLock = new RenewableWakeLock(pm, scheduler, PARTIAL_WAKE_LOCK,
-				WAKE_LOCK_TAG, 1, MINUTES);
 	}
 
 	@Override
@@ -179,15 +167,25 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	@Override
 	public void start() throws PluginException {
 		if (used.getAndSet(true)) throw new IllegalStateException();
+		if (!torDirectory.exists()) {
+			if (!torDirectory.mkdirs()) {
+				LOG.warning("Could not create Tor directory.");
+				throw new PluginException();
+			}
+		}
+		// Load the settings
+		settings = callback.getSettings();
 		// Install or update the assets if necessary
 		if (!assetsAreUpToDate()) installAssets();
 		if (cookieFile.exists() && !cookieFile.delete())
 			LOG.warning("Old auth cookie not deleted");
+		// Migrate old settings before having a chance to stop
+		migrateSettings();
 		// Start a new Tor process
 		LOG.info("Starting Tor");
 		String torPath = torFile.getAbsolutePath();
 		String configPath = configFile.getAbsolutePath();
-		String pid = String.valueOf(android.os.Process.myPid());
+		String pid = String.valueOf(getProcessId());
 		Process torProcess;
 		ProcessBuilder pb =
 				new ProcessBuilder(torPath, "-f", configPath, OWNER, pid);
@@ -266,13 +264,7 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	}
 
 	private boolean assetsAreUpToDate() {
-		try {
-			PackageManager pm = appContext.getPackageManager();
-			PackageInfo pi = pm.getPackageInfo(appContext.getPackageName(), 0);
-			return doneFile.lastModified() > pi.lastUpdateTime;
-		} catch (NameNotFoundException e) {
-			throw new RuntimeException(e);
-		}
+		return doneFile.lastModified() > getLastUpdateTime();
 	}
 
 	private void installAssets() throws PluginException {
@@ -305,29 +297,23 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	private InputStream getTorInputStream() throws IOException {
 		if (LOG.isLoggable(INFO))
 			LOG.info("Installing Tor binary for " + architecture);
-		int resId = getResourceId("tor_" + architecture);
-		InputStream in = appContext.getResources().openRawResource(resId);
+		InputStream in = resourceProvider
+				.getResourceInputStream("tor_" + architecture, ".zip");
 		ZipInputStream zin = new ZipInputStream(in);
 		if (zin.getNextEntry() == null) throw new IOException();
 		return zin;
 	}
 
 	private InputStream getGeoIpInputStream() throws IOException {
-		int resId = getResourceId("geoip");
-		InputStream in = appContext.getResources().openRawResource(resId);
+		InputStream in = resourceProvider.getResourceInputStream("geoip",
+				".zip");
 		ZipInputStream zin = new ZipInputStream(in);
 		if (zin.getNextEntry() == null) throw new IOException();
 		return zin;
 	}
 
 	private InputStream getConfigInputStream() {
-		int resId = getResourceId("torrc");
-		return appContext.getResources().openRawResource(resId);
-	}
-
-	private int getResourceId(String filename) {
-		Resources res = appContext.getResources();
-		return res.getIdentifier(filename, "raw", appContext.getPackageName());
+		return getClass().getClassLoader().getResourceAsStream("torrc");
 	}
 
 	private void tryToClose(@Nullable Closeable c) {
@@ -374,7 +360,7 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	private void bind() {
 		ioExecutor.execute(() -> {
 			// If there's already a port number stored in config, reuse it
-			String portString = callback.getSettings().get(PREF_TOR_PORT);
+			String portString = settings.get(PREF_TOR_PORT);
 			int port;
 			if (StringUtils.isNullOrEmpty(portString)) port = 0;
 			else port = Integer.parseInt(portString);
@@ -419,7 +405,7 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	private void publishHiddenService(String port) {
 		if (!running) return;
 		LOG.info("Creating hidden service");
-		String privKey = callback.getSettings().get(HS_PRIVKEY);
+		String privKey = settings.get(HS_PRIVKEY);
 		Map<Integer, String> portLines =
 				Collections.singletonMap(80, "127.0.0.1:" + port);
 		Map<String, String> response;
@@ -473,15 +459,11 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		}
 	}
 
-	private void enableNetwork(boolean enable) throws IOException {
+	protected void enableNetwork(boolean enable) throws IOException {
 		if (!running) return;
-		if (enable) wakeLock.acquire();
 		connectionStatus.enableNetwork(enable);
 		controlConnection.setConf("DisableNetwork", enable ? "0" : "1");
-		if (!enable) {
-			callback.transportDisabled();
-			wakeLock.release();
-		}
+		if (!enable) callback.transportDisabled();
 	}
 
 	private void enableBridges(boolean enable) throws IOException {
@@ -509,7 +491,6 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 				logException(LOG, WARNING, e);
 			}
 		}
-		wakeLock.release();
 	}
 
 	@Override
@@ -607,7 +588,8 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 
 	@Override
 	public void orConnStatus(String status, String orName) {
-		if (LOG.isLoggable(INFO)) LOG.info("OR connection " + status);
+		if (LOG.isLoggable(INFO))
+			LOG.info("OR connection " + status + " " + orName);
 		if (status.equals("CLOSED") || status.equals("FAILED")) {
 			// Check whether we've lost connectivity
 			updateConnectionStatus(networkManager.getNetworkStatus());
@@ -644,6 +626,7 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			SettingsUpdatedEvent s = (SettingsUpdatedEvent) e;
 			if (s.getNamespace().equals(ID.getString())) {
 				LOG.info("Tor settings updated");
+				settings = s.getSettings();
 				updateConnectionStatus(networkManager.getNetworkStatus());
 			}
 		} else if (e instanceof NetworkStatusEvent) {
@@ -659,10 +642,11 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 			String country = locationUtils.getCurrentCountry();
 			boolean blocked =
 					circumventionProvider.isTorProbablyBlocked(country);
-			Settings s = callback.getSettings();
-			int network = s.getInt(PREF_TOR_NETWORK, PREF_TOR_NETWORK_ALWAYS);
-			boolean disableWhenBlocked =
-					s.getBoolean(PREF_TOR_DISABLE_BLOCKED, true);
+			int network = settings.getInt(PREF_TOR_NETWORK,
+					PREF_TOR_NETWORK_AUTOMATIC);
+			boolean useMobile = settings.getBoolean(PREF_TOR_MOBILE, true);
+			boolean bridgesWork = circumventionProvider.doBridgesWork(country);
+			boolean automatic = network == PREF_TOR_NETWORK_AUTOMATIC;
 
 			if (LOG.isLoggable(INFO)) {
 				LOG.info("Online: " + online + ", wifi: " + wifi);
@@ -674,25 +658,20 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 				if (!online) {
 					LOG.info("Disabling network, device is offline");
 					enableNetwork(false);
-				} else if (network == PREF_TOR_NETWORK_NEVER
-						|| (network == PREF_TOR_NETWORK_WIFI && !wifi)) {
-					LOG.info("Disabling network due to data setting");
+				} else if (network == PREF_TOR_NETWORK_NEVER ||
+						(!useMobile && !wifi)) {
+					LOG.info("Disabling network due to setting");
 					enableNetwork(false);
-				} else if (blocked) {
-					if (circumventionProvider.doBridgesWork(country)) {
-						LOG.info("Enabling network, using bridges");
-						enableBridges(true);
-						enableNetwork(true);
-					} else if (disableWhenBlocked) {
-						LOG.info("Disabling network, country is blocked");
-						enableNetwork(false);
-					} else {
-						LOG.info("Enabling network but country is blocked");
-						enableBridges(false);
-						enableNetwork(true);
-					}
+				} else if (automatic && blocked && !bridgesWork) {
+					LOG.info("Disabling network, country is blocked");
+					enableNetwork(false);
+				} else if (network == PREF_TOR_NETWORK_WITH_BRIDGES ||
+						(automatic && bridgesWork)) {
+					LOG.info("Enabling network, using bridges");
+					enableBridges(true);
+					enableNetwork(true);
 				} else {
-					LOG.info("Enabling network");
+					LOG.info("Enabling network, not using bridges");
 					enableBridges(false);
 					enableNetwork(true);
 				}
@@ -702,6 +681,21 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		});
 	}
 
+	// TODO remove when sufficient time has passed. Added 2018-08-15
+	private void migrateSettings() {
+		Settings sOld = callback.getSettings();
+		int oldNetwork = sOld.getInt("network", -1);
+		if (oldNetwork == -1) return;
+		Settings s = new Settings();
+		if (oldNetwork == 0) {
+			s.putInt(PREF_TOR_NETWORK, PREF_TOR_NETWORK_NEVER);
+		} else if (oldNetwork == 1) {
+			s.putBoolean(PREF_TOR_MOBILE, false);
+		}
+		s.putInt("network", -1);
+		callback.mergeSettings(s);
+	}
+
 	private static class ConnectionStatus {
 
 		// All of the following are locking: this

bramble-core/src/main/java/org/briarproject/bramble/properties/TransportPropertyManagerImpl.java

@@ -164,7 +164,6 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
 			for (Entry<TransportId, LatestUpdate> e : latest.entrySet()) {
 				BdfList message = clientHelper.getMessageAsList(txn,
 						e.getValue().messageId);
-				if (message == null) throw new DbException();
 				local.put(e.getKey(), parseProperties(message));
 			}
 			return local;
@@ -187,7 +186,6 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
 					// Retrieve and parse the latest local properties
 					BdfList message = clientHelper.getMessageAsList(txn,
 							latest.messageId);
-					if (message == null) throw new DbException();
 					p = parseProperties(message);
 				}
 				db.commitTransaction(txn);
@@ -227,7 +225,6 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
 			// Retrieve and parse the latest remote properties
 			BdfList message =
 					clientHelper.getMessageAsList(txn, latest.messageId);
-			if (message == null) throw new DbException();
 			return parseProperties(message);
 		} catch (FormatException e) {
 			throw new DbException(e);
@@ -265,7 +262,6 @@ class TransportPropertyManagerImpl implements TransportPropertyManager,
 				} else {
 					BdfList message = clientHelper.getMessageAsList(txn,
 							latest.messageId);
-					if (message == null) throw new DbException();
 					TransportProperties old = parseProperties(message);
 					merged = new TransportProperties(old);
 					merged.putAll(p);

bramble-core/src/main/java/org/briarproject/bramble/settings/SettingsManagerImpl.java

@@ -34,6 +34,12 @@ class SettingsManagerImpl implements SettingsManager {
 		return s;
 	}
 
+	@Override
+	public Settings getSettings(Transaction txn, String namespace)
+			throws DbException {
+		return db.getSettings(txn, namespace);
+	}
+
 	@Override
 	public void mergeSettings(Settings s, String namespace) throws DbException {
 		Transaction txn = db.startTransaction(false);

bramble-core/src/main/java/org/briarproject/bramble/sync/DuplexOutgoingSession.java

@@ -13,6 +13,7 @@ import org.briarproject.bramble.api.lifecycle.IoExecutor;
 import org.briarproject.bramble.api.lifecycle.event.LifecycleEvent;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.Ack;
+import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.Offer;
 import org.briarproject.bramble.api.sync.Request;
 import org.briarproject.bramble.api.sync.SyncRecordWriter;
@@ -274,7 +275,7 @@ class DuplexOutgoingSession implements SyncSession, EventListener {
 			if (!generateBatchQueued.getAndSet(false))
 				throw new AssertionError();
 			try {
-				Collection<byte[]> b;
+				Collection<Message> b;
 				Transaction txn = db.startTransaction(false);
 				try {
 					b = db.generateRequestedBatch(txn, contactId,
@@ -296,9 +297,9 @@ class DuplexOutgoingSession implements SyncSession, EventListener {
 
 	private class WriteBatch implements ThrowingRunnable<IOException> {
 
-		private final Collection<byte[]> batch;
+		private final Collection<Message> batch;
 
-		private WriteBatch(Collection<byte[]> batch) {
+		private WriteBatch(Collection<Message> batch) {
 			this.batch = batch;
 		}
 
@@ -306,7 +307,7 @@ class DuplexOutgoingSession implements SyncSession, EventListener {
 		@Override
 		public void run() throws IOException {
 			if (interrupted) return;
-			for (byte[] raw : batch) recordWriter.writeMessage(raw);
+			for (Message m : batch) recordWriter.writeMessage(m);
 			LOG.info("Sent batch");
 			generateBatch();
 		}

bramble-core/src/main/java/org/briarproject/bramble/sync/MessageFactoryImpl.java

@@ -39,11 +39,7 @@ class MessageFactoryImpl implements MessageFactory {
 		if (body.length > MAX_MESSAGE_BODY_LENGTH)
 			throw new IllegalArgumentException();
 		MessageId id = getMessageId(g, timestamp, body);
-		byte[] raw = new byte[MESSAGE_HEADER_LENGTH + body.length];
-		System.arraycopy(g.getBytes(), 0, raw, 0, UniqueId.LENGTH);
-		ByteUtils.writeUint64(timestamp, raw, UniqueId.LENGTH);
-		System.arraycopy(body, 0, raw, MESSAGE_HEADER_LENGTH, body.length);
-		return new Message(id, g, timestamp, raw);
+		return new Message(id, g, timestamp, body);
 	}
 
 	private MessageId getMessageId(GroupId g, long timestamp, byte[] body) {
@@ -69,18 +65,16 @@ class MessageFactoryImpl implements MessageFactory {
 		byte[] body = new byte[raw.length - MESSAGE_HEADER_LENGTH];
 		System.arraycopy(raw, MESSAGE_HEADER_LENGTH, body, 0, body.length);
 		MessageId id = getMessageId(g, timestamp, body);
-		return new Message(id, g, timestamp, raw);
+		return new Message(id, g, timestamp, body);
 	}
 
 	@Override
-	public Message createMessage(MessageId m, byte[] raw) {
-		if (raw.length < MESSAGE_HEADER_LENGTH)
-			throw new IllegalArgumentException();
-		if (raw.length > MAX_MESSAGE_LENGTH)
-			throw new IllegalArgumentException();
-		byte[] groupId = new byte[UniqueId.LENGTH];
-		System.arraycopy(raw, 0, groupId, 0, UniqueId.LENGTH);
-		long timestamp = ByteUtils.readUint64(raw, UniqueId.LENGTH);
-		return new Message(m, new GroupId(groupId), timestamp, raw);
+	public byte[] getRawMessage(Message m) {
+		byte[] body = m.getBody();
+		byte[] raw = new byte[MESSAGE_HEADER_LENGTH + body.length];
+		System.arraycopy(m.getGroupId().getBytes(), 0, raw, 0, UniqueId.LENGTH);
+		ByteUtils.writeUint64(m.getTimestamp(), raw, UniqueId.LENGTH);
+		System.arraycopy(body, 0, raw, MESSAGE_HEADER_LENGTH, body.length);
+		return raw;
 	}
 }

bramble-core/src/main/java/org/briarproject/bramble/sync/SimplexOutgoingSession.java

@@ -13,6 +13,7 @@ import org.briarproject.bramble.api.lifecycle.IoExecutor;
 import org.briarproject.bramble.api.lifecycle.event.LifecycleEvent;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.Ack;
+import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.SyncRecordWriter;
 import org.briarproject.bramble.api.sync.SyncSession;
 import org.briarproject.bramble.api.transport.StreamWriter;
@@ -171,7 +172,7 @@ class SimplexOutgoingSession implements SyncSession, EventListener {
 		public void run() {
 			if (interrupted) return;
 			try {
-				Collection<byte[]> b;
+				Collection<Message> b;
 				Transaction txn = db.startTransaction(false);
 				try {
 					b = db.generateBatch(txn, contactId,
@@ -193,9 +194,9 @@ class SimplexOutgoingSession implements SyncSession, EventListener {
 
 	private class WriteBatch implements ThrowingRunnable<IOException> {
 
-		private final Collection<byte[]> batch;
+		private final Collection<Message> batch;
 
-		private WriteBatch(Collection<byte[]> batch) {
+		private WriteBatch(Collection<Message> batch) {
 			this.batch = batch;
 		}
 
@@ -203,7 +204,7 @@ class SimplexOutgoingSession implements SyncSession, EventListener {
 		@Override
 		public void run() throws IOException {
 			if (interrupted) return;
-			for (byte[] raw : batch) recordWriter.writeMessage(raw);
+			for (Message m : batch) recordWriter.writeMessage(m);
 			LOG.info("Sent batch");
 			dbExecutor.execute(new GenerateBatch());
 		}

bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordReaderImpl.java

@@ -46,7 +46,7 @@ class SyncRecordReaderImpl implements SyncRecordReader {
 	}
 
 	private void readRecord() throws IOException {
-		assert nextRecord == null;
+		if (nextRecord != null) throw new AssertionError();
 		while (true) {
 			nextRecord = reader.readRecord();
 			// Check the protocol version
@@ -62,7 +62,7 @@ class SyncRecordReaderImpl implements SyncRecordReader {
 	}
 
 	private byte getNextRecordType() {
-		assert nextRecord != null;
+		if (nextRecord == null) throw new AssertionError();
 		return nextRecord.getRecordType();
 	}
 
@@ -100,7 +100,7 @@ class SyncRecordReaderImpl implements SyncRecordReader {
 	}
 
 	private List<MessageId> readMessageIds() throws IOException {
-		assert nextRecord != null;
+		if (nextRecord == null) throw new AssertionError();
 		byte[] payload = nextRecord.getPayload();
 		if (payload.length == 0) throw new FormatException();
 		if (payload.length % UniqueId.LENGTH != 0) throw new FormatException();
@@ -122,7 +122,7 @@ class SyncRecordReaderImpl implements SyncRecordReader {
 	@Override
 	public Message readMessage() throws IOException {
 		if (!hasMessage()) throw new FormatException();
-		assert nextRecord != null;
+		if (nextRecord == null) throw new AssertionError();
 		byte[] payload = nextRecord.getPayload();
 		if (payload.length < MESSAGE_HEADER_LENGTH) throw new FormatException();
 		// Validate timestamp

bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordWriterFactoryImpl.java

@@ -3,6 +3,7 @@ package org.briarproject.bramble.sync;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.record.RecordWriter;
 import org.briarproject.bramble.api.record.RecordWriterFactory;
+import org.briarproject.bramble.api.sync.MessageFactory;
 import org.briarproject.bramble.api.sync.SyncRecordWriter;
 import org.briarproject.bramble.api.sync.SyncRecordWriterFactory;
 
@@ -13,16 +14,19 @@ import javax.inject.Inject;
 @NotNullByDefault
 class SyncRecordWriterFactoryImpl implements SyncRecordWriterFactory {
 
+	private final MessageFactory messageFactory;
 	private final RecordWriterFactory recordWriterFactory;
 
 	@Inject
-	SyncRecordWriterFactoryImpl(RecordWriterFactory recordWriterFactory) {
+	SyncRecordWriterFactoryImpl(MessageFactory messageFactory,
+			RecordWriterFactory recordWriterFactory) {
+		this.messageFactory = messageFactory;
 		this.recordWriterFactory = recordWriterFactory;
 	}
 
 	@Override
 	public SyncRecordWriter createRecordWriter(OutputStream out) {
 		RecordWriter writer = recordWriterFactory.createRecordWriter(out);
-		return new SyncRecordWriterImpl(writer);
+		return new SyncRecordWriterImpl(messageFactory, writer);
 	}
 }

bramble-core/src/main/java/org/briarproject/bramble/sync/SyncRecordWriterImpl.java

@@ -4,6 +4,8 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.record.Record;
 import org.briarproject.bramble.api.record.RecordWriter;
 import org.briarproject.bramble.api.sync.Ack;
+import org.briarproject.bramble.api.sync.Message;
+import org.briarproject.bramble.api.sync.MessageFactory;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.bramble.api.sync.Offer;
 import org.briarproject.bramble.api.sync.Request;
@@ -24,10 +26,12 @@ import static org.briarproject.bramble.api.sync.SyncConstants.PROTOCOL_VERSION;
 @NotNullByDefault
 class SyncRecordWriterImpl implements SyncRecordWriter {
 
+	private final MessageFactory messageFactory;
 	private final RecordWriter writer;
 	private final ByteArrayOutputStream payload = new ByteArrayOutputStream();
 
-	SyncRecordWriterImpl(RecordWriter writer) {
+	SyncRecordWriterImpl(MessageFactory messageFactory, RecordWriter writer) {
+		this.messageFactory = messageFactory;
 		this.writer = writer;
 	}
 
@@ -44,7 +48,8 @@ class SyncRecordWriterImpl implements SyncRecordWriter {
 	}
 
 	@Override
-	public void writeMessage(byte[] raw) throws IOException {
+	public void writeMessage(Message m) throws IOException {
+		byte[] raw = messageFactory.getRawMessage(m);
 		writer.writeRecord(new Record(PROTOCOL_VERSION, MESSAGE, raw));
 	}
 

bramble-core/src/main/java/org/briarproject/bramble/sync/ValidationManagerImpl.java

@@ -16,7 +16,6 @@ import org.briarproject.bramble.api.sync.Group;
 import org.briarproject.bramble.api.sync.InvalidMessageException;
 import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageContext;
-import org.briarproject.bramble.api.sync.MessageFactory;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.bramble.api.sync.ValidationManager;
 import org.briarproject.bramble.api.sync.event.MessageAddedEvent;
@@ -52,7 +51,6 @@ class ValidationManagerImpl implements ValidationManager, Service,
 
 	private final DatabaseComponent db;
 	private final Executor dbExecutor, validationExecutor;
-	private final MessageFactory messageFactory;
 	private final Map<ClientMajorVersion, MessageValidator> validators;
 	private final Map<ClientMajorVersion, IncomingMessageHook> hooks;
 	private final AtomicBoolean used = new AtomicBoolean(false);
@@ -60,12 +58,10 @@ class ValidationManagerImpl implements ValidationManager, Service,
 	@Inject
 	ValidationManagerImpl(DatabaseComponent db,
 			@DatabaseExecutor Executor dbExecutor,
-			@ValidationExecutor Executor validationExecutor,
-			MessageFactory messageFactory) {
+			@ValidationExecutor Executor validationExecutor) {
 		this.db = db;
 		this.dbExecutor = dbExecutor;
 		this.validationExecutor = validationExecutor;
-		this.messageFactory = messageFactory;
 		validators = new ConcurrentHashMap<>();
 		hooks = new ConcurrentHashMap<>();
 	}
@@ -128,9 +124,7 @@ class ValidationManagerImpl implements ValidationManager, Service,
 			Transaction txn = db.startTransaction(true);
 			try {
 				MessageId id = unvalidated.poll();
-				byte[] raw = db.getRawMessage(txn, id);
-				if (raw == null) throw new DbException();
-				m = messageFactory.createMessage(id, raw);
+				m = db.getMessage(txn, id);
 				g = db.getGroup(txn, m.getGroupId());
 				db.commitTransaction(txn);
 			} finally {
@@ -197,9 +191,7 @@ class ValidationManagerImpl implements ValidationManager, Service,
 						invalidateMessage(txn, id);
 						invalidate = getDependentsToInvalidate(txn, id);
 					} else if (allDelivered) {
-						byte[] raw = db.getRawMessage(txn, id);
-						if (raw == null) throw new DbException();
-						Message m = messageFactory.createMessage(id, raw);
+						Message m = db.getMessage(txn, id);
 						Group g = db.getGroup(txn, m.getGroupId());
 						ClientId c = g.getClientId();
 						int majorVersion = g.getMajorVersion();

bramble-core/src/main/java/org/briarproject/bramble/system/AbstractSecureRandomProvider.java

@@ -7,13 +7,15 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
-import java.util.Collections;
-import java.util.List;
+import java.util.Enumeration;
 import java.util.Map.Entry;
 import java.util.Properties;
 
 import javax.annotation.concurrent.Immutable;
 
+import static java.net.NetworkInterface.getNetworkInterfaces;
+import static java.util.Collections.list;
+
 @Immutable
 @NotNullByDefault
 abstract class AbstractSecureRandomProvider implements SecureRandomProvider {
@@ -23,13 +25,14 @@ abstract class AbstractSecureRandomProvider implements SecureRandomProvider {
 		out.writeLong(System.currentTimeMillis());
 		out.writeLong(System.nanoTime());
 		out.writeLong(Runtime.getRuntime().freeMemory());
-		List<NetworkInterface> ifaces =
-				Collections.list(NetworkInterface.getNetworkInterfaces());
-		for (NetworkInterface i : ifaces) {
-			List<InetAddress> addrs = Collections.list(i.getInetAddresses());
-			for (InetAddress a : addrs) out.write(a.getAddress());
-			byte[] hardware = i.getHardwareAddress();
-			if (hardware != null) out.write(hardware);
+		Enumeration<NetworkInterface> ifaces = getNetworkInterfaces();
+		if (ifaces != null) {
+			for (NetworkInterface i : list(ifaces)) {
+				for (InetAddress a : list(i.getInetAddresses()))
+					out.write(a.getAddress());
+				byte[] hardware = i.getHardwareAddress();
+				if (hardware != null) out.write(hardware);
+			}
 		}
 		for (Entry<String, String> e : System.getenv().entrySet()) {
 			out.writeUTF(e.getKey());

bramble-core/src/main/java/org/briarproject/bramble/versioning/ClientVersioningManagerImpl.java

@@ -139,7 +139,7 @@ class ClientVersioningManagerImpl implements ClientVersioningManager, Client,
 	}
 
 	@Override
-	public void stopService() throws ServiceException {
+	public void stopService() {
 	}
 
 	@Override
@@ -274,9 +274,7 @@ class ClientVersioningManagerImpl implements ClientVersioningManager, Client,
 	private List<ClientVersion> loadClientVersions(Transaction txn,
 			MessageId m) throws DbException {
 		try {
-			BdfList body = clientHelper.getMessageAsList(txn, m);
-			if (body == null) throw new DbException();
-			return parseClientVersions(body);
+			return parseClientVersions(clientHelper.getMessageAsList(txn, m));
 		} catch (FormatException e) {
 			throw new DbException(e);
 		}
@@ -359,9 +357,7 @@ class ClientVersioningManagerImpl implements ClientVersioningManager, Client,
 
 	private Update loadUpdate(Transaction txn, MessageId m) throws DbException {
 		try {
-			BdfList body = clientHelper.getMessageAsList(txn, m);
-			if (body == null) throw new DbException();
-			return parseUpdate(body);
+			return parseUpdate(clientHelper.getMessageAsList(txn, m));
 		} catch (FormatException e) {
 			throw new DbException(e);
 		}

bramble-core/src/main/resources/bridges

@@ -3,6 +3,6 @@ Bridge 67.205.189.122:8443 12D64D5D44E20169585E7378580C0D33A872AD98
 Bridge 45.32.148.146:8443 0CE016FB2462D8BF179AE71F7D702D09DEAC3F1D
 Bridge 148.251.90.59:7510 019F727CA6DCA6CA5C90B55E477B7D87981E75BC
 Bridge 195.91.239.8:9001 BA83F62551545655BBEBBFF353A45438D73FD45A
-Bridge 185.165.184.217:6429 64CC94BEC51254E4409AD059192833854CCB95F0
 Bridge 45.55.1.74:8443 6F18FEFBB0CAECD5ABA755312FCCB34FC11A7AB8
-Bridge 95.85.40.163:9001 40057BE9CF76B6C5BDBE713753468BE0A990DE9C
+Bridge 97.107.131.168:65341 DCDA8A5F1E2C50A6756A58462E5CF4B6B2DFDE26
+Bridge 85.229.131.78:444 50E433CCC5FEC11CC34CB4D92033561E065EA106

bramble-core/src/test/java/org/briarproject/bramble/client/BdfMessageValidatorTest.java

@@ -16,8 +16,8 @@ import org.jmock.Expectations;
 import org.jmock.lib.legacy.ClassImposteriser;
 import org.junit.Test;
 
-import static org.briarproject.bramble.api.sync.SyncConstants.MESSAGE_HEADER_LENGTH;
 import static org.briarproject.bramble.api.transport.TransportConstants.MAX_CLOCK_DIFFERENCE;
+import static org.briarproject.bramble.test.TestUtils.getMessage;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 
@@ -28,8 +28,7 @@ public class BdfMessageValidatorTest extends ValidatorTestCase {
 			new BdfMessageValidator(clientHelper, metadataEncoder, clock) {
 				@Override
 				protected BdfMessageContext validateMessage(Message m, Group g,
-						BdfList body)
-						throws InvalidMessageException, FormatException {
+						BdfList body) {
 					throw new AssertionError();
 				}
 			};
@@ -57,8 +56,7 @@ public class BdfMessageValidatorTest extends ValidatorTestCase {
 		context.checking(new Expectations() {{
 			oneOf(clock).currentTimeMillis();
 			will(returnValue(timestamp - MAX_CLOCK_DIFFERENCE));
-			oneOf(clientHelper).toList(raw, MESSAGE_HEADER_LENGTH,
-					raw.length - MESSAGE_HEADER_LENGTH);
+			oneOf(clientHelper).toList(message.getBody());
 			will(returnValue(body));
 			oneOf(metadataEncoder).encode(dictionary);
 			will(returnValue(meta));
@@ -69,7 +67,7 @@ public class BdfMessageValidatorTest extends ValidatorTestCase {
 				metadataEncoder, clock) {
 			@Override
 			protected BdfMessageContext validateMessage(Message m, Group g,
-					BdfList b) throws InvalidMessageException, FormatException {
+					BdfList b) {
 				assertSame(message, m);
 				assertSame(group, g);
 				assertSame(body, b);
@@ -83,17 +81,11 @@ public class BdfMessageValidatorTest extends ValidatorTestCase {
 
 	@Test(expected = InvalidMessageException.class)
 	public void testRejectsTooShortMessage() throws Exception {
-		byte[] invalidRaw = new byte[MESSAGE_HEADER_LENGTH];
-		// Use a mock message so the length of the raw message can be invalid
-		Message invalidMessage = context.mock(Message.class);
+		Message invalidMessage = getMessage(groupId, 0);
 
 		context.checking(new Expectations() {{
-			oneOf(invalidMessage).getTimestamp();
-			will(returnValue(timestamp));
 			oneOf(clock).currentTimeMillis();
 			will(returnValue(timestamp));
-			oneOf(invalidMessage).getRaw();
-			will(returnValue(invalidRaw));
 		}});
 
 		failIfSubclassIsCalled.validateMessage(invalidMessage, group);
@@ -101,15 +93,12 @@ public class BdfMessageValidatorTest extends ValidatorTestCase {
 
 	@Test
 	public void testAcceptsMinLengthMessage() throws Exception {
-		byte[] shortRaw = new byte[MESSAGE_HEADER_LENGTH + 1];
-		Message shortMessage =
-				new Message(messageId, groupId, timestamp, shortRaw);
+		Message shortMessage = getMessage(groupId, 1);
 
 		context.checking(new Expectations() {{
 			oneOf(clock).currentTimeMillis();
 			will(returnValue(timestamp));
-			oneOf(clientHelper).toList(shortRaw, MESSAGE_HEADER_LENGTH,
-					shortRaw.length - MESSAGE_HEADER_LENGTH);
+			oneOf(clientHelper).toList(shortMessage.getBody());
 			will(returnValue(body));
 			oneOf(metadataEncoder).encode(dictionary);
 			will(returnValue(meta));
@@ -120,7 +109,7 @@ public class BdfMessageValidatorTest extends ValidatorTestCase {
 				metadataEncoder, clock) {
 			@Override
 			protected BdfMessageContext validateMessage(Message m, Group g,
-					BdfList b) throws InvalidMessageException, FormatException {
+					BdfList b) {
 				assertSame(shortMessage, m);
 				assertSame(group, g);
 				assertSame(body, b);
@@ -137,8 +126,7 @@ public class BdfMessageValidatorTest extends ValidatorTestCase {
 		context.checking(new Expectations() {{
 			oneOf(clock).currentTimeMillis();
 			will(returnValue(timestamp));
-			oneOf(clientHelper).toList(raw, MESSAGE_HEADER_LENGTH,
-					raw.length - MESSAGE_HEADER_LENGTH);
+			oneOf(clientHelper).toList(message.getBody());
 			will(throwException(new FormatException()));
 		}});
 
@@ -150,8 +138,7 @@ public class BdfMessageValidatorTest extends ValidatorTestCase {
 		context.checking(new Expectations() {{
 			oneOf(clock).currentTimeMillis();
 			will(returnValue(timestamp));
-			oneOf(clientHelper).toList(raw, MESSAGE_HEADER_LENGTH,
-					raw.length - MESSAGE_HEADER_LENGTH);
+			oneOf(clientHelper).toList(message.getBody());
 			will(returnValue(body));
 		}});
 
@@ -160,7 +147,7 @@ public class BdfMessageValidatorTest extends ValidatorTestCase {
 				metadataEncoder, clock) {
 			@Override
 			protected BdfMessageContext validateMessage(Message m, Group g,
-					BdfList b) throws InvalidMessageException, FormatException {
+					BdfList b) throws FormatException {
 				throw new FormatException();
 			}
 		};

bramble-core/src/test/java/org/briarproject/bramble/client/ClientHelperImplTest.java

@@ -39,6 +39,7 @@ import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_N
 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.test.TestUtils.getAuthor;
+import static org.briarproject.bramble.test.TestUtils.getMessage;
 import static org.briarproject.bramble.test.TestUtils.getRandomBytes;
 import static org.briarproject.bramble.test.TestUtils.getRandomId;
 import static org.briarproject.bramble.util.StringUtils.getRandomString;
@@ -67,11 +68,9 @@ public class ClientHelperImplTest extends BrambleTestCase {
 
 	private final GroupId groupId = new GroupId(getRandomId());
 	private final BdfDictionary dictionary = new BdfDictionary();
-	private final long timestamp = 42L;
-	private final byte[] rawMessage = getRandomBytes(42);
-	private final MessageId messageId = new MessageId(getRandomId());
-	private final Message message =
-			new Message(messageId, groupId, timestamp, rawMessage);
+	private final Message message = getMessage(groupId);
+	private final MessageId messageId = message.getId();
+	private final long timestamp = message.getTimestamp();
 	private final Metadata metadata = new Metadata();
 	private final BdfList list = BdfList.of("Sign this!", getRandomBytes(42));
 	private final String label = StringUtils.getRandomString(5);
@@ -120,8 +119,8 @@ public class ClientHelperImplTest extends BrambleTestCase {
 		context.checking(new Expectations() {{
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn));
-			oneOf(db).getRawMessage(txn, messageId);
-			will(returnValue(rawMessage));
+			oneOf(db).getMessage(txn, messageId);
+			will(returnValue(message));
 			oneOf(db).commitTransaction(txn);
 			oneOf(db).endTransaction(txn);
 		}});
@@ -267,7 +266,7 @@ public class ClientHelperImplTest extends BrambleTestCase {
 	public void testToList() throws Exception {
 		expectToList(true);
 
-		assertEquals(list, clientHelper.toList(rawMessage));
+		assertEquals(list, clientHelper.toList(getRandomBytes(123)));
 		context.assertIsSatisfied();
 	}
 
@@ -276,7 +275,7 @@ public class ClientHelperImplTest extends BrambleTestCase {
 		expectToList(false); // no EOF after list
 
 		try {
-			clientHelper.toList(rawMessage);
+			clientHelper.toList(getRandomBytes(123));
 			fail();
 		} catch (FormatException e) {
 			// expected

bramble-core/src/test/java/org/briarproject/bramble/crypto/ScryptKdfTest.java

@@ -11,6 +11,8 @@ import java.util.HashSet;
 import java.util.Set;
 
 import static junit.framework.TestCase.assertTrue;
+
+import org.briarproject.bramble.test.ArrayClock;
 import static org.briarproject.bramble.test.TestUtils.getRandomBytes;
 import static org.briarproject.bramble.util.StringUtils.getRandomString;
 import static org.junit.Assert.assertEquals;
@@ -74,24 +76,4 @@ public class ScryptKdfTest extends BrambleTestCase {
 		PasswordBasedKdf kdf = new ScryptKdf(clock);
 		assertEquals(256, kdf.chooseCostParameter());
 	}
-
-	private static class ArrayClock implements Clock {
-
-		private final long[] times;
-		private int index = 0;
-
-		private ArrayClock(long... times) {
-			this.times = times;
-		}
-
-		@Override
-		public long currentTimeMillis() {
-			return times[index++];
-		}
-
-		@Override
-		public void sleep(long milliseconds) throws InterruptedException {
-			Thread.sleep(milliseconds);
-		}
-	}
 }

bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseComponentImplTest.java

@@ -64,6 +64,7 @@ import static java.util.Collections.singletonList;
 import static org.briarproject.bramble.api.sync.Group.Visibility.INVISIBLE;
 import static org.briarproject.bramble.api.sync.Group.Visibility.SHARED;
 import static org.briarproject.bramble.api.sync.Group.Visibility.VISIBLE;
+import static org.briarproject.bramble.api.sync.SyncConstants.MAX_MESSAGE_LENGTH;
 import static org.briarproject.bramble.api.sync.ValidationManager.State.DELIVERED;
 import static org.briarproject.bramble.api.sync.ValidationManager.State.UNKNOWN;
 import static org.briarproject.bramble.api.transport.TransportConstants.REORDERING_WINDOW_SIZE;
@@ -72,6 +73,7 @@ import static org.briarproject.bramble.test.TestUtils.getAuthor;
 import static org.briarproject.bramble.test.TestUtils.getClientId;
 import static org.briarproject.bramble.test.TestUtils.getGroup;
 import static org.briarproject.bramble.test.TestUtils.getLocalAuthor;
+import static org.briarproject.bramble.test.TestUtils.getMessage;
 import static org.briarproject.bramble.test.TestUtils.getRandomId;
 import static org.briarproject.bramble.test.TestUtils.getSecretKey;
 import static org.briarproject.bramble.test.TestUtils.getTransportId;
@@ -97,10 +99,8 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 	private final Group group;
 	private final Author author;
 	private final LocalAuthor localAuthor;
+	private final Message message, message1;
 	private final MessageId messageId, messageId1;
-	private final int size;
-	private final byte[] raw;
-	private final Message message;
 	private final Metadata metadata;
 	private final TransportId transportId;
 	private final int maxLatency;
@@ -115,12 +115,10 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		groupId = group.getId();
 		author = getAuthor();
 		localAuthor = getLocalAuthor();
-		messageId = new MessageId(getRandomId());
-		messageId1 = new MessageId(getRandomId());
-		long timestamp = System.currentTimeMillis();
-		size = 1234;
-		raw = new byte[size];
-		message = new Message(messageId, groupId, timestamp, raw);
+		message = getMessage(groupId);
+		message1 = getMessage(groupId);
+		messageId = message.getId();
+		messageId1 = message1.getId();
 		metadata = new Metadata();
 		metadata.put("foo", new byte[] {'b', 'a', 'r'});
 		transportId = getTransportId();
@@ -646,7 +644,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 
 		transaction = db.startTransaction(false);
 		try {
-			db.getRawMessage(transaction, messageId);
+			db.getMessage(transaction, messageId);
 			fail();
 		} catch (NoSuchMessageException expected) {
 			// Expected
@@ -865,23 +863,23 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testGenerateBatch() throws Exception {
-		byte[] raw1 = new byte[size];
 		Collection<MessageId> ids = Arrays.asList(messageId, messageId1);
-		Collection<byte[]> messages = Arrays.asList(raw, raw1);
+		Collection<Message> messages = Arrays.asList(message, message1);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
 			oneOf(database).containsContact(txn, contactId);
 			will(returnValue(true));
-			oneOf(database).getMessagesToSend(txn, contactId, size * 2);
+			oneOf(database).getMessagesToSend(txn, contactId,
+					MAX_MESSAGE_LENGTH * 2, maxLatency);
 			will(returnValue(ids));
-			oneOf(database).getRawMessage(txn, messageId);
-			will(returnValue(raw));
-			oneOf(database).updateExpiryTime(txn, contactId, messageId,
+			oneOf(database).getMessage(txn, messageId);
+			will(returnValue(message));
+			oneOf(database).updateExpiryTimeAndEta(txn, contactId, messageId,
 					maxLatency);
-			oneOf(database).getRawMessage(txn, messageId1);
-			will(returnValue(raw1));
-			oneOf(database).updateExpiryTime(txn, contactId, messageId1,
+			oneOf(database).getMessage(txn, messageId1);
+			will(returnValue(message1));
+			oneOf(database).updateExpiryTimeAndEta(txn, contactId, messageId1,
 					maxLatency);
 			oneOf(database).lowerRequestedFlag(txn, contactId, ids);
 			oneOf(database).commitTransaction(txn);
@@ -893,7 +891,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		Transaction transaction = db.startTransaction(false);
 		try {
 			assertEquals(messages, db.generateBatch(transaction, contactId,
-					size * 2, maxLatency));
+					MAX_MESSAGE_LENGTH * 2, maxLatency));
 			db.commitTransaction(transaction);
 		} finally {
 			db.endTransaction(transaction);
@@ -909,11 +907,11 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 			will(returnValue(txn));
 			oneOf(database).containsContact(txn, contactId);
 			will(returnValue(true));
-			oneOf(database).getMessagesToOffer(txn, contactId, 123);
+			oneOf(database).getMessagesToOffer(txn, contactId, 123, maxLatency);
 			will(returnValue(ids));
-			oneOf(database).updateExpiryTime(txn, contactId, messageId,
+			oneOf(database).updateExpiryTimeAndEta(txn, contactId, messageId,
 					maxLatency);
-			oneOf(database).updateExpiryTime(txn, contactId, messageId1,
+			oneOf(database).updateExpiryTimeAndEta(txn, contactId, messageId1,
 					maxLatency);
 			oneOf(database).commitTransaction(txn);
 		}});
@@ -961,24 +959,23 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testGenerateRequestedBatch() throws Exception {
-		byte[] raw1 = new byte[size];
 		Collection<MessageId> ids = Arrays.asList(messageId, messageId1);
-		Collection<byte[]> messages = Arrays.asList(raw, raw1);
+		Collection<Message> messages = Arrays.asList(message, message1);
 		context.checking(new Expectations() {{
 			oneOf(database).startTransaction();
 			will(returnValue(txn));
 			oneOf(database).containsContact(txn, contactId);
 			will(returnValue(true));
 			oneOf(database).getRequestedMessagesToSend(txn, contactId,
-					size * 2);
+					MAX_MESSAGE_LENGTH * 2, maxLatency);
 			will(returnValue(ids));
-			oneOf(database).getRawMessage(txn, messageId);
-			will(returnValue(raw));
-			oneOf(database).updateExpiryTime(txn, contactId, messageId,
+			oneOf(database).getMessage(txn, messageId);
+			will(returnValue(message));
+			oneOf(database).updateExpiryTimeAndEta(txn, contactId, messageId,
 					maxLatency);
-			oneOf(database).getRawMessage(txn, messageId1);
-			will(returnValue(raw1));
-			oneOf(database).updateExpiryTime(txn, contactId, messageId1,
+			oneOf(database).getMessage(txn, messageId1);
+			will(returnValue(message1));
+			oneOf(database).updateExpiryTimeAndEta(txn, contactId, messageId1,
 					maxLatency);
 			oneOf(database).lowerRequestedFlag(txn, contactId, ids);
 			oneOf(database).commitTransaction(txn);
@@ -990,7 +987,7 @@ public class DatabaseComponentImplTest extends BrambleMockTestCase {
 		Transaction transaction = db.startTransaction(false);
 		try {
 			assertEquals(messages, db.generateRequestedBatch(transaction,
-					contactId, size * 2, maxLatency));
+					contactId, MAX_MESSAGE_LENGTH * 2, maxLatency));
 			db.commitTransaction(transaction);
 		} finally {
 			db.endTransaction(transaction);

bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseMigrationTest.java

@@ -7,10 +7,12 @@ import org.briarproject.bramble.api.db.DatabaseConfig;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.settings.Settings;
+import org.briarproject.bramble.api.sync.MessageFactory;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.system.SystemClock;
 import org.briarproject.bramble.test.BrambleMockTestCase;
 import org.briarproject.bramble.test.TestDatabaseConfig;
+import org.briarproject.bramble.test.TestMessageFactory;
 import org.briarproject.bramble.test.TestUtils;
 import org.jmock.Expectations;
 import org.junit.After;
@@ -45,6 +47,7 @@ public abstract class DatabaseMigrationTest extends BrambleMockTestCase {
 
 	protected final DatabaseConfig config =
 			new TestDatabaseConfig(testDir, 1024 * 1024);
+	protected final MessageFactory messageFactory = new TestMessageFactory();
 	protected final SecretKey key = getSecretKey();
 	protected final Clock clock = new SystemClock();
 

bramble-core/src/test/java/org/briarproject/bramble/db/DatabasePerformanceComparisonTest.java

@@ -1,10 +1,13 @@
 package org.briarproject.bramble.db;
 
+import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.db.DatabaseConfig;
 import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.sync.MessageFactory;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.system.SystemClock;
 import org.briarproject.bramble.test.TestDatabaseConfig;
+import org.briarproject.bramble.test.TestMessageFactory;
 import org.briarproject.bramble.test.UTest;
 
 import java.io.IOException;
@@ -26,9 +29,11 @@ public abstract class DatabasePerformanceComparisonTest
 	 * How many blocks of each condition to compare.
 	 */
 	private static final int COMPARISON_BLOCKS = 10;
+	private SecretKey databaseKey = getSecretKey();
 
 	abstract Database<Connection> createDatabase(boolean conditionA,
-			DatabaseConfig databaseConfig, Clock clock);
+			DatabaseConfig databaseConfig, MessageFactory messageFactory,
+			Clock clock);
 
 	@Override
 	protected void benchmark(String name,
@@ -71,8 +76,9 @@ public abstract class DatabasePerformanceComparisonTest
 	private Database<Connection> openDatabase(boolean conditionA)
 			throws DbException {
 		Database<Connection> db = createDatabase(conditionA,
-				new TestDatabaseConfig(testDir, MAX_SIZE), new SystemClock());
-		db.open(getSecretKey(), null);
+				new TestDatabaseConfig(testDir, MAX_SIZE),
+				new TestMessageFactory(), new SystemClock());
+		db.open(databaseKey, null);
 		return db;
 	}
 

bramble-core/src/test/java/org/briarproject/bramble/db/DatabasePerformanceTest.java

@@ -96,6 +96,9 @@ public abstract class DatabasePerformanceTest extends BrambleTestCase {
 	 */
 	private static final int STEADY_STATE_BLOCKS = 5;
 
+	// All our transports use a maximum latency of 30 seconds
+	private static final int MAX_LATENCY = 30 * 1000;
+
 	protected final File testDir = getTestDirectory();
 	private final File resultsFile = new File(getTestName() + ".tsv");
 	protected final Random random = new Random();
@@ -448,7 +451,7 @@ public abstract class DatabasePerformanceTest extends BrambleTestCase {
 		benchmark(name, db -> {
 			Connection txn = db.startTransaction();
 			db.getMessagesToOffer(txn, pickRandom(contacts).getId(),
-					MAX_MESSAGE_IDS);
+					MAX_MESSAGE_IDS, MAX_LATENCY);
 			db.commitTransaction(txn);
 		});
 	}
@@ -470,7 +473,7 @@ public abstract class DatabasePerformanceTest extends BrambleTestCase {
 		benchmark(name, db -> {
 			Connection txn = db.startTransaction();
 			db.getMessagesToSend(txn, pickRandom(contacts).getId(),
-					MAX_MESSAGE_IDS);
+					MAX_MESSAGE_IDS, MAX_LATENCY);
 			db.commitTransaction(txn);
 		});
 	}
@@ -506,11 +509,11 @@ public abstract class DatabasePerformanceTest extends BrambleTestCase {
 	}
 
 	@Test
-	public void testGetRawMessage() throws Exception {
-		String name = "getRawMessage(T, MessageId)";
+	public void testGetMessage() throws Exception {
+		String name = "getMessage(T, MessageId)";
 		benchmark(name, db -> {
 			Connection txn = db.startTransaction();
-			db.getRawMessage(txn, pickRandom(messages).getId());
+			db.getMessage(txn, pickRandom(messages).getId());
 			db.commitTransaction(txn);
 		});
 	}
@@ -521,7 +524,7 @@ public abstract class DatabasePerformanceTest extends BrambleTestCase {
 		benchmark(name, db -> {
 			Connection txn = db.startTransaction();
 			db.getRequestedMessagesToSend(txn, pickRandom(contacts).getId(),
-					MAX_MESSAGE_IDS);
+					MAX_MESSAGE_IDS, MAX_LATENCY);
 			db.commitTransaction(txn);
 		});
 	}

bramble-core/src/test/java/org/briarproject/bramble/db/DatabaseTraceTest.java

@@ -1,10 +1,13 @@
 package org.briarproject.bramble.db;
 
+import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.db.DatabaseConfig;
 import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.sync.MessageFactory;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.system.SystemClock;
 import org.briarproject.bramble.test.TestDatabaseConfig;
+import org.briarproject.bramble.test.TestMessageFactory;
 import org.briarproject.bramble.util.IoUtils;
 
 import java.io.File;
@@ -20,8 +23,10 @@ import static org.briarproject.bramble.test.TestUtils.getSecretKey;
 
 public abstract class DatabaseTraceTest extends DatabasePerformanceTest {
 
+	private SecretKey databaseKey = getSecretKey();
+
 	abstract Database<Connection> createDatabase(DatabaseConfig databaseConfig,
-			Clock clock);
+			MessageFactory messageFactory, Clock clock);
 
 	@Nullable
 	protected abstract File getTraceFile();
@@ -43,8 +48,9 @@ public abstract class DatabaseTraceTest extends DatabasePerformanceTest {
 
 	private Database<Connection> openDatabase() throws DbException {
 		Database<Connection> db = createDatabase(
-				new TestDatabaseConfig(testDir, MAX_SIZE), new SystemClock());
-		db.open(getSecretKey(), null);
+				new TestDatabaseConfig(testDir, MAX_SIZE),
+				new TestMessageFactory(), new SystemClock());
+		db.open(databaseKey, null);
 		return db;
 	}
 

bramble-core/src/test/java/org/briarproject/bramble/db/H2DatabasePerformanceTest.java

@@ -1,6 +1,7 @@
 package org.briarproject.bramble.db;
 
 import org.briarproject.bramble.api.db.DatabaseConfig;
+import org.briarproject.bramble.api.sync.MessageFactory;
 import org.briarproject.bramble.api.system.Clock;
 import org.junit.Ignore;
 
@@ -13,7 +14,8 @@ public class H2DatabasePerformanceTest extends SingleDatabasePerformanceTest {
 	}
 
 	@Override
-	protected JdbcDatabase createDatabase(DatabaseConfig config, Clock clock) {
-		return new H2Database(config, clock);
+	protected JdbcDatabase createDatabase(DatabaseConfig config,
+			MessageFactory messageFactory, Clock clock) {
+		return new H2Database(config, messageFactory, clock);
 	}
 }

bramble-core/src/test/java/org/briarproject/bramble/db/H2DatabaseTest.java

@@ -1,16 +1,14 @@
 package org.briarproject.bramble.db;
 
 import org.briarproject.bramble.api.db.DatabaseConfig;
+import org.briarproject.bramble.api.sync.MessageFactory;
 import org.briarproject.bramble.api.system.Clock;
 
 public class H2DatabaseTest extends JdbcDatabaseTest {
 
-	public H2DatabaseTest() throws Exception {
-		super();
-	}
-
 	@Override
-	protected JdbcDatabase createDatabase(DatabaseConfig config, Clock clock) {
-		return new H2Database(config, clock);
+	protected JdbcDatabase createDatabase(DatabaseConfig config,
+			MessageFactory messageFactory, Clock clock) {
+		return new H2Database(config, messageFactory, clock);
 	}
 }

bramble-core/src/test/java/org/briarproject/bramble/db/H2DatabaseTraceTest.java

@@ -1,6 +1,7 @@
 package org.briarproject.bramble.db;
 
 import org.briarproject.bramble.api.db.DatabaseConfig;
+import org.briarproject.bramble.api.sync.MessageFactory;
 import org.briarproject.bramble.api.system.Clock;
 import org.junit.Ignore;
 
@@ -14,8 +15,8 @@ public class H2DatabaseTraceTest extends DatabaseTraceTest {
 
 	@Override
 	Database<Connection> createDatabase(DatabaseConfig databaseConfig,
-			Clock clock) {
-		return new H2Database(databaseConfig, clock) {
+			MessageFactory messageFactory, Clock clock) {
+		return new H2Database(databaseConfig, messageFactory, clock) {
 			@Override
 			@Nonnull
 			String getUrl() {

bramble-core/src/test/java/org/briarproject/bramble/db/H2HyperSqlDatabasePerformanceComparisonTest.java

@@ -1,6 +1,7 @@
 package org.briarproject.bramble.db;
 
 import org.briarproject.bramble.api.db.DatabaseConfig;
+import org.briarproject.bramble.api.sync.MessageFactory;
 import org.briarproject.bramble.api.system.Clock;
 import org.junit.Ignore;
 
@@ -12,9 +13,11 @@ public class H2HyperSqlDatabasePerformanceComparisonTest
 
 	@Override
 	Database<Connection> createDatabase(boolean conditionA,
-			DatabaseConfig databaseConfig, Clock clock) {
-		if (conditionA) return new H2Database(databaseConfig, clock);
-		else return new HyperSqlDatabase(databaseConfig, clock);
+			DatabaseConfig databaseConfig, MessageFactory messageFactory,
+			Clock clock) {
+		if (conditionA)
+			return new H2Database(databaseConfig, messageFactory, clock);
+		else return new HyperSqlDatabase(databaseConfig, messageFactory, clock);
 	}
 
 	@Override

bramble-core/src/test/java/org/briarproject/bramble/db/H2MigrationTest.java

@@ -11,7 +11,7 @@ public class H2MigrationTest extends DatabaseMigrationTest {
 	@Override
 	Database<Connection> createDatabase(
 			List<Migration<Connection>> migrations) {
-		return new H2Database(config, clock) {
+		return new H2Database(config, messageFactory, clock) {
 			@Override
 			List<Migration<Connection>> getMigrations() {
 				return migrations;

bramble-core/src/test/java/org/briarproject/bramble/db/H2SelfDatabasePerformanceComparisonTest.java

@@ -1,6 +1,7 @@
 package org.briarproject.bramble.db;
 
 import org.briarproject.bramble.api.db.DatabaseConfig;
+import org.briarproject.bramble.api.sync.MessageFactory;
 import org.briarproject.bramble.api.system.Clock;
 import org.junit.Ignore;
 
@@ -17,8 +18,9 @@ public class H2SelfDatabasePerformanceComparisonTest
 
 	@Override
 	Database<Connection> createDatabase(boolean conditionA,
-			DatabaseConfig databaseConfig, Clock clock) {
-		return new H2Database(databaseConfig, clock);
+			DatabaseConfig databaseConfig, MessageFactory messageFactory,
+			Clock clock) {
+		return new H2Database(databaseConfig, messageFactory, clock);
 	}
 
 	@Override

bramble-core/src/test/java/org/briarproject/bramble/db/H2SleepDatabasePerformanceComparisonTest.java

@@ -3,6 +3,7 @@ package org.briarproject.bramble.db;
 import org.briarproject.bramble.api.db.DatabaseConfig;
 import org.briarproject.bramble.api.db.DbException;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.sync.MessageFactory;
 import org.briarproject.bramble.api.system.Clock;
 import org.junit.Ignore;
 
@@ -19,11 +20,12 @@ public class H2SleepDatabasePerformanceComparisonTest
 
 	@Override
 	Database<Connection> createDatabase(boolean conditionA,
-			DatabaseConfig databaseConfig, Clock clock) {
+			DatabaseConfig databaseConfig, MessageFactory messageFactory,
+			Clock clock) {
 		if (conditionA) {
-			return new H2Database(databaseConfig, clock);
+			return new H2Database(databaseConfig, messageFactory, clock);
 		} else {
-			return new H2Database(databaseConfig, clock) {
+			return new H2Database(databaseConfig, messageFactory, clock) {
 				@Override
 				@NotNullByDefault
 				public void commitTransaction(Connection txn)

bramble-core/src/test/java/org/briarproject/bramble/db/HyperSqlDatabasePerformanceTest.java

@@ -1,6 +1,7 @@
 package org.briarproject.bramble.db;
 
 import org.briarproject.bramble.api.db.DatabaseConfig;
+import org.briarproject.bramble.api.sync.MessageFactory;
 import org.briarproject.bramble.api.system.Clock;
 import org.junit.Ignore;
 
@@ -14,7 +15,8 @@ public class HyperSqlDatabasePerformanceTest
 	}
 
 	@Override
-	protected JdbcDatabase createDatabase(DatabaseConfig config, Clock clock) {
-		return new HyperSqlDatabase(config, clock);
+	protected JdbcDatabase createDatabase(DatabaseConfig config,
+			MessageFactory messageFactory, Clock clock) {
+		return new HyperSqlDatabase(config, messageFactory, clock);
 	}
 }

bramble-core/src/test/java/org/briarproject/bramble/db/HyperSqlDatabaseTest.java

@@ -1,16 +1,14 @@
 package org.briarproject.bramble.db;
 
 import org.briarproject.bramble.api.db.DatabaseConfig;
+import org.briarproject.bramble.api.sync.MessageFactory;
 import org.briarproject.bramble.api.system.Clock;
 
 public class HyperSqlDatabaseTest extends JdbcDatabaseTest {
 
-	public HyperSqlDatabaseTest() throws Exception {
-		super();
-	}
-
 	@Override
-	protected JdbcDatabase createDatabase(DatabaseConfig config, Clock clock) {
-		return new HyperSqlDatabase(config, clock);
+	protected JdbcDatabase createDatabase(DatabaseConfig config,
+			MessageFactory messageFactory, Clock clock) {
+		return new HyperSqlDatabase(config, messageFactory ,clock);
 	}
 }

bramble-core/src/test/java/org/briarproject/bramble/db/HyperSqlMigrationTest.java

@@ -9,9 +9,9 @@ import java.util.List;
 public class HyperSqlMigrationTest extends DatabaseMigrationTest {
 
 	@Override
-	Database<Connection> createDatabase(List<Migration<Connection>> migrations)
-			throws Exception {
-		return new HyperSqlDatabase(config, clock) {
+	Database<Connection> createDatabase(
+			List<Migration<Connection>> migrations) {
+		return new HyperSqlDatabase(config, messageFactory, clock) {
 			@Override
 			List<Migration<Connection>> getMigrations() {
 				return migrations;

bramble-core/src/test/java/org/briarproject/bramble/db/JdbcDatabaseTest.java

@@ -5,6 +5,7 @@ import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.db.DatabaseConfig;
 import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.db.MessageDeletedException;
 import org.briarproject.bramble.api.db.Metadata;
 import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.bramble.api.identity.LocalAuthor;
@@ -14,6 +15,7 @@ import org.briarproject.bramble.api.sync.ClientId;
 import org.briarproject.bramble.api.sync.Group;
 import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.Message;
+import org.briarproject.bramble.api.sync.MessageFactory;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.bramble.api.sync.MessageStatus;
 import org.briarproject.bramble.api.sync.ValidationManager.State;
@@ -24,8 +26,10 @@ import org.briarproject.bramble.api.transport.KeySetId;
 import org.briarproject.bramble.api.transport.OutgoingKeys;
 import org.briarproject.bramble.api.transport.TransportKeys;
 import org.briarproject.bramble.system.SystemClock;
+import org.briarproject.bramble.test.ArrayClock;
 import org.briarproject.bramble.test.BrambleTestCase;
 import org.briarproject.bramble.test.TestDatabaseConfig;
+import org.briarproject.bramble.test.TestMessageFactory;
 import org.briarproject.bramble.test.TestUtils;
 import org.junit.After;
 import org.junit.Before;
@@ -52,16 +56,17 @@ import static org.briarproject.bramble.api.db.Metadata.REMOVE;
 import static org.briarproject.bramble.api.sync.Group.Visibility.INVISIBLE;
 import static org.briarproject.bramble.api.sync.Group.Visibility.SHARED;
 import static org.briarproject.bramble.api.sync.Group.Visibility.VISIBLE;
-import static org.briarproject.bramble.api.sync.SyncConstants.MAX_MESSAGE_LENGTH;
+import static org.briarproject.bramble.api.sync.SyncConstants.MAX_MESSAGE_BODY_LENGTH;
 import static org.briarproject.bramble.api.sync.ValidationManager.State.DELIVERED;
 import static org.briarproject.bramble.api.sync.ValidationManager.State.INVALID;
 import static org.briarproject.bramble.api.sync.ValidationManager.State.PENDING;
 import static org.briarproject.bramble.api.sync.ValidationManager.State.UNKNOWN;
+import static org.briarproject.bramble.test.TestUtils.deleteTestDirectory;
 import static org.briarproject.bramble.test.TestUtils.getAuthor;
 import static org.briarproject.bramble.test.TestUtils.getClientId;
 import static org.briarproject.bramble.test.TestUtils.getGroup;
 import static org.briarproject.bramble.test.TestUtils.getLocalAuthor;
-import static org.briarproject.bramble.test.TestUtils.getRandomBytes;
+import static org.briarproject.bramble.test.TestUtils.getMessage;
 import static org.briarproject.bramble.test.TestUtils.getRandomId;
 import static org.briarproject.bramble.test.TestUtils.getSecretKey;
 import static org.briarproject.bramble.test.TestUtils.getTestDirectory;
@@ -79,6 +84,9 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 
 	private static final int ONE_MEGABYTE = 1024 * 1024;
 	private static final int MAX_SIZE = 5 * ONE_MEGABYTE;
+	// All our transports use a maximum latency of 30 seconds
+	private static final int MAX_LATENCY = 30 * 1000;
+
 
 	private final SecretKey key = getSecretKey();
 	private final File testDir = getTestDirectory();
@@ -88,11 +96,8 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 	private final Group group;
 	private final Author author;
 	private final LocalAuthor localAuthor;
-	private final MessageId messageId;
-	private final long timestamp;
-	private final int size;
-	private final byte[] raw;
 	private final Message message;
+	private final MessageId messageId;
 	private final TransportId transportId;
 	private final ContactId contactId;
 	private final KeySetId keySetId, keySetId1;
@@ -105,11 +110,8 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 		groupId = group.getId();
 		author = getAuthor();
 		localAuthor = getLocalAuthor();
-		messageId = new MessageId(getRandomId());
-		timestamp = System.currentTimeMillis();
-		size = 1234;
-		raw = getRandomBytes(size);
-		message = new Message(messageId, groupId, timestamp, raw);
+		message = getMessage(groupId);
+		messageId = message.getId();
 		transportId = getTransportId();
 		contactId = new ContactId(1);
 		keySetId = new KeySetId(1);
@@ -117,7 +119,7 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 	}
 
 	protected abstract JdbcDatabase createDatabase(DatabaseConfig config,
-			Clock clock);
+			MessageFactory messageFactory, Clock clock);
 
 	@Before
 	public void setUp() {
@@ -149,8 +151,8 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 		assertTrue(db.containsContact(txn, contactId));
 		assertTrue(db.containsGroup(txn, groupId));
 		assertTrue(db.containsMessage(txn, messageId));
-		byte[] raw1 = db.getRawMessage(txn, messageId);
-		assertArrayEquals(raw, raw1);
+		assertArrayEquals(message.getBody(),
+				db.getMessage(txn, messageId).getBody());
 
 		// Delete the records
 		db.removeMessage(txn, messageId);
@@ -202,16 +204,16 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 
 		// The contact has not seen the message, so it should be sendable
 		Collection<MessageId> ids =
-				db.getMessagesToSend(txn, contactId, ONE_MEGABYTE);
+				db.getMessagesToSend(txn, contactId, ONE_MEGABYTE, MAX_LATENCY);
 		assertEquals(singletonList(messageId), ids);
-		ids = db.getMessagesToOffer(txn, contactId, 100);
+		ids = db.getMessagesToOffer(txn, contactId, 100, MAX_LATENCY);
 		assertEquals(singletonList(messageId), ids);
 
 		// Changing the status to seen = true should make the message unsendable
 		db.raiseSeenFlag(txn, contactId, messageId);
-		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE);
+		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE, MAX_LATENCY);
 		assertTrue(ids.isEmpty());
-		ids = db.getMessagesToOffer(txn, contactId, 100);
+		ids = db.getMessagesToOffer(txn, contactId, 100, MAX_LATENCY);
 		assertTrue(ids.isEmpty());
 
 		db.commitTransaction(txn);
@@ -233,30 +235,30 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 
 		// The message has not been validated, so it should not be sendable
 		Collection<MessageId> ids = db.getMessagesToSend(txn, contactId,
-				ONE_MEGABYTE);
+				ONE_MEGABYTE, MAX_LATENCY);
 		assertTrue(ids.isEmpty());
-		ids = db.getMessagesToOffer(txn, contactId, 100);
+		ids = db.getMessagesToOffer(txn, contactId, 100, MAX_LATENCY);
 		assertTrue(ids.isEmpty());
 
 		// Marking the message delivered should make it sendable
 		db.setMessageState(txn, messageId, DELIVERED);
-		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE);
+		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE, MAX_LATENCY);
 		assertEquals(singletonList(messageId), ids);
-		ids = db.getMessagesToOffer(txn, contactId, 100);
+		ids = db.getMessagesToOffer(txn, contactId, 100, MAX_LATENCY);
 		assertEquals(singletonList(messageId), ids);
 
 		// Marking the message invalid should make it unsendable
 		db.setMessageState(txn, messageId, INVALID);
-		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE);
+		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE, MAX_LATENCY);
 		assertTrue(ids.isEmpty());
-		ids = db.getMessagesToOffer(txn, contactId, 100);
+		ids = db.getMessagesToOffer(txn, contactId, 100, MAX_LATENCY);
 		assertTrue(ids.isEmpty());
 
 		// Marking the message pending should make it unsendable
 		db.setMessageState(txn, messageId, PENDING);
-		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE);
+		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE, MAX_LATENCY);
 		assertTrue(ids.isEmpty());
-		ids = db.getMessagesToOffer(txn, contactId, 100);
+		ids = db.getMessagesToOffer(txn, contactId, 100, MAX_LATENCY);
 		assertTrue(ids.isEmpty());
 
 		db.commitTransaction(txn);
@@ -277,37 +279,37 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 
 		// The group is invisible, so the message should not be sendable
 		Collection<MessageId> ids = db.getMessagesToSend(txn, contactId,
-				ONE_MEGABYTE);
+				ONE_MEGABYTE, MAX_LATENCY);
 		assertTrue(ids.isEmpty());
-		ids = db.getMessagesToOffer(txn, contactId, 100);
+		ids = db.getMessagesToOffer(txn, contactId, 100, MAX_LATENCY);
 		assertTrue(ids.isEmpty());
 
 		// Making the group visible should not make the message sendable
 		db.addGroupVisibility(txn, contactId, groupId, false);
-		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE);
+		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE, MAX_LATENCY);
 		assertTrue(ids.isEmpty());
-		ids = db.getMessagesToOffer(txn, contactId, 100);
+		ids = db.getMessagesToOffer(txn, contactId, 100, MAX_LATENCY);
 		assertTrue(ids.isEmpty());
 
 		// Sharing the group should make the message sendable
 		db.setGroupVisibility(txn, contactId, groupId, true);
-		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE);
+		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE, MAX_LATENCY);
 		assertEquals(singletonList(messageId), ids);
-		ids = db.getMessagesToOffer(txn, contactId, 100);
+		ids = db.getMessagesToOffer(txn, contactId, 100, MAX_LATENCY);
 		assertEquals(singletonList(messageId), ids);
 
 		// Unsharing the group should make the message unsendable
 		db.setGroupVisibility(txn, contactId, groupId, false);
-		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE);
+		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE, MAX_LATENCY);
 		assertTrue(ids.isEmpty());
-		ids = db.getMessagesToOffer(txn, contactId, 100);
+		ids = db.getMessagesToOffer(txn, contactId, 100, MAX_LATENCY);
 		assertTrue(ids.isEmpty());
 
 		// Making the group invisible should make the message unsendable
 		db.removeGroupVisibility(txn, contactId, groupId);
-		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE);
+		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE, MAX_LATENCY);
 		assertTrue(ids.isEmpty());
-		ids = db.getMessagesToOffer(txn, contactId, 100);
+		ids = db.getMessagesToOffer(txn, contactId, 100, MAX_LATENCY);
 		assertTrue(ids.isEmpty());
 
 		db.commitTransaction(txn);
@@ -329,16 +331,16 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 
 		// The message is not shared, so it should not be sendable
 		Collection<MessageId> ids = db.getMessagesToSend(txn, contactId,
-				ONE_MEGABYTE);
+				ONE_MEGABYTE, MAX_LATENCY);
 		assertTrue(ids.isEmpty());
-		ids = db.getMessagesToOffer(txn, contactId, 100);
+		ids = db.getMessagesToOffer(txn, contactId, 100, MAX_LATENCY);
 		assertTrue(ids.isEmpty());
 
 		// Sharing the message should make it sendable
 		db.setMessageShared(txn, messageId);
-		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE);
+		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE, MAX_LATENCY);
 		assertEquals(singletonList(messageId), ids);
-		ids = db.getMessagesToOffer(txn, contactId, 100);
+		ids = db.getMessagesToOffer(txn, contactId, 100, MAX_LATENCY);
 		assertEquals(singletonList(messageId), ids);
 
 		db.commitTransaction(txn);
@@ -359,12 +361,13 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 		db.addMessage(txn, message, DELIVERED, true, null);
 
 		// The message is sendable, but too large to send
-		Collection<MessageId> ids = db.getMessagesToSend(txn, contactId,
-				size - 1);
+		Collection<MessageId> ids =
+				db.getMessagesToSend(txn, contactId, message.getRawLength() - 1,
+						MAX_LATENCY);
 		assertTrue(ids.isEmpty());
-
 		// The message is just the right size to send
-		ids = db.getMessagesToSend(txn, contactId, size);
+		ids = db.getMessagesToSend(txn, contactId, message.getRawLength(),
+				MAX_LATENCY);
 		assertEquals(singletonList(messageId), ids);
 
 		db.commitTransaction(txn);
@@ -384,8 +387,8 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 		db.addGroupVisibility(txn, contactId, groupId, false);
 
 		// Add some messages to ack
-		MessageId messageId1 = new MessageId(getRandomId());
-		Message message1 = new Message(messageId1, groupId, timestamp, raw);
+		Message message1 = getMessage(groupId);
+		MessageId messageId1 = message1.getId();
 		db.addMessage(txn, message, DELIVERED, true, contactId);
 		db.addMessage(txn, message1, DELIVERED, true, contactId);
 
@@ -427,19 +430,19 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 
 		// Retrieve the message from the database and mark it as sent
 		Collection<MessageId> ids = db.getMessagesToSend(txn, contactId,
-				ONE_MEGABYTE);
+				ONE_MEGABYTE, MAX_LATENCY);
 		assertEquals(singletonList(messageId), ids);
-		db.updateExpiryTime(txn, contactId, messageId, Integer.MAX_VALUE);
+		db.updateExpiryTimeAndEta(txn, contactId, messageId, MAX_LATENCY);
 
 		// The message should no longer be sendable
-		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE);
+		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE, MAX_LATENCY);
 		assertTrue(ids.isEmpty());
 
 		// Pretend that the message was acked
 		db.raiseSeenFlag(txn, contactId, messageId);
 
 		// The message still should not be sendable
-		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE);
+		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE, MAX_LATENCY);
 		assertTrue(ids.isEmpty());
 
 		db.commitTransaction(txn);
@@ -448,9 +451,7 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 
 	@Test
 	public void testGetFreeSpace() throws Exception {
-		byte[] largeBody = new byte[MAX_MESSAGE_LENGTH];
-		for (int i = 0; i < largeBody.length; i++) largeBody[i] = (byte) i;
-		Message message = new Message(messageId, groupId, timestamp, largeBody);
+		Message message = getMessage(groupId, MAX_MESSAGE_BODY_LENGTH);
 		Database<Connection> db = open(false);
 
 		// Sanity check: there should be enough space on disk for this test
@@ -1104,8 +1105,8 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 
 	@Test
 	public void testMetadataQueries() throws Exception {
-		MessageId messageId1 = new MessageId(getRandomId());
-		Message message1 = new Message(messageId1, groupId, timestamp, raw);
+		Message message1 = getMessage(groupId);
+		MessageId messageId1 = message1.getId();
 
 		Database<Connection> db = open(false);
 		Connection txn = db.startTransaction();
@@ -1208,8 +1209,8 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 
 	@Test
 	public void testMetadataQueriesOnlyForDeliveredMessages() throws Exception {
-		MessageId messageId1 = new MessageId(getRandomId());
-		Message message1 = new Message(messageId1, groupId, timestamp, raw);
+		Message message1 = getMessage(groupId);
+		MessageId messageId1 = message1.getId();
 
 		Database<Connection> db = open(false);
 		Connection txn = db.startTransaction();
@@ -1279,14 +1280,14 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 
 	@Test
 	public void testMessageDependencies() throws Exception {
-		MessageId messageId1 = new MessageId(getRandomId());
-		MessageId messageId2 = new MessageId(getRandomId());
-		MessageId messageId3 = new MessageId(getRandomId());
-		MessageId messageId4 = new MessageId(getRandomId());
-		Message message1 = new Message(messageId1, groupId, timestamp, raw);
-		Message message2 = new Message(messageId2, groupId, timestamp, raw);
-		Message message3 = new Message(messageId3, groupId, timestamp, raw);
-		Message message4 = new Message(messageId4, groupId, timestamp, raw);
+		Message message1 = getMessage(groupId);
+		Message message2 = getMessage(groupId);
+		Message message3 = getMessage(groupId);
+		Message message4 = getMessage(groupId);
+		MessageId messageId1 = message1.getId();
+		MessageId messageId2 = message2.getId();
+		MessageId messageId3 = message3.getId();
+		MessageId messageId4 = message4.getId();
 
 		Database<Connection> db = open(false);
 		Connection txn = db.startTransaction();
@@ -1384,16 +1385,16 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 		db.addGroup(txn, group1);
 
 		// Add a message to the second group
-		MessageId messageId1 = new MessageId(getRandomId());
-		Message message1 = new Message(messageId1, groupId1, timestamp, raw);
+		Message message1 = getMessage(groupId1);
+		MessageId messageId1 = message1.getId();
 		db.addMessage(txn, message1, DELIVERED, true, contactId);
 
 		// Create an ID for a missing message
 		MessageId messageId2 = new MessageId(getRandomId());
 
 		// Add another message to the first group
-		MessageId messageId3 = new MessageId(getRandomId());
-		Message message3 = new Message(messageId3, groupId, timestamp, raw);
+		Message message3 = getMessage(groupId);
+		MessageId messageId3 = message3.getId();
 		db.addMessage(txn, message3, DELIVERED, true, contactId);
 
 		// Add dependencies between the messages
@@ -1427,36 +1428,32 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 
 	@Test
 	public void testGetPendingMessagesForDelivery() throws Exception {
-		MessageId mId1 = new MessageId(getRandomId());
-		MessageId mId2 = new MessageId(getRandomId());
-		MessageId mId3 = new MessageId(getRandomId());
-		MessageId mId4 = new MessageId(getRandomId());
-		Message m1 = new Message(mId1, groupId, timestamp, raw);
-		Message m2 = new Message(mId2, groupId, timestamp, raw);
-		Message m3 = new Message(mId3, groupId, timestamp, raw);
-		Message m4 = new Message(mId4, groupId, timestamp, raw);
+		Message message1 = getMessage(groupId);
+		Message message2 = getMessage(groupId);
+		Message message3 = getMessage(groupId);
+		Message message4 = getMessage(groupId);
 
 		Database<Connection> db = open(false);
 		Connection txn = db.startTransaction();
 
 		// Add a group and some messages with different states
 		db.addGroup(txn, group);
-		db.addMessage(txn, m1, UNKNOWN, true, contactId);
-		db.addMessage(txn, m2, INVALID, true, contactId);
-		db.addMessage(txn, m3, PENDING, true, contactId);
-		db.addMessage(txn, m4, DELIVERED, true, contactId);
+		db.addMessage(txn, message1, UNKNOWN, true, contactId);
+		db.addMessage(txn, message2, INVALID, true, contactId);
+		db.addMessage(txn, message3, PENDING, true, contactId);
+		db.addMessage(txn, message4, DELIVERED, true, contactId);
 
 		Collection<MessageId> result;
 
 		// Retrieve messages to be validated
 		result = db.getMessagesToValidate(txn);
 		assertEquals(1, result.size());
-		assertTrue(result.contains(mId1));
+		assertTrue(result.contains(message1.getId()));
 
 		// Retrieve pending messages
 		result = db.getPendingMessages(txn);
 		assertEquals(1, result.size());
-		assertTrue(result.contains(mId3));
+		assertTrue(result.contains(message3.getId()));
 
 		db.commitTransaction(txn);
 		db.close();
@@ -1464,35 +1461,31 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 
 	@Test
 	public void testGetMessagesToShare() throws Exception {
-		MessageId mId1 = new MessageId(getRandomId());
-		MessageId mId2 = new MessageId(getRandomId());
-		MessageId mId3 = new MessageId(getRandomId());
-		MessageId mId4 = new MessageId(getRandomId());
-		Message m1 = new Message(mId1, groupId, timestamp, raw);
-		Message m2 = new Message(mId2, groupId, timestamp, raw);
-		Message m3 = new Message(mId3, groupId, timestamp, raw);
-		Message m4 = new Message(mId4, groupId, timestamp, raw);
+		Message message1 = getMessage(groupId);
+		Message message2 = getMessage(groupId);
+		Message message3 = getMessage(groupId);
+		Message message4 = getMessage(groupId);
 
 		Database<Connection> db = open(false);
 		Connection txn = db.startTransaction();
 
 		// Add a group and some messages
 		db.addGroup(txn, group);
-		db.addMessage(txn, m1, DELIVERED, true, contactId);
-		db.addMessage(txn, m2, DELIVERED, false, contactId);
-		db.addMessage(txn, m3, DELIVERED, false, contactId);
-		db.addMessage(txn, m4, DELIVERED, true, contactId);
+		db.addMessage(txn, message1, DELIVERED, true, contactId);
+		db.addMessage(txn, message2, DELIVERED, false, contactId);
+		db.addMessage(txn, message3, DELIVERED, false, contactId);
+		db.addMessage(txn, message4, DELIVERED, true, contactId);
 
 		// Introduce dependencies between the messages
-		db.addMessageDependency(txn, m1, mId2, DELIVERED);
-		db.addMessageDependency(txn, m3, mId1, DELIVERED);
-		db.addMessageDependency(txn, m4, mId3, DELIVERED);
+		db.addMessageDependency(txn, message1, message2.getId(), DELIVERED);
+		db.addMessageDependency(txn, message3, message1.getId(), DELIVERED);
+		db.addMessageDependency(txn, message4, message3.getId(), DELIVERED);
 
 		// Retrieve messages to be shared
 		Collection<MessageId> result = db.getMessagesToShare(txn);
 		assertEquals(2, result.size());
-		assertTrue(result.contains(mId2));
-		assertTrue(result.contains(mId3));
+		assertTrue(result.contains(message2.getId()));
+		assertTrue(result.contains(message3.getId()));
 
 		db.commitTransaction(txn);
 		db.close();
@@ -1530,7 +1523,7 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 		assertFalse(status.isSeen());
 
 		// Pretend the message was sent to the contact
-		db.updateExpiryTime(txn, contactId, messageId, Integer.MAX_VALUE);
+		db.updateExpiryTimeAndEta(txn, contactId, messageId, Integer.MAX_VALUE);
 
 		// The message should be sent but not seen
 		status = db.getMessageStatus(txn, contactId, messageId);
@@ -1649,13 +1642,17 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 
 		// The message should be sendable
 		Collection<MessageId> ids = db.getMessagesToSend(txn, contactId,
-				ONE_MEGABYTE);
+				ONE_MEGABYTE, MAX_LATENCY);
 		assertEquals(singletonList(messageId), ids);
-		ids = db.getMessagesToOffer(txn, contactId, 100);
+		ids = db.getMessagesToOffer(txn, contactId, 100, MAX_LATENCY);
 		assertEquals(singletonList(messageId), ids);
 
-		// The raw message should not be null
-		assertNotNull(db.getRawMessage(txn, messageId));
+		// The message should be available
+		Message m = db.getMessage(txn, messageId);
+		assertEquals(messageId, m.getId());
+		assertEquals(groupId, m.getGroupId());
+		assertEquals(message.getTimestamp(), m.getTimestamp());
+		assertArrayEquals(message.getBody(), m.getBody());
 
 		// Delete the message
 		db.deleteMessage(txn, messageId);
@@ -1664,13 +1661,18 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 		assertTrue(db.containsVisibleMessage(txn, contactId, messageId));
 
 		// The message should not be sendable
-		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE);
+		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE, MAX_LATENCY);
 		assertTrue(ids.isEmpty());
-		ids = db.getMessagesToOffer(txn, contactId, 100);
+		ids = db.getMessagesToOffer(txn, contactId, 100, MAX_LATENCY);
 		assertTrue(ids.isEmpty());
 
-		// The raw message should be null
-		assertNull(db.getRawMessage(txn, messageId));
+		// Requesting the message should throw an exception
+		try {
+			db.getMessage(txn, messageId);
+			fail();
+		} catch (MessageDeletedException expected) {
+			// Expected
+		}
 
 		db.commitTransaction(txn);
 		db.close();
@@ -1733,7 +1735,8 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 	@Test
 	public void testGetNextSendTime() throws Exception {
 		long now = System.currentTimeMillis();
-		Database<Connection> db = open(false, new StoppedClock(now));
+		Database<Connection> db = open(false, new TestMessageFactory(),
+				new StoppedClock(now));
 		Connection txn = db.startTransaction();
 
 		// Add a contact, a group and a message
@@ -1764,12 +1767,12 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 
 		// Update the message's expiry time as though we sent it - now the
 		// message should be sendable after one round-trip
-		db.updateExpiryTime(txn, contactId, messageId, 1000);
+		db.updateExpiryTimeAndEta(txn, contactId, messageId, 1000);
 		assertEquals(now + 2000, db.getNextSendTime(txn, contactId));
 
 		// Update the message's expiry time again - now it should be sendable
 		// after two round-trips
-		db.updateExpiryTime(txn, contactId, messageId, 1000);
+		db.updateExpiryTimeAndEta(txn, contactId, messageId, 1000);
 		assertEquals(now + 4000, db.getNextSendTime(txn, contactId));
 
 		// Delete the message - there should be no messages to send
@@ -1802,7 +1805,7 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 		Connection txn = db.startTransaction();
 		try {
 			// Ask for a nonexistent message - an exception should be thrown
-			db.getRawMessage(txn, messageId);
+			db.getMessage(txn, messageId);
 			fail();
 		} catch (DbException expected) {
 			// It should be possible to abort the transaction without error
@@ -1812,14 +1815,112 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 		db.close();
 	}
 
-	private Database<Connection> open(boolean resume) throws Exception {
-		return open(resume, new SystemClock());
+	@Test
+	public void testMessageRetransmission() throws Exception {
+		long now = System.currentTimeMillis();
+		long steps[] = {now, now, now + MAX_LATENCY * 2 - 1,
+				now + MAX_LATENCY * 2};
+		Database<Connection> db =
+				open(false, new TestMessageFactory(), new ArrayClock(steps));
+		Connection txn = db.startTransaction();
+
+		// Add a contact, a shared group and a shared message
+		db.addLocalAuthor(txn, localAuthor);
+		assertEquals(contactId, db.addContact(txn, author, localAuthor.getId(),
+				true, true));
+		db.addGroup(txn, group);
+		db.addGroupVisibility(txn, contactId, groupId, true);
+		db.addMessage(txn, message, DELIVERED, true, null);
+
+		// Time: now
+		// Retrieve the message from the database
+		Collection<MessageId> ids = db.getMessagesToSend(txn, contactId,
+				ONE_MEGABYTE, MAX_LATENCY);
+		assertEquals(singletonList(messageId), ids);
+
+		// Time: now
+		// Mark the message as sent
+		db.updateExpiryTimeAndEta(txn, contactId, messageId, MAX_LATENCY);
+
+		// The message should expire after 2 * MAX_LATENCY
+		assertEquals(now + MAX_LATENCY * 2, db.getNextSendTime(txn, contactId));
+
+		// Time: now + MAX_LATENCY * 2 - 1
+		// The message should not yet be sendable
+		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE, MAX_LATENCY);
+		assertTrue(ids.isEmpty());
+
+		// Time: now + MAX_LATENCY * 2
+		// The message should have expired and should now be sendable
+		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE, MAX_LATENCY);
+		assertEquals(singletonList(messageId), ids);
+
+		db.commitTransaction(txn);
+		db.close();
 	}
 
-	private Database<Connection> open(boolean resume, Clock clock)
-			throws Exception {
-		Database<Connection> db = createDatabase(
-				new TestDatabaseConfig(testDir, MAX_SIZE), clock);
+
+	@Test
+	public void testFasterMessageRetransmission() throws Exception {
+		long now = System.currentTimeMillis();
+		long steps[] = {now, now, now, now, now + 1};
+		Database<Connection> db =
+				open(false, new TestMessageFactory(), new ArrayClock(steps));
+		Connection txn = db.startTransaction();
+
+		// Add a contact, a shared group and a shared message
+		db.addLocalAuthor(txn, localAuthor);
+		assertEquals(contactId, db.addContact(txn, author, localAuthor.getId(),
+				true, true));
+		db.addGroup(txn, group);
+		db.addGroupVisibility(txn, contactId, groupId, true);
+		db.addMessage(txn, message, DELIVERED, true, null);
+
+		// Time: now
+		// Retrieve the message from the database
+		Collection<MessageId> ids = db.getMessagesToSend(txn, contactId,
+				ONE_MEGABYTE, MAX_LATENCY);
+		assertEquals(singletonList(messageId), ids);
+
+		// Time: now
+		// Mark the message as sent
+		db.updateExpiryTimeAndEta(txn, contactId, messageId, MAX_LATENCY);
+
+		// The message should expire after 2 * MAX_LATENCY
+		assertEquals(now + MAX_LATENCY * 2, db.getNextSendTime(txn, contactId));
+
+		// Time: now
+		// The message should not be sendable via the same transport
+		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE, MAX_LATENCY);
+		assertTrue(ids.isEmpty());
+
+		// Time: now
+		// The message should be sendable via a transport with a faster ETA
+		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE,
+				MAX_LATENCY - 1);
+		assertEquals(singletonList(messageId), ids);
+
+		// Time: now + 1
+		// The message should no longer be sendable via the faster transport,
+		// as the ETA is now equal
+		ids = db.getMessagesToSend(txn, contactId, ONE_MEGABYTE,
+				MAX_LATENCY - 1);
+		assertTrue(ids.isEmpty());
+
+		db.commitTransaction(txn);
+		db.close();
+	}
+
+
+	private Database<Connection> open(boolean resume) throws Exception {
+		return open(resume, new TestMessageFactory(), new SystemClock());
+	}
+
+	private Database<Connection> open(boolean resume,
+			MessageFactory messageFactory, Clock clock) throws Exception {
+		Database<Connection> db =
+				createDatabase(new TestDatabaseConfig(testDir, MAX_SIZE),
+						messageFactory, clock);
 		if (!resume) TestUtils.deleteTestDirectory(testDir);
 		db.open(key, null);
 		return db;
@@ -1848,7 +1949,7 @@ public abstract class JdbcDatabaseTest extends BrambleTestCase {
 
 	@After
 	public void tearDown() {
-		TestUtils.deleteTestDirectory(testDir);
+		deleteTestDirectory(testDir);
 	}
 
 	private static class StoppedClock implements Clock {

bramble-core/src/test/java/org/briarproject/bramble/db/SingleDatabasePerformanceTest.java

@@ -1,10 +1,13 @@
 package org.briarproject.bramble.db;
 
+import org.briarproject.bramble.api.crypto.SecretKey;
 import org.briarproject.bramble.api.db.DatabaseConfig;
 import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.sync.MessageFactory;
 import org.briarproject.bramble.api.system.Clock;
 import org.briarproject.bramble.system.SystemClock;
 import org.briarproject.bramble.test.TestDatabaseConfig;
+import org.briarproject.bramble.test.TestMessageFactory;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -20,7 +23,9 @@ public abstract class SingleDatabasePerformanceTest
 		extends DatabasePerformanceTest {
 
 	abstract Database<Connection> createDatabase(DatabaseConfig databaseConfig,
-			Clock clock);
+			MessageFactory messageFactory, Clock clock);
+
+	private SecretKey databaseKey = getSecretKey();
 
 	@Override
 	protected void benchmark(String name,
@@ -40,8 +45,9 @@ public abstract class SingleDatabasePerformanceTest
 
 	private Database<Connection> openDatabase() throws DbException {
 		Database<Connection> db = createDatabase(
-				new TestDatabaseConfig(testDir, MAX_SIZE), new SystemClock());
-		db.open(getSecretKey(), null);
+				new TestDatabaseConfig(testDir, MAX_SIZE),
+				new TestMessageFactory(), new SystemClock());
+		db.open(databaseKey, null);
 		return db;
 	}
 

bramble-core/src/test/java/org/briarproject/bramble/properties/TransportPropertyManagerImplTest.java

@@ -34,11 +34,10 @@ import static java.util.Collections.singletonList;
 import static org.briarproject.bramble.api.properties.TransportPropertyManager.CLIENT_ID;
 import static org.briarproject.bramble.api.properties.TransportPropertyManager.MAJOR_VERSION;
 import static org.briarproject.bramble.api.sync.Group.Visibility.SHARED;
-import static org.briarproject.bramble.api.sync.SyncConstants.MAX_MESSAGE_BODY_LENGTH;
 import static org.briarproject.bramble.test.TestUtils.getAuthor;
 import static org.briarproject.bramble.test.TestUtils.getGroup;
 import static org.briarproject.bramble.test.TestUtils.getLocalAuthor;
-import static org.briarproject.bramble.test.TestUtils.getRandomBytes;
+import static org.briarproject.bramble.test.TestUtils.getMessage;
 import static org.briarproject.bramble.test.TestUtils.getRandomId;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -187,8 +186,7 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 			throws Exception {
 		Transaction txn = new Transaction(null, false);
 		GroupId contactGroupId = new GroupId(getRandomId());
-		long timestamp = 123456789;
-		Message message = getMessage(contactGroupId, timestamp);
+		Message message = getMessage(contactGroupId);
 		Metadata meta = new Metadata();
 		BdfDictionary metaDictionary = BdfDictionary.of(
 				new BdfEntry("transportId", "foo"),
@@ -229,8 +227,7 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 			throws Exception {
 		Transaction txn = new Transaction(null, false);
 		GroupId contactGroupId = new GroupId(getRandomId());
-		long timestamp = 123456789;
-		Message message = getMessage(contactGroupId, timestamp);
+		Message message = getMessage(contactGroupId);
 		Metadata meta = new Metadata();
 		// Version 4 is being delivered
 		BdfDictionary metaDictionary = BdfDictionary.of(
@@ -267,8 +264,7 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 	public void testDeletesObsoleteUpdateWhenDelivered() throws Exception {
 		Transaction txn = new Transaction(null, false);
 		GroupId contactGroupId = new GroupId(getRandomId());
-		long timestamp = 123456789;
-		Message message = getMessage(contactGroupId, timestamp);
+		Message message = getMessage(contactGroupId);
 		Metadata meta = new Metadata();
 		// Version 3 is being delivered
 		BdfDictionary metaDictionary = BdfDictionary.of(
@@ -619,12 +615,6 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 				true, active);
 	}
 
-	private Message getMessage(GroupId g, long timestamp) {
-		MessageId messageId = new MessageId(getRandomId());
-		byte[] raw = getRandomBytes(MAX_MESSAGE_BODY_LENGTH);
-		return new Message(messageId, g, timestamp, raw);
-	}
-
 	private void expectGetLocalProperties(Transaction txn) throws Exception {
 		Map<MessageId, BdfDictionary> messageMetadata = new LinkedHashMap<>();
 		// The latest update for transport "foo" should be returned
@@ -664,9 +654,9 @@ public class TransportPropertyManagerImplTest extends BrambleMockTestCase {
 	private void expectStoreMessage(Transaction txn, GroupId g,
 			String transportId, BdfDictionary properties, long version,
 			boolean local, boolean shared) throws Exception {
-		long timestamp = 123456789;
 		BdfList body = BdfList.of(transportId, version, properties);
-		Message message = getMessage(g, timestamp);
+		Message message = getMessage(g);
+		long timestamp = message.getTimestamp();
 		BdfDictionary meta = BdfDictionary.of(
 				new BdfEntry("transportId", transportId),
 				new BdfEntry("version", version),

bramble-core/src/test/java/org/briarproject/bramble/sync/SimplexOutgoingSessionTest.java

@@ -5,6 +5,8 @@ import org.briarproject.bramble.api.db.DatabaseComponent;
 import org.briarproject.bramble.api.db.Transaction;
 import org.briarproject.bramble.api.event.EventBus;
 import org.briarproject.bramble.api.sync.Ack;
+import org.briarproject.bramble.api.sync.GroupId;
+import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.bramble.api.sync.SyncRecordWriter;
 import org.briarproject.bramble.api.transport.StreamWriter;
@@ -13,11 +15,11 @@ import org.briarproject.bramble.test.ImmediateExecutor;
 import org.jmock.Expectations;
 import org.junit.Test;
 
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.concurrent.Executor;
 
+import static java.util.Collections.singletonList;
 import static org.briarproject.bramble.api.sync.SyncConstants.MAX_MESSAGE_IDS;
+import static org.briarproject.bramble.test.TestUtils.getMessage;
 import static org.briarproject.bramble.test.TestUtils.getRandomId;
 
 public class SimplexOutgoingSessionTest extends BrambleMockTestCase {
@@ -32,7 +34,8 @@ public class SimplexOutgoingSessionTest extends BrambleMockTestCase {
 
 	private final Executor dbExecutor = new ImmediateExecutor();
 	private final ContactId contactId = new ContactId(234);
-	private final MessageId messageId = new MessageId(getRandomId());
+	private final Message message = getMessage(new GroupId(getRandomId()));
+	private final MessageId messageId = message.getId();
 
 	@Test
 	public void testNothingToSend() throws Exception {
@@ -71,8 +74,7 @@ public class SimplexOutgoingSessionTest extends BrambleMockTestCase {
 
 	@Test
 	public void testSomethingToSend() throws Exception {
-		Ack ack = new Ack(Collections.singletonList(messageId));
-		byte[] raw = new byte[1234];
+		Ack ack = new Ack(singletonList(messageId));
 		SimplexOutgoingSession session = new SimplexOutgoingSession(db,
 				dbExecutor, eventBus, contactId, MAX_LATENCY, streamWriter,
 				recordWriter);
@@ -97,10 +99,10 @@ public class SimplexOutgoingSessionTest extends BrambleMockTestCase {
 			will(returnValue(msgTxn));
 			oneOf(db).generateBatch(with(msgTxn), with(contactId),
 					with(any(int.class)), with(MAX_LATENCY));
-			will(returnValue(Arrays.asList(raw)));
+			will(returnValue(singletonList(message)));
 			oneOf(db).commitTransaction(msgTxn);
 			oneOf(db).endTransaction(msgTxn);
-			oneOf(recordWriter).writeMessage(raw);
+			oneOf(recordWriter).writeMessage(message);
 			// No more acks
 			oneOf(db).startTransaction(false);
 			will(returnValue(noAckTxn));

bramble-core/src/test/java/org/briarproject/bramble/sync/SyncIntegrationTest.java

@@ -108,8 +108,8 @@ public class SyncIntegrationTest extends BrambleTestCase {
 				streamWriter.getOutputStream());
 
 		recordWriter.writeAck(new Ack(messageIds));
-		recordWriter.writeMessage(message.getRaw());
-		recordWriter.writeMessage(message1.getRaw());
+		recordWriter.writeMessage(message);
+		recordWriter.writeMessage(message1);
 		recordWriter.writeOffer(new Offer(messageIds));
 		recordWriter.writeRequest(new Request(messageIds));
 
@@ -169,7 +169,7 @@ public class SyncIntegrationTest extends BrambleTestCase {
 		assertArrayEquals(m1.getGroupId().getBytes(),
 				m2.getGroupId().getBytes());
 		assertEquals(m1.getTimestamp(), m2.getTimestamp());
-		assertEquals(m1.getLength(), m2.getLength());
-		assertArrayEquals(m1.getRaw(), m2.getRaw());
+		assertEquals(m1.getRawLength(), m2.getRawLength());
+		assertArrayEquals(m1.getBody(), m2.getBody());
 	}
 }

bramble-core/src/test/java/org/briarproject/bramble/sync/ValidationManagerImplTest.java

@@ -1,6 +1,5 @@
 package org.briarproject.bramble.sync;
 
-import org.briarproject.bramble.api.UniqueId;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.db.DatabaseComponent;
 import org.briarproject.bramble.api.db.Metadata;
@@ -13,7 +12,6 @@ import org.briarproject.bramble.api.sync.GroupId;
 import org.briarproject.bramble.api.sync.InvalidMessageException;
 import org.briarproject.bramble.api.sync.Message;
 import org.briarproject.bramble.api.sync.MessageContext;
-import org.briarproject.bramble.api.sync.MessageFactory;
 import org.briarproject.bramble.api.sync.MessageId;
 import org.briarproject.bramble.api.sync.ValidationManager.IncomingMessageHook;
 import org.briarproject.bramble.api.sync.ValidationManager.MessageValidator;
@@ -21,30 +19,31 @@ import org.briarproject.bramble.api.sync.ValidationManager.State;
 import org.briarproject.bramble.api.sync.event.MessageAddedEvent;
 import org.briarproject.bramble.test.BrambleMockTestCase;
 import org.briarproject.bramble.test.ImmediateExecutor;
-import org.briarproject.bramble.util.ByteUtils;
 import org.jmock.Expectations;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.concurrent.Executor;
 
+import static java.util.Collections.emptyList;
+import static java.util.Collections.emptyMap;
+import static java.util.Collections.singletonList;
+import static java.util.Collections.singletonMap;
 import static org.briarproject.bramble.api.sync.ValidationManager.State.DELIVERED;
 import static org.briarproject.bramble.api.sync.ValidationManager.State.INVALID;
 import static org.briarproject.bramble.api.sync.ValidationManager.State.PENDING;
 import static org.briarproject.bramble.api.sync.ValidationManager.State.UNKNOWN;
 import static org.briarproject.bramble.test.TestUtils.getClientId;
 import static org.briarproject.bramble.test.TestUtils.getGroup;
+import static org.briarproject.bramble.test.TestUtils.getMessage;
 import static org.briarproject.bramble.test.TestUtils.getRandomId;
 
 public class ValidationManagerImplTest extends BrambleMockTestCase {
 
 	private final DatabaseComponent db = context.mock(DatabaseComponent.class);
-	private final MessageFactory messageFactory =
-			context.mock(MessageFactory.class);
 	private final MessageValidator validator =
 			context.mock(MessageValidator.class);
 	private final IncomingMessageHook hook =
@@ -54,38 +53,26 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 	private final Executor validationExecutor = new ImmediateExecutor();
 	private final ClientId clientId = getClientId();
 	private final int majorVersion = 123;
-	private final MessageId messageId = new MessageId(getRandomId());
-	private final MessageId messageId1 = new MessageId(getRandomId());
-	private final MessageId messageId2 = new MessageId(getRandomId());
 	private final Group group = getGroup(clientId, majorVersion);
 	private final GroupId groupId = group.getId();
-	private final long timestamp = System.currentTimeMillis();
-	private final byte[] raw = new byte[123];
-	private final Message message = new Message(messageId, groupId, timestamp,
-			raw);
-	private final Message message1 = new Message(messageId1, groupId, timestamp,
-			raw);
-	private final Message message2 = new Message(messageId2, groupId, timestamp,
-			raw);
+	private final Message message = getMessage(groupId);
+	private final Message message1 = getMessage(groupId);
+	private final Message message2 = getMessage(groupId);
+	private final MessageId messageId = message.getId();
+	private final MessageId messageId1 = message1.getId();
+	private final MessageId messageId2 = message2.getId();
 
 	private final Metadata metadata = new Metadata();
 	private final MessageContext validResult = new MessageContext(metadata);
 	private final ContactId contactId = new ContactId(234);
 	private final MessageContext validResultWithDependencies =
-			new MessageContext(metadata, Collections.singletonList(messageId1));
+			new MessageContext(metadata, singletonList(messageId1));
 
 	private ValidationManagerImpl vm;
 
-	public ValidationManagerImplTest() {
-		// Encode the messages
-		System.arraycopy(groupId.getBytes(), 0, raw, 0, UniqueId.LENGTH);
-		ByteUtils.writeUint64(timestamp, raw, UniqueId.LENGTH);
-	}
-
 	@Before
 	public void setUp() {
-		vm = new ValidationManagerImpl(db, dbExecutor, validationExecutor,
-				messageFactory);
+		vm = new ValidationManagerImpl(db, dbExecutor, validationExecutor);
 		vm.registerMessageValidator(clientId, majorVersion, validator);
 		vm.registerIncomingMessageHook(clientId, majorVersion, hook);
 	}
@@ -101,21 +88,21 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn));
 			oneOf(db).getMessagesToValidate(txn);
-			will(returnValue(Collections.emptyList()));
+			will(returnValue(emptyList()));
 			oneOf(db).commitTransaction(txn);
 			oneOf(db).endTransaction(txn);
 			// deliverOutstandingMessages()
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn1));
 			oneOf(db).getPendingMessages(txn1);
-			will(returnValue(Collections.emptyList()));
+			will(returnValue(emptyList()));
 			oneOf(db).commitTransaction(txn1);
 			oneOf(db).endTransaction(txn1);
 			// shareOutstandingMessages()
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn2));
 			oneOf(db).getMessagesToShare(txn2);
-			will(returnValue(Collections.emptyList()));
+			will(returnValue(emptyList()));
 			oneOf(db).commitTransaction(txn2);
 			oneOf(db).endTransaction(txn2);
 		}});
@@ -145,9 +132,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			// Load the first raw message and group
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn1));
-			oneOf(db).getRawMessage(txn1, messageId);
-			will(returnValue(raw));
-			oneOf(messageFactory).createMessage(messageId, raw);
+			oneOf(db).getMessage(txn1, messageId);
 			will(returnValue(message));
 			oneOf(db).getGroup(txn1, groupId);
 			will(returnValue(group));
@@ -166,15 +151,13 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).setMessageState(txn2, messageId, DELIVERED);
 			// Get any pending dependents
 			oneOf(db).getMessageDependents(txn2, messageId);
-			will(returnValue(Collections.emptyMap()));
+			will(returnValue(emptyMap()));
 			oneOf(db).commitTransaction(txn2);
 			oneOf(db).endTransaction(txn2);
 			// Load the second raw message and group
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn3));
-			oneOf(db).getRawMessage(txn3, messageId1);
-			will(returnValue(raw));
-			oneOf(messageFactory).createMessage(messageId1, raw);
+			oneOf(db).getMessage(txn3, messageId1);
 			will(returnValue(message1));
 			oneOf(db).getGroup(txn3, groupId);
 			will(returnValue(group));
@@ -193,21 +176,21 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).deleteMessageMetadata(txn4, messageId1);
 			// Recursively invalidate any dependents
 			oneOf(db).getMessageDependents(txn4, messageId1);
-			will(returnValue(Collections.emptyMap()));
+			will(returnValue(emptyMap()));
 			oneOf(db).commitTransaction(txn4);
 			oneOf(db).endTransaction(txn4);
 			// Get pending messages to deliver
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn5));
 			oneOf(db).getPendingMessages(txn5);
-			will(returnValue(Collections.emptyList()));
+			will(returnValue(emptyList()));
 			oneOf(db).commitTransaction(txn5);
 			oneOf(db).endTransaction(txn5);
 			// Get messages to share
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn6));
 			oneOf(db).getMessagesToShare(txn6);
-			will(returnValue(Collections.emptyList()));
+			will(returnValue(emptyList()));
 			oneOf(db).commitTransaction(txn6);
 			oneOf(db).endTransaction(txn6);
 		}});
@@ -228,14 +211,14 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn));
 			oneOf(db).getMessagesToValidate(txn);
-			will(returnValue(Collections.emptyList()));
+			will(returnValue(emptyList()));
 			oneOf(db).commitTransaction(txn);
 			oneOf(db).endTransaction(txn);
 			// Get pending messages to deliver
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn1));
 			oneOf(db).getPendingMessages(txn1);
-			will(returnValue(Collections.singletonList(messageId)));
+			will(returnValue(singletonList(messageId)));
 			oneOf(db).commitTransaction(txn1);
 			oneOf(db).endTransaction(txn1);
 			// Check whether the message is ready to deliver
@@ -244,11 +227,9 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).getMessageState(txn2, messageId);
 			will(returnValue(PENDING));
 			oneOf(db).getMessageDependencies(txn2, messageId);
-			will(returnValue(Collections.singletonMap(messageId1, DELIVERED)));
+			will(returnValue(singletonMap(messageId1, DELIVERED)));
 			// Get the message and its metadata to deliver
-			oneOf(db).getRawMessage(txn2, messageId);
-			will(returnValue(raw));
-			oneOf(messageFactory).createMessage(messageId, raw);
+			oneOf(db).getMessage(txn2, messageId);
 			will(returnValue(message));
 			oneOf(db).getGroup(txn2, groupId);
 			will(returnValue(group));
@@ -260,7 +241,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).setMessageState(txn2, messageId, DELIVERED);
 			// Get any pending dependents
 			oneOf(db).getMessageDependents(txn2, messageId);
-			will(returnValue(Collections.singletonMap(messageId2, PENDING)));
+			will(returnValue(singletonMap(messageId2, PENDING)));
 			oneOf(db).commitTransaction(txn2);
 			oneOf(db).endTransaction(txn2);
 			// Check whether the dependent is ready to deliver
@@ -269,11 +250,9 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).getMessageState(txn3, messageId2);
 			will(returnValue(PENDING));
 			oneOf(db).getMessageDependencies(txn3, messageId2);
-			will(returnValue(Collections.singletonMap(messageId1, DELIVERED)));
+			will(returnValue(singletonMap(messageId1, DELIVERED)));
 			// Get the dependent and its metadata to deliver
-			oneOf(db).getRawMessage(txn3, messageId2);
-			will(returnValue(raw));
-			oneOf(messageFactory).createMessage(messageId2, raw);
+			oneOf(db).getMessage(txn3, messageId2);
 			will(returnValue(message2));
 			oneOf(db).getGroup(txn3, groupId);
 			will(returnValue(group));
@@ -285,7 +264,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).setMessageState(txn3, messageId2, DELIVERED);
 			// Get any pending dependents
 			oneOf(db).getMessageDependents(txn3, messageId2);
-			will(returnValue(Collections.emptyMap()));
+			will(returnValue(emptyMap()));
 			oneOf(db).commitTransaction(txn3);
 			oneOf(db).endTransaction(txn3);
 
@@ -293,7 +272,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn4));
 			oneOf(db).getMessagesToShare(txn4);
-			will(returnValue(Collections.emptyList()));
+			will(returnValue(emptyList()));
 			oneOf(db).commitTransaction(txn4);
 			oneOf(db).endTransaction(txn4);
 		}});
@@ -314,14 +293,14 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn));
 			oneOf(db).getMessagesToValidate(txn);
-			will(returnValue(Collections.emptyList()));
+			will(returnValue(emptyList()));
 			oneOf(db).commitTransaction(txn);
 			oneOf(db).endTransaction(txn);
 			// No pending messages to deliver
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn1));
 			oneOf(db).getPendingMessages(txn1);
-			will(returnValue(Collections.emptyList()));
+			will(returnValue(emptyList()));
 			oneOf(db).commitTransaction(txn1);
 			oneOf(db).endTransaction(txn1);
 
@@ -329,7 +308,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn2));
 			oneOf(db).getMessagesToShare(txn2);
-			will(returnValue(Collections.singletonList(messageId)));
+			will(returnValue(singletonList(messageId)));
 			oneOf(db).commitTransaction(txn2);
 			oneOf(db).endTransaction(txn2);
 			// Share message and get dependencies
@@ -337,7 +316,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			will(returnValue(txn3));
 			oneOf(db).setMessageShared(txn3, messageId);
 			oneOf(db).getMessageDependencies(txn3, messageId);
-			will(returnValue(Collections.singletonMap(messageId2, DELIVERED)));
+			will(returnValue(singletonMap(messageId2, DELIVERED)));
 			oneOf(db).commitTransaction(txn3);
 			oneOf(db).endTransaction(txn3);
 			// Share dependency
@@ -345,7 +324,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			will(returnValue(txn4));
 			oneOf(db).setMessageShared(txn4, messageId2);
 			oneOf(db).getMessageDependencies(txn4, messageId2);
-			will(returnValue(Collections.emptyMap()));
+			will(returnValue(emptyMap()));
 			oneOf(db).commitTransaction(txn4);
 			oneOf(db).endTransaction(txn4);
 		}});
@@ -376,7 +355,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).addMessageDependencies(txn1, message,
 					validResultWithDependencies.getDependencies());
 			oneOf(db).getMessageDependencies(txn1, messageId);
-			will(returnValue(Collections.singletonMap(messageId1, DELIVERED)));
+			will(returnValue(singletonMap(messageId1, DELIVERED)));
 			oneOf(db).mergeMessageMetadata(txn1, messageId, metadata);
 			// Deliver the message
 			oneOf(hook).incomingMessage(txn1, message, metadata);
@@ -384,7 +363,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).setMessageState(txn1, messageId, DELIVERED);
 			// Get any pending dependents
 			oneOf(db).getMessageDependents(txn1, messageId);
-			will(returnValue(Collections.emptyMap()));
+			will(returnValue(emptyMap()));
 			// Share message
 			oneOf(db).setMessageShared(txn1, messageId);
 			oneOf(db).commitTransaction(txn1);
@@ -394,7 +373,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			will(returnValue(txn2));
 			oneOf(db).setMessageShared(txn2, messageId1);
 			oneOf(db).getMessageDependencies(txn2, messageId1);
-			will(returnValue(Collections.emptyMap()));
+			will(returnValue(emptyMap()));
 			oneOf(db).commitTransaction(txn2);
 			oneOf(db).endTransaction(txn2);
 		}});
@@ -423,16 +402,14 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			// Load the first raw message - *gasp* it's gone!
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn1));
-			oneOf(db).getRawMessage(txn1, messageId);
+			oneOf(db).getMessage(txn1, messageId);
 			will(throwException(new NoSuchMessageException()));
 			never(db).commitTransaction(txn1);
 			oneOf(db).endTransaction(txn1);
 			// Load the second raw message and group
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn2));
-			oneOf(db).getRawMessage(txn2, messageId1);
-			will(returnValue(raw));
-			oneOf(messageFactory).createMessage(messageId1, raw);
+			oneOf(db).getMessage(txn2, messageId1);
 			will(returnValue(message1));
 			oneOf(db).getGroup(txn2, groupId);
 			will(returnValue(group));
@@ -451,21 +428,21 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).deleteMessageMetadata(txn3, messageId1);
 			// Recursively invalidate dependents
 			oneOf(db).getMessageDependents(txn3, messageId1);
-			will(returnValue(Collections.emptyMap()));
+			will(returnValue(emptyMap()));
 			oneOf(db).commitTransaction(txn3);
 			oneOf(db).endTransaction(txn3);
 			// Get pending messages to deliver
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn4));
 			oneOf(db).getPendingMessages(txn4);
-			will(returnValue(Collections.emptyList()));
+			will(returnValue(emptyList()));
 			oneOf(db).commitTransaction(txn4);
 			oneOf(db).endTransaction(txn4);
 			// Get messages to share
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn5));
 			oneOf(db).getMessagesToShare(txn5);
-			will(returnValue(Collections.emptyList()));
+			will(returnValue(emptyList()));
 			oneOf(db).commitTransaction(txn5);
 			oneOf(db).endTransaction(txn5);
 		}});
@@ -494,9 +471,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			// Load the first raw message
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn1));
-			oneOf(db).getRawMessage(txn1, messageId);
-			will(returnValue(raw));
-			oneOf(messageFactory).createMessage(messageId, raw);
+			oneOf(db).getMessage(txn1, messageId);
 			will(returnValue(message));
 			// Load the group - *gasp* it's gone!
 			oneOf(db).getGroup(txn1, groupId);
@@ -506,9 +481,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			// Load the second raw message and group
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn2));
-			oneOf(db).getRawMessage(txn2, messageId1);
-			will(returnValue(raw));
-			oneOf(messageFactory).createMessage(messageId1, raw);
+			oneOf(db).getMessage(txn2, messageId1);
 			will(returnValue(message1));
 			oneOf(db).getGroup(txn2, groupId);
 			will(returnValue(group));
@@ -527,21 +500,21 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).deleteMessageMetadata(txn3, messageId1);
 			// Recursively invalidate dependents
 			oneOf(db).getMessageDependents(txn3, messageId1);
-			will(returnValue(Collections.emptyMap()));
+			will(returnValue(emptyMap()));
 			oneOf(db).commitTransaction(txn3);
 			oneOf(db).endTransaction(txn3);
 			// Get pending messages to deliver
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn4));
 			oneOf(db).getPendingMessages(txn4);
-			will(returnValue(Collections.emptyList()));
+			will(returnValue(emptyList()));
 			oneOf(db).commitTransaction(txn4);
 			oneOf(db).endTransaction(txn4);
 			// Get messages to share
 			oneOf(db).startTransaction(true);
 			will(returnValue(txn5));
 			oneOf(db).getMessagesToShare(txn5);
-			will(returnValue(Collections.emptyList()));
+			will(returnValue(emptyList()));
 			oneOf(db).commitTransaction(txn5);
 			oneOf(db).endTransaction(txn5);
 		}});
@@ -575,7 +548,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).setMessageState(txn1, messageId, DELIVERED);
 			// Get any pending dependents
 			oneOf(db).getMessageDependents(txn1, messageId);
-			will(returnValue(Collections.emptyMap()));
+			will(returnValue(emptyMap()));
 			oneOf(db).commitTransaction(txn1);
 			oneOf(db).endTransaction(txn1);
 		}});
@@ -584,7 +557,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 	}
 
 	@Test
-	public void testLocalMessagesAreNotValidatedWhenAdded() throws Exception {
+	public void testLocalMessagesAreNotValidatedWhenAdded() {
 		vm.eventOccurred(new MessageAddedEvent(message, null));
 	}
 
@@ -611,7 +584,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).addMessageDependencies(txn1, message,
 					validResultWithDependencies.getDependencies());
 			oneOf(db).getMessageDependencies(txn1, messageId);
-			will(returnValue(Collections.singletonMap(messageId1, UNKNOWN)));
+			will(returnValue(singletonMap(messageId1, UNKNOWN)));
 			oneOf(db).mergeMessageMetadata(txn1, messageId, metadata);
 			oneOf(db).setMessageState(txn1, messageId, PENDING);
 			oneOf(db).commitTransaction(txn1);
@@ -644,7 +617,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).addMessageDependencies(txn1, message,
 					validResultWithDependencies.getDependencies());
 			oneOf(db).getMessageDependencies(txn1, messageId);
-			will(returnValue(Collections.singletonMap(messageId1, DELIVERED)));
+			will(returnValue(singletonMap(messageId1, DELIVERED)));
 			oneOf(db).mergeMessageMetadata(txn1, messageId, metadata);
 			// Deliver the message
 			oneOf(hook).incomingMessage(txn1, message, metadata);
@@ -652,7 +625,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).setMessageState(txn1, messageId, DELIVERED);
 			// Get any pending dependents
 			oneOf(db).getMessageDependents(txn1, messageId);
-			will(returnValue(Collections.emptyMap()));
+			will(returnValue(emptyMap()));
 			oneOf(db).commitTransaction(txn1);
 			oneOf(db).endTransaction(txn1);
 		}});
@@ -685,7 +658,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 					validResultWithDependencies.getDependencies());
 			// Check for invalid dependencies
 			oneOf(db).getMessageDependencies(txn1, messageId);
-			will(returnValue(Collections.singletonMap(messageId1, INVALID)));
+			will(returnValue(singletonMap(messageId1, INVALID)));
 			// Invalidate message
 			oneOf(db).getMessageState(txn1, messageId);
 			will(returnValue(UNKNOWN));
@@ -694,7 +667,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).deleteMessageMetadata(txn1, messageId);
 			// Recursively invalidate dependents
 			oneOf(db).getMessageDependents(txn1, messageId);
-			will(returnValue(Collections.singletonMap(messageId2, UNKNOWN)));
+			will(returnValue(singletonMap(messageId2, UNKNOWN)));
 			oneOf(db).commitTransaction(txn1);
 			oneOf(db).endTransaction(txn1);
 			// Invalidate dependent in a new transaction
@@ -706,7 +679,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).deleteMessage(txn2, messageId2);
 			oneOf(db).deleteMessageMetadata(txn2, messageId2);
 			oneOf(db).getMessageDependents(txn2, messageId2);
-			will(returnValue(Collections.emptyMap()));
+			will(returnValue(emptyMap()));
 			oneOf(db).commitTransaction(txn2);
 			oneOf(db).endTransaction(txn2);
 		}});
@@ -763,7 +736,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).deleteMessageMetadata(txn2, messageId1);
 			// Message 1 has one dependent: 3
 			oneOf(db).getMessageDependents(txn2, messageId1);
-			will(returnValue(Collections.singletonMap(messageId3, PENDING)));
+			will(returnValue(singletonMap(messageId3, PENDING)));
 			oneOf(db).commitTransaction(txn2);
 			oneOf(db).endTransaction(txn2);
 			// Invalidate message 2
@@ -776,7 +749,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).deleteMessageMetadata(txn3, messageId2);
 			// Message 2 has one dependent: 3 (same dependent as 1)
 			oneOf(db).getMessageDependents(txn3, messageId2);
-			will(returnValue(Collections.singletonMap(messageId3, PENDING)));
+			will(returnValue(singletonMap(messageId3, PENDING)));
 			oneOf(db).commitTransaction(txn3);
 			oneOf(db).endTransaction(txn3);
 			// Invalidate message 3 (via 1)
@@ -789,7 +762,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).deleteMessageMetadata(txn4, messageId3);
 			// Message 3 has one dependent: 4
 			oneOf(db).getMessageDependents(txn4, messageId3);
-			will(returnValue(Collections.singletonMap(messageId4, PENDING)));
+			will(returnValue(singletonMap(messageId4, PENDING)));
 			oneOf(db).commitTransaction(txn4);
 			oneOf(db).endTransaction(txn4);
 			// Invalidate message 3 (again, via 2)
@@ -809,7 +782,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).deleteMessageMetadata(txn6, messageId4);
 			// Message 4 has no dependents
 			oneOf(db).getMessageDependents(txn6, messageId4);
-			will(returnValue(Collections.emptyMap()));
+			will(returnValue(emptyMap()));
 			oneOf(db).commitTransaction(txn6);
 			oneOf(db).endTransaction(txn6);
 		}});
@@ -819,12 +792,10 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 
 	@Test
 	public void testPendingDependentsGetDelivered() throws Exception {
-		MessageId messageId3 = new MessageId(getRandomId());
-		MessageId messageId4 = new MessageId(getRandomId());
-		Message message3 = new Message(messageId3, groupId, timestamp,
-				raw);
-		Message message4 = new Message(messageId4, groupId, timestamp,
-				raw);
+		Message message3 = getMessage(groupId);
+		Message message4 = getMessage(groupId);
+		MessageId messageId3 = message3.getId();
+		MessageId messageId4 = message4.getId();
 		Map<MessageId, State> twoDependents = new LinkedHashMap<>();
 		twoDependents.put(messageId1, PENDING);
 		twoDependents.put(messageId2, PENDING);
@@ -869,11 +840,9 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).getMessageState(txn2, messageId1);
 			will(returnValue(PENDING));
 			oneOf(db).getMessageDependencies(txn2, messageId1);
-			will(returnValue(Collections.singletonMap(messageId, DELIVERED)));
+			will(returnValue(singletonMap(messageId, DELIVERED)));
 			// Get message 1 and its metadata
-			oneOf(db).getRawMessage(txn2, messageId1);
-			will(returnValue(raw));
-			oneOf(messageFactory).createMessage(messageId1, raw);
+			oneOf(db).getMessage(txn2, messageId1);
 			will(returnValue(message1));
 			oneOf(db).getGroup(txn2, groupId);
 			will(returnValue(group));
@@ -885,7 +854,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).setMessageState(txn2, messageId1, DELIVERED);
 			// Message 1 has one pending dependent: 3
 			oneOf(db).getMessageDependents(txn2, messageId1);
-			will(returnValue(Collections.singletonMap(messageId3, PENDING)));
+			will(returnValue(singletonMap(messageId3, PENDING)));
 			oneOf(db).commitTransaction(txn2);
 			oneOf(db).endTransaction(txn2);
 			// Check whether message 2 is ready to be delivered
@@ -894,11 +863,9 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).getMessageState(txn3, messageId2);
 			will(returnValue(PENDING));
 			oneOf(db).getMessageDependencies(txn3, messageId2);
-			will(returnValue(Collections.singletonMap(messageId, DELIVERED)));
+			will(returnValue(singletonMap(messageId, DELIVERED)));
 			// Get message 2 and its metadata
-			oneOf(db).getRawMessage(txn3, messageId2);
-			will(returnValue(raw));
-			oneOf(messageFactory).createMessage(messageId2, raw);
+			oneOf(db).getMessage(txn3, messageId2);
 			will(returnValue(message2));
 			oneOf(db).getGroup(txn3, groupId);
 			will(returnValue(group));
@@ -910,7 +877,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).setMessageState(txn3, messageId2, DELIVERED);
 			// Message 2 has one pending dependent: 3 (same dependent as 1)
 			oneOf(db).getMessageDependents(txn3, messageId2);
-			will(returnValue(Collections.singletonMap(messageId3, PENDING)));
+			will(returnValue(singletonMap(messageId3, PENDING)));
 			oneOf(db).commitTransaction(txn3);
 			oneOf(db).endTransaction(txn3);
 			// Check whether message 3 is ready to be delivered (via 1)
@@ -921,9 +888,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).getMessageDependencies(txn4, messageId3);
 			will(returnValue(twoDependencies));
 			// Get message 3 and its metadata
-			oneOf(db).getRawMessage(txn4, messageId3);
-			will(returnValue(raw));
-			oneOf(messageFactory).createMessage(messageId3, raw);
+			oneOf(db).getMessage(txn4, messageId3);
 			will(returnValue(message3));
 			oneOf(db).getGroup(txn4, groupId);
 			will(returnValue(group));
@@ -934,7 +899,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).setMessageState(txn4, messageId3, DELIVERED);
 			// Message 3 has one pending dependent: 4
 			oneOf(db).getMessageDependents(txn4, messageId3);
-			will(returnValue(Collections.singletonMap(messageId4, PENDING)));
+			will(returnValue(singletonMap(messageId4, PENDING)));
 			oneOf(db).commitTransaction(txn4);
 			oneOf(db).endTransaction(txn4);
 			// Check whether message 3 is ready to be delivered (again, via 2)
@@ -950,11 +915,9 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).getMessageState(txn6, messageId4);
 			will(returnValue(PENDING));
 			oneOf(db).getMessageDependencies(txn6, messageId4);
-			will(returnValue(Collections.singletonMap(messageId3, DELIVERED)));
+			will(returnValue(singletonMap(messageId3, DELIVERED)));
 			// Get message 4 and its metadata
-			oneOf(db).getRawMessage(txn6, messageId4);
-			will(returnValue(raw));
-			oneOf(messageFactory).createMessage(messageId4, raw);
+			oneOf(db).getMessage(txn6, messageId4);
 			will(returnValue(message4));
 			oneOf(db).getGroup(txn6, groupId);
 			will(returnValue(group));
@@ -966,7 +929,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).setMessageState(txn6, messageId4, DELIVERED);
 			// Message 4 has no pending dependents
 			oneOf(db).getMessageDependents(txn6, messageId4);
-			will(returnValue(Collections.emptyMap()));
+			will(returnValue(emptyMap()));
 			oneOf(db).commitTransaction(txn6);
 			oneOf(db).endTransaction(txn6);
 		}});
@@ -1004,7 +967,7 @@ public class ValidationManagerImplTest extends BrambleMockTestCase {
 			oneOf(db).setMessageState(txn1, messageId, DELIVERED);
 			// Get any pending dependents
 			oneOf(db).getMessageDependents(txn1, messageId);
-			will(returnValue(Collections.singletonMap(messageId1, PENDING)));
+			will(returnValue(singletonMap(messageId1, PENDING)));
 			oneOf(db).commitTransaction(txn1);
 			oneOf(db).endTransaction(txn1);
 			// Check whether the pending dependent is ready to be delivered

bramble-core/src/test/java/org/briarproject/bramble/test/TestMessageFactory.java

@@ -0,0 +1,30 @@
+package org.briarproject.bramble.test;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.sync.GroupId;
+import org.briarproject.bramble.api.sync.Message;
+import org.briarproject.bramble.api.sync.MessageFactory;
+
+import static org.briarproject.bramble.api.sync.SyncConstants.MESSAGE_HEADER_LENGTH;
+
+@NotNullByDefault
+public class TestMessageFactory implements MessageFactory {
+
+	@Override
+	public Message createMessage(GroupId g, long timestamp, byte[] body) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public Message createMessage(byte[] raw) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public byte[] getRawMessage(Message m) {
+		byte[] body = m.getBody();
+		byte[] raw = new byte[MESSAGE_HEADER_LENGTH + body.length];
+		System.arraycopy(body, 0, raw, MESSAGE_HEADER_LENGTH, body.length);
+		return raw;
+	}
+}

bramble-core/src/test/java/org/briarproject/bramble/test/ValidatorTestCase.java

@@ -30,7 +30,6 @@ public abstract class ValidatorTestCase extends BrambleMockTestCase {
 	protected final Message message = getMessage(groupId);
 	protected final MessageId messageId = message.getId();
 	protected final long timestamp = message.getTimestamp();
-	protected final byte[] raw = message.getRaw();
 	protected final Author author = getAuthor();
 	protected final BdfList authorList = BdfList.of(
 			author.getFormatVersion(),

bramble-core/witness.gradle

@@ -0,0 +1,33 @@
+dependencyVerification {
+    verify = [
+        'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861',
+        '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.guava:guava:18.0:guava-18.0.jar:d664fbfc03d2e5ce9cab2a44fb01f1d0bf9dfebeccc1a473b1f9ea31f79f6f99',
+        'com.h2database:h2:1.4.192:h2-1.4.192.jar:225b22e9857235c46c93861410b60b8c81c10dc8985f4faf188985ba5445126c',
+        '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.briarproject:jtorctl:0.3:jtorctl-0.3.jar:f2939238a097898998432effe93b0334d97a787972ab3a91a8973a1d309fc864',
+        'org.codehaus.mojo.signature:java16:1.1:java16-1.1.signature:53799223a2c98dba2d0add810bed76315460df285c69e4f397ae6098f87dd619',
+        'org.codehaus.mojo:animal-sniffer-ant-tasks:1.16:animal-sniffer-ant-tasks-1.16.jar:890040976fbe2d584619a6a61b1fd2e925b3b5eb342a85eb2762c467c0d64e90',
+        'org.codehaus.mojo:animal-sniffer:1.16:animal-sniffer-1.16.jar:72be8bcc226ba43b937c722a08a07852bfa1b11400089265d5df0ee7b38b1d52',
+        'org.hamcrest:hamcrest-core:1.3:hamcrest-core-1.3.jar:66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9',
+        'org.hamcrest:hamcrest-library:1.3:hamcrest-library-1.3.jar:711d64522f9ec410983bd310934296da134be4254a125080a0416ec178dfad1c',
+        'org.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-all:5.2:asm-all-5.2.jar:7fbffbc1db3422e2101689fd88df8384b15817b52b9b2b267b9f6d2511dc198d',
+        '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',
+    ]
+}

bramble-j2se/.gitignore

@@ -1,3 +0,0 @@
-bin
-build
-.settings

bramble-j2se/build.gradle

@@ -1,54 +0,0 @@
-apply plugin: 'java-library'
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
-
-apply plugin: 'net.ltgt.apt'
-apply plugin: 'idea'
-apply plugin: 'witness'
-
-dependencies {
-	implementation project(path: ':bramble-core', configuration: 'default')
-	implementation fileTree(dir: 'libs', include: '*.jar')
-	implementation 'net.java.dev.jna:jna:4.4.0'
-	implementation 'net.java.dev.jna:jna-platform:4.4.0'
-
-	apt 'com.google.dagger:dagger-compiler:2.0.2'
-
-	testImplementation project(path: ':bramble-api', configuration: 'testOutput')
-	testImplementation project(path: ':bramble-core', configuration: 'testOutput')
-	testImplementation 'junit:junit:4.12'
-	testImplementation "org.jmock:jmock:2.8.2"
-	testImplementation "org.jmock:jmock-junit4:2.8.2"
-	testImplementation "org.jmock:jmock-legacy:2.8.2"
-	testImplementation "org.hamcrest:hamcrest-library:1.3"
-	testImplementation "org.hamcrest:hamcrest-core:1.3"
-}
-
-dependencyVerification {
-	verify = [
-			'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861',
-			'com.google.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.guava:guava:18.0:guava-18.0.jar:d664fbfc03d2e5ce9cab2a44fb01f1d0bf9dfebeccc1a473b1f9ea31f79f6f99',
-			'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
-			'junit:junit:4.12:junit-4.12.jar:59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a',
-			'net.java.dev.jna:jna-platform:4.4.0:jna-platform-4.4.0.jar:e9dda9e884fc107eb6367710540789a12dfa8ad28be9326b22ca6e352e325499',
-			'net.java.dev.jna:jna:4.4.0:jna-4.4.0.jar:c4dadeeecaa90c8847902082aee5eb107fcf59c5d0e63a17fcaf273c0e2d2bd1',
-			'org.apache.ant:ant-launcher:1.9.4:ant-launcher-1.9.4.jar:7bccea20b41801ca17bcbc909a78c835d0f443f12d639c77bd6ae3d05861608d',
-			'org.apache.ant:ant:1.9.4:ant-1.9.4.jar:649ae0730251de07b8913f49286d46bba7b92d47c5f332610aa426c4f02161d8',
-			'org.beanshell:bsh:1.3.0:bsh-1.3.0.jar:9b04edc75d19db54f1b4e8b5355e9364384c6cf71eb0a1b9724c159d779879f8',
-			'org.hamcrest:hamcrest-core:1.3:hamcrest-core-1.3.jar:66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9',
-			'org.hamcrest:hamcrest-library:1.3:hamcrest-library-1.3.jar:711d64522f9ec410983bd310934296da134be4254a125080a0416ec178dfad1c',
-			'org.jmock:jmock-junit4:2.8.2:jmock-junit4-2.8.2.jar:f7ee4df4f7bd7b7f1cafad3b99eb74d579f109d5992ff625347352edb55e674c',
-			'org.jmock:jmock-legacy:2.8.2:jmock-legacy-2.8.2.jar:f2b985a5c08a9edb7f37612330c058809da3f6a6d63ce792426ebf8ff0d6d31b',
-			'org.jmock:jmock-testjar:2.8.2:jmock-testjar-2.8.2.jar:8900860f72c474e027cf97fe78dcbf154a1aa7fc62b6845c5fb4e4f3c7bc8760',
-			'org.jmock:jmock:2.8.2:jmock-2.8.2.jar:6c73cb4a2e6dbfb61fd99c9a768539c170ab6568e57846bd60dbf19596b65b16',
-			'org.objenesis:objenesis:2.1:objenesis-2.1.jar:c74330cc6b806c804fd37e74487b4fe5d7c2750c5e15fbc6efa13bdee1bdef80',
-			'org.ow2.asm:asm:5.0.4:asm-5.0.4.jar:896618ed8ae62702521a78bc7be42b7c491a08e6920a15f89a3ecdec31e9a220',
-	]
-}
-
-tasks.withType(Test) {
-	systemProperty 'java.library.path', 'libs'
-}

bramble-java/.gitignore

@@ -0,0 +1,4 @@
+bin
+build
+.settings
+src/main/resources/*.zip

bramble-java/build.gradle

@@ -0,0 +1,44 @@
+apply plugin: 'java-library'
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+
+apply plugin: 'net.ltgt.apt'
+apply plugin: 'idea'
+apply plugin: 'witness'
+apply from: 'witness.gradle'
+
+configurations {
+	tor
+}
+
+dependencies {
+	implementation project(path: ':bramble-core', configuration: 'default')
+	implementation fileTree(dir: 'libs', include: '*.jar')
+	implementation 'net.java.dev.jna:jna:4.4.0'
+	implementation 'net.java.dev.jna:jna-platform:4.4.0'
+	tor 'org.briarproject:tor:0.2.9.16@zip'
+
+	apt 'com.google.dagger:dagger-compiler:2.0.2'
+
+	testImplementation project(path: ':bramble-api', configuration: 'testOutput')
+	testImplementation project(path: ':bramble-core', configuration: 'testOutput')
+	testImplementation 'junit:junit:4.12'
+	testImplementation "org.jmock:jmock:2.8.2"
+	testImplementation "org.jmock:jmock-junit4:2.8.2"
+	testImplementation "org.jmock:jmock-legacy:2.8.2"
+	testImplementation "org.hamcrest:hamcrest-library:1.3"
+	testImplementation "org.hamcrest:hamcrest-core:1.3"
+
+	testApt 'com.google.dagger:dagger-compiler:2.0.2'
+}
+
+project.afterEvaluate {
+	copy {
+		from configurations.tor.collect { zipTree(it) }
+		into 'src/main/resources'
+	}
+}
+
+tasks.withType(Test) {
+	systemProperty 'java.library.path', 'libs'
+}

bramble-java/src/main/java/org/briarproject/bramble/BrambleJavaModule.java

@@ -0,0 +1,16 @@
+package org.briarproject.bramble;
+
+import org.briarproject.bramble.network.JavaNetworkModule;
+import org.briarproject.bramble.plugin.tor.CircumventionModule;
+import org.briarproject.bramble.system.JavaSystemModule;
+
+import dagger.Module;
+
+@Module(includes = {
+		JavaNetworkModule.class,
+		JavaSystemModule.class,
+		CircumventionModule.class
+})
+public class BrambleJavaModule {
+
+}

bramble-java/src/main/java/org/briarproject/bramble/network/JavaNetworkManager.java

@@ -0,0 +1,71 @@
+package org.briarproject.bramble.network;
+
+import org.briarproject.bramble.api.event.EventBus;
+import org.briarproject.bramble.api.lifecycle.Service;
+import org.briarproject.bramble.api.network.NetworkManager;
+import org.briarproject.bramble.api.network.NetworkStatus;
+import org.briarproject.bramble.api.network.event.NetworkStatusEvent;
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.util.Enumeration;
+import java.util.logging.Logger;
+
+import javax.inject.Inject;
+
+import static java.net.NetworkInterface.getNetworkInterfaces;
+import static java.util.Collections.list;
+import static java.util.logging.Level.INFO;
+import static java.util.logging.Level.WARNING;
+import static org.briarproject.bramble.util.LogUtils.logException;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+class JavaNetworkManager implements NetworkManager, Service {
+
+	private static final Logger LOG =
+			Logger.getLogger(JavaNetworkManager.class.getName());
+
+	private final EventBus eventBus;
+
+	@Inject
+	JavaNetworkManager(EventBus eventBus) {
+		this.eventBus = eventBus;
+	}
+
+	@Override
+	public void startService() {
+		eventBus.broadcast(new NetworkStatusEvent(getNetworkStatus()));
+	}
+
+	@Override
+	public void stopService() {
+	}
+
+	@Override
+	public NetworkStatus getNetworkStatus() {
+		boolean connected = false;
+		try {
+			Enumeration<NetworkInterface> interfaces = getNetworkInterfaces();
+			if (interfaces != null) {
+				for (NetworkInterface i : list(interfaces)) {
+					if (i.isLoopback()) continue;
+					if (i.isUp() && i.getInetAddresses().hasMoreElements()) {
+						if (LOG.isLoggable(INFO)) {
+							LOG.info("Interface " + i.getDisplayName() +
+									" is up with at least one address.");
+						}
+						connected = true;
+						break;
+					}
+				}
+			}
+		} catch (SocketException e) {
+			logException(LOG, WARNING, e);
+		}
+		return new NetworkStatus(connected, false);
+	}
+
+}

bramble-java/src/main/java/org/briarproject/bramble/network/JavaNetworkModule.java

@@ -0,0 +1,21 @@
+package org.briarproject.bramble.network;
+
+import org.briarproject.bramble.api.lifecycle.LifecycleManager;
+import org.briarproject.bramble.api.network.NetworkManager;
+
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module
+public class JavaNetworkModule {
+
+	@Provides
+	@Singleton
+	NetworkManager provideNetworkManager(LifecycleManager lifecycleManager,
+			JavaNetworkManager networkManager) {
+		lifecycleManager.registerService(networkManager);
+		return networkManager;
+	}
+}