Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 12:49:55 +01:00
Code Issues Projects Releases Wiki Activity

merged with master

Browse Source
This commit is contained in:
Ernir Erlingsson
2016-03-03 15:02:54 +01:00
parent ac5d68df81
commit 95d89553d5
15 changed files with 209 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="roboguice_modules">
<item>org.briarproject.android.AndroidModule</item>
<item>org.briarproject.clients.ClientsModule</item>
<item>org.briarproject.contact.ContactModule</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.forum.ForumModule</item>
<item>org.briarproject.identity.IdentityModule</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.properties.PropertiesModule</item>
<item>org.briarproject.sync.SyncModule</item>
<item>org.briarproject.system.AndroidSystemModule</item>
<item>org.briarproject.transport.TransportModule</item>
<item>org.briarproject.settings.SettingsModule</item>
</string-array>
</resources>

3
briar-android/src/org/briarproject/android/AndroidComponent.java
View File

@@ -14,6 +14,7 @@ import org.briarproject.android.identity.CreateIdentityActivity;
import org.briarproject.android.invitation.AddContactActivity;
import org.briarproject.android.panic.PanicPreferencesActivity;
import org.briarproject.android.panic.PanicResponderActivity;
import org.briarproject.clients.ClientsModule;
import org.briarproject.contact.ContactModule;
import org.briarproject.crypto.CryptoModule;
import org.briarproject.data.DataModule;
@@ -44,7 +45,7 @@ import dagger.Component;
EventModule.class, DataModule.class, ContactModule.class,
AndroidSystemModule.class, AndroidPluginsModule.class,
PropertiesModule.class, TransportModule.class, SyncModule.class,
SettingsModule.class})
SettingsModule.class, ClientsModule.class})
public interface AndroidComponent {
void inject(SplashScreenActivity activity);
void inject(SetupActivity activity);