Code cleanup for constant naming

Author: davidtruong

iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java

@@ -364,8 +364,8 @@ static String getNotificationIcon(Context context) {
     protected void registerForPush(String iterableAppId, String gcmProjectNumber, boolean disableAfterRegistration) {
         Intent pushRegistrationIntent = new Intent(_applicationContext, IterablePushReceiver.class);
         pushRegistrationIntent.setAction(IterableConstants.ACTION_PUSH_REGISTRATION);
-        pushRegistrationIntent.putExtra(IterableConstants.PUSH_APPID, iterableAppId);
-        pushRegistrationIntent.putExtra(IterableConstants.PUSH_PROJECT_NUMBER, gcmProjectNumber);
+        pushRegistrationIntent.putExtra(IterableConstants.PUSH_APP_ID, iterableAppId);
+        pushRegistrationIntent.putExtra(IterableConstants.PUSH_GCM_PROJECT_NUMBER, gcmProjectNumber);
         pushRegistrationIntent.putExtra(IterableConstants.PUSH_DISABLE_AFTER_REGISTRATION, disableAfterRegistration);
         _applicationContext.sendBroadcast(pushRegistrationIntent);
     }

iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java

@@ -38,8 +38,8 @@ public final class IterableConstants {
     public static final String ENDPOINT_UPDATEEMAIL         = "users/updateEmail";
     public static final String ENDPOINT_UPDATEUSER          = "users/update";
 
-    public static final String PUSH_APPID = "IterableAppId";
-    public static final String PUSH_PROJECT_NUMBER = "GCMProjectNumber";
+    public static final String PUSH_APP_ID = "IterableAppId";
+    public static final String PUSH_GCM_PROJECT_NUMBER = "GCMProjectNumber";
     public static final String PUSH_DISABLE_AFTER_REGISTRATION = "DisableAfterRegistration";
 
     public static final String MESSAGING_PLATFORM_GOOGLE = "GCM";

iterableapi/src/main/java/com/iterable/iterableapi/IterableLogger.java

@@ -7,7 +7,6 @@
  */
 class IterableLogger {
 
-
     public static void d(String tag, String msg) {
         if (isDebugMode()) {
             Log.d(tag, msg);

iterableapi/src/main/java/com/iterable/iterableapi/IterablePushReceiver.java

@@ -28,8 +28,8 @@ public void onReceive(Context context, Intent intent) {
     }
 
     private void handlePushRegistration(Context context, Intent intent) {
-        String iterableAppId = intent.getStringExtra(IterableConstants.PUSH_APPID);
-        String projectNumber = intent.getStringExtra(IterableConstants.PUSH_PROJECT_NUMBER);
+        String iterableAppId = intent.getStringExtra(IterableConstants.PUSH_APP_ID);
+        String projectNumber = intent.getStringExtra(IterableConstants.PUSH_GCM_PROJECT_NUMBER);
         boolean disablePush = intent.getBooleanExtra(IterableConstants.PUSH_DISABLE_AFTER_REGISTRATION, false);
         IterableGCMRegistrationData data = new IterableGCMRegistrationData(iterableAppId, projectNumber, disablePush);
         new IterablePushRegistrationGCM().execute(data);

iterableapi/src/main/java/com/iterable/iterableapi/IterableRequest.java

@@ -22,8 +22,8 @@ class IterableRequest extends AsyncTask<IterableApiRequest, Void, String> {
     static final String iterableBaseUrl = "https://api.iterable.com/api/";
     static String overrideUrl;
 
-    static final int DEFAULT_TIMEOUT = 10000;   //10 seconds
-    static final long RETRY_DELAY = 10000;      //10 seconds
+    static final int DEFAULT_TIMEOUT_MS = 10000;   //10 seconds
+    static final long RETRY_DELAY_MS = 10000;      //10 seconds
     static final int MAX_RETRY_COUNT = 3;
 
     int retryCount = 0;
@@ -43,7 +43,7 @@ protected String doInBackground(IterableApiRequest... params) {
 
         if (retryRequest) {
             try {
-                Thread.sleep(RETRY_DELAY * retryCount);
+                Thread.sleep(RETRY_DELAY_MS * retryCount);
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
@@ -62,8 +62,8 @@ protected String doInBackground(IterableApiRequest... params) {
                 urlConnection.setDoOutput(true);
                 urlConnection.setRequestMethod("POST");
 
-                urlConnection.setReadTimeout(DEFAULT_TIMEOUT);
-                urlConnection.setConnectTimeout(DEFAULT_TIMEOUT);
+                urlConnection.setReadTimeout(DEFAULT_TIMEOUT_MS);
+                urlConnection.setConnectTimeout(DEFAULT_TIMEOUT_MS);
 
                 urlConnection.setRequestProperty("Accept", "application/json");
                 urlConnection.setRequestProperty("Content-Type", "application/json");