Merge pull request #6 from AdevintaSpain/update-from-upstream

Update from upstream
AdevintaSpain · Nov 12, 2019 · d5c2b6c · d5c2b6c
2 parents f79924d + e98010e
commit d5c2b6c
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 2.5.1
+
+##### Added
+- Added support for `double` typed `Traits` values.
+
+## 2.5.0
+
+##### Breaking
+- Updated to [Braze Android SDK 3.7.1](https://github.com/Appboy/appboy-android-sdk/blob/master/CHANGELOG.md#371).
+- Removed the Feedback feature.
+
 ## 2.4.1
 
 ##### Fixed

diff --git a/build.gradle b/build.gradle
@@ -56,7 +56,7 @@ dependencies {
 
   compileOnly 'com.segment.analytics.android:analytics:4.3.1'
 
-  api 'com.appboy:android-sdk-ui:3.3.0'
+  api 'com.appboy:android-sdk-ui:3.7.1'
 
   testImplementation 'junit:junit:4.12'
   testImplementation('org.robolectric:robolectric:3.0') {
@@ -74,7 +74,6 @@ dependencies {
   testImplementation 'org.powermock:powermock-module-junit4-rule:1.6.2'
   testImplementation 'org.powermock:powermock-api-mockito:1.6.2'
   testImplementation 'org.powermock:powermock-classloading-xstream:1.6.2'
-  testImplementation files('libs/amazon-device-messaging-1.0.1.jar')
 
   androidTestImplementation 'com.android.support.test:runner:1.0.2'
   androidTestImplementation 'com.android.support.test:rules:1.0.2'
@@ -83,7 +82,7 @@ dependencies {
   androidTestImplementation 'junit:junit:4.12'
 }
 
-version = '2.4.1'
+version = '2.5.1'
 
 publishing {
   publications {

diff --git a/libs/amazon-device-messaging-1.0.1.jar b/libs/amazon-device-messaging-1.0.1.jar
diff --git a/src/main/java/com/segment/analytics/android/integrations/appboy/AppboyIntegration.java b/src/main/java/com/segment/analytics/android/integrations/appboy/AppboyIntegration.java
@@ -206,6 +206,8 @@ public void identify(IdentifyPayload identify) {
         mAppboy.getCurrentUser().setCustomUserAttribute(key, (Boolean) value);
       } else if (value instanceof Integer) {
         mAppboy.getCurrentUser().setCustomUserAttribute(key, (Integer) value);
+      } else if (value instanceof Double) {
+        mAppboy.getCurrentUser().setCustomUserAttribute(key, (Double) value);
       } else if (value instanceof Float) {
         mAppboy.getCurrentUser().setCustomUserAttribute(key, (Float) value);
       } else if (value instanceof Long) {

diff --git a/src/test/java/com/segment/analytics/android/integrations/appboy/AppboyTest.java b/src/test/java/com/segment/analytics/android/integrations/appboy/AppboyTest.java
@@ -153,6 +153,7 @@ public void testIdentifyFields() {
     traits.putAvatar("avatarUrl");
     traits.put("int", new Integer(10));
     traits.put("bool", new Boolean(true));
+    traits.put("double", new Double(4.2));
     traits.put("float", new Float(5.0));
     traits.put("long", new Long(15L));
     traits.put("string", "value");
@@ -170,6 +171,7 @@ public void testIdentifyFields() {
     verify(mAppboyUser).setAvatarImageUrl("avatarUrl");
     verify(mAppboyUser).setCustomUserAttribute("int", new Integer(10));
     verify(mAppboyUser).setCustomUserAttribute("bool", new Boolean(true));
+    verify(mAppboyUser).setCustomUserAttribute("double", new Double(4.2));
     verify(mAppboyUser).setCustomUserAttribute("float", new Float(5.0));
     verify(mAppboyUser).setCustomUserAttribute("long", new Long(15L));
     verify(mAppboyUser).setCustomUserAttribute("string", "value");