From 79233a47baf314af8251c05751f97168daa8a38b Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Mon, 22 Apr 2013 15:59:34 +0100
Subject: [PATCH] Throw an exception if BriarService is (re)created without a
password.
---
.../src/net/sf/briar/android/BriarService.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/briar-android/src/net/sf/briar/android/BriarService.java b/briar-android/src/net/sf/briar/android/BriarService.java
index bf96ef3254..afaa6584ee 100644
--- a/briar-android/src/net/sf/briar/android/BriarService.java
+++ b/briar-android/src/net/sf/briar/android/BriarService.java
@@ -12,6 +12,7 @@ import java.util.logging.Logger;
import net.sf.briar.R;
import net.sf.briar.api.crypto.KeyManager;
import net.sf.briar.api.db.DatabaseComponent;
+import net.sf.briar.api.db.DatabaseConfig;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.plugins.PluginManager;
import roboguice.service.RoboService;
@@ -34,9 +35,10 @@ public class BriarService extends RoboService {
private final CountDownLatch shutdownLatch = new CountDownLatch(1);
private final Binder binder = new BriarBinder();
- @Inject private DatabaseComponent db;
- @Inject private KeyManager keyManager;
- @Inject private PluginManager pluginManager;
+ @Inject private DatabaseConfig databaseConfig = null;
+ @Inject private DatabaseComponent db = null;
+ @Inject private KeyManager keyManager = null;
+ @Inject private PluginManager pluginManager = null;
@Override
public void onCreate() {
@@ -90,6 +92,8 @@ public class BriarService extends RoboService {
}
private void startServices() {
+ if(databaseConfig.getEncryptionKey() == null)
+ throw new IllegalStateException();
try {
if(LOG.isLoggable(INFO)) LOG.info("Starting");
boolean reopened = db.open();
--
GitLab