diff --git a/briar-android/AndroidManifest.xml b/briar-android/AndroidManifest.xml
index e3c64dfbd81a544360b5879ffa8539dd96c9e5d1..a96f393207beee336ffdf5635f2acee6f0603fe7 100644
--- a/briar-android/AndroidManifest.xml
+++ b/briar-android/AndroidManifest.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.briarproject"
- android:versionCode="10"
- android:versionName="0.10" >
+ android:versionCode="11"
+ android:versionName="0.11" >
<uses-sdk
android:minSdkVersion="7"
diff --git a/briar-android/briar-android.iml b/briar-android/briar-android.iml
index 77be30b33bc0981aeacce1e242baaad846711d87..1613f5c83f49f758e2ac60dce59c61a1f15ae113 100644
--- a/briar-android/briar-android.iml
+++ b/briar-android/briar-android.iml
@@ -59,6 +59,18 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
diff --git a/briar-android/res/values/roboguice.xml b/briar-android/res/values/roboguice.xml
index 7eb58937cf16796cc1fc50d175baab6c12db7189..3305d826c29616679219e4f503b2733356f19018 100644
--- a/briar-android/res/values/roboguice.xml
+++ b/briar-android/res/values/roboguice.xml
@@ -3,13 +3,13 @@
<string-array name="roboguice_modules">
<item>org.briarproject.android.AndroidModule</item>
<item>org.briarproject.crypto.CryptoModule</item>
+ <item>org.briarproject.data.DataModule</item>
<item>org.briarproject.db.DatabaseModule</item>
<item>org.briarproject.event.EventModule</item>
<item>org.briarproject.invitation.InvitationModule</item>
<item>org.briarproject.lifecycle.LifecycleModule</item>
<item>org.briarproject.messaging.MessagingModule</item>
<item>org.briarproject.plugins.AndroidPluginsModule</item>
- <item>org.briarproject.serial.SerialModule</item>
<item>org.briarproject.system.AndroidSystemModule</item>
<item>org.briarproject.transport.TransportModule</item>
</string-array>
diff --git a/briar-core/src/org/briarproject/data/SerialModule.java b/briar-core/src/org/briarproject/data/DataModule.java
similarity index 86%
rename from briar-core/src/org/briarproject/data/SerialModule.java
rename to briar-core/src/org/briarproject/data/DataModule.java
index b18f57fafb465fa06061e28c2ebe317f8943d607..be692d7fb7c052fb8d944de2812d80e90569c995 100644
--- a/briar-core/src/org/briarproject/data/SerialModule.java
+++ b/briar-core/src/org/briarproject/data/DataModule.java
@@ -5,7 +5,7 @@ import org.briarproject.api.data.WriterFactory;
import com.google.inject.AbstractModule;
-public class SerialModule extends AbstractModule {
+public class DataModule extends AbstractModule {
@Override
protected void configure() {
diff --git a/briar-tests/src/org/briarproject/ProtocolIntegrationTest.java b/briar-tests/src/org/briarproject/ProtocolIntegrationTest.java
index 4fcb7dfb61e480756d6d1743af706e4e44726c74..557d4a990b8d9114d860fa48501f393deda702d0 100644
--- a/briar-tests/src/org/briarproject/ProtocolIntegrationTest.java
+++ b/briar-tests/src/org/briarproject/ProtocolIntegrationTest.java
@@ -39,7 +39,7 @@ import org.briarproject.api.transport.StreamContext;
import org.briarproject.api.transport.StreamReaderFactory;
import org.briarproject.api.transport.StreamWriterFactory;
import org.briarproject.crypto.CryptoModule;
-import org.briarproject.data.SerialModule;
+import org.briarproject.data.DataModule;
import org.briarproject.db.DatabaseModule;
import org.briarproject.event.EventModule;
import org.briarproject.messaging.MessagingModule;
@@ -74,7 +74,7 @@ public class ProtocolIntegrationTest extends BriarTestCase {
Injector i = Guice.createInjector(new TestDatabaseModule(),
new TestLifecycleModule(), new TestSystemModule(),
new CryptoModule(), new DatabaseModule(), new EventModule(),
- new MessagingModule(), new SerialModule(),
+ new MessagingModule(), new DataModule(),
new TransportModule());
streamReaderFactory = i.getInstance(StreamReaderFactory.class);
streamWriterFactory = i.getInstance(StreamWriterFactory.class);
diff --git a/briar-tests/src/org/briarproject/messaging/ConstantsTest.java b/briar-tests/src/org/briarproject/messaging/ConstantsTest.java
index 4eecb2c2780a8628d14eec0477ef29eaa885fbc8..eb19901e5e5a7a4a6dbfb96a376978175fee6564 100644
--- a/briar-tests/src/org/briarproject/messaging/ConstantsTest.java
+++ b/briar-tests/src/org/briarproject/messaging/ConstantsTest.java
@@ -44,7 +44,7 @@ import org.briarproject.api.messaging.Request;
import org.briarproject.api.messaging.SubscriptionUpdate;
import org.briarproject.api.messaging.TransportUpdate;
import org.briarproject.crypto.CryptoModule;
-import org.briarproject.data.SerialModule;
+import org.briarproject.data.DataModule;
import org.briarproject.db.DatabaseModule;
import org.briarproject.event.EventModule;
import org.junit.Test;
@@ -64,7 +64,7 @@ public class ConstantsTest extends BriarTestCase {
Injector i = Guice.createInjector(new TestDatabaseModule(),
new TestLifecycleModule(), new TestSystemModule(),
new CryptoModule(), new DatabaseModule(), new EventModule(),
- new MessagingModule(), new SerialModule());
+ new MessagingModule(), new DataModule());
crypto = i.getInstance(CryptoComponent.class);
groupFactory = i.getInstance(GroupFactory.class);
authorFactory = i.getInstance(AuthorFactory.class);
diff --git a/briar-tests/src/org/briarproject/messaging/PacketReaderImplTest.java b/briar-tests/src/org/briarproject/messaging/PacketReaderImplTest.java
index 1ce59e04e80237b5ea6aa464a61889cac92d74a6..fcacc16c8ad8c0a4edb86348e418edfb36237e2d 100644
--- a/briar-tests/src/org/briarproject/messaging/PacketReaderImplTest.java
+++ b/briar-tests/src/org/briarproject/messaging/PacketReaderImplTest.java
@@ -17,7 +17,7 @@ import org.briarproject.api.FormatException;
import org.briarproject.api.data.ReaderFactory;
import org.briarproject.api.data.Writer;
import org.briarproject.api.data.WriterFactory;
-import org.briarproject.data.SerialModule;
+import org.briarproject.data.DataModule;
import org.briarproject.util.ByteUtils;
import org.junit.Test;
@@ -32,7 +32,7 @@ public class PacketReaderImplTest extends BriarTestCase {
private final WriterFactory writerFactory;
public PacketReaderImplTest() throws Exception {
- Injector i = Guice.createInjector(new SerialModule());
+ Injector i = Guice.createInjector(new DataModule());
readerFactory = i.getInstance(ReaderFactory.class);
writerFactory = i.getInstance(WriterFactory.class);
}
diff --git a/briar-tests/src/org/briarproject/messaging/SimplexMessagingIntegrationTest.java b/briar-tests/src/org/briarproject/messaging/SimplexMessagingIntegrationTest.java
index ea5701c9929bd256182a5d11dff61143a0aec52f..d6002c609e7a24ca615da82fb352e3ff4e780d4a 100644
--- a/briar-tests/src/org/briarproject/messaging/SimplexMessagingIntegrationTest.java
+++ b/briar-tests/src/org/briarproject/messaging/SimplexMessagingIntegrationTest.java
@@ -44,7 +44,7 @@ import org.briarproject.api.transport.StreamReaderFactory;
import org.briarproject.api.transport.StreamWriterFactory;
import org.briarproject.api.transport.TagRecogniser;
import org.briarproject.crypto.CryptoModule;
-import org.briarproject.data.SerialModule;
+import org.briarproject.data.DataModule;
import org.briarproject.db.DatabaseModule;
import org.briarproject.event.EventModule;
import org.briarproject.plugins.ImmediateExecutor;
@@ -91,7 +91,7 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase {
return Guice.createInjector(new TestDatabaseModule(dir),
new TestLifecycleModule(), new TestSystemModule(),
new CryptoModule(), new DatabaseModule(), new EventModule(),
- new MessagingModule(), new SerialModule(),
+ new MessagingModule(), new DataModule(),
new TransportModule());
}