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

Switched AppBus for ResultHandler, Controller for Helper. Added the basics for LifecycleControllers and implemented it for BriarActivity and NavDrawerActivity

Browse Source
This commit is contained in:
Ernir Erlingsson
2016-04-07 12:54:23 +02:00
parent 27098db18f
commit a14e981236
32 changed files with 584 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,14 +6,19 @@ import android.content.SharedPreferences;
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.NavDrawerController;
import org.briarproject.android.controller.NavDrawerControllerImp;
import org.briarproject.android.controller.TransportStateListener;
import org.briarproject.android.forum.ForumListFragment;
import org.briarproject.android.fragment.BaseFragment;
import org.briarproject.android.helper.PasswordHelper;
import org.briarproject.android.helper.PasswordHelperImp;
import org.briarproject.android.helper.SetupHelper;
import org.briarproject.android.helper.SetupHelperImp;
import org.briarproject.android.helper.ConfigHelper;
import org.briarproject.android.helper.ConfigHelperImp;
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.keyagreement.ChooseIdentityFragment;
import org.briarproject.android.keyagreement.ShowQrCodeFragment;
@@ -22,6 +27,8 @@ import javax.inject.Named;
import dagger.Module;
import dagger.Provides;
import static org.briarproject.android.BriarService.*;
@Module
public class ActivityModule {
@@ -31,6 +38,12 @@ public class ActivityModule {
this.activity = activity;
}
@ActivityScope
@Provides
BaseActivity providesBaseActivity() {
return activity;
}
@ActivityScope
@Provides
Activity providesActivity() {
@@ -39,14 +52,16 @@ public class ActivityModule {
@ActivityScope
@Provides
SetupHelper provideSetupHelper(SetupHelperImp setupHelperImp) {
return setupHelperImp;
SetupController provideSetupController(
SetupControllerImp setupControllerImp) {
return setupControllerImp;
}
@ActivityScope
@Provides
ConfigHelper provideConfigHelper(ConfigHelperImp configHelperImp) {
return configHelperImp;
ConfigController provideConfigController(
ConfigControllerImp configControllerImp) {
return configControllerImp;
}
@ActivityScope
@@ -57,8 +72,35 @@ public class ActivityModule {
@ActivityScope
@Provides
PasswordHelper providePasswordHelper(PasswordHelperImp passwordHelperImp) {
return passwordHelperImp;
PasswordController providePasswordController(
PasswordControllerImp passwordControllerImp) {
return passwordControllerImp;
}
@ActivityScope
@Provides
BriarController provideBriarController(
BriarControllerImp briarControllerImp) {
activity.addLifecycleController(briarControllerImp);
return briarControllerImp;
}
@ActivityScope
@Provides
NavDrawerController provideNavDrawerController(
NavDrawerControllerImp navDrawerControllerImp) {
activity.addLifecycleController(navDrawerControllerImp);
if (activity instanceof TransportStateListener) {
navDrawerControllerImp
.setTransportListener((TransportStateListener) activity);
}
return navDrawerControllerImp;
}
@ActivityScope
@Provides
BriarServiceConnection provideBriarServiceConnection() {
return new BriarServiceConnection();
}
@Provides