Switched Roboguice/Guice out for Dagger 2

briar-android/src/org/briarproject/android/forum/AvailableForumsActivity.java

@@ -8,6 +8,7 @@ import android.widget.ListView;
 import android.widget.Toast;
 
 import org.briarproject.R;
+import org.briarproject.android.AndroidComponent;
 import org.briarproject.android.BriarActivity;
 import org.briarproject.android.util.ListLoadingProgressBar;
 import org.briarproject.api.contact.Contact;
@@ -47,9 +48,9 @@ implements EventListener, OnItemClickListener {
 	private ListView list = null;
 
 	// Fields that are accessed from background threads must be volatile
-	@Inject private volatile ForumManager forumManager;
-	@Inject private volatile ForumSharingManager forumSharingManager;
-	@Inject private volatile EventBus eventBus;
+	@Inject protected volatile ForumManager forumManager;
+	@Inject protected volatile ForumSharingManager forumSharingManager;
+	@Inject protected volatile EventBus eventBus;
 
 	@Override
 	public void onCreate(Bundle state) {
@@ -66,6 +67,11 @@ implements EventListener, OnItemClickListener {
 		setContentView(loading);
 	}
 
+	@Override
+	public void injectActivity(AndroidComponent component) {
+		component.inject(this);
+	}
+
 	@Override
 	public void onResume() {
 		super.onResume();

briar-android/src/org/briarproject/android/forum/CreateForumActivity.java

@@ -14,6 +14,7 @@ import android.widget.TextView.OnEditorActionListener;
 import android.widget.Toast;
 
 import org.briarproject.R;
+import org.briarproject.android.AndroidComponent;
 import org.briarproject.android.BriarActivity;
 import org.briarproject.android.util.LayoutUtils;
 import org.briarproject.api.db.DbException;
@@ -51,7 +52,7 @@ implements OnEditorActionListener, OnClickListener {
 	private TextView feedback = null;
 
 	// Fields that are accessed from background threads must be volatile
-	@Inject private volatile ForumSharingManager forumSharingManager;
+	@Inject protected volatile ForumSharingManager forumSharingManager;
 
 	@Override
 	public void onCreate(Bundle state) {
@@ -102,6 +103,11 @@ implements OnEditorActionListener, OnClickListener {
 		setContentView(layout);
 	}
 
+	@Override
+	public void injectActivity(AndroidComponent component) {
+		component.inject(this);
+	}
+
 	private void enableOrDisableCreateButton() {
 		if (progress == null) return; // Not created yet
 		createForumButton.setEnabled(validateName());

briar-android/src/org/briarproject/android/forum/ForumActivity.java

@@ -13,6 +13,7 @@ import android.widget.ListView;
 import android.widget.TextView;
 
 import org.briarproject.R;
+import org.briarproject.android.AndroidComponent;
 import org.briarproject.android.BriarActivity;
 import org.briarproject.android.util.ElasticHorizontalSpace;
 import org.briarproject.android.util.HorizontalBorder;
@@ -62,7 +63,7 @@ public class ForumActivity extends BriarActivity implements EventListener,
 	private static final Logger LOG =
 			Logger.getLogger(ForumActivity.class.getName());
 
-	@Inject private AndroidNotificationManager notificationManager;
+	@Inject protected AndroidNotificationManager notificationManager;
 	private Map<MessageId, byte[]> bodyCache = new HashMap<MessageId, byte[]>();
 	private TextView empty = null;
 	private ForumAdapter adapter = null;
@@ -71,8 +72,8 @@ public class ForumActivity extends BriarActivity implements EventListener,
 	private ImageButton composeButton = null, shareButton = null;
 
 	// Fields that are accessed from background threads must be volatile
-	@Inject private volatile ForumManager forumManager;
-	@Inject private volatile EventBus eventBus;
+	@Inject protected volatile ForumManager forumManager;
+	@Inject protected volatile EventBus eventBus;
 	private volatile GroupId groupId = null;
 	private volatile Forum forum = null;
 
@@ -139,6 +140,11 @@ public class ForumActivity extends BriarActivity implements EventListener,
 		setContentView(layout);
 	}
 
+	@Override
+	public void injectActivity(AndroidComponent component) {
+		component.inject(this);
+	}
+
 	@Override
 	public void onResume() {
 		super.onResume();

briar-android/src/org/briarproject/android/forum/ForumListFragment.java

@@ -19,6 +19,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import org.briarproject.R;
+import org.briarproject.android.AndroidComponent;
 import org.briarproject.android.fragment.BaseEventFragment;
 import org.briarproject.android.util.HorizontalBorder;
 import org.briarproject.android.util.LayoutUtils;
@@ -83,8 +84,8 @@ public class ForumListFragment extends BaseEventFragment implements
 	private ImageButton newForumButton = null;
 
 	// Fields that are accessed from background threads must be volatile
-	@Inject private volatile ForumManager forumManager;
-	@Inject private volatile ForumSharingManager forumSharingManager;
+	@Inject protected volatile ForumManager forumManager;
+	@Inject protected volatile ForumSharingManager forumSharingManager;
 
 	@Nullable
 	@Override
@@ -152,6 +153,11 @@ public class ForumListFragment extends BaseEventFragment implements
 		return TAG;
 	}
 
+	@Override
+	public void injectActivity(AndroidComponent component) {
+		component.inject(this);
+	}
+
 	@Override
 	public void onResume() {
 		super.onResume();

briar-android/src/org/briarproject/android/forum/ReadForumPostActivity.java

@@ -12,6 +12,7 @@ import android.widget.ScrollView;
 import android.widget.TextView;
 
 import org.briarproject.R;
+import org.briarproject.android.AndroidComponent;
 import org.briarproject.android.BriarActivity;
 import org.briarproject.android.util.AuthorView;
 import org.briarproject.android.util.ElasticHorizontalSpace;
@@ -59,7 +60,7 @@ implements OnClickListener {
 	private int position = -1;
 
 	// Fields that are accessed from background threads must be volatile
-	@Inject private volatile ForumManager forumManager;
+	@Inject protected volatile ForumManager forumManager;
 	private volatile MessageId messageId = null;
 
 	@Override
@@ -164,6 +165,11 @@ implements OnClickListener {
 		setContentView(layout);
 	}
 
+	@Override
+	public void injectActivity(AndroidComponent component) {
+		component.inject(this);
+	}
+
 	@Override
 	public void onPause() {
 		super.onPause();

briar-android/src/org/briarproject/android/forum/ShareForumActivity.java

@@ -11,6 +11,7 @@ import android.widget.RadioButton;
 import android.widget.RadioGroup;
 
 import org.briarproject.R;
+import org.briarproject.android.AndroidComponent;
 import org.briarproject.android.BriarActivity;
 import org.briarproject.android.contact.SelectContactsDialog;
 import org.briarproject.android.invitation.AddContactActivity;
@@ -51,8 +52,8 @@ SelectContactsDialog.Listener {
 	private boolean changed = false;
 
 	// Fields that are accessed from background threads must be volatile
-	@Inject private volatile ContactManager contactManager;
-	@Inject private volatile ForumSharingManager forumSharingManager;
+	@Inject protected volatile ContactManager contactManager;
+	@Inject protected volatile ForumSharingManager forumSharingManager;
 	private volatile GroupId groupId = null;
 	private volatile Collection<Contact> contacts = null;
 	private volatile Collection<ContactId> selected = null;
@@ -109,6 +110,11 @@ SelectContactsDialog.Listener {
 		setContentView(layout);
 	}
 
+	@Override
+	public void injectActivity(AndroidComponent component) {
+		component.inject(this);
+	}
+
 	public void onClick(View view) {
 		if (view == shareWithAll) {
 			changed = true;

briar-android/src/org/briarproject/android/forum/WriteForumPostActivity.java

@@ -16,6 +16,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import org.briarproject.R;
+import org.briarproject.android.AndroidComponent;
 import org.briarproject.android.BriarActivity;
 import org.briarproject.android.identity.CreateIdentityActivity;
 import org.briarproject.android.identity.LocalAuthorItem;
@@ -67,7 +68,7 @@ implements OnItemSelectedListener, OnClickListener {
 	private static final Logger LOG =
 			Logger.getLogger(WriteForumPostActivity.class.getName());
 
-	@Inject @CryptoExecutor private Executor cryptoExecutor;
+	@Inject @CryptoExecutor protected Executor cryptoExecutor;
 	private LocalAuthorSpinnerAdapter adapter = null;
 	private Spinner spinner = null;
 	private ImageButton sendButton = null;
@@ -76,10 +77,10 @@ implements OnItemSelectedListener, OnClickListener {
 	private GroupId groupId = null;
 
 	// Fields that are accessed from background threads must be volatile
-	@Inject private volatile IdentityManager identityManager;
-	@Inject private volatile ForumManager forumManager;
-	@Inject private volatile ForumPostFactory forumPostFactory;
-	@Inject private volatile CryptoComponent crypto;
+	@Inject protected volatile IdentityManager identityManager;
+	@Inject protected volatile ForumManager forumManager;
+	@Inject protected volatile ForumPostFactory forumPostFactory;
+	@Inject protected volatile CryptoComponent crypto;
 	private volatile MessageId parentId = null;
 	private volatile long minTimestamp = -1;
 	private volatile LocalAuthor localAuthor = null;
@@ -157,6 +158,11 @@ implements OnItemSelectedListener, OnClickListener {
 		setContentView(layout);
 	}
 
+	@Override
+	public void injectActivity(AndroidComponent component) {
+		component.inject(this);
+	}
+
 	@Override
 	public void onResume() {
 		super.onResume();