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

merge and update

Browse Source
This commit is contained in:
Ernir Erlingsson
2016-04-26 10:59:58 +02:00
parent ef3b41dc1d
commit e809aaa932
27 changed files with 187 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@ import org.briarproject.api.forum.ForumPostFactory;
import org.briarproject.api.forum.ForumSharingManager;
import org.briarproject.api.identity.AuthorFactory;
import org.briarproject.api.identity.IdentityManager;
import org.briarproject.api.introduction.IntroductionManager;
import org.briarproject.api.invitation.InvitationTaskFactory;
import org.briarproject.api.keyagreement.KeyAgreementTaskFactory;
import org.briarproject.api.keyagreement.PayloadEncoder;
@@ -33,7 +34,6 @@ import org.briarproject.system.AndroidSystemModule;
import java.util.concurrent.Executor;
import javax.inject.Named;
import javax.inject.Singleton;
import dagger.Component;
@@ -95,6 +95,8 @@ public interface AndroidComponent extends CoreEagerSingletons {
PayloadParser payloadParser();
IntroductionManager introductionManager();
void inject(BriarService activity);
void inject(ContactChooserFragment fragment);