Signal/Android
1
0 Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-10-09 00:55:19 +01: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 authored and Moxie Marlinspike committed 2015-03-25 13:28:57 -07:00
1 parent 62181a3d7f
commit 6f600a80b8
1 file changed
+1 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/org/thoughtcrime/securesms/RegistrationActivity.java
+1 -2
View File
@@ -197,8 +197,7 @@ public class RegistrationActivity extends BaseActionBarActivity {
AlertDialogWrapper.Builder dialog = new AlertDialogWrapper.Builder(self);
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),
PhoneNumberFormatter.getInternationalFormatFromE164(e164number)));
dialog.setMessage(R.string.RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s);
dialog.setPositiveButton(getString(R.string.RegistrationActivity_continue),
new DialogInterface.OnClickListener() {
@Override