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

Merge branch '704-constructor-injection' into 'master'

Browse Source 
Use constructor injection for controllers

Also made some listeners volatile.

This is part of #704 - if I don't find any other classes that need constructor injection I'll close the ticket.

See merge request !351
This commit is contained in:
akwizgran
2016-10-12 16:02:53 +00:00
parent 970cbbf557 2b91631ba5
commit 8637faf858
12 changed files with 141 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,6 @@
package org.briarproject.android;
import android.app.Activity;
import android.content.Context;
import android.content.SharedPreferences;
import org.briarproject.android.blogs.BlogController;
@@ -28,6 +27,7 @@ import org.briarproject.android.privategroup.list.GroupListControllerImpl;
import dagger.Module;
import dagger.Provides;
import static android.content.Context.MODE_PRIVATE;
import static org.briarproject.android.BriarService.BriarServiceConnection;
@Module
@@ -54,36 +54,36 @@ public class ActivityModule {
@ActivityScope
@Provides
SetupController provideSetupController(
SetupControllerImpl setupControllerImpl) {
return setupControllerImpl;
SetupControllerImpl setupController) {
return setupController;
}
@ActivityScope
@Provides
ConfigController provideConfigController(
ConfigControllerImpl configControllerImpl) {
return configControllerImpl;
ConfigControllerImpl configController) {
return configController;
}
@ActivityScope
@Provides
SharedPreferences provideSharedPreferences(Activity activity) {
return activity.getSharedPreferences("db", Context.MODE_PRIVATE);
return activity.getSharedPreferences("db", MODE_PRIVATE);
}
@ActivityScope
@Provides
PasswordController providePasswordController(
PasswordControllerImpl passwordControllerImpl) {
return passwordControllerImpl;
PasswordControllerImpl passwordController) {
return passwordController;
}
@ActivityScope
@Provides
protected BriarController provideBriarController(
BriarControllerImpl briarControllerImpl) {
activity.addLifecycleController(briarControllerImpl);
return briarControllerImpl;
BriarControllerImpl briarController) {
activity.addLifecycleController(briarController);
return briarController;
}
@ActivityScope