Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-19 08:09:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reopen properly when we select launcher icon.

Browse Source 
* Reopen properly when we select launcher icon.

* Reduce noise
This commit is contained in:
Alex Hart
2020-12-19 16:54:00 -04:00
committed by Alan Evans
parent 6bab6c2454
commit b7477d287b
20 changed files with 72 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreActivity.java
View File

@@ -29,7 +29,7 @@ public final class PinRestoreActivity extends AppCompatActivity {
}
void navigateToPinCreation() {
final Intent main = new Intent(this, MainActivity.class);
final Intent main = MainActivity.clearTop(this);
final Intent createPin = CreateKbsPinActivity.getIntentForPinCreate(this);
final Intent chained = PassphraseRequiredActivity.chainIntent(createPin, main);

4
app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreEntryFragment.java
View File

@@ -231,7 +231,7 @@ public class PinRestoreEntryFragment extends LoggingFragment {
Activity activity = requireActivity();
if (Recipient.self().getProfileName().isEmpty() || !AvatarHelper.hasAvatar(activity, Recipient.self().getId())) {
final Intent main = new Intent(activity, MainActivity.class);
final Intent main = MainActivity.clearTop(activity);
final Intent profile = EditProfileActivity.getIntentForUserProfile(activity);
profile.putExtra("next_intent", main);
@@ -239,7 +239,7 @@ public class PinRestoreEntryFragment extends LoggingFragment {
} else {
RegistrationUtil.maybeMarkRegistrationComplete(requireContext());
ApplicationDependencies.getJobManager().add(new ProfileUploadJob());
startActivity(new Intent(activity, MainActivity.class));
startActivity(MainActivity.clearTop(activity));
}
activity.finish();