Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
briar
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
briar
briar
Commits
7a3bcc58
Unverified
Commit
7a3bcc58
authored
8 years ago
by
akwizgran
Browse files
Options
Downloads
Patches
Plain Diff
Inject fragments. Fixes an NPE due to uninitialised fields.
parent
2a980af6
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
briar-android/src/org/briarproject/android/ActivityModule.java
+26
-31
26 additions, 31 deletions
...-android/src/org/briarproject/android/ActivityModule.java
with
26 additions
and
31 deletions
briar-android/src/org/briarproject/android/ActivityModule.java
+
26
−
31
View file @
7a3bcc58
...
...
@@ -44,13 +44,13 @@ public class ActivityModule {
@ActivityScope
@Provides
BaseActivity
provide
s
BaseActivity
()
{
BaseActivity
provideBaseActivity
()
{
return
activity
;
}
@ActivityScope
@Provides
Activity
provide
s
Activity
()
{
Activity
provideActivity
()
{
return
activity
;
}
...
...
@@ -77,8 +77,8 @@ public class ActivityModule {
@ActivityScope
@Provides
protected
PasswordController
providePasswordController
(
PasswordControllerImpl
passwordControllerImp
)
{
return
passwordControllerImp
;
PasswordControllerImpl
passwordControllerImp
l
)
{
return
passwordControllerImp
l
;
}
@ActivityScope
...
...
@@ -92,13 +92,13 @@ public class ActivityModule {
@ActivityScope
@Provides
protected
NavDrawerController
provideNavDrawerController
(
NavDrawerControllerImpl
navDrawerControllerImp
)
{
activity
.
addLifecycleController
(
navDrawerControllerImp
);
NavDrawerControllerImpl
navDrawerControllerImp
l
)
{
activity
.
addLifecycleController
(
navDrawerControllerImp
l
);
if
(
activity
instanceof
TransportStateListener
)
{
navDrawerControllerImp
.
setTransportListener
(
(
TransportStateListener
)
activity
);
navDrawerControllerImp
l
.
setTransportListener
(
(
TransportStateListener
)
activity
);
}
return
navDrawerControllerImp
;
return
navDrawerControllerImp
l
;
}
@ActivityScope
...
...
@@ -109,67 +109,62 @@ public class ActivityModule {
@Provides
@Named
(
"ForumListFragment"
)
BaseFragment
provideForumListFragment
(
ForumListFragment
forumListFragment
)
{
forumListFragment
.
setArguments
(
new
Bundle
());
return
forumListFragment
;
BaseFragment
provideForumListFragment
(
ForumListFragment
fragment
)
{
fragment
.
setArguments
(
new
Bundle
());
return
fragment
;
}
@Provides
@Named
(
"ContactListFragment"
)
BaseFragment
provideContactListFragment
(
ContactListFragment
contactListFragment
)
{
contactListFragment
.
setArguments
(
new
Bundle
());
return
contactListFragment
;
BaseFragment
provideContactListFragment
(
ContactListFragment
fragment
)
{
fragment
.
setArguments
(
new
Bundle
());
return
fragment
;
}
@Provides
@Named
(
"ChooseIdentityFragment"
)
BaseFragment
provideChooseIden
d
ityFragment
(
)
{
ChooseIdentityFragment
fragment
=
new
ChooseIdentityFragment
();
BaseFragment
provideChooseIden
t
ityFragment
(
ChooseIdentityFragment
fragment
)
{
fragment
.
setArguments
(
new
Bundle
());
return
fragment
;
}
@Provides
@Named
(
"ShowQrCodeFragment"
)
BaseFragment
provideShowQrCodeFragment
()
{
ShowQrCodeFragment
fragment
=
new
ShowQrCodeFragment
();
BaseFragment
provideShowQrCodeFragment
(
ShowQrCodeFragment
fragment
)
{
fragment
.
setArguments
(
new
Bundle
());
return
fragment
;
}
@Provides
@Named
(
"ContactChooserFragment"
)
BaseFragment
provideContactChooserFragment
(
)
{
ContactChooserFragment
fragment
=
new
ContactChooserFragment
();
BaseFragment
provideContactChooserFragment
(
ContactChooserFragment
fragment
)
{
fragment
.
setArguments
(
new
Bundle
());
return
fragment
;
}
@Provides
@Named
(
"ContactSelectorFragment"
)
ContactSelectorFragment
provideContactSelectorFragment
(
)
{
ContactSelectorFragment
fragment
=
new
ContactSelectorFragment
();
ContactSelectorFragment
provideContactSelectorFragment
(
ContactSelectorFragment
fragment
)
{
fragment
.
setArguments
(
new
Bundle
());
return
fragment
;
}
@Provides
@Named
(
"ShareForumMessageFragment"
)
ShareForumMessageFragment
provideShareForumMessageFragment
(
)
{
ShareForumMessageFragment
fragment
=
new
ShareForumMessageFragment
();
ShareForumMessageFragment
provideShareForumMessageFragment
(
ShareForumMessageFragment
fragment
)
{
fragment
.
setArguments
(
new
Bundle
());
return
fragment
;
}
@Provides
@Named
(
"IntroductionMessageFragment"
)
IntroductionMessageFragment
provideIntroductionMessageFragment
()
{
IntroductionMessageFragment
fragment
=
new
IntroductionMessageFragment
();
IntroductionMessageFragment
provideIntroductionMessageFragment
(
IntroductionMessageFragment
fragment
)
{
fragment
.
setArguments
(
new
Bundle
());
return
fragment
;
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment