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

Fixed merge issues.

Browse Source
This commit is contained in:
akwizgran
2016-03-15 20:26:50 +00:00
parent c2a1cc1e4e
commit 3d57516258
4 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
briar-android/src/org/briarproject/android/AndroidComponent.java
View File

@@ -11,7 +11,6 @@ import org.briarproject.android.forum.ForumListFragment;
import org.briarproject.android.forum.ReadForumPostActivity;
import org.briarproject.android.forum.ShareForumActivity;
import org.briarproject.android.forum.WriteForumPostActivity;
import org.briarproject.android.fragment.SettingsFragment;
import org.briarproject.android.identity.CreateIdentityActivity;
import org.briarproject.android.invitation.AddContactActivity;
import org.briarproject.android.panic.PanicPreferencesActivity;
@@ -63,9 +62,9 @@ public interface AndroidComponent extends CoreEagerSingletons {
void inject(ForumActivity activity);
void inject(ContactListFragment fragment);
void inject(SettingsActivity activity);
void inject(SettingsFragment fragment);
void inject(ContactListFragment fragment);
void inject(ForumListFragment fragment);

10
briar-android/src/org/briarproject/android/SettingsActivity.java
View File

@@ -11,8 +11,9 @@ import org.briarproject.api.settings.SettingsManager;
import javax.inject.Inject;
public class SettingsActivity extends BriarActivity {
@Inject private SettingsManager settingsManager;
@Inject private EventBus eventBus;
@Inject protected SettingsManager settingsManager;
@Inject protected EventBus eventBus;
@Override
public void onCreate(Bundle bundle) {
@@ -27,6 +28,11 @@ public class SettingsActivity extends BriarActivity {
setContentView(R.layout.activity_settings);
}
@Override
public void injectActivity(AndroidComponent component) {
component.inject(this);
}
public SettingsManager getSettingsManager() {
return settingsManager;
}