Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-22 07:39:53 +01:00
Code Issues Projects Releases Wiki Activity

Renamed SerialModule, fixed Roboguice module list.

Browse Source
This commit is contained in:
akwizgran
2015-11-30 16:46:54 +00:00
parent 7eb7257076
commit 7841ae52ca
8 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/AndroidManifest.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.briarproject" package="org.briarproject"
android:versionCode="10" android:versionCode="11"
android:versionName="0.10" > android:versionName="0.11" >
<uses-sdk <uses-sdk
android:minSdkVersion="7" android:minSdkVersion="7"

12
briar-android/briar-android.iml
View File

@@ -59,6 +59,18 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" /> <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/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" 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/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" /> <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content> </content>

2
briar-android/res/values/roboguice.xml
View File

@@ -3,13 +3,13 @@
<string-array name="roboguice_modules"> <string-array name="roboguice_modules">
<item>org.briarproject.android.AndroidModule</item> <item>org.briarproject.android.AndroidModule</item>
<item>org.briarproject.crypto.CryptoModule</item> <item>org.briarproject.crypto.CryptoModule</item>
<item>org.briarproject.data.DataModule</item>
<item>org.briarproject.db.DatabaseModule</item> <item>org.briarproject.db.DatabaseModule</item>
<item>org.briarproject.event.EventModule</item> <item>org.briarproject.event.EventModule</item>
<item>org.briarproject.invitation.InvitationModule</item> <item>org.briarproject.invitation.InvitationModule</item>
<item>org.briarproject.lifecycle.LifecycleModule</item> <item>org.briarproject.lifecycle.LifecycleModule</item>
<item>org.briarproject.messaging.MessagingModule</item> <item>org.briarproject.messaging.MessagingModule</item>
<item>org.briarproject.plugins.AndroidPluginsModule</item> <item>org.briarproject.plugins.AndroidPluginsModule</item>
<item>org.briarproject.serial.SerialModule</item>
<item>org.briarproject.system.AndroidSystemModule</item> <item>org.briarproject.system.AndroidSystemModule</item>
<item>org.briarproject.transport.TransportModule</item> <item>org.briarproject.transport.TransportModule</item>
</string-array> </string-array>

2
briar-core/src/org/briarproject/data/SerialModule.java → briar-core/src/org/briarproject/data/DataModule.java
View File

