Code review nitpicks.

briar-android/src/org/briarproject/android/ActivityModule.java

@@ -10,8 +10,8 @@ import org.briarproject.android.controller.BriarController;
 import org.briarproject.android.controller.BriarControllerImpl;
 import org.briarproject.android.controller.ConfigController;
 import org.briarproject.android.controller.ConfigControllerImpl;
-import org.briarproject.android.controller.DBController;
+import org.briarproject.android.controller.DbController;
-import org.briarproject.android.controller.DBControllerImpl;
+import org.briarproject.android.controller.DbControllerImpl;
 import org.briarproject.android.controller.NavDrawerController;
 import org.briarproject.android.controller.NavDrawerControllerImpl;
 import org.briarproject.android.controller.PasswordController;
@@ -93,8 +93,8 @@ public class ActivityModule {
 
 	@ActivityScope
 	@Provides
-	protected DBController provideDBController(
+	protected DbController provideDBController(
-			DBControllerImpl dbController) {
+			DbControllerImpl dbController) {
 		return dbController;
 	}
 

briar-android/src/org/briarproject/android/BriarActivity.java

@@ -5,7 +5,7 @@ import android.content.Intent;
 import android.os.Build;
 
 import org.briarproject.android.controller.BriarController;
-import org.briarproject.android.controller.DBController;
+import org.briarproject.android.controller.DbController;
 import org.briarproject.android.controller.handler.UiResultHandler;
 import org.briarproject.android.panic.ExitActivity;
 
@@ -36,7 +36,7 @@ public abstract class BriarActivity extends BaseActivity {
 	protected BriarController briarController;
 	// TODO remove this when the deprecated method runOnDbThread is removed
 	@Inject
-	protected DBController dbController;
+	protected DbController dbController;
 
 	@Override
 	protected void onActivityResult(int request, int result, Intent data) {

briar-android/src/org/briarproject/android/NavDrawerActivity.java

@@ -67,14 +67,13 @@ public class NavDrawerActivity extends BriarFragmentActivity implements
 	@Override
 	protected void onNewIntent(Intent intent) {
 		super.onNewIntent(intent);
-		if (!isStartupFailed(intent)) {
+		exitIfStartupFailed(intent);
-			checkAuthorHandle(intent);
+		checkAuthorHandle(intent);
-			clearBackStack();
+		clearBackStack();
-			if (intent.getBooleanExtra(INTENT_FORUMS, false))
+		if (intent.getBooleanExtra(INTENT_FORUMS, false))
-				startFragment(activityComponent.newForumListFragment());
+			startFragment(activityComponent.newForumListFragment());
-			else if (intent.getBooleanExtra(INTENT_CONTACTS, false))
+		else if (intent.getBooleanExtra(INTENT_CONTACTS, false))
-				startFragment(activityComponent.newContactListFragment());
+			startFragment(activityComponent.newContactListFragment());
-		}
 	}
 
 	@Override
@@ -86,10 +85,7 @@ public class NavDrawerActivity extends BriarFragmentActivity implements
 	@Override
 	public void onCreate(Bundle state) {
 		super.onCreate(state);
-
+		exitIfStartupFailed(getIntent());
-		if (isStartupFailed(getIntent()))
-			return;
-
 		setContentView(R.layout.activity_nav_drawer);
 
 		toolbar = (Toolbar) findViewById(R.id.toolbar);
@@ -106,7 +102,6 @@ public class NavDrawerActivity extends BriarFragmentActivity implements
 				R.string.nav_drawer_open_description,
 				R.string.nav_drawer_close_description);
 		drawerLayout.setDrawerListener(drawerToggle);
-		LOG.info("NavDrawerActivity created: " + (state == null));
 		if (state == null) {
 			startFragment(activityComponent.newContactListFragment());
 		} else {
@@ -154,14 +149,12 @@ public class NavDrawerActivity extends BriarFragmentActivity implements
 		}
 	}
 
-	private boolean isStartupFailed(Intent intent) {
+	private void exitIfStartupFailed(Intent intent) {
 		if (intent.getBooleanExtra(KEY_STARTUP_FAILED, false)) {
 			finish();
 			LOG.info("Exiting");
 			System.exit(0);
-			return true;
 		}
-		return false;
 	}
 
 	private void storeLocalAuthor(LocalAuthor a) {

briar-android/src/org/briarproject/android/controller/DbController.java

@@ -1,7 +1,6 @@
 package org.briarproject.android.controller;
 
-public interface DBController {
+public interface DbController {
 
 	void runOnDbThread(Runnable task);
-
 }

briar-android/src/org/briarproject/android/controller/DbControllerImpl.java

@@ -8,10 +8,10 @@ import java.util.logging.Logger;
 
 import javax.inject.Inject;
 
-public class DBControllerImpl implements DBController {
+public class DbControllerImpl implements DbController {
 
 	private static final Logger LOG =
-			Logger.getLogger(BriarControllerImpl.class.getName());
+			Logger.getLogger(DbControllerImpl.class.getName());
 
 	// Fields that are accessed from background threads must be volatile
 	@Inject
@@ -21,7 +21,7 @@ public class DBControllerImpl implements DBController {
 	protected volatile LifecycleManager lifecycleManager;
 
 	@Inject
-	public DBControllerImpl() {
+	public DbControllerImpl() {
 
 	}
 

briar-android/src/org/briarproject/android/controller/NavDrawerControllerImpl.java

@@ -23,7 +23,7 @@ import javax.inject.Inject;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 
-public class NavDrawerControllerImpl extends DBControllerImpl
+public class NavDrawerControllerImpl extends DbControllerImpl
 		implements NavDrawerController, EventListener {
 
 	private static final Logger LOG =