mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Utilize proper intent creation when launching profile creator from PassphraseRequiredActivity.

fork-5.53.8
Alex Hart 2022-08-18 14:46:45 -03:00 zatwierdzone przez Cody Henthorne
rodzic 9c266e7995
commit 796e98be10
1 zmienionych plików z 7 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
Wyświetl plik

@ -238,7 +238,8 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
} }
private Intent getCreateProfileNameIntent() { private Intent getCreateProfileNameIntent() {
return getRoutedIntent(EditProfileActivity.class, getIntent()); Intent intent = EditProfileActivity.getIntentForUserProfile(this);
return getRoutedIntent(intent, getIntent());
} }
private Intent getOldDeviceTransferIntent() { private Intent getOldDeviceTransferIntent() {
@ -258,6 +259,11 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
return ChangeNumberLockActivity.createIntent(this); return ChangeNumberLockActivity.createIntent(this);
} }
private Intent getRoutedIntent(Intent destination, @Nullable Intent nextIntent) {
if (nextIntent != null) destination.putExtra("next_intent", nextIntent);
return destination;
}
private Intent getRoutedIntent(Class<?> destination, @Nullable Intent nextIntent) { private Intent getRoutedIntent(Class<?> destination, @Nullable Intent nextIntent) {
final Intent intent = new Intent(this, destination); final Intent intent = new Intent(this, destination);
if (nextIntent != null) intent.putExtra("next_intent", nextIntent); if (nextIntent != null) intent.putExtra("next_intent", nextIntent);