Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 21:29:54 +01:00
Code Issues Projects Releases Wiki Activity

further polish

Browse Source
This commit is contained in:
Ernir Erlingsson
2016-04-26 12:21:14 +02:00
parent da50c5dcc3
commit aa3ef896f5
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
briar-android/src/org/briarproject/android/BriarFragmentActivity.java
View File

@@ -49,8 +49,7 @@ public abstract class BriarFragmentActivity extends BriarActivity {
exiting. This models the typical Google navigation behaviour such exiting. This models the typical Google navigation behaviour such
as in Gmail/Inbox. as in Gmail/Inbox.
*/ */
// FIXME startFragment(activityComponent.newContactListFragment());
// startFragment(ContactListFragment.newInstance());
} else { } else {
super.onBackPressed(); super.onBackPressed();

1
briar-android/src/org/briarproject/android/controller/BriarControllerImp.java
View File

@@ -45,7 +45,6 @@ public class BriarControllerImp implements BriarController {
@Override @Override
@CallSuper @CallSuper
public void onActivityCreate() { public void onActivityCreate() {
LOG.info("onActivityCreate : " + databaseConfig.getEncryptionKey());
if (databaseConfig.getEncryptionKey() != null) startAndBindService(); if (databaseConfig.getEncryptionKey() != null) startAndBindService();
} }

2
briar-android/src/org/briarproject/android/introduction/IntroductionMessageFragment.java
View File

@@ -52,7 +52,7 @@ public class IntroductionMessageFragment extends BaseFragment {
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putInt(CONTACT_ID_1, contactId1); args.putInt(CONTACT_ID_1, contactId1);
args.putInt(CONTACT_ID_2, contactId2); args.putInt(CONTACT_ID_2, contactId2);
this.setArguments(args); setArguments(args);
} }
@Inject @Inject