TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-01 10:12:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't offer backup restore on reregistration

Browse Source 
Fixes #7502
This commit is contained in:
Moxie Marlinspike 2018-03-11 17:12:42 -07:00
parent cc288d1e43
commit 43d7e99a50
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/thoughtcrime/securesms/ConversationActivity.java
View File

@ -675,7 +675,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
private void handleRegisterForSignal() { private void handleRegisterForSignal() {
Intent intent = new Intent(this, RegistrationActivity.class); Intent intent = new Intent(this, RegistrationActivity.class);
intent.putExtra("cancel_button", true); intent.putExtra(RegistrationActivity.RE_REGISTRATION_EXTRA, true);
startActivity(intent); startActivity(intent);
} }

2
src/org/thoughtcrime/securesms/components/reminder/PushRegistrationReminder.java
View File

@ -16,7 +16,7 @@ public class PushRegistrationReminder extends Reminder {
final OnClickListener okListener = v -> { final OnClickListener okListener = v -> {
Intent intent = new Intent(context, RegistrationActivity.class); Intent intent = new Intent(context, RegistrationActivity.class);
intent.putExtra("cancel_button", true); intent.putExtra(RegistrationActivity.RE_REGISTRATION_EXTRA, true);
context.startActivity(intent); context.startActivity(intent);
}; };

6
src/org/thoughtcrime/securesms/components/reminder/UnauthorizedReminder.java
View File

@ -14,7 +14,11 @@ public class UnauthorizedReminder extends Reminder {
super(context.getString(R.string.UnauthorizedReminder_device_no_longer_registered), super(context.getString(R.string.UnauthorizedReminder_device_no_longer_registered),
context.getString(R.string.UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device)); context.getString(R.string.UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device));
setOkListener(v -> context.startActivity(new Intent(context, RegistrationActivity.class))); setOkListener(v -> {
Intent intent = new Intent(context, RegistrationActivity.class);
intent.putExtra(RegistrationActivity.RE_REGISTRATION_EXTRA, true);
context.startActivity(intent);
});
} }
@Override @Override