Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 21:29:54 +01:00
Code Issues Projects Releases Wiki Activity

add AndroidSocialBackupModule to AppModule

Browse Source
This commit is contained in:
ameba23
2021-03-12 10:51:00 +01:00
parent 6c3df2a3d4
commit e09fedd79f
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/main/java/org/briarproject/briar/android/AppModule.java
View File

@@ -48,6 +48,7 @@ import org.briarproject.briar.api.android.DozeWatchdog;
import org.briarproject.briar.api.android.LockManager; import org.briarproject.briar.api.android.LockManager;
import org.briarproject.briar.api.android.ScreenFilterMonitor; import org.briarproject.briar.api.android.ScreenFilterMonitor;
import org.briarproject.briar.api.test.TestAvatarCreator; import org.briarproject.briar.api.test.TestAvatarCreator;
import org.briarproject.briar.socialbackup.AndroidSocialBackupModule;
import java.io.File; import java.io.File;
import java.security.GeneralSecurityException; import java.security.GeneralSecurityException;
@@ -82,6 +83,7 @@ import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
SettingsModule.class, SettingsModule.class,
DevReportModule.class, DevReportModule.class,
ContactListModule.class, ContactListModule.class,
AndroidSocialBackupModule.class,
// below need to be within same scope as ViewModelProvider.Factory // below need to be within same scope as ViewModelProvider.Factory
ForumModule.class, ForumModule.class,
GroupListModule.class, GroupListModule.class,

10
briar-android/src/main/java/org/briarproject/briar/android/socialbackup/DarkCrystalImpl.java
View File

@@ -1,5 +1,6 @@
package org.briarproject.briar.android.socialbackup; package org.briarproject.briar.android.socialbackup;
import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.crypto.SecretKey;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.briar.api.socialbackup.Shard; import org.briarproject.briar.api.socialbackup.Shard;
import org.briarproject.briar.api.socialbackup.DarkCrystal; import org.briarproject.briar.api.socialbackup.DarkCrystal;
import org.magmacollective.darkcrystal.secretsharingwrapper.SecretSharingWrapper; import org.magmacollective.darkcrystal.secretsharingwrapper.SecretSharingWrapper;
@@ -10,10 +11,19 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import javax.inject.Inject;
import dagger.Provides;
import static org.briarproject.briar.socialbackup.SocialBackupConstants.SECRET_ID_BYTES; import static org.briarproject.briar.socialbackup.SocialBackupConstants.SECRET_ID_BYTES;
@NotNullByDefault
public class DarkCrystalImpl implements DarkCrystal { public class DarkCrystalImpl implements DarkCrystal {
@Inject
DarkCrystalImpl() {
}
@Override @Override
public List<Shard> createShards(SecretKey secret, int numShards, public List<Shard> createShards(SecretKey secret, int numShards,
int threshold) { int threshold) {

2
briar-core/src/main/java/org/briarproject/briar/socialbackup/SocialBackupModule.java → briar-core/src/main/java/org/briarproject/briar/socialbackup/DefaultSocialBackupModule.java
View File

@@ -21,7 +21,7 @@ import static org.briarproject.briar.api.socialbackup.SocialBackupManager.MAJOR_
import static org.briarproject.briar.api.socialbackup.SocialBackupManager.MINOR_VERSION; import static org.briarproject.briar.api.socialbackup.SocialBackupManager.MINOR_VERSION;
@Module @Module
public class SocialBackupModule { public class DefaultSocialBackupModule {
public static class EagerSingletons { public static class EagerSingletons {
@Inject @Inject