Initial GCM registration

src/org/thoughtcrime/securesms/util/PhoneNumberFormatter.java

@@ -0,0 +1,116 @@
+package org.thoughtcrime.securesms.util;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.util.Log;
+
+import com.google.i18n.phonenumbers.NumberParseException;
+import com.google.i18n.phonenumbers.PhoneNumberUtil;
+import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat;
+import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
+
+import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
+
+import java.util.Locale;
+
+/**
+ * Phone number formats are a pain.
+ *
+ * @author Moxie Marlinspike
+ *
+ */
+public class PhoneNumberFormatter {
+
+  public static boolean isValidNumber(String number) {
+    return number.matches("^\\+[0-9]{10,}");
+  }
+
+  private static String impreciseFormatNumber(String number, String localNumber) {
+    number = number.replaceAll("[^0-9+]", "");
+
+    if (number.charAt(0) == '+')
+      return number;
+
+    if (localNumber.charAt(0) == '+')
+      localNumber = localNumber.substring(1);
+
+    if (localNumber.length() == number.length() || number.length() > localNumber.length())
+      return "+" + number;
+
+    int difference = localNumber.length() - number.length();
+
+    return "+" + localNumber.substring(0, difference) + number;
+  }
+
+  public static String formatNumberInternational(String number) {
+    try {
+      PhoneNumberUtil util     = PhoneNumberUtil.getInstance();
+      PhoneNumber parsedNumber = util.parse(number, null);
+      return util.format(parsedNumber, PhoneNumberFormat.INTERNATIONAL);
+    } catch (NumberParseException e) {
+      Log.w("PhoneNumberFormatter", e);
+      return number;
+    }
+  }
+
+  public static String formatNumber(Context context, String number) {
+    SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
+    String localNumber            = preferences.getString(ApplicationPreferencesActivity.LOCAL_NUMBER_PREF, "No Stored Number");
+    number                        = number.replaceAll("[^0-9+]", "");
+
+    if (number.charAt(0) == '+')
+      return number;
+
+    try {
+      PhoneNumberUtil util          = PhoneNumberUtil.getInstance();
+      PhoneNumber localNumberObject = util.parse(localNumber, null);
+
+      String localCountryCode       = util.getRegionCodeForNumber(localNumberObject);
+      Log.w("PhoneNumberFormatter", "Got local CC: " + localCountryCode);
+
+      PhoneNumber numberObject      = util.parse(number, localCountryCode);
+      return util.format(numberObject, PhoneNumberFormat.E164);
+    } catch (NumberParseException e) {
+      Log.w("PhoneNumberFormatter", e);
+      return impreciseFormatNumber(number, localNumber);
+    }
+  }
+
+  public static String getRegionDisplayName(String regionCode) {
+    return (regionCode == null || regionCode.equals("ZZ") || regionCode.equals(PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY))
+        ? "Unknown country" : new Locale("", regionCode).getDisplayCountry(Locale.getDefault());
+  }
+
+  public static String formatE164(String countryCode, String number) {
+    try {
+      PhoneNumberUtil util     = PhoneNumberUtil.getInstance();
+      int parsedCountryCode    = Integer.parseInt(countryCode);
+      PhoneNumber parsedNumber = util.parse(number,
+                                            util.getRegionCodeForCountryCode(parsedCountryCode));
+
+      return util.format(parsedNumber, PhoneNumberUtil.PhoneNumberFormat.E164);
+    } catch (NumberParseException npe) {
+      Log.w("CreateAccountActivity", npe);
+    } catch (NumberFormatException nfe) {
+      Log.w("CreateAccountActivity", nfe);
+    }
+
+    return "+"                                                     +
+        countryCode.replaceAll("[^0-9]", "").replaceAll("^0*", "") +
+        number.replaceAll("[^0-9]", "");
+  }
+
+  public static String getInternationalFormatFromE164(String e164number) {
+    try {
+      PhoneNumberUtil util     = PhoneNumberUtil.getInstance();
+      PhoneNumber parsedNumber = util.parse(e164number, null);
+      return util.format(parsedNumber, PhoneNumberFormat.INTERNATIONAL);
+    } catch (NumberParseException e) {
+      Log.w("PhoneNumberFormatter", e);
+      return e164number;
+    }
+  }
+
+
+}

src/org/thoughtcrime/securesms/util/Util.java

@@ -16,12 +16,19 @@
  */
 package org.thoughtcrime.securesms.util;
 
+import android.app.AlertDialog;
+import android.content.Context;
 import android.graphics.Typeface;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.style.StyleSpan;
 import android.widget.EditText;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
@@ -94,6 +101,10 @@ public class Util {
     return value == null || value.getText() == null || isEmpty(value.getText().toString());
   }
 
+  public static boolean isEmpty(CharSequence value) {
+    return value == null || value.length() == 0;
+  }
+
   public static CharSequence getBoldedString(String value) {
     SpannableString spanned = new SpannableString(value);
     spanned.setSpan(new StyleSpan(Typeface.BOLD), 0,
@@ -112,6 +123,39 @@ public class Util {
     return spanned;
   }
 
+  public static void showAlertDialog(Context context, String title, String message) {
+    AlertDialog.Builder dialog = new AlertDialog.Builder(context);
+    dialog.setTitle(title);
+    dialog.setMessage(message);
+    dialog.setIcon(android.R.drawable.ic_dialog_alert);
+    dialog.setPositiveButton(android.R.string.ok, null);
+    dialog.show();
+  }
+
+  public static String getSecret(int size) {
+    try {
+      byte[] secret = new byte[size];
+      SecureRandom.getInstance("SHA1PRNG").nextBytes(secret);
+      return Base64.encodeBytes(secret);
+    } catch (NoSuchAlgorithmException nsae) {
+      throw new AssertionError(nsae);
+    }
+  }
+
+  public static String readFully(InputStream in) throws IOException {
+    ByteArrayOutputStream bout = new ByteArrayOutputStream();
+    byte[] buffer              = new byte[4096];
+    int read;
+
+    while ((read = in.read(buffer)) != -1) {
+      bout.write(buffer, 0, read);
+    }
+
+    in.close();
+
+    return new String(bout.toByteArray());
+  }
+
   //  public static Bitmap loadScaledBitmap(InputStream src, int targetWidth, int targetHeight) {
   //    return BitmapFactory.decodeStream(src);
   ////  BitmapFactory.Options options = new BitmapFactory.Options();