[TIMOB-25045] Fix vibratePattern property

tidev · Nov 15, 2017 · 444f444 · 444f444
1 parent fecc689
commit 444f444
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/...id/src/java/ti/modules/titanium/android/notificationmanager/NotificationChannelProxy.java b/...id/src/java/ti/modules/titanium/android/notificationmanager/NotificationChannelProxy.java
@@ -77,7 +77,7 @@ public void handleCreationDict(KrollDict d)
 				setShowBadge(d.getBoolean(TiC.PROPERTY_SHOW_BADGE));
 			}
 			if (d.containsKey(TiC.PROPERTY_VIBRATE_PATTERN)) {
-				setVibrationPattern((long[]) d.get(TiC.PROPERTY_VIBRATE_PATTERN));
+				setVibrationPattern(d.get(TiC.PROPERTY_VIBRATE_PATTERN));
 			}
 		} else {
 			Log.e(TAG, "could not create notification channel");
@@ -161,10 +161,22 @@ public void setShowBadge(boolean showBadge)
 	}
 
 	@Kroll.method @Kroll.setProperty
-	public void setVibrationPattern(long[] vibrationPattern)
-	{
-		channel.setVibrationPattern(vibrationPattern);
-		setProperty(TiC.PROPERTY_VIBRATE_PATTERN, vibrationPattern);
+	public void setVibrationPattern(Object patternObj)
+	{
+		if (patternObj instanceof Object[]) {
+			Object[] patternArray = (Object[]) patternObj;
+			long[] pattern = new long[patternArray.length];
+
+			for (int i = 0; i < patternArray.length; i++) {
+				if (!(patternArray[i] instanceof Integer)) {
+					Log.e(TAG, "invalid vibratePattern array element");
+					return;
+				}
+				pattern[i] = ((Integer) patternArray[i]).intValue();
+			}
+			channel.setVibrationPattern(pattern);
+			setProperty(TiC.PROPERTY_VIBRATE_PATTERN, patternArray);
+		}
 	}
 
 	public NotificationChannel getNotificationChannel()