Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 03:09:04 +01:00
Code Issues Projects Releases Wiki Activity

modifications based on Akwizgran's comments

Browse Source
This commit is contained in:
Ernir Erlingsson
2016-05-11 11:40:49 +02:00
parent d4232b6a01
commit c93e78f178
19 changed files with 57 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
briar-android/src/org/briarproject/android/ActivityModule.java
View File

@@ -7,18 +7,18 @@ import android.os.Bundle;
import org.briarproject.android.contact.ContactListFragment;
import org.briarproject.android.controller.BriarController;
import org.briarproject.android.controller.BriarControllerImp;
import org.briarproject.android.controller.BriarControllerImpl;
import org.briarproject.android.controller.NavDrawerController;
import org.briarproject.android.controller.NavDrawerControllerImp;
import org.briarproject.android.controller.NavDrawerControllerImpl;
import org.briarproject.android.controller.PasswordControllerImpl;
import org.briarproject.android.controller.SetupControllerImpl;
import org.briarproject.android.controller.TransportStateListener;
import org.briarproject.android.forum.ForumListFragment;
import org.briarproject.android.fragment.BaseFragment;
import org.briarproject.android.controller.PasswordController;
import org.briarproject.android.controller.PasswordControllerImp;
import org.briarproject.android.controller.SetupController;
import org.briarproject.android.controller.SetupControllerImp;
import org.briarproject.android.controller.ConfigController;
import org.briarproject.android.controller.ConfigControllerImp;
import org.briarproject.android.controller.ConfigControllerImpl;
import org.briarproject.android.introduction.ContactChooserFragment;
import org.briarproject.android.introduction.IntroductionMessageFragment;
import org.briarproject.android.keyagreement.ChooseIdentityFragment;
@@ -55,15 +55,15 @@ public class ActivityModule {
@ActivityScope
@Provides
protected SetupController provideSetupController(
SetupControllerImp setupControllerImp) {
return setupControllerImp;
SetupControllerImpl setupControllerImpl) {
return setupControllerImpl;
}
@ActivityScope
@Provides
protected ConfigController provideConfigController(
ConfigControllerImp configControllerImp) {
return configControllerImp;
ConfigControllerImpl configControllerImpl) {
return configControllerImpl;
}
@ActivityScope
@@ -75,22 +75,22 @@ public class ActivityModule {
@ActivityScope
@Provides
protected PasswordController providePasswordController(
PasswordControllerImp passwordControllerImp) {
PasswordControllerImpl passwordControllerImp) {
return passwordControllerImp;
}
@ActivityScope
@Provides
protected BriarController provideBriarController(
BriarControllerImp briarControllerImp) {
activity.addLifecycleController(briarControllerImp);
return briarControllerImp;
BriarControllerImpl briarControllerImpl) {
activity.addLifecycleController(briarControllerImpl);
return briarControllerImpl;
}
@ActivityScope
@Provides
protected NavDrawerController provideNavDrawerController(
NavDrawerControllerImp navDrawerControllerImp) {
NavDrawerControllerImpl navDrawerControllerImp) {
activity.addLifecycleController(navDrawerControllerImp);
if (activity instanceof TransportStateListener) {
navDrawerControllerImp