Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 10:49:06 +01:00
Code Issues Projects Releases Wiki Activity

add a CustodianReturnShardModule which provides the view model

Browse Source
This commit is contained in:
ameba23
2021-04-13 09:19:42 +02:00
parent dba4cc278c
commit d6608fd8cb
4 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
briar-android/src/main/AndroidManifest.xml
View File

@@ -165,6 +165,15 @@
android:value="org.briarproject.briar.android.account.NewOrRecoverActivity" />
</activity>
<activity
android:name="org.briarproject.briar.android.socialbackup.recover.CustodianReturnShardActivity"
android:label="@string/activity_name_recovery"
android:parentActivityName="org.briarproject.briar.android.settings.SettingsActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="org.briarproject.briar.android.settings.SettingsActivity" />
</activity>
<activity
android:name="org.briarproject.briar.android.socialbackup.recover.OwnerReturnShardActivity"
android:label="@string/activity_name_recovery"

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

@@ -42,6 +42,7 @@ import org.briarproject.briar.android.privategroup.list.GroupListModule;
import org.briarproject.briar.android.reporting.DevReportModule;
import org.briarproject.briar.android.settings.SettingsModule;
import org.briarproject.briar.android.sharing.SharingModule;
import org.briarproject.briar.android.socialbackup.recover.CustodianReturnShardModule;
import org.briarproject.briar.android.socialbackup.recover.OwnerReturnShardModule;
import org.briarproject.briar.android.test.TestAvatarCreatorImpl;
import org.briarproject.briar.android.viewmodel.ViewModelModule;
@@ -92,7 +93,8 @@ import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
GroupListModule.class,
GroupConversationModule.class,
SharingModule.class,
OwnerReturnShardModule.class
OwnerReturnShardModule.class,
CustodianReturnShardModule.class
})
public class AppModule {

5
briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/CustodianReturnShardActivity.java
View File

@@ -18,9 +18,10 @@ import androidx.lifecycle.ViewModelProvider;
import static java.util.logging.Logger.getLogger;
public class CustodianReturnShardActivity extends BriarActivity {
private CustodianReturnShardViewModel viewModel;
public class CustodianReturnShardActivity extends BriarActivity
implements BaseFragment.BaseFragmentListener {
private CustodianReturnShardViewModel viewModel;
private static final Logger LOG =
getLogger(CustodianReturnShardActivity.class.getName());

19
briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/CustodianReturnShardModule.java Normal file
View File

@@ -0,0 +1,19 @@
package org.briarproject.briar.android.socialbackup.recover;
import org.briarproject.briar.android.viewmodel.ViewModelKey;
import androidx.lifecycle.ViewModel;
import dagger.Binds;
import dagger.Module;
import dagger.multibindings.IntoMap;
@Module
public abstract class CustodianReturnShardModule {
@Binds
@IntoMap
@ViewModelKey(CustodianReturnShardViewModel.class)
abstract ViewModel bindCustodianReturnShardViewModel(
CustodianReturnShardViewModel custodianReturnShardViewModel);
}