Use refactored GCM code

Author: rogerhu

src/Adapters/Push/SNSPushAdapter.js

@@ -78,70 +78,9 @@ export class SNSPushAdapter extends PushAdapter {
         };
     }
 
-    // FIXME - pull out of GCM as static
-    generateGCMPayload(coreData, pushId, timeStamp, expirationTime) {
-
-        const GCMTimeToLiveMax = 4 * 7 * 24 * 60 * 60; // GCM allows a max of 4 weeks
-
-        let payloadData = {
-            'time': new Date(timeStamp).toISOString(),
-            'push_id': pushId,
-            'data': JSON.stringify(coreData)
-        }
-        let payload = {
-            priority: 'normal',
-            data: payloadData
-        };
-        if (expirationTime) {
-            // The timeStamp and expiration is in milliseconds but gcm requires second
-            let timeToLive = Math.floor((expirationTime - timeStamp) / 1000);
-            if (timeToLive < 0) {
-                timeToLive = 0;
-            }
-            if (timeToLive >= GCMTimeToLiveMax) {
-                timeToLive = GCMTimeToLiveMax;
-            }
-            payload.timeToLive = timeToLive;
-        }
-        return payload;
-    }
-
     // Generate proper json for GCM message
     generateAndroidPayload(data) {
-        let pushId = cryptoUtils.newObjectId();
-        let timeStamp = Date.now();
-        let expirationTime;
-        // We handle the expiration_time convertion in push.js, so expiration_time is a valid date
-        // in Unix epoch time in milliseconds here
-        if (data['expiration_time']) {
-            expirationTime = data['expiration_time'];
-        }
-
-//        var payload = this.generateGCMPayload(data.data, pushId, timestamp, expirationTime);
-
-        const GCMTimeToLiveMax = 4 * 7 * 24 * 60 * 60; // GCM allows a max of 4 weeks
-
-        let payloadData = {
-            'time': new Date(timeStamp).toISOString(),
-            'push_id': pushId,
-            'data': JSON.stringify(data.data)
-        }
-        let payload = {
-            priority: 'normal',
-            data: payloadData
-        };
-
-        if (expirationTime) {
-            // The timeStamp and expiration is in milliseconds but gcm requires second
-            let timeToLive = Math.floor((expirationTime - timeStamp) / 1000);
-            if (timeToLive < 0) {
-                timeToLive = 0;
-            }
-            if (timeToLive >= GCMTimeToLiveMax) {
-                timeToLive = GCMTimeToLiveMax;
-            }
-            payload.timeToLive = timeToLive;
-        }
+        var payload = GCM.generateGCMPayload(data);
 
         // SNS is verify sensitive to the body being JSON stringified but not GCM key.
         return {