@convivainc/conviva-react-native-appanalytics 0.1.1 → 0.1.2

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 
 # Changelog
+## 0.1.2 (01/MAY/2023)
+* Supports the inclusion of the latest Android/iOS Native sensor always in the Android/iOS Bridge going forward
+* Fixes the issue of App Name being incorrect for iOS Bridge
+* Updates related to the default Network and Tracker Config in the iOS Bridge
+
 ## 0.1.1 (24/APR/2023)
 * Published the Android/iOS folders along with the podspec files
 

package/README.md

@@ -10,6 +10,15 @@ npm install @convivainc/conviva-react-native-appanalytics --save
 npx pod-install
 ```
 
+## Android Gradle dependency
+Add the following line to app's build.gradle file along with the dependencies:
+```
+dependencies {
+    ...
+    implementation 'com.conviva.sdk:conviva-android-tracker:<version>'
+}
+```
+
 ## Initialize the tracker
 ```js
 import { createTracker } from '@convivainc/conviva-react-native-appanalytics';

package/RNConvivaAppAnalytics.podspec

@@ -20,5 +20,5 @@ Pod::Spec.new do |s|
   s.requires_arc = true
 
   s.dependency "React-Core"
-  s.dependency "ConvivaAppAnalytics", "~> 0.2.10"
+  s.dependency "ConvivaAppAnalytics", ">= 0.2.12"
 end

package/android/build.gradle

@@ -51,5 +51,5 @@ dependencies {
     implementation "com.squareup.okhttp3:okhttp:4.9.3"
     implementation "com.facebook.react:react-native:+"
     implementation 'com.googlecode.json-simple:json-simple:1.1'
-    implementation 'com.conviva.sdk:conviva-android-tracker:0.5.+'
+    implementation 'com.conviva.sdk:conviva-android-tracker:+'
 }

package/android/src/main/java/com/conviva/react/apptracker/util/TrackerVersion.java

@@ -4,6 +4,6 @@ import com.conviva.react.apptracker.BuildConfig;
 
 public class TrackerVersion {
 
-    public final static String RN_CONVIVA_TRACKER_VERSION = "rn-0.1.1";
+    public final static String RN_CONVIVA_TRACKER_VERSION = "rn-0.1.2";
 
 }

package/ios/RNConvivaAppAnalytics.m

