Fixed vibration pattern handling and misc clean up

Author: jkasten2

OneSignalSDK/gradle.properties

@@ -17,7 +17,8 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-# Work around for robolectric-3.4-RC4 bug
+# Work around for robolectric-3.4 bug
 # https://github.com/robolectric/robolectric/issues/3169
 #    org.robolectric.res.ResourceTableFactory.parseResourceFiles
+# Remove when creating an .aar build.
 android.enableAapt2=false

OneSignalSDK/onesignal/src/main/java/com/onesignal/BootUpReceiver.java

@@ -35,6 +35,6 @@ public class BootUpReceiver extends WakefulBroadcastReceiver {
 
    @Override
    public void onReceive(Context context, Intent intent) {
-      NotificationRestorer.startRestoreTaskFromReceiver(this, context);
+      NotificationRestorer.startRestoreTaskFromReceiver(context);
    }
 }

OneSignalSDK/onesignal/src/main/java/com/onesignal/GenerateNotification.java

@@ -228,35 +228,19 @@ private static OneSignalNotificationBuilder getBaseOneSignalNotificationBuilder(
          .setContentText(message)
          .setTicker(message);
 
-      if (notifJob.shownTimeStamp != null) {
-         try {
-            notifBuilder.setWhen(notifJob.shownTimeStamp * 1000L);
-         } catch (Throwable t) {} // Can throw if an old android support lib is used.
-      }
-
-      try {
-         BigInteger accentColor = getAccentColor(gcmBundle);
-         if (accentColor != null)
-            notifBuilder.setColor(accentColor.intValue());
-      } catch (Throwable t) {} // Can throw if an old android support lib is used.
-      
       int notificationDefaults = 0;
 
-      if (OneSignal.getVibrate(currentContext)) {
-         if (gcmBundle.optBoolean("vib", true))
-            notificationDefaults = Notification.DEFAULT_VIBRATE;
+      if (OneSignal.getVibrate(currentContext) && gcmBundle.optInt("vib", 1) == 1) {
          if (gcmBundle.has("vib_pt")) {
-            JSONArray json_vib_array = gcmBundle.optJSONArray("vib_pt");
-            long[] long_array = new long[json_vib_array.length()];
-            for (int i = 0; i < json_vib_array.length(); i++)
-               long_array[i] = json_vib_array.optLong(i);
-   
-            notificationDefaults = Notification.DEFAULT_VIBRATE;
-            notifBuilder.setVibrate(long_array);
+            long[] vibrationPattern = OSUtils.parseVibrationPattern(gcmBundle);
+            if (vibrationPattern != null)
+               notifBuilder.setVibrate(vibrationPattern);
          }
+         else
+            notificationDefaults = Notification.DEFAULT_VIBRATE;
       }
-
-      if (gcmBundle.has("ledc")) {
+      
+      if (gcmBundle.has("ledc") && gcmBundle.optInt("led", 1) == 1) {
          try {
             BigInteger ledColor = new BigInteger(gcmBundle.optString("ledc"), 16);
             notifBuilder.setLights(ledColor.intValue(), 2000, 5000);
@@ -266,6 +250,18 @@ private static OneSignalNotificationBuilder getBaseOneSignalNotificationBuilder(
       }
       else
          notificationDefaults |= Notification.DEFAULT_LIGHTS;
+   
+      if (notifJob.shownTimeStamp != null) {
+         try {
+            notifBuilder.setWhen(notifJob.shownTimeStamp * 1000L);
+         } catch (Throwable t) {} // Can throw if an old android support lib is used.
+      }
+   
+      try {
+         BigInteger accentColor = getAccentColor(gcmBundle);
+         if (accentColor != null)
+            notifBuilder.setColor(accentColor.intValue());
+      } catch (Throwable t) {} // Can throw if an old android support lib is used.
 
       try {
          int visibility = NotificationCompat.VISIBILITY_PUBLIC;

OneSignalSDK/onesignal/src/main/java/com/onesignal/NotificationBundleProcessor.java

@@ -414,8 +414,9 @@ private static boolean startExtenderService(Context context, Bundle bundle, Proc
       intent.putExtra("timestamp", System.currentTimeMillis() / 1000L);
 
       // Using Alarm for Android O compatibility
+      Random random = new Random();
       long atTime = System.currentTimeMillis();
-      PendingIntent pendingIntent = PendingIntent.getService(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+      PendingIntent pendingIntent = PendingIntent.getService(context, random.nextInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT);
       AlarmManager alarm = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE);
       alarm.set(AlarmManager.RTC_WAKEUP, atTime, pendingIntent);
 

OneSignalSDK/onesignal/src/main/java/com/onesignal/NotificationChannelManager.java

@@ -134,11 +134,9 @@ private static String createChannel(Context context, NotificationManager notific
       channel.enableLights(payload.optInt("led", 1) == 1);
 
       if (payload.has("vib_pt")) {
-         JSONArray json_vib_array = payload.optJSONArray("vib_pt");
-         long[] long_array = new long[json_vib_array.length()];
-         for (int i = 0; i < json_vib_array.length(); i++)
-            long_array[i] = json_vib_array.optLong(i);
-         channel.setVibrationPattern(long_array);
+         long[] vibrationPattern = OSUtils.parseVibrationPattern(payload);
+         if (vibrationPattern != null)
+            channel.setVibrationPattern(vibrationPattern);
       }
       channel.enableVibration(payload.optInt("vib", 1) == 1);
 

OneSignalSDK/onesignal/src/main/java/com/onesignal/NotificationRestorer.java

@@ -35,7 +35,6 @@
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Build;
-import android.os.PersistableBundle;
 import android.support.v4.content.WakefulBroadcastReceiver;
 
 import com.onesignal.OneSignalDbContract.NotificationTable;
@@ -145,28 +144,32 @@ static void showNotifications(Context context, Cursor cursor) {
       }
    }
 
-   // TODO: Update method to support both Services and JobServices
+   // Android O - Works when app is cold started but not from Boot or app update event.
+   //               AlarmManager is also restricted on those 2 events.
+   //             Due to NotificationExtenderService being a public class we can't just upgrade to a
+   //               JobScheduler.
    private static void startService(Context context, Intent intent) {
       context.startService(intent);
    }
 
-   static void startRestoreTaskFromReceiver(WakefulBroadcastReceiver receiver, Context context) {
+   static void startRestoreTaskFromReceiver(Context context) {
       if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-         ComponentName componentName = new ComponentName(context.getPackageName(),
-             NotificationRestoreJobService.class.getName());
-         
-         Random random = new Random();
-         JobInfo jobInfo = new JobInfo.Builder(random.nextInt(), componentName)
-             .setOverrideDeadline(0)
-             .build();
-         JobScheduler jobScheduler = (JobScheduler)context.getSystemService(Context.JOB_SCHEDULER_SERVICE);
-         jobScheduler.schedule(jobInfo);
+// Skipping for Android O due to startService note above.
+//         ComponentName componentName = new ComponentName(context.getPackageName(),
+//             NotificationRestoreJobService.class.getName());
+//
+//         Random random = new Random();
+//         JobInfo jobInfo = new JobInfo.Builder(random.nextInt(), componentName)
+//             .setOverrideDeadline(0)
+//             .build();
+//         JobScheduler jobScheduler = (JobScheduler)context.getSystemService(Context.JOB_SCHEDULER_SERVICE);
+//         jobScheduler.schedule(jobInfo);
       }
       else {
          Intent intentForService = new Intent();
          intentForService.setComponent(new ComponentName(context.getPackageName(),
              NotificationRestoreService.class.getName()));
-         receiver.startWakefulService(context, intentForService);
+         WakefulBroadcastReceiver.startWakefulService(context, intentForService);
       }
    }
 }

OneSignalSDK/onesignal/src/main/java/com/onesignal/OSUtils.java

@@ -42,6 +42,10 @@
 import android.support.v4.app.NotificationManagerCompat;
 import android.telephony.TelephonyManager;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.util.Locale;
 import java.util.UUID;
 import java.util.regex.Pattern;
@@ -238,4 +242,23 @@ static Uri getSoundUri(Context context, String sound) {
 
       return null;
    }
+   
+   static long[] parseVibrationPattern(JSONObject gcmBundle) {
+      try {
+         Object patternObj = gcmBundle.opt("vib_pt");
+         JSONArray jsonVibArray;
+         if (patternObj instanceof String)
+            jsonVibArray = new JSONArray((String)patternObj);
+         else
+            jsonVibArray = (JSONArray)patternObj;
+         
+         long[] longArray = new long[jsonVibArray.length()];
+         for (int i = 0; i < jsonVibArray.length(); i++)
+            longArray[i] = jsonVibArray.optLong(i);
+         
+         return longArray;
+      } catch (JSONException e) {}
+      
+      return null;
+   }
 }

OneSignalSDK/onesignal/src/main/java/com/onesignal/SyncService.java

@@ -165,6 +165,7 @@ static void onTaskRemoved(Service service) {
          LocationGMS.scheduleUpdate(service);
    }
 
+   private static final int SYNC_SERVICE_REQUEST_CODE = 2071862119;
    static void scheduleServiceSyncTask(Context context, long atTime) {
       OneSignal.Log(OneSignal.LOG_LEVEL.VERBOSE, "scheduleServiceSyncTask:atTime: " + atTime);
 
@@ -175,7 +176,7 @@ static void scheduleServiceSyncTask(Context context, long atTime) {
       //    Some Samsung devices will throw the below exception otherwise.
       //    "java.lang.SecurityException: !@Too many alarms (500) registered"
 
-      PendingIntent pendingIntent = PendingIntent.getService(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+      PendingIntent pendingIntent = PendingIntent.getService(context, SYNC_SERVICE_REQUEST_CODE, intent, PendingIntent.FLAG_UPDATE_CURRENT);
       AlarmManager alarm = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE);
       alarm.set(AlarmManager.RTC_WAKEUP, atTime, pendingIntent);
    }

OneSignalSDK/onesignal/src/main/java/com/onesignal/UpgradeReceiver.java

@@ -35,6 +35,6 @@ public class UpgradeReceiver extends WakefulBroadcastReceiver {
 
    @Override
    public void onReceive(Context context, Intent intent) {
-      NotificationRestorer.startRestoreTaskFromReceiver(this, context);
+      NotificationRestorer.startRestoreTaskFromReceiver(context);
    }
 }