Merge pull request #729 from funk78/feature/use_getDeviceE164Number

FREEBIE reuse code
11 years ago · 0da1d8818e
parent 5a525a2e58 c84285c639
commit 0da1d8818e
1 changed files with 1 additions and 7 deletions
--- a/src/org/thoughtcrime/securesms/RegistrationActivity.java
+++ b/src/org/thoughtcrime/securesms/RegistrationActivity.java
@ -107,13 +107,7 @@ public class RegistrationActivity extends SherlockActivity {
  }

  private void initializeNumber() {
-    String localNumber = ((TelephonyManager)getSystemService(Context.TELEPHONY_SERVICE))
-                         .getLine1Number();
-
-    if (!Util.isEmpty(localNumber) && !localNumber.startsWith("+")) {
-      if (localNumber.length() == 10) localNumber = "+1" + localNumber;
-      else                            localNumber = "+"  + localNumber;
-    }
+    String localNumber = org.whispersystems.textsecure.util.Util.getDeviceE164Number(this);

    try {
      if (!Util.isEmpty(localNumber)) {