react-native-userleap 2.18.5 → 2.18.7

package/android/build.gradle

@@ -1,5 +1,4 @@
 // android/build.gradle
-
 // based on:
 //
 // * https://github.com/facebook/react-native/blob/0.60-stable/template/android/build.gradle
@@ -9,16 +8,13 @@
 // * https://github.com/facebook/react-native/blob/0.60-stable/template/android/app/build.gradle
 //   original location:
 //   - https://github.com/facebook/react-native/blob/0.58-stable/local-cli/templates/HelloWorld/android/app/build.gradle
-
 def DEFAULT_COMPILE_SDK_VERSION = 28
 def DEFAULT_BUILD_TOOLS_VERSION = '30.0.2'
 def DEFAULT_MIN_SDK_VERSION = 16
 def DEFAULT_TARGET_SDK_VERSION = 28
-
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
-
 buildscript {
     // The Android Gradle plugin is only required when opening the android folder stand-alone.
     // This avoids unnecessary downloads and potential conflicts when the library is included as a
@@ -34,15 +30,13 @@ buildscript {
         }
     }
 }
-
 apply plugin: 'com.android.library'
-
 android {
     compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
     buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
     compileOptions {
-	    sourceCompatibility JavaVersion.VERSION_1_8
-	    targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
@@ -54,7 +48,6 @@ android {
         abortOnError false
     }
 }
-
 repositories {
     // ref: https://www.baeldung.com/maven-local-repository
     maven {
@@ -65,7 +58,6 @@ repositories {
         // Android JSC is installed from npm
         url "$rootDir/../node_modules/jsc-android/dist"
     }
-
     mavenCentral {
         // We don't want to fetch react-native from Maven Central as there are
         // older versions over there.
@@ -76,9 +68,13 @@ repositories {
     google()
     maven { url 'https://www.jitpack.io' }
 }
-
 dependencies {
-    //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'  // From node_modules
-    implementation ("com.userleap:userleap-android-sdk:2.17.8") // update this version on android updates
-}
+    
+    // Use conditional logic for local vs Maven
+    if (findProject(':userleap-android-sdk') != null) {
+        implementation project(':userleap-android-sdk')
+    } else {
+        implementation ("com.userleap:userleap-android-sdk:2.19.0") // update this version on android updates
+    }
+}

package/android/src/main/java/com/userleap/reactnative/UserLeapModule.java

@@ -51,6 +51,11 @@ public class UserLeapModule extends ReactContextBaseJavaModule {
         return visitorIdentifierObject == null ? "" : visitorIdentifierObject;
     }
 
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String getSdkVersion() {
+        return UserLeap.INSTANCE.getSdkVersion();
+    }
+
     @ReactMethod
     public void configure(String environment, ReadableMap configuration) {
         UserLeap.INSTANCE.configure(reactContext, environment, stringifyMap(configuration), getFragmentActivity());

package/index.d.ts

@@ -6,6 +6,7 @@ declare namespace UserLeap {
     };
     function visitorIdentifier(): number;
     function visitorIdentifierString(): string;
+    function sdkVersion(): string;
     function configure(environment: string, configuration?: {[key: string]: any}): void;
     function setPreviewKey(previewKey: string): void;
     function presentSurvey(): void;

package/index.js

@@ -1,25 +1,29 @@
-import { Platform, NativeModules } from 'react-native';
+import { Platform, NativeModules } from "react-native";
 
-import { version } from './package.json';
+import { version } from "./package.json";
 
 const SurveyState = {
-  READY: 'READY',
-  DISABLED: 'DISABLED',
-  NO_SURVEY: 'NO_SURVEY'
+  READY: "READY",
+  DISABLED: "DISABLED",
+  NO_SURVEY: "NO_SURVEY",
 };
 
-const stringifyAttributes = ( attributes ) => {
-  if (!(attributes instanceof Object && attributes.constructor === Object)) return {};
-  Object.keys(attributes).forEach(function(key, index) {
+const stringifyAttributes = (attributes) => {
+  if (!(attributes instanceof Object && attributes.constructor === Object))
+    return {};
+  Object.keys(attributes).forEach(function (key, index) {
     attributes[key] = String(attributes[key]);
   });
   return attributes;
-}
+};
 
 const isValidPlatform = () => {
   //Platform.Version is a number for android and string for ios
-  return (Platform.OS === 'android' && String(Platform.Version) >= '21') || (Platform.OS === 'ios' && String(Platform.Version) >= '10.3');
-}
+  return (
+    (Platform.OS === "android" && String(Platform.Version) >= "21") ||
+    (Platform.OS === "ios" && String(Platform.Version) >= "10.3")
+  );
+};
 
 const visitorIdentifier = () => {
   if (isValidPlatform()) {
@@ -27,7 +31,18 @@ const visitorIdentifier = () => {
   } else {
     return 0;
   }
-}
+};
+
+const sdkVersion = () => {
+  if (Platform.OS === "ios") {
+    if (String(Platform.Version) >= "10.3") {
+      return NativeModules.UserLeapBindings.sdkVersion();
+    }
+  } else {
+    return NativeModules.UserLeapBindings.getSdkVersion();
+  }
+  return "0.0.0";
+};
 
 const visitorIdentifierString = () => {
   if (isValidPlatform()) {
@@ -35,109 +50,144 @@ const visitorIdentifierString = () => {
   } else {
     return "";
   }
-}
+};
 
 const configure = (environment, configuration = {}) => {
-  const source = 
-    configuration.source === 'react-native-segment' 
-      ? 'react-native-segment' 
-      : 'react-native';
-  const packageVersion = 
-    configuration.packageVersion 
-      ? configuration.packageVersion
-      : version;
+  const source =
+    configuration.source === "react-native-segment"
+      ? "react-native-segment"
+      : "react-native";
+  const packageVersion = configuration.packageVersion
+    ? configuration.packageVersion
+    : version;
   const defaultConfiguration = {
-    'x-ul-installation-method': `${Platform.OS}-${source}`,
-    'x-ul-package-version': packageVersion
+    "x-ul-installation-method": `${Platform.OS}-${source}`,
+    "x-ul-package-version": packageVersion,
   };
   if (isValidPlatform()) {
     NativeModules.UserLeapBindings.configure(environment, defaultConfiguration);
   }
-}
+};
 
 const setPreviewKey = (previewKey) => {
   if (isValidPlatform()) {
     NativeModules.UserLeapBindings.setPreviewKey(previewKey);
   }
-}
+};
 
 const presentSurvey = () => {
   if (isValidPlatform()) {
     NativeModules.UserLeapBindings.presentSurvey();
   }
-}
+};
 
 const track = (event, surveyStateCallback) => {
   if (isValidPlatform()) {
     NativeModules.UserLeapBindings.track(event, surveyStateCallback);
   }
-}
+};
 
-const trackWithProperties = (event, userId, partnerAnonymousId, properties, surveyStateCallback) => {
-  if (isValidPlatform()) {
-    NativeModules.UserLeapBindings.trackWithProperties(event, userId, partnerAnonymousId,  properties, surveyStateCallback);
+const trackWithProperties = (
+  event,
+  userId,
+  partnerAnonymousId,
+  properties,
+  surveyStateCallback
+) => {
+  if (isValidPlatform()) {
+    NativeModules.UserLeapBindings.trackWithProperties(
+      event,
+      userId,
+      partnerAnonymousId,
+      properties,
+      surveyStateCallback
+    );
   }
-}
+};
 
-const trackAndIdentify = (event, userId, partnerAnonynmousId, surveyStateCallback) => {
+const trackAndIdentify = (
+  event,
+  userId,
+  partnerAnonynmousId,
+  surveyStateCallback
+) => {
   if (isValidPlatform()) {
-    NativeModules.UserLeapBindings.trackAndIdentify(event, userId, partnerAnonynmousId, surveyStateCallback);
+    NativeModules.UserLeapBindings.trackAndIdentify(
+      event,
+      userId,
+      partnerAnonynmousId,
+      surveyStateCallback
+    );
   }
-}
+};
 
 const setEmailAddress = (emailAddress) => {
   if (isValidPlatform()) {
     NativeModules.UserLeapBindings.setEmailAddress(emailAddress);
   }
-}
+};
 
 const setVisitorAttribute = (key, value) => {
   if (isValidPlatform()) {
     NativeModules.UserLeapBindings.setVisitorAttribute(key, value);
   }
-}
+};
 
 const setVisitorAttributes = (attributes) => {
   if (isValidPlatform()) {
-    NativeModules.UserLeapBindings.setVisitorAttributes(stringifyAttributes(attributes));
+    NativeModules.UserLeapBindings.setVisitorAttributes(
+      stringifyAttributes(attributes)
+    );
   }
-}
+};
 
 const removeVisitorAttributes = (keys) => {
   if (isValidPlatform()) {
     NativeModules.UserLeapBindings.removeVisitorAttributes(keys);
   }
-}
+};
 