@@ -61,17 +61,32 @@ RCT_EXPORT_METHOD(createTracker:
     NSString *customerKey = [argmap objectForKey:@"customerKey"];
     NSDictionary *networkConfig =[argmap objectForKey:@"networkConfig"];
 
-    // NetworkConfiguration
-    NSString *method = [networkConfig rncat_stringForKey:@"method" defaultValue:nil];
-    CATHttpMethod httpMethod = [@"get" isEqualToString:method] ? CATHttpMethodGet : CATHttpMethodPost;
-    CATNetworkConfiguration *networkConfiguration = [[CATNetworkConfiguration alloc] initWithEndpoint:networkConfig[@"endpoint"] method:httpMethod];
-    NSString *customPostPath = [networkConfig rncat_stringForKey:@"customPostPath" defaultValue:nil];
-    if (customPostPath != nil) {
-        networkConfiguration.customPostPath = customPostPath;
-    }
-    NSObject *requestHeaders = [networkConfig objectForKey:@"requestHeaders"];
-    if (requestHeaders != nil && [requestHeaders isKindOfClass:NSDictionary.class]) {
-        networkConfiguration.requestHeaders = (NSDictionary *)requestHeaders;
+    CATNetworkConfiguration *networkConfiguration = nil;
+    if(nil != networkConfig){
+        
+        // NetworkConfiguration
+        NSString *method = [networkConfig rncat_stringForKey:@"method" defaultValue:nil];
+        CATHttpMethod httpMethod = CATHttpMethodPost;
+        
+        if(0 < [method length]){
+            httpMethod = [@"get" isEqualToString:method] ? CATHttpMethodGet : CATHttpMethodPost;
+        }
+        
+        NSString *endpoint = networkConfig[@"endpoint"];
+        
+        if(0 < [endpoint length]) {
+            networkConfiguration = [[CATNetworkConfiguration alloc] initWithEndpoint:networkConfig[@"endpoint"] method:httpMethod];
+        }
+        
+        NSString *customPostPath = [networkConfig rncat_stringForKey:@"customPostPath" defaultValue:nil];
+        if (0 < [customPostPath length]) {
+            networkConfiguration.customPostPath = customPostPath;
+        }
+        
+        NSObject *requestHeaders = [networkConfig objectForKey:@"requestHeaders"];
+        if (requestHeaders != nil && [requestHeaders isKindOfClass:NSDictionary.class]) {
+            networkConfiguration.requestHeaders = (NSDictionary *)requestHeaders;
+        }
     }
 
     // Configurations
@@ -83,6 +98,10 @@ RCT_EXPORT_METHOD(createTracker:
         CATTrackerConfiguration *trackerConfiguration = [RNConfigUtils mkTrackerConfig:(NSDictionary *)trackerArg];
         [controllers addObject:trackerConfiguration];
     }
+    else{
+        CATTrackerConfiguration *trackerConfiguration = [RNConfigUtils mkDefaultTrackerConfig];
+        [controllers addObject:trackerConfiguration];
+    }
 
     // SessionConfiguration
     NSObject *sessionArg = [argmap objectForKey:@"sessionConfig"];
@@ -118,10 +137,20 @@ RCT_EXPORT_METHOD(createTracker:
         CATGlobalContextsConfiguration *gcConfiguration = [RNConfigUtils mkGCConfig:(NSArray *)gcArg];
         [controllers addObject:gcConfiguration];
     }
-
-    id<CATTrackerController> tracker = [CATAppAnalytics createTrackerWithNamespace:trackerNs customerKey:customerKey network:networkConfiguration configurations:controllers];
-    tracker.appId = appName;
-
+    
+    id<CATTrackerController> tracker = nil;
+    if(nil != networkConfiguration){
+        tracker = [CATAppAnalytics createTrackerWithCustomerKey:customerKey
+                                                        appName:appName
+                                                        network:networkConfiguration
+                                                 configurations:controllers];
+    }
+    else{
+        tracker = [CATAppAnalytics createTrackerWithCustomerKey:customerKey
+                                                        appName:appName
+                                                 configurations:controllers];
+    }
+    
     if (tracker) {
         resolve(@YES);
     } else {

package/ios/Util/RNConfigUtils.h

@@ -29,6 +29,8 @@
 
 @interface RNConfigUtils : NSObject
 
++ (CATTrackerConfiguration *) mkDefaultTrackerConfig;
+
 + (CATTrackerConfiguration *) mkTrackerConfig:(NSDictionary *) trackerConfig;
 
 + (CATSessionConfiguration *) mkSessionConfig:(NSDictionary *) sessionConfig;

package/ios/Util/RNConfigUtils.m

@@ -37,6 +37,14 @@
 
 @implementation RNConfigUtils
 
++ (CATTrackerConfiguration *) mkDefaultTrackerConfig {
+    
+    CATTrackerConfiguration *trackerConfiguration = [CATTrackerConfiguration new];
+    trackerConfiguration.trackerVersionSuffix = kRNTrackerVersion;
+    
+    return trackerConfiguration;
+}
+
 + (CATTrackerConfiguration *) mkTrackerConfig:(NSDictionary *) trackerConfig {
     CATTrackerConfiguration *trackerConfiguration = [CATTrackerConfiguration new];
     trackerConfiguration.trackerVersionSuffix = kRNTrackerVersion;

package/ios/Util/RNTrackerVersion.m

@@ -22,6 +22,6 @@
 
 @implementation RNTrackerVersion
 
-NSString * const kRNTrackerVersion = @"rn-0.1.1";
+NSString * const kRNTrackerVersion = @"rn-0.1.2";
 
 @end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@convivainc/conviva-react-native-appanalytics",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Conviva React Native Application Analytics Library",
   "main": "conviva-react-native-appanalytics.js",
   "repository": {