Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 10:20:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

CreatePinActivity naming update and copy fixes.

Browse Source
This commit is contained in:
Alex Hart
2020-02-03 12:32:14 -04:00
committed by Greyson Parrelli
parent b29b3d0432
commit e14861d79d
11 changed files with 87 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationCompleteFragment.java
View File

@@ -36,13 +36,13 @@ public final class RegistrationCompleteFragment extends BaseRegistrationFragment
if (!isReregister()) {
final Intent main = new Intent(activity, MainActivity.class);
final Intent next = getRoutedIntent(activity, EditProfileActivity.class, main);
final Intent next = chainIntents(new Intent(activity, EditProfileActivity.class), main);
next.putExtra(EditProfileActivity.SHOW_TOOLBAR, false);
Context context = requireContext();
if (FeatureFlags.pinsForAll() && !PinUtil.userHasPin(context)) {
activity.startActivity(getRoutedIntent(activity, CreateKbsPinActivity.class, next));
activity.startActivity(chainIntents(CreateKbsPinActivity.getIntentForPinCreate(context), next));
} else {
activity.startActivity(next);
}
@@ -52,9 +52,8 @@ public final class RegistrationCompleteFragment extends BaseRegistrationFragment
ActivityNavigator.applyPopAnimationsToPendingTransition(activity);
}
private static Intent getRoutedIntent(@NonNull Context context, Class<?> destination, @Nullable Intent nextIntent) {
final Intent intent = new Intent(context, destination);
if (nextIntent != null) intent.putExtra("next_intent", nextIntent);
return intent;
private static Intent chainIntents(@NonNull Intent sourceIntent, @Nullable Intent nextIntent) {
if (nextIntent != null) sourceIntent.putExtra("next_intent", nextIntent);
return sourceIntent;
}
}