Adding functinality to set location in init. Fixes for a few issues. Merge pull request #24 from Countly/dev-junaid

sertLocationInit Added
iOS/Android SDK's version updated
Application set for config on Android side
Automatic view tracking removed
iOS recordNetworkTrace issue fixed

Author: ArtursKadikis

CHANGELOG.md

@@ -0,0 +1,23 @@
+## 20.4.6
+* Adding APM calls
+* Adding functionality to enable attribution
+* Added call to retrieve the currently used device ID
+* Updated "init" call to async
+* Added "setLoggingEnabled" call
+* Added call to set location during init time
+* Fixed issues related to location tracking
+* Fixed issue where ios crash handling was enabled without enabling it
+* Deprecated "enableLogging" and "disableLogging" calls
+* Updated underlying android SDK to 20.04.5
+* Updated underlying ios SDK to 20.04.3
+
+## 20.4.5
+* Fixed "onNotification" listener
+* Fixed a few issues with setting location
+* Fixed bug with push messaging modes
+* Reworked android push notifications (!! PREVIOUS ANDROID PUSH SETUP SHOULD BE REMOVED AFTER UPDATE !!)
+* Adding android star rating callback
+* Tweaked android push notifications to show up only in the notification bar
+* Fixed SDK version and SDK name metrics to show not the bridged SDK values but the ones from the react native SDK
+
+* Please refer to this documentation for released work https://support.count.ly/hc/en-us/articles/360037813231-React-Native-Bridge-

Countly.js

@@ -117,24 +117,6 @@ Countly.recordView = function(recordView, segments){
     CountlyReactNative.recordView(args);
 };
 
-/**
- * Enable automatic view tracking
- * Should be call before Countly init
- * @param enabled Expected value is boolean
- */
-Countly.setViewTracking = async function(enabled = true){
-    if(typeof enabled !== 'boolean' && typeof enabled !== 'string') {
-        if(await CountlyReactNative.isLoggingEnabled()) {
-            console.warn("setViewTracking, unsupported data type [" + typeof enabled+ "]");
-        }
-        return;
-    }
-    if(typeof enabled === 'string') {
-        enabled = (enabled === "true"); // Typecast from string to boolean
-    }
-    CountlyReactNative.setAutomaticViewTracking([enabled]);
-}
-
 /**
  * 
  * Set Push notification messaging mode and callbacks for push notifications
@@ -150,7 +132,6 @@ Countly.pushTokenType = function(tokenType, channelName, channelDescription){
 Countly.sendPushToken = function(options){
     var args = [];
     args.push(options.token || "");
-    args.push((options.messagingMode || "").toString());
     CountlyReactNative.sendPushToken(args);
 }
 
@@ -226,6 +207,24 @@ Countly.demo = function(){
 
 }
 
+/**
+ * Set user initial location
+ * Should be call before init
+ * @param {ISO Country code for the user's country} countryCode 
+ * @param {Name of the user's city} city 
+ * @param {comma separate lat and lng values. For example, "56.42345,123.45325"} location 
+ * @param {IP address of user's} ipAddress 
+ * */
+
+Countly.setLocationInit = function(countryCode, city, location, ipAddress){
+    var args = [];
+    args.push(countryCode || "null");
+    args.push(city || "null");
+    args.push(location || "null");
+    args.push(ipAddress || "null");
+    CountlyReactNative.setLocationInit(args);
+}
+
 Countly.setLocation = function(countryCode, city, location, ipAddress){
     var args = [];
     args.push(countryCode || "null");

CountlyReactNative.podspec

@@ -46,5 +46,5 @@ Pod::Spec.new do |s|
   end
 
   s.dependency "React"
-  s.dependency "Countly", '20.04.2'
+  s.dependency "Countly", '20.04.3'
 end

android/build.gradle

@@ -16,11 +16,11 @@ def safeExtGet(prop, fallback) {
 }
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', 28)
+    compileSdkVersion safeExtGet('compileSdkVersion', 29)
 
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 16)
-        targetSdkVersion safeExtGet('targetSdkVersion', 28)
+        minSdkVersion safeExtGet('minSdkVersion', 17)
+        targetSdkVersion safeExtGet('targetSdkVersion', 29)
 
         versionCode 2
         versionName "1.1"