-const setVisitorAttributesAndIdentify = (attributes, userId, partnerAnonynmousId) => {
+const setVisitorAttributesAndIdentify = (
+  attributes,
+  userId,
+  partnerAnonynmousId
+) => {
   if (isValidPlatform()) {
-    NativeModules.UserLeapBindings.setVisitorAttributesAndIdentify(stringifyAttributes(attributes), userId, partnerAnonynmousId);
+    NativeModules.UserLeapBindings.setVisitorAttributesAndIdentify(
+      stringifyAttributes(attributes),
+      userId,
+      partnerAnonynmousId
+    );
   }
-}
+};
 
 const setUserIdentifier = (identifier) => {
   if (isValidPlatform()) {
     NativeModules.UserLeapBindings.setUserIdentifier(identifier);
   }
-}
+};
 
 const logout = () => {
   if (isValidPlatform()) {
     NativeModules.UserLeapBindings.logout();
   }
-}
+};
 
 const trackAndPresent = (event) => {
   if (isValidPlatform()) {
     NativeModules.UserLeapBindings.trackAndPresent(event);
   }
-}
+};
 
 const trackIdentifyAndPresent = (event, userId, partnerAnonynmousId) => {
   if (isValidPlatform()) {
-    NativeModules.UserLeapBindings.trackIdentifyAndPresent(event, userId, partnerAnonynmousId);
+    NativeModules.UserLeapBindings.trackIdentifyAndPresent(
+      event,
+      userId,
+      partnerAnonynmousId
+    );
   }
-}
+};
 
 // Uncomment for UI testing
 // const renderSnapshotForUITest = (name, maskingLevel) => {
