Merge branch 'develop' into feature/feat-channels-registration

# Conflicts:
#	AndroidSDK/src/com/leanplum/LeanplumPushService.java

Author: Enuviel

AndroidSDK/src/com/leanplum/Leanplum.java

@@ -1556,6 +1556,35 @@ public static void track(final String event, double value, String info,
     LeanplumInternal.track(event, value, info, params, null);
   }
 
+  /**
+   * Manually track purchase event with currency code in your application. It is advised to use
+   * {@link Leanplum#trackGooglePlayPurchase} instead for in-app purchases.
+   *
+   * @param event Name of the event.
+   * @param value The value of the event. Can be price.
+   * @param currencyCode The currency code corresponding to the price.
+   * @param params Key-value pairs with metrics or data associated with the event. Parameters can be
+   * strings or numbers. You can use up to 200 different parameter names in your app.
+   */
+  public static void trackPurchase(final String event, double value, String currencyCode,
+      Map<String, ?> params) {
+    try {
+      if (TextUtils.isEmpty(event)) {
+        Log.w("trackPurchase - Empty event parameter provided.");
+      }
+
+      final Map<String, String> requestArgs = new HashMap<>();
+      if (!TextUtils.isEmpty(currencyCode)) {
+        requestArgs.put(Constants.Params.IAP_CURRENCY_CODE, currencyCode);
+      }
+
+      LeanplumInternal.track(event, value, null, params, requestArgs);
+    } catch (Throwable t) {
+      Log.e("trackPurchase - Failed to track purchase event.");
+      Util.handleException(t);
+    }
+  }
+
   /**
    * Tracks an in-app purchase as a Purchase event.
    *

AndroidSDK/src/com/leanplum/LeanplumNotificationChannel.java

@@ -40,7 +40,9 @@
 
 import org.json.JSONArray;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -602,10 +604,17 @@ private static class NotificationChannelData {
       showBadge = (boolean) CollectionUtil.getOrDefault(channel, "show_badge", showBadge);
 
       try {
-        List<Long> pattern = CollectionUtil.uncheckedCast(
+        List<Number> pattern = CollectionUtil.uncheckedCast(
             CollectionUtil.getOrDefault(channel, "vibration_pattern", null));
         if (pattern != null) {
-          vibrationPattern = CollectionUtil.toPrimitive(pattern.toArray(new Long[pattern.size()]));
+          vibrationPattern = new long[pattern.size()];
+          Iterator<Number> iterator = pattern.iterator();
+          for (int i = 0; i < vibrationPattern.length; i++) {
+            Number next = iterator.next();
+            if (next != null) {
+              vibrationPattern[i] = next.longValue();
+            }
+          }
         }
       } catch (Exception e) {
         Log.w("Failed to parse vibration pattern.");

AndroidSDKTests/src/test/java/com/leanplum/LeanplumNotificationChannelTests.java

@@ -95,12 +95,16 @@ public void testNotificationChannels() throws Exception {
     channel2.put("name", "name_2");
     channel2.put("importance", 1);
     channel2.put("description", "description_2");
+    channel2.put("enable_vibration", true);
+    channel2.put("vibration_pattern", new long[] {1L, 2L, 3L, 4L, 5L});
 
     HashMap<String, Object> channel3 = new HashMap<>();
     channel3.put("id", "id_3");
     channel3.put("name", "name_3");
     channel3.put("importance", 1);
     channel3.put("description", "description_3");
+    channel3.put("enable_vibration", true);
+    channel3.put("vibration_pattern", new ArrayList<Long>() {{add(1L); add(2L); add(3L);}});
 
     groupList.add(group1);
     groupList.add(group2);

AndroidSDKTests/src/test/java/com/leanplum/LeanplumTest.java

@@ -56,6 +56,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
@@ -603,7 +604,7 @@ public void onRequest(String httpMethod, String apiMethod, Map<String, Object> p
     });
     Leanplum.trackGooglePlayPurchase(eventName, 10, "USD", "data", "signature");
 
-    // Validate request for purchae.
+    // Validate request for purchase.
     RequestHelper.addRequestHandler(new RequestHelper.RequestHandler() {
       @Override
       public void onRequest(String httpMethod, String apiMethod, Map<String, Object> params) {
@@ -621,6 +622,23 @@ public void onRequest(String httpMethod, String apiMethod, Map<String, Object> p
       }
     });
     Leanplum.trackGooglePlayPurchase(eventName, 10, "USD", "data", "signature", new HashMap<String, Object>());
+
+    // Validate request for manual purchase.
+    RequestHelper.addRequestHandler(new RequestHelper.RequestHandler() {
+      @Override
+      public void onRequest(String httpMethod, String apiMethod, Map<String, Object> params) {
+        assertEquals(Constants.Methods.TRACK, apiMethod);
+
+        String requestEventName = (String) params.get("event");
+        String requestEventValue = (String) params.get("value");
+        String requestCurrencyCode = (String) params.get("currencyCode");
+
+        assertEquals(eventName, requestEventName);
+        assertEquals("1.99", requestEventValue);
+        assertEquals("USD", requestCurrencyCode);
+      }
+    });
+    Leanplum.trackPurchase(eventName, 1.99, "USD", new HashMap<String, Objects>());
   }
 
   @Test

Leanplum.svg

@@ -1,4 +1,10 @@
-# Leanplum-Android-SDK
+![Leanplum](Leanplum.svg)
+
+<p align="center">
+<img src='https://jenkins.leanplum.com/buildStatus/icon?job=android-sdk'></a>
+<a href="https://raw.githubusercontent.com/Leanplum/Leanplum-iOS-SDK/master/LICENSE"><img src="https://img.shields.io/badge/license-apache%202.0-blue.svg?style=flat" alt="License: Apache 2.0" /></a>
+</p>
+
 ## Installation & Usage
 Please refer to: https://www.leanplum.com/docs#/setup/android
 ## Development Workflow