Halt method added for android and iOS

Countly · Mar 14, 2020 · 03c120b · 03c120b
1 parent 9e30e8a
commit 03c120b
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 24 deletions.
diff --git a/Countly.js b/Countly.js
@@ -60,6 +60,10 @@ Countly.start = function(){
 Countly.stop = function(){
     cordova.exec(Countly.onSuccess,Countly.onError,"CountlyCordova","stop",[]);
 }
+// countly halt for android
+Countly.halt = function(){
+    cordova.exec(Countly.onSuccess,Countly.onError,"CountlyCordova","halt",[]);
+}
 
 // countly manualSessionHandling for android
 // Countly.manualSessionHandling = function(){
@@ -177,17 +181,10 @@ Countly.logException = function(exception, nonfatal, segments){
     cordova.exec(Countly.onSuccess,Countly.onError,"CountlyCordova","logException",args);
 };
 
-Countly.startSession = function(){
-    cordova.exec(Countly.onSuccess,Countly.onError,"CountlyCordova","startSession",[]);
-}
-
-Countly.endSession = function(){
-    cordova.exec(Countly.onSuccess,Countly.onError,"CountlyCordova","endSession",[]);
-}
-
 Countly.enableParameterTamperingProtection = function(salt){
     cordova.exec(Countly.onSuccess,Countly.onError,"CountlyCordova","enableParameterTamperingProtection",[salt.toString() || ""]);
 }
+
 Countly.startEvent = function(key){
     cordova.exec(Countly.onSuccess,Countly.onError,"CountlyCordova","startEvent",[key.toString() || ""]);
 }

diff --git a/src/android/CountlyCordova.java b/src/android/CountlyCordova.java
@@ -58,6 +58,12 @@ else if("logException".equals(action)){
         else if ("start".equals(action)) {
             callbackContext.success(countlyNative.start(args));
         }
+        else if ("stop".equals(action)) {
+            callbackContext.success(countlyNative.stop(args));
+        }
+        else if ("halt".equals(action)) {
+            callbackContext.success(countlyNative.halt(args));
+        }
 
         else if ("askForNotificationPermission".equals(action)) {
             callbackContext.success(countlyNative.askForNotificationPermission(args));

diff --git a/src/android/CountlyNative.java b/src/android/CountlyNative.java
@@ -217,12 +217,16 @@ public String start(JSONArray args){
         return "started: success";
     }
 
-
     public String stop(JSONArray args){
         Countly.sharedInstance().onStop();
         return "stoped: success";
     }
 
+    public String halt(JSONArray args){
+        Countly.sharedInstance().halt();
+        return "halt: success";
+    }
+
 
 
     // public String eventSendThreshold(JSONArray args){

diff --git a/src/ios/CountlyCordova.h b/src/ios/CountlyCordova.h
@@ -11,6 +11,7 @@
 - (void)sendRating:(CDVInvokedUrlCommand*)command;
 - (void)start:(CDVInvokedUrlCommand*)command;
 - (void)update:(CDVInvokedUrlCommand*)command;
+- (void)halt:(CDVInvokedUrlCommand*)command;
 - (void)manualSessionHandling:(CDVInvokedUrlCommand*)command;
 - (void)stop:(CDVInvokedUrlCommand*)command;
 - (void)updateSessionPeriod:(CDVInvokedUrlCommand*)command;

diff --git a/src/ios/CountlyCordova.m b/src/ios/CountlyCordova.m
@@ -111,6 +111,31 @@ - (void)start:(CDVInvokedUrlCommand*)command
      }];
 }
 
+
+- (void)stop:(CDVInvokedUrlCommand*)command
+{
+    if(countlyNative == nil){
+        countlyNative = CountlyNative.new;
+    }
+    [countlyNative onCall: @"stop" commandString: command.arguments callback: ^(NSString * theResult)
+     {
+         CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString: theResult];
+         [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+     }];
+}
+
+
+- (void)halt:(CDVInvokedUrlCommand*)command
+{
+    if(countlyNative == nil){
+        countlyNative = CountlyNative.new;
+    }
+    [countlyNative onCall: @"halt" commandString: command.arguments callback: ^(NSString * theResult)
+     {
+         CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString: theResult];
+         [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+     }];
+}
 - (void)update:(CDVInvokedUrlCommand*)command
 {
     if(countlyNative == nil){
@@ -135,17 +160,6 @@ - (void)update:(CDVInvokedUrlCommand*)command
 //      }];
 // }
 
-- (void)stop:(CDVInvokedUrlCommand*)command
-{
-    if(countlyNative == nil){
-        countlyNative = CountlyNative.new;
-    }
-    [countlyNative onCall: @"stop" commandString: command.arguments callback: ^(NSString * theResult)
-     {
-         CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString: theResult];
-         [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-     }];
-}
 
 // - (void)updateSessionPeriod:(CDVInvokedUrlCommand*)command
 // {

diff --git a/src/ios/CountlyNative.m b/src/ios/CountlyNative.m
@@ -127,6 +127,12 @@ - (void) onCall:(NSString *)method commandString:(NSArray *)command callback:(Re
         [Countly.sharedInstance beginSession];
         result(@"start!");
 
+    }else if ([@"stop" isEqualToString:method]) {
+        [Countly.sharedInstance endSession];
+        result(@"stop!");
+    }else if ([@"halt" isEqualToString:method]) { // This method is not implemented in iOS SDK
+        // [Countly.sharedInstance endSession];
+        result(@"No implemntation for halt!");
     }else if ([@"update" isEqualToString:method]) {
         [Countly.sharedInstance updateSession];
         result(@"update!");
@@ -136,10 +142,6 @@ - (void) onCall:(NSString *)method commandString:(NSArray *)command callback:(Re
     //     config.manualSessionHandling = YES;
     //     result(@"manualSessionHandling!");
 
-    }else if ([@"stop" isEqualToString:method]) {
-        [Countly.sharedInstance endSession];
-        result(@"stop!");
-
     // }else if ([@"updateSessionPeriod" isEqualToString:method]) {
     //     config.updateSessionPeriod = [[command objectAtIndex:0] intValue];
     //     result(@"updateSessionPeriod!");