Merge pull request #2 from Iterable/development

davidtruong · web-flow · commit 183ec3dd70de · 2016-06-29T11:28:37.000-07:00
Development
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java
@@ -24,13 +24,12 @@ public class IterableApi {
 
     protected static IterableApi sharedInstance = null;
 
-    private Context _context;
+    private Context _applicationContext;
     private String _apiKey;
     private String _email;
 
     private Bundle _payloadData;
     private IterableNotificationData _notificationData;
-    private String _pushToken;
 
     private IterableApi(Context context, String apiKey, String email){
         updateData(context, apiKey, email);
@@ -39,40 +38,35 @@ private IterableApi(Context context, String apiKey, String email){
     /**
      * Returns a shared instance of IterableApi. Updates the client data if an instance already exists.
      * Should be called whenever the app is opened.
-     * @param context The current activity
+     * @param currentActivity The current activity
      * @return stored instance of IterableApi
      */
-    public static IterableApi sharedInstanceWithApiKey(Context context, String apiKey, String email)
+    public static IterableApi sharedInstanceWithApiKey(Activity currentActivity, String apiKey, String email)
     {
+        Context applicationContext = currentActivity.getApplicationContext();
+
         if (sharedInstance == null)
         {
-            sharedInstance = new IterableApi(context, apiKey, email);
+            sharedInstance = new IterableApi(applicationContext, apiKey, email);
         } else{
-            sharedInstance.updateData(context, apiKey, email);
+            sharedInstance.updateData(applicationContext, apiKey, email);
         }
 
-        if (context instanceof Activity) {
-            Activity currentActivity = (Activity) context;
-            Intent calledIntent = currentActivity.getIntent();
-            sharedInstance.tryTrackNotifOpen(calledIntent);
-        }
-        else {
-            Log.d(TAG, "Notification Opens will not be tracked: "+
-                    "sharedInstanceWithApiKey called with a Context that is not an instance of Activity. " +
-                    "Pass in an Activity to IterableApi.sharedInstanceWithApiKey to enable open tracking.");
-        }
+        Intent calledIntent = currentActivity.getIntent();
+        sharedInstance.setPayloadData(calledIntent);
+        sharedInstance.tryTrackNotifOpen(calledIntent);
 
         return sharedInstance;
     }
 
     private void updateData(Context context, String apiKey, String email) {
-        this._context = context;
+        this._applicationContext = context;
         this._apiKey = apiKey;
         this._email = email;
     }
 
     protected Context getMainActivityContext() {
-        return _context;
+        return _applicationContext;
     }
 
     /**
@@ -81,13 +75,11 @@ protected Context getMainActivityContext() {
      * @param iconName
      */
     public void setNotificationIcon(String iconName) {
-        setNotificationIcon(_context, iconName);
+        setNotificationIcon(_applicationContext, iconName);
     }
 
-    protected void setPushToken(String token) { _pushToken = token; }
-
     protected static void setNotificationIcon(Context context, String iconName) {
-        SharedPreferences sharedPref = ((Activity) context).getSharedPreferences(NOTIFICATION_ICON_NAME, Context.MODE_PRIVATE);
+        SharedPreferences sharedPref = context.getSharedPreferences(NOTIFICATION_ICON_NAME, Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = sharedPref.edit();
         editor.putString(NOTIFICATION_ICON_NAME, iconName);
         editor.commit();
@@ -107,21 +99,26 @@ protected static String getNotificationIcon(Context context) {
      *                       - https://console.developers.google.com/iam-admin/settings
      */
     public void registerForPush(String iterableAppId, String gcmProjectId) {
-        Intent pushRegistrationIntent = new Intent(_context, IterablePushReceiver.class);
+        registerForPush(iterableAppId, gcmProjectId, false);
+    }
+
+    protected void registerForPush(String iterableAppId, String gcmProjectId, 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_PROJECTID, gcmProjectId);
-        _context.sendBroadcast(pushRegistrationIntent);
+        pushRegistrationIntent.putExtra(IterableConstants.PUSH_DISABLE_AFTER_REGISTRATION, disableAfterRegistration);
+        _applicationContext.sendBroadcast(pushRegistrationIntent);
     }
 
     private void tryTrackNotifOpen(Intent calledIntent) {
         Bundle extras = calledIntent.getExtras();
         if (extras != null) {
             Intent intent = new Intent();
-            intent.setClass(_context, IterablePushOpenReceiver.class);
+            intent.setClass(_applicationContext, IterablePushOpenReceiver.class);
             intent.setAction(IterableConstants.ACTION_NOTIF_OPENED);
             intent.putExtras(extras);
-            _context.sendBroadcast(intent);
+            _applicationContext.sendBroadcast(intent);
         }
     }
 
@@ -314,18 +311,23 @@ public void updateUser(JSONObject dataFields) {
     }
 
     public void disablePush(String iterableAppId, String gcmProjectId) {
-        registerForPush(iterableAppId, gcmProjectId);
+        registerForPush(iterableAppId, gcmProjectId, true);
+    }
 
+    /**
+     * Internal api call made from IterablePushRegistrionGCM after a registration is completed.
+     * @param token
+     */
+    protected void disablePush(String token) {
         JSONObject requestJSON = new JSONObject();
         try {
-            requestJSON.put(IterableConstants.KEY_TOKEN, _pushToken);
+            requestJSON.put(IterableConstants.KEY_TOKEN, token);
             requestJSON.put(IterableConstants.KEY_EMAIL, _email);
         }
         catch (JSONException e) {
             e.printStackTrace();
         }
         sendRequest(IterableConstants.ENDPOINT_DISABLEDEVICE, requestJSON);
-
     }
 
     /**
@@ -342,6 +344,13 @@ public String getPayloadData(String key) {
         return dataString;
     }
 
+    void setPayloadData(Intent intent) {
+        Bundle extras = intent.getExtras();
+        if (extras != null && !extras.isEmpty() && extras.containsKey(IterableConstants.ITERABLE_DATA_KEY)) {
+            setPayloadData(extras);
+        }
+    }
+
     void setPayloadData(Bundle bundle) {
         _payloadData = bundle;
     }
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java
@@ -41,6 +41,7 @@ public final class IterableConstants {
 
     public static final String PUSH_APPID = "IterableAppId";
     public static final String PUSH_PROJECTID = "GCMProjectNumber";
+    public static final String PUSH_DISABLE_AFTER_REGISTRATION = "DisableAfterRegistration";
 
     public static final String MESSAGING_PLATFORM_GOOGLE = "GCM";
     public static final String MESSAGING_PLATFORM_AMAZON = "ADM";
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterablePushOpenReceiver.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterablePushOpenReceiver.java
@@ -31,7 +31,6 @@ public void onReceive(Context context, Intent intent) {
                 String iterableDataString = extras.getString(IterableConstants.ITERABLE_DATA_KEY);
                 IterableNotificationData iterableNotificationData = new IterableNotificationData(iterableDataString);
                 if (IterableApi.sharedInstance != null) {
-                    IterableApi.sharedInstance.setPayloadData(extras);
                     IterableApi.sharedInstance.setNotificationData(iterableNotificationData);
                     IterableApi.sharedInstance.trackPushOpen(iterableNotificationData.getCampaignId(), iterableNotificationData.getTemplateId());
                 }
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterablePushReceiver.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterablePushReceiver.java
@@ -34,41 +34,43 @@ 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_PROJECTID);
-        IterableGCMRegistrationData data = new IterableGCMRegistrationData(iterableAppId, projectNumber);
+        boolean disablePush = intent.getBooleanExtra(IterableConstants.PUSH_DISABLE_AFTER_REGISTRATION, false);
+        IterableGCMRegistrationData data = new IterableGCMRegistrationData(iterableAppId, projectNumber, disablePush);
         new IterablePushRegistrationGCM().execute(data);
     }
 
     private void handlePushReceived(Context context, Intent intent) {
-        Context appContext = context.getApplicationContext();
-
-        PackageManager packageManager = appContext.getPackageManager();
-        Intent packageIntent = packageManager.getLaunchIntentForPackage(appContext.getPackageName());
-        ComponentName componentPackageName = packageIntent.getComponent();
-        String mainClassName = componentPackageName.getClassName();
-        Class mainClass = null;
-        try {
-            mainClass = Class.forName(mainClassName);
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
+        if (intent.hasExtra(IterableConstants.ITERABLE_DATA_KEY)) {
+            Context appContext = context.getApplicationContext();
+            PackageManager packageManager = appContext.getPackageManager();
+            Intent packageIntent = packageManager.getLaunchIntentForPackage(appContext.getPackageName());
+            ComponentName componentPackageName = packageIntent.getComponent();
+            String mainClassName = componentPackageName.getClassName();
+            Class mainClass = null;
+            try {
+                mainClass = Class.forName(mainClassName);
+            } catch (ClassNotFoundException e) {
+                e.printStackTrace();
+            }
 
-        int iconId = appContext.getResources().getIdentifier(
-                IterableApi.getNotificationIcon(context),
-                "drawable",
-                appContext.getPackageName());
+            int iconId = appContext.getResources().getIdentifier(
+                    IterableApi.getNotificationIcon(context),
+                    "drawable",
+                    appContext.getPackageName());
 
-        if (iconId == 0) {
-            iconId = appContext.getApplicationInfo().icon;
-            if (iconId != 0){
-                Log.d(TAG, "No Notification Icon defined - defaulting to app icon");
-            } else {
-                Log.w(TAG, "No Notification Icon defined - push notifications will not be displayed");
+            if (iconId == 0) {
+                iconId = appContext.getApplicationInfo().icon;
+                if (iconId != 0) {
+                    Log.d(TAG, "No Notification Icon defined - defaulting to app icon");
+                } else {
+                    Log.w(TAG, "No Notification Icon defined - push notifications will not be displayed");
+                }
             }
-        }
 
-        IterableNotification notificationBuilder = IterableNotification.createNotification(
-                appContext, intent.getExtras(), mainClass, iconId);
+            IterableNotification notificationBuilder = IterableNotification.createNotification(
+                    appContext, intent.getExtras(), mainClass, iconId);
 
-        IterableNotification.postNotificationOnDevice(appContext, notificationBuilder);
+            IterableNotification.postNotificationOnDevice(appContext, notificationBuilder);
+        }
     }
 }
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterablePushRegistrationGCM.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterablePushRegistrationGCM.java
@@ -14,20 +14,24 @@
 class IterablePushRegistrationGCM extends AsyncTask<IterableGCMRegistrationData, Void, String> {
     static final String TAG = "IterableGCM";
 
+    private IterableGCMRegistrationData iterableGCMRegistrationData;
+    private boolean disableAfterRegistration;
+
     protected String doInBackground(IterableGCMRegistrationData... params) {
+        String registrationToken = "";
+
         try {
-            IterableGCMRegistrationData iterableGCMRegistrationData = params[0];
+            iterableGCMRegistrationData = params[0];
 
             if (iterableGCMRegistrationData.iterableAppId != null) {
                 Class instanceIdClass = Class.forName("com.google.android.gms.iid.InstanceID");
                 if (instanceIdClass != null) {
                     InstanceID instanceID = InstanceID.getInstance(IterableApi.sharedInstance.getMainActivityContext());
-                    String registrationToken = "";
+
                     String idInstance = instanceID.getId();
                     registrationToken = instanceID.getToken(iterableGCMRegistrationData.projectNumber,
                             GoogleCloudMessaging.INSTANCE_ID_SCOPE);
                     if (!registrationToken.isEmpty()) {
-                        IterableApi.sharedInstance.setPushToken(registrationToken);
                         IterableApi.sharedInstance.registerDeviceToken(iterableGCMRegistrationData.iterableAppId, registrationToken);
                     }
                 }
@@ -44,16 +48,30 @@ protected String doInBackground(IterableGCMRegistrationData... params) {
             e.printStackTrace();
             Log.e(TAG, "Invalid projectNumber");
         }
-        return null;
+        return registrationToken;
+    }
+
+    @Override
+    protected void onPostExecute(String registrationToken) {
+        super.onPostExecute(registrationToken);
+        if (iterableGCMRegistrationData.disableAfterRegistration) {
+            disableOnRegistrationComplete(registrationToken);
+        }
+    }
+
+    protected void disableOnRegistrationComplete(String registrationToken) {
+        IterableApi.sharedInstance.disablePush(registrationToken);
     }
 }
 
 class IterableGCMRegistrationData {
     String iterableAppId = "";
     String projectNumber = "";
-    public IterableGCMRegistrationData(String iterableAppId, String projectNumber){
+    boolean disableAfterRegistration = false;
+    public IterableGCMRegistrationData(String iterableAppId, String projectNumber, boolean disableAfterRegistration){
         this.iterableAppId = iterableAppId;
         this.projectNumber = projectNumber;
+        this.disableAfterRegistration = disableAfterRegistration;
     }
 }
 
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequest.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableRequest.java
@@ -19,22 +19,36 @@
 class IterableRequest extends AsyncTask<IterableApiRequest, Void, String> {
     static final String TAG = "IterableRequest";
     static final String AUTHENTICATION_IO_EXCEPTION = "Received authentication challenge is null";
-    static final int DEFAULT_TIMEOUT = 10000;
-
-    long retryDelay = 10000;
 
     static final String iterableBaseUrl = "https://api.iterable.com/api/";
-
     static String overrideUrl;
 
+    static final int DEFAULT_TIMEOUT = 10000;
+    static final long RETRY_DELAY = 10000;
+    static final int MAX_RETRY_COUNT = 3;
+
+    int retryCount = 0;
+    IterableApiRequest iterableApiRequest;
+    boolean retryRequest;
+
     /**
      * Sends the given request to Iterable using a HttpUserConnection
      * Reference - http://developer.android.com/reference/java/net/HttpURLConnection.html
      * @param params
      * @return
      */
     protected String doInBackground(IterableApiRequest... params) {
-        IterableApiRequest iterableApiRequest = params[0];
+        if (params != null && params.length > 0) {
+            iterableApiRequest = params[0];
+        }
+
+        if (retryRequest) {
+            try {
+                Thread.sleep(RETRY_DELAY * retryCount);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
 
         String requestResult = null;
         if (iterableApiRequest != null) {
@@ -77,14 +91,13 @@ protected String doInBackground(IterableApiRequest... params) {
                 String mess = e.getMessage();
                 if (mess.equals(AUTHENTICATION_IO_EXCEPTION)) {
                     Log.d(TAG, "Invalid API Key");
-                } else
-                {
-                    retryRequest(iterableApiRequest);
+                } else {
+                    retryRequest = true;
                 }
                 e.printStackTrace();
             } catch (Exception e) {
                 e.printStackTrace();
-                retryRequest(iterableApiRequest);
+                retryRequest = true;
             } finally {
                 if (urlConnection != null) {
                     urlConnection.disconnect();
@@ -96,17 +109,16 @@ protected String doInBackground(IterableApiRequest... params) {
 
     @Override
     protected void onPostExecute(String s) {
+        if (retryRequest && retryCount <= MAX_RETRY_COUNT) {
+            IterableRequest request = new IterableRequest();
+            request.setRetryCount(retryCount + 1);
+            request.execute(iterableApiRequest);
+        }
         super.onPostExecute(s);
     }
 
-    private void retryRequest(IterableApiRequest iterableApiRequest) {
-        try {
-            wait(retryDelay);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        retryDelay *= 2; //exponential retry backoff
-        doInBackground(iterableApiRequest);
+    protected void setRetryCount(int count) {
+        retryCount = count;
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@ public void onReceive(Context context, Intent intent) {`
`31`	`31`	`String iterableDataString = extras.getString(IterableConstants.ITERABLE_DATA_KEY);`
`32`	`32`	`IterableNotificationData iterableNotificationData = new IterableNotificationData(iterableDataString);`
`33`	`33`	`if (IterableApi.sharedInstance != null) {`
`34`		`- IterableApi.sharedInstance.setPayloadData(extras);`
`35`	`34`	`IterableApi.sharedInstance.setNotificationData(iterableNotificationData);`
`36`	`35`	`IterableApi.sharedInstance.trackPushOpen(iterableNotificationData.getCampaignId(), iterableNotificationData.getTemplateId());`
`37`	`36`	`}`