dependency injection for SocialBackupManager and DatabaseComponent

briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java

@@ -13,6 +13,7 @@ import org.briarproject.bramble.api.contact.ContactExchangeManager;
 import org.briarproject.bramble.api.contact.ContactManager;
 import org.briarproject.bramble.api.crypto.CryptoExecutor;
 import org.briarproject.bramble.api.crypto.PasswordStrengthEstimator;
+import org.briarproject.bramble.api.db.DatabaseComponent;
 import org.briarproject.bramble.api.db.DatabaseExecutor;
 import org.briarproject.bramble.api.db.TransactionManager;
 import org.briarproject.bramble.api.event.EventBus;
@@ -59,7 +60,9 @@ import org.briarproject.briar.api.privategroup.PrivateGroupFactory;
 import org.briarproject.briar.api.privategroup.PrivateGroupManager;
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationFactory;
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager;
+import org.briarproject.briar.api.socialbackup.SocialBackupManager;
 import org.briarproject.briar.api.test.TestDataCreator;
+import org.briarproject.briar.socialbackup.SocialBackupManagerImpl_Factory;
 
 import java.util.concurrent.Executor;
 
@@ -184,6 +187,9 @@ public interface AndroidComponent
 
 	Thread.UncaughtExceptionHandler exceptionHandler();
 
+	SocialBackupManager socialBackupManager();
+    DatabaseComponent databaseComponent();
+
 	void inject(SignInReminderReceiver briarService);
 
 	void inject(BriarService briarService);

briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java

@@ -2,6 +2,7 @@ package org.briarproject.briar.android.activity;
 
 import android.app.Activity;
 
+import org.briarproject.bramble.api.db.DatabaseComponent;
 import org.briarproject.briar.android.AndroidComponent;
 import org.briarproject.briar.android.StartupFailureActivity;
 import org.briarproject.briar.android.account.AuthorNameFragment;
@@ -253,6 +254,8 @@ public interface ActivityComponent {
 //    void inject(CreateBackupController createBackupController);
 //	void inject(CustodianDisplayFragment custodianDisplayFragment);
 
+	void inject(DatabaseComponent databaseComponent);
+
 	void inject(CustodianSelectorFragment custodianSelectorFragment);
 
 	void inject(ShardsSentFragment shardsSentFragment);

briar-android/src/main/java/org/briarproject/briar/android/socialbackup/DistributedBackupActivity.java

@@ -25,17 +25,12 @@ public class DistributedBackupActivity extends BriarActivity implements
 		ThresholdDefinedListener, ShardsSentDismissedListener {
 
 	private Collection<ContactId> custodians;
-    private SocialBackupManager socialBackupManager;
-    private DatabaseComponent db;
-
-    public DistributedBackupActivity() {
-    }
 
 	@Inject
-    public DistributedBackupActivity(SocialBackupManager socialBackupManager, DatabaseComponent db) {
+    public SocialBackupManager socialBackupManager;
-		this.socialBackupManager = socialBackupManager;
+
-		this.db = db;
+	@Inject
-    }
+    public DatabaseComponent db;
 
 	@Override
 	public void injectActivity(ActivityComponent component) {