From 25bbb5aa36b3f2d092ce66b39a6a07accbc930cf Mon Sep 17 00:00:00 2001
From: ameba23 <ameba23@systemli.org>
Date: Mon, 8 Mar 2021 18:00:24 +0100
Subject: [PATCH] dependency injection for SocialBackupManager and
 DatabaseComponent

---
 .../briar/android/AndroidComponent.java             |  6 ++++++
 .../briar/android/activity/ActivityComponent.java   |  3 +++
 .../socialbackup/DistributedBackupActivity.java     | 13 ++++---------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java b/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java
index 86db83f29..233b70399 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java
+++ b/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);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java b/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java
index e762afab6..63ce7f935 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java
+++ b/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);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/DistributedBackupActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/DistributedBackupActivity.java
index a5edbc222..42308599d 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/DistributedBackupActivity.java
+++ b/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) {
-		this.socialBackupManager = socialBackupManager;
-		this.db = db;
-    }
+    public SocialBackupManager socialBackupManager;
+
+	@Inject
+    public DatabaseComponent db;
 
 	@Override
 	public void injectActivity(ActivityComponent component) {