@@ -5,7 +5,7 @@ import org.briarproject.api.data.WriterFactory;
import com.google.inject.AbstractModule; import com.google.inject.AbstractModule;
public class SerialModule extends AbstractModule { public class DataModule extends AbstractModule {
@Override @Override
protected void configure() { protected void configure() {

4
briar-tests/src/org/briarproject/ProtocolIntegrationTest.java
View File

@@ -39,7 +39,7 @@ import org.briarproject.api.transport.StreamContext;
import org.briarproject.api.transport.StreamReaderFactory; import org.briarproject.api.transport.StreamReaderFactory;
import org.briarproject.api.transport.StreamWriterFactory; import org.briarproject.api.transport.StreamWriterFactory;
import org.briarproject.crypto.CryptoModule; import org.briarproject.crypto.CryptoModule;
import org.briarproject.data.SerialModule; import org.briarproject.data.DataModule;
import org.briarproject.db.DatabaseModule; import org.briarproject.db.DatabaseModule;
import org.briarproject.event.EventModule; import org.briarproject.event.EventModule;
import org.briarproject.messaging.MessagingModule; import org.briarproject.messaging.MessagingModule;
@@ -74,7 +74,7 @@ public class ProtocolIntegrationTest extends BriarTestCase {
Injector i = Guice.createInjector(new TestDatabaseModule(), Injector i = Guice.createInjector(new TestDatabaseModule(),
new TestLifecycleModule(), new TestSystemModule(), new TestLifecycleModule(), new TestSystemModule(),
new CryptoModule(), new DatabaseModule(), new EventModule(), new CryptoModule(), new DatabaseModule(), new EventModule(),
new MessagingModule(), new SerialModule(), new MessagingModule(), new DataModule(),
new TransportModule()); new TransportModule());
streamReaderFactory = i.getInstance(StreamReaderFactory.class); streamReaderFactory = i.getInstance(StreamReaderFactory.class);
streamWriterFactory = i.getInstance(StreamWriterFactory.class); streamWriterFactory = i.getInstance(StreamWriterFactory.class);

4
briar-tests/src/org/briarproject/messaging/ConstantsTest.java
View File

@@ -44,7 +44,7 @@ import org.briarproject.api.messaging.Request;
import org.briarproject.api.messaging.SubscriptionUpdate; import org.briarproject.api.messaging.SubscriptionUpdate;
import org.briarproject.api.messaging.TransportUpdate; import org.briarproject.api.messaging.TransportUpdate;
import org.briarproject.crypto.CryptoModule; import org.briarproject.crypto.CryptoModule;
import org.briarproject.data.SerialModule; import org.briarproject.data.DataModule;
import org.briarproject.db.DatabaseModule; import org.briarproject.db.DatabaseModule;
import org.briarproject.event.EventModule; import org.briarproject.event.EventModule;
import org.junit.Test; import org.junit.Test;
@@ -64,7 +64,7 @@ public class ConstantsTest extends BriarTestCase {
Injector i = Guice.createInjector(new TestDatabaseModule(), Injector i = Guice.createInjector(new TestDatabaseModule(),
new TestLifecycleModule(), new TestSystemModule(), new TestLifecycleModule(), new TestSystemModule(),
new CryptoModule(), new DatabaseModule(), new EventModule(), new CryptoModule(), new DatabaseModule(), new EventModule(),
new MessagingModule(), new SerialModule()); new MessagingModule(), new DataModule());
crypto = i.getInstance(CryptoComponent.class); crypto = i.getInstance(CryptoComponent.class);
groupFactory = i.getInstance(GroupFactory.class); groupFactory = i.getInstance(GroupFactory.class);
authorFactory = i.getInstance(AuthorFactory.class); authorFactory = i.getInstance(AuthorFactory.class);

4
briar-tests/src/org/briarproject/messaging/PacketReaderImplTest.java
View File

@@ -17,7 +17,7 @@ import org.briarproject.api.FormatException;
import org.briarproject.api.data.ReaderFactory; import org.briarproject.api.data.ReaderFactory;
import org.briarproject.api.data.Writer; import org.briarproject.api.data.Writer;
import org.briarproject.api.data.WriterFactory; import org.briarproject.api.data.WriterFactory;
import org.briarproject.data.SerialModule; import org.briarproject.data.DataModule;
import org.briarproject.util.ByteUtils; import org.briarproject.util.ByteUtils;
import org.junit.Test; import org.junit.Test;
@@ -32,7 +32,7 @@ public class PacketReaderImplTest extends BriarTestCase {
private final WriterFactory writerFactory; private final WriterFactory writerFactory;
public PacketReaderImplTest() throws Exception { public PacketReaderImplTest() throws Exception {
Injector i = Guice.createInjector(new SerialModule()); Injector i = Guice.createInjector(new DataModule());
readerFactory = i.getInstance(ReaderFactory.class); readerFactory = i.getInstance(ReaderFactory.class);
writerFactory = i.getInstance(WriterFactory.class); writerFactory = i.getInstance(WriterFactory.class);
} }

4
briar-tests/src/org/briarproject/messaging/SimplexMessagingIntegrationTest.java
View File

@@ -44,7 +44,7 @@ import org.briarproject.api.transport.StreamReaderFactory;
import org.briarproject.api.transport.StreamWriterFactory; import org.briarproject.api.transport.StreamWriterFactory;
import org.briarproject.api.transport.TagRecogniser; import org.briarproject.api.transport.TagRecogniser;
import org.briarproject.crypto.CryptoModule; import org.briarproject.crypto.CryptoModule;
import org.briarproject.data.SerialModule; import org.briarproject.data.DataModule;
import org.briarproject.db.DatabaseModule; import org.briarproject.db.DatabaseModule;
import org.briarproject.event.EventModule; import org.briarproject.event.EventModule;
import org.briarproject.plugins.ImmediateExecutor; import org.briarproject.plugins.ImmediateExecutor;
@@ -91,7 +91,7 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase {
return Guice.createInjector(new TestDatabaseModule(dir), return Guice.createInjector(new TestDatabaseModule(dir),
new TestLifecycleModule(), new TestSystemModule(), new TestLifecycleModule(), new TestSystemModule(),
new CryptoModule(), new DatabaseModule(), new EventModule(), new CryptoModule(), new DatabaseModule(), new EventModule(),
new MessagingModule(), new SerialModule(), new MessagingModule(), new DataModule(),
new TransportModule()); new TransportModule());
} }