@@ -44,7 +44,7 @@ repositories {
 
 dependencies {
     implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
-    implementation 'ly.count.android:sdk:20.04.4'
+    implementation 'ly.count.android:sdk:20.04.5'
 
     //if any version higher than 18.0.0 is used then it forces AndroidX
     implementation 'com.google.firebase:firebase-messaging:18.0.0'

android/src/main/java/ly/count/android/sdk/react/CountlyReactNative.java

@@ -65,7 +65,7 @@ public String toString(){
 }
 
 public class CountlyReactNative extends ReactContextBaseJavaModule {
-    private String COUNTLY_RN_SDK_VERSION_STRING = "20.04.5";
+    private String COUNTLY_RN_SDK_VERSION_STRING = "20.04.6";
     private String COUNTLY_RN_SDK_NAME = "js-rnb-android";
 
     private static CountlyConfig config = new CountlyConfig();
@@ -117,6 +117,8 @@ public void init(ReadableArray args, Promise promise){
           Countly.sharedInstance().COUNTLY_SDK_VERSION_STRING = COUNTLY_RN_SDK_VERSION_STRING;
 
         this.config.setContext(_reactContext);
+        Activity activity = getCurrentActivity();
+        this.config.setApplication(activity.getApplication());
         if(deviceId == null || "".equals(deviceId)){
         }else{
             if(deviceId.equals("TemporaryDeviceID")){
@@ -250,6 +252,27 @@ public void pinnedCertificates(ReadableArray args){
         return new String[]{};
     }
 
+    @ReactMethod
+    public void setLocationInit(ReadableArray args){
+        String countryCode = args.getString(0);
+        String city = args.getString(1);
+        String location = args.getString(2);
+        String ipAddress = args.getString(3);
+        if("null".equals(countryCode)){
+            countryCode = null;
+        }
+        if("null".equals(city)){
+            city = null;
+        }
+        if("null".equals(location)){
+            location = null;
+        }
+        if("null".equals(ipAddress)){
+            ipAddress = null;
+        }
+        this.config.setLocation(countryCode, city, location, ipAddress);
+    }
+
     @ReactMethod
     public void setLocation(ReadableArray args){
         String countryCode = args.getString(0);
@@ -403,12 +426,6 @@ public void recordView(ReadableArray args){
         Countly.sharedInstance().recordView(viewName, segmentation);
     }
 
-    @ReactMethod
-    public void setAutomaticViewTracking(ReadableArray args){
-        Boolean flag = args.getBoolean(0);
-        this.config.setViewTracking(flag);
-    }
-
     @ReactMethod
     public void setUserData(ReadableArray args){
         Map<String, String> bundle = new HashMap<String, String>();
@@ -428,16 +445,7 @@ public void setUserData(ReadableArray args){
     @ReactMethod
     public void sendPushToken(ReadableArray args){
         String pushToken = args.getString(0);
-        int messagingMode = Integer.parseInt(args.getString(1));
-
-        Countly.CountlyMessagingMode mode = null;
-        if(messagingMode == 0){
-            mode = Countly.CountlyMessagingMode.PRODUCTION;
-        }
-        else{
-            mode = Countly.CountlyMessagingMode.TEST;
-        }
-        Countly.sharedInstance().onRegistrationId(pushToken, mode);
+        CountlyPush.onTokenRefresh(pushToken);
     }
 
     @ReactMethod
@@ -668,12 +676,12 @@ public void removeConsent(ReadableArray featureNames){
 
     @ReactMethod
     public void giveAllConsent(){
-        Countly.sharedInstance().consent().giveConsent(validConsentFeatureNames.toArray(new String[validConsentFeatureNames.size()]));
+        Countly.sharedInstance().consent().giveConsentAll();
     }
 
     @ReactMethod
     public void removeAllConsent(){
-        Countly.sharedInstance().consent().removeConsent(validConsentFeatureNames.toArray(new String[validConsentFeatureNames.size()]));
+        Countly.sharedInstance().consent().removeConsentAll();
     }
 
 

example/Example.js

@@ -45,7 +45,7 @@ class Example extends Component {
         Countly.setLoggingEnabled(true); // Enable countly internal debugging logs
         Countly.enableCrashReporting(); // Enable crash reporting to report unhandled crashes to Countly
         Countly.setRequiresConsent(true); // Set that consent should be required for features to work.
-        Countly.setViewTracking(true); // Enable automatic view tracking
+        Countly.setLocationInit("TR", "Istanbul", "41.0082,28.9784", "10.2.33.12"); // Set user initial location.
 
         /** Optional settings for Countly initialisation */
         Countly.enableParameterTamperingProtection("salt"); // Set the optional salt to be used for calculating the checksum of requested data which will be sent with each request

example/install.sh

@@ -11,7 +11,7 @@ rm App.js
 curl https://raw.githubusercontent.com/Countly/countly-sdk-react-native-bridge/master/example/App.js --output App.js
 curl https://raw.githubusercontent.com/Countly/countly-sdk-react-native-bridge/master/example/Example.js --output Example.js
 
-yarn add [email protected].5
+yarn add [email protected].6
 
 cd ./ios
 pod install

ios/Podfile

@@ -2,5 +2,5 @@ platform :ios, '8.0'
 
 target 'countly-sdk-react-native-bridge' do
   use_frameworks!
-  pod 'Countly', "20.04.2"
+  pod 'Countly', "20.04.3"
 end

ios/src/CountlyReactNative.h

@@ -12,6 +12,7 @@ typedef void (^Result)(id _Nullable result);
 - (void)recordView:(NSArray*_Nullable)arguments;
 
 - (void)setHttpPostForced:(NSArray*_Nullable)arguments;
+- (void)setLocationInit:(NSArray*_Nullable)arguments;
 - (void)setLocation:(NSArray*_Nullable)arguments;
 - (void)enableCrashReporting;
 - (void)addCrashLog:(NSArray*_Nullable)arguments;

ios/src/CountlyReactNative.m

@@ -11,7 +11,7 @@
 #import "CountlyRemoteConfig.h"
 #import "CountlyCommon.h"
 
-NSString* const kCountlyReactNativeSDKVersion = @"20.04.5";
+NSString* const kCountlyReactNativeSDKVersion = @"20.04.6";
 NSString* const kCountlyReactNativeSDKName = @"js-rnb-ios";
 
 CountlyConfig* config = nil;
@@ -120,18 +120,6 @@ @implementation CountlyReactNative
   });
 }
 
-RCT_EXPORT_METHOD(setAutomaticViewTracking:(NSArray*)arguments)
-{
-    BOOL boolean = [[arguments objectAtIndex:0] boolValue];
-    if(boolean) {
-        [self addCountlyFeature:CLYAutoViewTracking];
-    }
-    else {
-        [self removeCountlyFeature:CLYAutoViewTracking];
-    }
-    [Countly.sharedInstance setIsAutoViewTrackingActive:boolean];
-}
-
 RCT_EXPORT_METHOD(setLoggingEnabled:(NSArray*)arguments)
 {
   dispatch_async(dispatch_get_main_queue(), ^ {
@@ -179,7 +167,10 @@ @implementation CountlyReactNative
   dispatch_async(dispatch_get_main_queue(), ^ {
 
     NSString* token = [arguments objectAtIndex:0];
-    NSString* messagingMode = [arguments objectAtIndex:1];
+    NSString* messagingMode = @"1";
+    if(config.pushTestMode == nil || [config.pushTestMode  isEqual: @""] || [config.pushTestMode isEqualToString:@"CLYPushTestModeTestFlightOrAdHoc"]) {
+        messagingMode = @"0";
+    }
     NSString *urlString = [ @"" stringByAppendingFormat:@"%@?device_id=%@&app_key=%@&token_session=1&test_mode=%@&ios_token=%@", config.host, [Countly.sharedInstance deviceID], config.appKey, messagingMode, token];
     NSMutableURLRequest *request = [[NSMutableURLRequest alloc] init];
     [request setHTTPMethod:@"GET"];
@@ -433,6 +424,43 @@ + (void) log: (NSString *) theMessage{
   });
 }
 
+RCT_EXPORT_METHOD(setLocationInit:(NSArray*)arguments)
+{
+  dispatch_async(dispatch_get_main_queue(), ^ {
+      if (config == nil){
+        config = CountlyConfig.new;
+      }
+      NSString* countryCode = [arguments objectAtIndex:0];
+      NSString* city = [arguments objectAtIndex:1];
+      NSString* locationString = [arguments objectAtIndex:2];
+      NSString* ipAddress = [arguments objectAtIndex:3];
+
+      if(locationString != nil && ![locationString isEqualToString:@"null"] && [locationString containsString:@","]){
+          @try{
+              NSArray *locationArray = [locationString componentsSeparatedByString:@","];
+              NSString* latitudeString = [locationArray objectAtIndex:0];
+              NSString* longitudeString = [locationArray objectAtIndex:1];
+
+              double latitudeDouble = [latitudeString doubleValue];
+              double longitudeDouble = [longitudeString doubleValue];
+              config.location = (CLLocationCoordinate2D){latitudeDouble,longitudeDouble};
+          }
+          @catch(NSException *exception){
+              NSLog(@"[Countly] Invalid location: %@", locationString);
+          }
+      }
+      if(city != nil && ![city isEqualToString:@"null"]) {
+          config.city = city;
+      }
+      if(countryCode != nil && ![countryCode isEqualToString:@"null"]) {
+          config.ISOCountryCode = countryCode;
+      }
+      if(ipAddress != nil && ![ipAddress isEqualToString:@"null"]) {
+          config.IP = ipAddress;
+      }
+  });
+}
+
 RCT_EXPORT_METHOD(setLocation:(NSArray*)arguments)
 {
   dispatch_async(dispatch_get_main_queue(), ^ {
@@ -886,8 +914,8 @@ + (void) log: (NSString *) theMessage{
         int responseCode = [[arguments objectAtIndex:1] intValue];
         int requestPayloadSize = [[arguments objectAtIndex:2] intValue];
         int responsePayloadSize = [[arguments objectAtIndex:3] intValue];
-        int startTime = [[arguments objectAtIndex:4] intValue];
-        int endTime = [[arguments objectAtIndex:5] intValue];
+        long long  startTime = [[arguments objectAtIndex:4] longLongValue];
+        long long  endTime = [[arguments objectAtIndex:5] longLongValue];
         [Countly.sharedInstance recordNetworkTrace: networkTraceKey requestPayloadSize: requestPayloadSize responsePayloadSize: responsePayloadSize responseStatusCode: responseCode startTime: startTime endTime: endTime];
 
     });