TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 01:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict between #2743 and #2746

Browse Source 
Closes #2789

//FREEBIE
This commit is contained in:
agrajaghh 2015-03-25 20:02:07 +01:00 committed by Moxie Marlinspike
parent 62181a3d7f
commit 6f600a80b8
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/org/thoughtcrime/securesms/RegistrationActivity.java
View File

@ -197,8 +197,7 @@ public class RegistrationActivity extends BaseActionBarActivity {
AlertDialogWrapper.Builder dialog = new AlertDialogWrapper.Builder(self); AlertDialogWrapper.Builder dialog = new AlertDialogWrapper.Builder(self);
dialog.setTitle(PhoneNumberFormatter.getInternationalFormatFromE164(e164number)); dialog.setTitle(PhoneNumberFormatter.getInternationalFormatFromE164(e164number));
dialog.setMessage(String.format(getString(R.string.RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s), dialog.setMessage(R.string.RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s);
PhoneNumberFormatter.getInternationalFormatFromE164(e164number)));
dialog.setPositiveButton(getString(R.string.RegistrationActivity_continue), dialog.setPositiveButton(getString(R.string.RegistrationActivity_continue),
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
@Override @Override