Adding call to get the current device ID. Merge pull request #22 from Countly/dev-junaid

Get device Id and Author implemented and some text changes

Author: ArtursKadikis

Countly.js

@@ -138,7 +138,7 @@ Countly.setViewTracking = async function(enabled = true){
 /**
  * 
  * Set Push notification messaging mode and callbacks for push notifications
- * Should be call before Countly init
+ * Should be call after Countly init
  */
 Countly.pushTokenType = function(tokenType, channelName, channelDescription){
     var args = [];
@@ -153,9 +153,20 @@ Countly.sendPushToken = function(options){
     args.push((options.messagingMode || "").toString());
     CountlyReactNative.sendPushToken(args);
 }
+
+/**
+ * This method will ask for permission, enables push notification and send push token to countly server.
+ * Should be call after Countly init
+ */
 Countly.askForNotificationPermission = function(){
     CountlyReactNative.askForNotificationPermission([]);
 }
+
+/**
+ * 
+ * Set callback to receive push notifications
+ * @param { callback listner } theListener 
+ */
 Countly.registerForNotification = function(theListener){
     var event = eventEmitter.addListener('onCountlyPushNotification', theListener);
     CountlyReactNative.registerForNotification([]);
@@ -226,6 +237,20 @@ Countly.setLocation = function(countryCode, city, location, ipAddress){
 Countly.disableLocation = function(){
     CountlyReactNative.disableLocation();
 }
+/** 
+ * 
+ * Get currently used device Id.
+ * Should be call after Countly init
+ * */
+  static Future<String> getCurrentDeviceId() async {
+    if(!await Countly.isInitialized()) {
+        console.warn('getCurrentDeviceId, init must be called before getCurrentDeviceId');
+        return "init must be called before getCurrentDeviceId";
+      }
+      const result = await CountlyReactNative.getCurrentDeviceId();
+      return result;
+  }
+
 Countly.changeDeviceId = function(newDeviceID, onServer){
     if(onServer === false){
         onServer = "0";
@@ -473,6 +498,11 @@ Countly.removeConsent = function(args){
     CountlyReactNative.removeConsent(features);
 }
 
+/**
+ * 
+ * Give consent for all features
+ * Should be call after Countly init
+ */
 Countly.giveAllConsent = function(){
     CountlyReactNative.giveAllConsent();
 }

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

@@ -153,6 +153,36 @@ public void hasBeenCalledOnStart(Promise promise){
         Boolean result = Countly.sharedInstance().hasBeenCalledOnStart();
         promise.resolve(result);
     }
+    
+    @ReactMethod
+    public void getCurrentDeviceId(ReadableArray args, final Callback myCallback){
+        String deviceID = Countly.sharedInstance().getDeviceID();
+        if (deviceID == null) {
+            Log.d(Countly.TAG, "[CountlyReactNative] getCurrentDeviceId, deviceIdNotFound");
+            myCallback.invoke("deviceIdNotFound");
+        }
+        else {
+            Log.d(Countly.TAG, "[CountlyReactNative] getCurrentDeviceId: " + deviceID);
+            myCallback.invoke(deviceID);
+        }
+    }
+
+    @ReactMethod
+    public void getDeviceIdAuthor(ReadableArray args, final Callback myCallback){
+        DeviceId.Type deviceIDType = Countly.sharedInstance().getDeviceIDType();
+        if (deviceIDType == null) {
+            Log.d(Countly.TAG, "[CountlyReactNative] getDeviceIdAuthor, deviceIdAuthorNotFound");
+            myCallback.invoke("deviceIdAuthorNotFound");
+        }
+        else {
+            Log.d(Countly.TAG, "[CountlyReactNative] getDeviceIdAuthor: " + deviceIDType);
+            if(deviceIDType == DeviceId.Type.DEVELOPER_SUPPLIED){
+                myCallback.success("developerProvided");
+            }else{
+                myCallback.success("sdkGenerated");
+            }
+        }
+    }
 
     @ReactMethod
     public void changeDeviceId(ReadableArray args){

example/Example.js

@@ -53,10 +53,6 @@ class Example extends Component {
         // Countly.setHttpPostForced(false); // Set to "true" if you want HTTP POST to be used for all requests
         Countly.enableApm(); // Enable APM features, which includes the recording of app start time.
         Countly.enableAttribution(); // Enable to measure your marketing campaign performance by attributing installs from specific campaigns.
-
-        Countly.setEventSendThreshold("10"); // Set event threshold value, Events get grouped together and are sent either every minute or after the unsent event count reaches a threshold. By default it is 10
-
-        /** Push Notification Settings */
 
         await Countly.init("https://master.count.ly", "5b77e4c785410351f32d8aa286d2383195d13b93", "123456"); // Initialize the countly SDK.
 

ios/src/CountlyReactNative.h

@@ -16,6 +16,8 @@ typedef void (^Result)(id _Nullable result);
 - (void)enableCrashReporting;
 - (void)addCrashLog:(NSArray*_Nullable)arguments;
 
+- (void)getCurrentDeviceId:(NSArray*_Nullable)arguments callback:(RCTResponseSenderBlock _Nullable)callback;
+- (void)getDeviceIdAuthor:(NSArray*_Nullable)arguments callback:(RCTResponseSenderBlock _Nullable)callback;
 - (void)changeDeviceId:(NSArray*_Nullable)arguments;
 - (void)enableParameterTamperingProtection:(NSArray*_Nullable)arguments;
 - (void)pinnedCertificates:(NSArray*_Nullable)arguments;

ios/src/CountlyReactNative.m

@@ -275,6 +275,28 @@ + (void) log: (NSString *) theMessage{
   // [Countly.sharedInstance suspend];
 }
 
+RCT_EXPORT_METHOD(getCurrentDeviceId:(NSArray*)arguments callback:(RCTResponseSenderBlock)callback)
+{
+  dispatch_async(dispatch_get_main_queue(), ^ {
+  id value = [Countly.sharedInstance deviceID];
+  if(value){
+    callback(@[value]);
+  }
+  else{
+    NSString *value = @"deviceIdNotFound";
+    callback(@[value]);
+  }
+  });
+}
+
+RCT_EXPORT_METHOD(getDeviceIdAuthor:(NSArray*)arguments callback:(RCTResponseSenderBlock)callback)
+{
+  dispatch_async(dispatch_get_main_queue(), ^ {
+    NSString *value = @"Not implemented for iOS";
+    callback(@[value]);
+  });
+}
+
 RCT_EXPORT_METHOD(changeDeviceId:(NSArray*)arguments)
 {
   dispatch_async(dispatch_get_main_queue(), ^ {