From aa3ef896f5c0f375e44b2260579e26866a3ad0c8 Mon Sep 17 00:00:00 2001
From: Ernir Erlingsson <ernir@ymirmobile.com>
Date: Tue, 26 Apr 2016 12:21:14 +0200
Subject: [PATCH] further polish
---
.../src/org/briarproject/android/BriarFragmentActivity.java | 3 +--
.../briarproject/android/controller/BriarControllerImp.java | 1 -
.../android/introduction/IntroductionMessageFragment.java | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/briar-android/src/org/briarproject/android/BriarFragmentActivity.java b/briar-android/src/org/briarproject/android/BriarFragmentActivity.java
index 28f9923262..00fe0f39ac 100644
--- a/briar-android/src/org/briarproject/android/BriarFragmentActivity.java
+++ b/briar-android/src/org/briarproject/android/BriarFragmentActivity.java
@@ -49,8 +49,7 @@ public abstract class BriarFragmentActivity extends BriarActivity {
exiting. This models the typical Google navigation behaviour such
as in Gmail/Inbox.
*/
- // FIXME
-// startFragment(ContactListFragment.newInstance());
+ startFragment(activityComponent.newContactListFragment());
} else {
super.onBackPressed();
diff --git a/briar-android/src/org/briarproject/android/controller/BriarControllerImp.java b/briar-android/src/org/briarproject/android/controller/BriarControllerImp.java
index b959d66e8d..9e7cadeaec 100644
--- a/briar-android/src/org/briarproject/android/controller/BriarControllerImp.java
+++ b/briar-android/src/org/briarproject/android/controller/BriarControllerImp.java
@@ -45,7 +45,6 @@ public class BriarControllerImp implements BriarController {
@Override
@CallSuper
public void onActivityCreate() {
- LOG.info("onActivityCreate : " + databaseConfig.getEncryptionKey());
if (databaseConfig.getEncryptionKey() != null) startAndBindService();
}
diff --git a/briar-android/src/org/briarproject/android/introduction/IntroductionMessageFragment.java b/briar-android/src/org/briarproject/android/introduction/IntroductionMessageFragment.java
index ed9c7b3c77..48f0726c08 100644
--- a/briar-android/src/org/briarproject/android/introduction/IntroductionMessageFragment.java
+++ b/briar-android/src/org/briarproject/android/introduction/IntroductionMessageFragment.java
@@ -52,7 +52,7 @@ public class IntroductionMessageFragment extends BaseFragment {
Bundle args = new Bundle();
args.putInt(CONTACT_ID_1, contactId1);
args.putInt(CONTACT_ID_2, contactId2);
- this.setArguments(args);
+ setArguments(args);
}
@Inject
--
GitLab