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

OwnerReturnShard activity and view model now running

Browse Source
This commit is contained in:
ameba23
2021-04-12 16:17:22 +02:00
parent e006e22616
commit 5fd0d0d2d3
5 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerRecoveryModeExplainerFragment.java
View File

@@ -24,7 +24,7 @@ public class OwnerRecoveryModeExplainerFragment extends BaseFragment {
@Inject @Inject
ViewModelProvider.Factory viewModelFactory; ViewModelProvider.Factory viewModelFactory;
private ReturnShardViewModel viewModel; private OwnerReturnShardViewModel viewModel;
// @Override // @Override
// public void onCreate(@Nullable Bundle savedInstanceState) { // public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -36,7 +36,7 @@ public class OwnerRecoveryModeExplainerFragment extends BaseFragment {
public void injectFragment(ActivityComponent component) { public void injectFragment(ActivityComponent component) {
component.inject(this); component.inject(this);
viewModel = new ViewModelProvider(requireActivity(), viewModelFactory) viewModel = new ViewModelProvider(requireActivity(), viewModelFactory)
.get(ReturnShardViewModel.class); .get(OwnerReturnShardViewModel.class);
} }
@Override @Override

3
briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardFragment.java
View File

@@ -33,9 +33,6 @@ import static android.view.View.INVISIBLE;
import static android.view.View.VISIBLE; import static android.view.View.VISIBLE;
import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
import static android.widget.LinearLayout.HORIZONTAL; import static android.widget.LinearLayout.HORIZONTAL;
import static android.widget.Toast.LENGTH_LONG;
import static java.util.logging.Level.WARNING;
import static org.briarproject.bramble.util.LogUtils.logException;
@MethodsNotNullByDefault @MethodsNotNullByDefault
@ParametersNotNullByDefault @ParametersNotNullByDefault

8
briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardModule.java
View File

@@ -9,12 +9,12 @@ import dagger.multibindings.IntoMap;
@Module @Module
public abstract class ReturnShardModule { public abstract class OwnerReturnShardModule {
@Binds @Binds
@IntoMap @IntoMap
@ViewModelKey(ReturnShardViewModel.class) @ViewModelKey(OwnerReturnShardViewModel.class)
abstract ViewModel bindContactExchangeViewModel( abstract ViewModel bindOwnerReturnShardViewModel(
ReturnShardViewModel returnShardViewModel); OwnerReturnShardViewModel ownerReturnShardViewModel);
} }

2
briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardViewModel.java
View File

@@ -224,8 +224,8 @@ class OwnerReturnShardViewModel extends AndroidViewModel implements SecretOwnerT
// Use ISO 8859-1 to encode bytes directly as a string // Use ISO 8859-1 to encode bytes directly as a string
String content = new String(payloadBytes, ISO_8859_1); String content = new String(payloadBytes, ISO_8859_1);
qrCodeBitmap = QrCodeUtils.createQrCode(dm, content); qrCodeBitmap = QrCodeUtils.createQrCode(dm, content);
showQrCodeFragment.setEvent(true);
}); });
showQrCodeFragment.setEvent(true);
} }
} }
} }