@@ -147,26 +197,27 @@ const trackIdentifyAndPresent = (event, userId, partnerAnonynmousId) => {
 // }
 
 const UserLeap = {
-    SurveyState,
-    visitorIdentifier,
-    visitorIdentifierString,
-    configure,
-    presentSurvey,
-    setPreviewKey,
-    track,
-    trackWithProperties,
-    trackAndIdentify,
-    setEmailAddress,
-    setVisitorAttribute,
-    setVisitorAttributes,
-    removeVisitorAttributes,
-    setVisitorAttributesAndIdentify,
-    setUserIdentifier,
-    logout,
-    trackAndPresent,
-    trackIdentifyAndPresent,
-    // Uncomment for UI testing
-    // renderSnapshotForUITest,
-}
+  SurveyState,
+  visitorIdentifier,
+  visitorIdentifierString,
+  sdkVersion,
+  configure,
+  presentSurvey,
+  setPreviewKey,
+  track,
+  trackWithProperties,
+  trackAndIdentify,
+  setEmailAddress,
+  setVisitorAttribute,
+  setVisitorAttributes,
+  removeVisitorAttributes,
+  setVisitorAttributesAndIdentify,
+  setUserIdentifier,
+  logout,
+  trackAndPresent,
+  trackIdentifyAndPresent,
+  // Uncomment for UI testing
+  // renderSnapshotForUITest,
+};
 
 export default UserLeap;

package/ios/UserLeapBindings.m

@@ -47,6 +47,11 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(visitorIdentifierString)
     return [[UserLeap shared] visitorIdentifierString];
 }
 
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(sdkVersion)
+{
+    return [[UserLeap shared] sdkVersion];
+}
+
 RCT_EXPORT_METHOD(configure:(NSString *)environmentId configuration:(NSDictionary *)configuration )
 {
     [[UserLeap shared] configureWithEnvironment:environmentId configuration:configuration];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-userleap",
-  "version": "2.18.5",
+  "version": "2.18.7",
   "description": "React Native module for UserLeap",
   "main": "index.js",
   "types": "index.d.ts",

package/react-native-userleap.podspec

@@ -19,5 +19,5 @@ Pod::Spec.new do |s|
   s.requires_arc = true
 
   s.dependency "React"
-  s.dependency "UserLeapKit", "4.24.3"
+  s.dependency "UserLeapKit", "4.25.1"
 end