Trimmed some Roboguice boilerplate.

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

@@ -26,7 +26,6 @@ import roboguice.activity.event.OnResumeEvent;
 import roboguice.activity.event.OnStartEvent;
 import roboguice.activity.event.OnStopEvent;
 import roboguice.event.EventManager;
-import roboguice.inject.ContentViewListener;
 import roboguice.inject.RoboInjector;
 import roboguice.util.RoboContext;
 
@@ -34,20 +33,20 @@ import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
 import static android.view.inputmethod.InputMethodManager.HIDE_IMPLICIT_ONLY;
 import static org.briarproject.android.TestingConstants.PREVENT_SCREENSHOTS;
 
-public abstract class BaseActivity extends AppCompatActivity implements RoboContext {
+public abstract class BaseActivity extends AppCompatActivity
+		implements RoboContext {
 
 	private final static String PREFS_DB = "db";
 	private final static String KEY_DB_KEY = "key";
 
-	protected EventManager eventManager;
-	protected HashMap<Key<?>, Object> scopedObjects = new HashMap();
-	@Inject
-	ContentViewListener ignored;
+	private final HashMap<Key<?>, Object> scopedObjects =
+			new HashMap<Key<?>, Object>();
+
+	@Inject private EventManager eventManager;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		RoboInjector injector = RoboGuice.getInjector(this);
-		eventManager = (EventManager) injector.getInstance(EventManager.class);
 		injector.injectMembersWithoutViews(this);
 		super.onCreate(savedInstanceState);
 		eventManager.fire(new OnCreateEvent(savedInstanceState));
@@ -105,7 +104,8 @@ public abstract class BaseActivity extends AppCompatActivity implements RoboCont
 	public void onConfigurationChanged(Configuration newConfig) {
 		Configuration currentConfig = getResources().getConfiguration();
 		super.onConfigurationChanged(newConfig);
-		eventManager.fire(new OnConfigurationChangedEvent(currentConfig, newConfig));
+		eventManager.fire(new OnConfigurationChangedEvent(currentConfig,
+				newConfig));
 	}
 
 	public void onContentChanged() {
@@ -114,9 +114,11 @@ public abstract class BaseActivity extends AppCompatActivity implements RoboCont
 		eventManager.fire(new OnContentChangedEvent());
 	}
 
-	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+	protected void onActivityResult(int requestCode, int resultCode,
+			Intent data) {
 		super.onActivityResult(requestCode, resultCode, data);
-		eventManager.fire(new OnActivityResultEvent(requestCode, resultCode, data));
+		eventManager.fire(new OnActivityResultEvent(requestCode, resultCode,
+				data));
 	}
 
 	@Override
@@ -139,7 +141,7 @@ public abstract class BaseActivity extends AppCompatActivity implements RoboCont
 	}
 
 	protected void clearDbPrefs() {
-		this.clearPrefs(PREFS_DB);
+		clearPrefs(PREFS_DB);
 	}
 
 	protected void gotoAndFinish(Class classInstance, int resultCode) {

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

 package org.briarproject.android;
 
-import static android.content.Intent.FLAG_ACTIVITY_NO_ANIMATION;
-import static android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP;
-import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
-import static android.view.inputmethod.InputMethodManager.HIDE_IMPLICIT_ONLY;
-import static org.briarproject.android.TestingConstants.PREVENT_SCREENSHOTS;
-
-import java.util.concurrent.Executor;
-import java.util.logging.Logger;
-
-import javax.inject.Inject;
+import android.annotation.SuppressLint;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.IBinder;
 
 import org.briarproject.android.BriarService.BriarBinder;
 import org.briarproject.android.BriarService.BriarServiceConnection;
@@ -17,12 +11,13 @@ import org.briarproject.api.db.DatabaseConfig;
 import org.briarproject.api.db.DatabaseExecutor;
 import org.briarproject.api.lifecycle.LifecycleManager;
 
-import roboguice.activity.RoboActivity;
-import android.annotation.SuppressLint;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.view.inputmethod.InputMethodManager;
+import java.util.concurrent.Executor;
+import java.util.logging.Logger;
+
+import javax.inject.Inject;
+
+import static android.content.Intent.FLAG_ACTIVITY_NO_ANIMATION;
+import static android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP;
 
 @SuppressLint("Registered")
 public class BriarActivity extends BaseActivity {
@@ -136,9 +131,4 @@ public class BriarActivity extends BaseActivity {
 			}
 		});
 	}
-
-	protected void hideSoftKeyboard() {
-		Object o = getSystemService(INPUT_METHOD_SERVICE);
-		((InputMethodManager) o).toggleSoftInput(HIDE_IMPLICIT_ONLY, 0);
-	}
 }