Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 18:59:06 +01:00
Code Issues Projects Releases Wiki Activity

Throw an exception if BriarService is (re)created without a password.

Browse Source
This commit is contained in:
akwizgran
2013-04-22 15:59:34 +01:00
parent 371cdf0f90
commit 79233a47ba
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
briar-android/src/net/sf/briar/android/BriarService.java
View File

@@ -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();