From da50c5dcc31ba46d7b23236dabc8de13df835137 Mon Sep 17 00:00:00 2001
From: Ernir Erlingsson <ernir@ymirmobile.com>
Date: Tue, 26 Apr 2016 12:05:25 +0200
Subject: [PATCH] cleanup and minor refactoring
---
.../src/org/briarproject/android/AndroidComponent.java | 8 +++++++-
.../src/org/briarproject/android/BaseActivity.java | 10 ----------
.../src/org/briarproject/android/BriarActivity.java | 2 --
.../src/org/briarproject/android/BriarService.java | 2 +-
.../android/controller/BriarController.java | 2 --
.../android/controller/BriarControllerImp.java | 3 ++-
6 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/briar-android/src/org/briarproject/android/AndroidComponent.java b/briar-android/src/org/briarproject/android/AndroidComponent.java
index 623aba6e55..fe444a02f9 100644
--- a/briar-android/src/org/briarproject/android/AndroidComponent.java
+++ b/briar-android/src/org/briarproject/android/AndroidComponent.java
@@ -47,11 +47,17 @@ import dagger.Component;
})
public interface AndroidComponent extends CoreEagerSingletons {
// Exposed objects
- @CryptoExecutor Executor cryptoExecutor();
+ @CryptoExecutor
+ Executor cryptoExecutor();
+
PasswordStrengthEstimator passwordStrengthIndicator();
+
CryptoComponent cryptoComponent();
+
DatabaseConfig databaseConfig();
+
AuthorFactory authFactory();
+
ReferenceManager referenceMangager();
@DatabaseExecutor
diff --git a/briar-android/src/org/briarproject/android/BaseActivity.java b/briar-android/src/org/briarproject/android/BaseActivity.java
index 6ae3eb8c20..e14eb29633 100644
--- a/briar-android/src/org/briarproject/android/BaseActivity.java
+++ b/briar-android/src/org/briarproject/android/BaseActivity.java
@@ -48,16 +48,6 @@ public abstract class BaseActivity extends AppCompatActivity {
}
}
- @Override
- public void onPostCreate(Bundle savedInstanceState) {
- super.onPostCreate(savedInstanceState);
- // Post call used for controllers to ensure that the onCreate method
- // override in inherited Activities has finished
-// for (ActivityLifecycleController alc : lifecycleControllers) {
-// alc.onActivityCreate();
-// }
- }
-
@Override
protected void onResume() {
super.onResume();
diff --git a/briar-android/src/org/briarproject/android/BriarActivity.java b/briar-android/src/org/briarproject/android/BriarActivity.java
index fca3fd12d5..901a04e42e 100644
--- a/briar-android/src/org/briarproject/android/BriarActivity.java
+++ b/briar-android/src/org/briarproject/android/BriarActivity.java
@@ -38,8 +38,6 @@ public abstract class BriarActivity extends BaseActivity {
@Override
public void onCreate(Bundle state) {
super.onCreate(state);
-
- briarController.startAndBindService();
}
@Override
diff --git a/briar-android/src/org/briarproject/android/BriarService.java b/briar-android/src/org/briarproject/android/BriarService.java
index 6055c2d691..33d69c8f68 100644
--- a/briar-android/src/org/briarproject/android/BriarService.java
+++ b/briar-android/src/org/briarproject/android/BriarService.java
@@ -180,7 +180,7 @@ public class BriarService extends Service {
/** Starts the shutdown process. */
public void shutdown() {
- stopSelf(); // This will call onActivityDestroy()
+ stopSelf(); // This will call onDestroy()
}
public class BriarBinder extends Binder {
diff --git a/briar-android/src/org/briarproject/android/controller/BriarController.java b/briar-android/src/org/briarproject/android/controller/BriarController.java
index 342e19359b..2ed024ee99 100644
--- a/briar-android/src/org/briarproject/android/controller/BriarController.java
+++ b/briar-android/src/org/briarproject/android/controller/BriarController.java
@@ -8,8 +8,6 @@ public interface BriarController extends ActivityLifecycleController {
void startAndBindService();
- void unbindService();
-
boolean encryptionKey();
void signOut(ResultHandler<Void> eventHandler);
diff --git a/briar-android/src/org/briarproject/android/controller/BriarControllerImp.java b/briar-android/src/org/briarproject/android/controller/BriarControllerImp.java
index 59ed95d3b0..b959d66e8d 100644
--- a/briar-android/src/org/briarproject/android/controller/BriarControllerImp.java
+++ b/briar-android/src/org/briarproject/android/controller/BriarControllerImp.java
@@ -45,6 +45,7 @@ public class BriarControllerImp implements BriarController {
@Override
@CallSuper
public void onActivityCreate() {
+ LOG.info("onActivityCreate : " + databaseConfig.getEncryptionKey());
if (databaseConfig.getEncryptionKey() != null) startAndBindService();
}
@@ -97,7 +98,7 @@ public class BriarControllerImp implements BriarController {
}.start();
}
- public void unbindService() {
+ private void unbindService() {
if (bound) activity.unbindService(serviceConnection);
}
--
GitLab