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

Inject fragments. Fixes an NPE due to uninitialised fields.

Browse Source
This commit is contained in:
akwizgran
2016-05-11 13:31:45 +01:00
parent 2a980af69a
commit 7a3bcc58ae
1 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,13 +44,13 @@ public class ActivityModule {
@ActivityScope @ActivityScope
@Provides @Provides
BaseActivity providesBaseActivity() { BaseActivity provideBaseActivity() {
return activity; return activity;
} }
@ActivityScope @ActivityScope
@Provides @Provides
Activity providesActivity() { Activity provideActivity() {
return activity; return activity;
} }
@@ -77,8 +77,8 @@ public class ActivityModule {
@ActivityScope @ActivityScope
@Provides @Provides
protected PasswordController providePasswordController( protected PasswordController providePasswordController(
PasswordControllerImpl passwordControllerImp) { PasswordControllerImpl passwordControllerImpl) {
return passwordControllerImp; return passwordControllerImpl;
} }
@ActivityScope @ActivityScope
@@ -92,13 +92,13 @@ public class ActivityModule {
@ActivityScope @ActivityScope
@Provides @Provides
protected NavDrawerController provideNavDrawerController( protected NavDrawerController provideNavDrawerController(
NavDrawerControllerImpl navDrawerControllerImp) { NavDrawerControllerImpl navDrawerControllerImpl) {
activity.addLifecycleController(navDrawerControllerImp); activity.addLifecycleController(navDrawerControllerImpl);
if (activity instanceof TransportStateListener) { if (activity instanceof TransportStateListener) {
navDrawerControllerImp navDrawerControllerImpl.setTransportListener(
.setTransportListener((TransportStateListener) activity); (TransportStateListener) activity);
} }
return navDrawerControllerImp; return navDrawerControllerImpl;
} }
@ActivityScope @ActivityScope
@@ -109,67 +109,62 @@ public class ActivityModule {
@Provides @Provides
@Named("ForumListFragment") @Named("ForumListFragment")
BaseFragment provideForumListFragment( BaseFragment provideForumListFragment(ForumListFragment fragment) {
ForumListFragment forumListFragment) { fragment.setArguments(new Bundle());
forumListFragment.setArguments(new Bundle()); return fragment;
return forumListFragment;
} }
@Provides @Provides
@Named("ContactListFragment") @Named("ContactListFragment")
BaseFragment provideContactListFragment( BaseFragment provideContactListFragment(ContactListFragment fragment) {
ContactListFragment contactListFragment) { fragment.setArguments(new Bundle());
contactListFragment.setArguments(new Bundle()); return fragment;
return contactListFragment;
} }
@Provides @Provides
@Named("ChooseIdentityFragment") @Named("ChooseIdentityFragment")
BaseFragment provideChooseIdendityFragment() { BaseFragment provideChooseIdentityFragment(
ChooseIdentityFragment fragment = new ChooseIdentityFragment(); ChooseIdentityFragment fragment) {
fragment.setArguments(new Bundle()); fragment.setArguments(new Bundle());
return fragment; return fragment;
} }
@Provides @Provides
@Named("ShowQrCodeFragment") @Named("ShowQrCodeFragment")
BaseFragment provideShowQrCodeFragment() { BaseFragment provideShowQrCodeFragment(ShowQrCodeFragment fragment) {
ShowQrCodeFragment fragment = new ShowQrCodeFragment();
fragment.setArguments(new Bundle()); fragment.setArguments(new Bundle());
return fragment; return fragment;
} }
@Provides @Provides
@Named("ContactChooserFragment") @Named("ContactChooserFragment")
BaseFragment provideContactChooserFragment() { BaseFragment provideContactChooserFragment(
ContactChooserFragment fragment = new ContactChooserFragment(); ContactChooserFragment fragment) {
fragment.setArguments(new Bundle()); fragment.setArguments(new Bundle());
return fragment; return fragment;
} }
@Provides @Provides
@Named("ContactSelectorFragment") @Named("ContactSelectorFragment")
ContactSelectorFragment provideContactSelectorFragment() { ContactSelectorFragment provideContactSelectorFragment(
ContactSelectorFragment fragment = new ContactSelectorFragment(); ContactSelectorFragment fragment) {
fragment.setArguments(new Bundle()); fragment.setArguments(new Bundle());
return fragment; return fragment;
} }
@Provides @Provides
@Named("ShareForumMessageFragment") @Named("ShareForumMessageFragment")
ShareForumMessageFragment provideShareForumMessageFragment() { ShareForumMessageFragment provideShareForumMessageFragment(
ShareForumMessageFragment fragment = new ShareForumMessageFragment(); ShareForumMessageFragment fragment) {
fragment.setArguments(new Bundle()); fragment.setArguments(new Bundle());
return fragment; return fragment;
} }
@Provides @Provides
@Named("IntroductionMessageFragment") @Named("IntroductionMessageFragment")
IntroductionMessageFragment provideIntroductionMessageFragment() { IntroductionMessageFragment provideIntroductionMessageFragment(
IntroductionMessageFragment fragment = IntroductionMessageFragment fragment) {
new IntroductionMessageFragment();
fragment.setArguments(new Bundle()); fragment.setArguments(new Bundle());
return fragment; return fragment;
} }
} }