Use start/stop lifecycle callbacks rather than pause/resume.

Also fixed a couple of bugs.

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

@@ -6,9 +6,9 @@ public interface ActivityLifecycleController {
 
 	void onActivityCreate(Activity activity);
 
-	void onActivityResume();
+	void onActivityStart();
 
-	void onActivityPause();
+	void onActivityStop();
 
 	void onActivityDestroy();
 }

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

@@ -19,18 +19,18 @@ public class BriarControllerImpl implements BriarController {
 	private static final Logger LOG =
 			Logger.getLogger(BriarControllerImpl.class.getName());
 
-	@Inject
-	BriarServiceConnection serviceConnection;
-	@Inject
-	DatabaseConfig databaseConfig;
-	@Inject
-	Activity activity;
+	private final BriarServiceConnection serviceConnection;
+	private final DatabaseConfig databaseConfig;
+	private final Activity activity;
 
 	private boolean bound = false;
 
 	@Inject
-	public BriarControllerImpl() {
-
+	BriarControllerImpl(BriarServiceConnection serviceConnection,
+			DatabaseConfig databaseConfig, Activity activity) {
+		this.serviceConnection = serviceConnection;
+		this.databaseConfig = databaseConfig;
+		this.activity = activity;
 	}
 
 	@Override
@@ -40,13 +40,11 @@ public class BriarControllerImpl implements BriarController {
 	}
 
 	@Override
-	@CallSuper
-	public void onActivityResume() {
+	public void onActivityStart() {
 	}
 
 	@Override
-	@CallSuper
-	public void onActivityPause() {
+	public void onActivityStop() {
 	}
 
 	@Override

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

@@ -57,12 +57,12 @@ public class NavDrawerControllerImpl extends DbControllerImpl
 	}
 
 	@Override
-	public void onActivityResume() {
+	public void onActivityStart() {
 		eventBus.addListener(this);
 	}
 
 	@Override
-	public void onActivityPause() {
+	public void onActivityStop() {
 		eventBus.removeListener(this);
 	}