From 74afc381d800d0d949f08e960910132e5614fa00 Mon Sep 17 00:00:00 2001
From: ijunaid <mjunaid.akram@yahoo.com>
Date: Tue, 15 Dec 2020 22:12:54 +0500
Subject: [PATCH] [sdk-184] APM fixes app_start, foreground and background
 tracking. (#80)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* — APM changes implemented for app_start, foreground and background.
— old iOS platform check was not working fixed.
- android plugin auto initialise implemented

* Example app updated for APM changes

* onLoad callback added in example app.

* Changelog file added

* Changelog updated

* Update Countly.js

Added missing bracket
---
 CHANGELOG.md                    | 11 +++++++++++
 Countly.js                      | 21 +++++++++++++++++---
 change.log                      | 34 ---------------------------------
 hooks/createService.js          |  4 ++--
 index.html                      | 14 ++++++++++----
 plugin.xml                      |  1 +
 src/android/CountlyCordova.java | 32 ++++++++++++++++++++++++++++++-
 src/android/CountlyNative.java  | 25 +++++++++++++++++++++++-
 src/ios/CountlyCordova.h        |  1 +
 src/ios/CountlyCordova.m        | 12 ++++++++++++
 src/ios/CountlyNative.m         |  6 ++++++
 11 files changed, 116 insertions(+), 45 deletions(-)
 create mode 100644 CHANGELOG.md
 delete mode 100644 change.log

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..29cf94a
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,11 @@
+## 20.11.0
+* !! Consent change !! To use remote config, you now need to give "remote-config" consent
+* !! Push breaking changes !! Google play vulnerability issue fixed due to broadcast receiver for android push notification
+* Added Surveys and NPS feedback widgets
+* Added replaceAllAppKeysInQueueWithCurrentAppKey method to replace all app keys in queue with the current app key
+* Added removeDifferentAppKeysFromQueue method to remove all different app keys from the queue
+* Added setStarRatingDialogTexts method to set text's for different fields of star rating dialog
+* Updated underlying android SDK to 20.11.2
+* Updated underlying ios SDK to 20.11.1
+
+## 20.4.0
diff --git a/Countly.js b/Countly.js
index 19590fb..7fc0a85 100644
--- a/Countly.js
+++ b/Countly.js
@@ -4,12 +4,11 @@ Countly.appKey = "";
 Countly.ready = false;
 Countly.version = "20.11.0";
 Countly.isDebug = false;
-var userAgent = navigator.userAgent || navigator.vendor || window.opera;
-if (/android/i.test(userAgent)) {
+if (window.cordova.platformId == "android") {
     Countly.isAndroid = true;
     Countly.messagingMode = {"TEST": "2", "PRODUCTION": "0"};
 }
-if (/iPad|iPhone|iPod/.test(userAgent) && !window.MSStream) {
+if (window.cordova.platformId == "ios") {
     Countly.isiOS = true;
     Countly.messagingMode = {"TEST": "1", "PRODUCTION": "0", "ADHOC": "2"};
 }
@@ -520,6 +519,22 @@ Countly.askForFeedback = function(widgetId, buttonText){
     cordova.exec(Countly.onSuccess,Countly.onError,"CountlyCordova","askForFeedback",[widgetId, buttonText || ""]);
 }
 
+// Call this function when app is loaded, so that the app launch duration can be recorded.
+// Should be call after init.
+Countly.appLoadingFinished = async function(){
+    Countly.isInitialized().then((result) => {
+    if(result != "true") {
+        if(Countly.isDebug){
+            console.warn('[CountlyCordova] appLoadingFinished, init must be called before appLoadingFinished');
+        }
+        return;
+    }
+    },(err) => {
+        console.error(err);
+    });
+    cordova.exec(Countly.onSuccess,Countly.onError,"CountlyCordova","appLoadingFinished",[]);
+}
+
 /**
  * Get a list of available feedback widgets for this device ID
  */
diff --git a/change.log b/change.log
deleted file mode 100644
index bdf5fba..0000000
--- a/change.log
+++ /dev/null
@@ -1,34 +0,0 @@
-Developer release notes.
-
-plugin.xml update version
-package.json update version
-package.js update version, update app.use version of meteor.js
-Countly.js update version
-ionic.countly.js update version
-create tag / release based on the same version
-Sync Countly.js with ngCountly.js some angular customer depends on it.
-
-Updating index.html should also update ionic/home.html
-
-Making a new release on github, should also release on npm and meteor.
-Make sure all of them have the same versioning.
-
-Apply documentation to the sdk, for a newbie to understand.
-
-Provide callback to the user instead of handling the callback manually.
-
-Please review the documentation once the changes are made.
-
-npm publish --release
-meteor publish
-
-1.  Update both sdk to 18.08.1
-2.  review plugin.xml files
-   (ProxyActivity in xml file)
-   (review both code to confirm no outling files)
-   `Notification channels` there
-3.  Test push on android 8 and 9 version
-4.  Make a release on meteor community.
-
-Change quest to Gorkem
-1. Change header "Phonegap, Icenium & Meteor" -> "Cordova" to keep it simple
diff --git a/hooks/createService.js b/hooks/createService.js
index 7f7e7bd..05e7cd4 100644
--- a/hooks/createService.js
+++ b/hooks/createService.js
@@ -41,8 +41,8 @@ module.exports = function(context) {
             });
 
             var countlyFiles = [
-                __dirname +'/../../../platforms/ios/Pods/Countly/' +'CountlyNotificationService.h',
-                __dirname +'/../../../platforms/ios/Pods/Countly/' +'CountlyNotificationService.m'
+                __dirname +'/../../../platforms/ios/Pods/CountlyPod/' +'CountlyNotificationService.h',
+                __dirname +'/../../../platforms/ios/Pods/CountlyPod/' +'CountlyNotificationService.m'
             ];
             extFiles.push(countlyFiles[0]);
             extFiles.push(countlyFiles[1]);
diff --git a/index.html b/index.html
index 965c126..d0e4dc5 100644
--- a/index.html
+++ b/index.html
@@ -18,11 +18,10 @@
     <title>Countly Cordova Demo App</title>
 </head>
 
-<body>
+<body onload="onBodyLoad()">
     <div class="app">
         <h1 class="ui center aligned header">Countly Cordova Demo App</h1>
         <img class="ui centered medium image" src="http://try.count.ly/images/dashboard/countly_logo.svg">
-        <button onclick="app.init()" class="fluid ui green button">Init</button>
         <button onclick="app.start()" class="fluid ui green button">Start</button>
         <button onclick="app.stop()" class="fluid ui red button">Stop</button>
         <button onclick="app.halt()" class="fluid ui red button">Halt</button>
@@ -147,12 +146,18 @@ <h1 class="ui center aligned header">Countly Cordova Demo App</h1>
 
     </div>
     <script type="text/javascript">
-        document.addEventListener("deviceready", function(){
+        function onBodyLoad() {
+            console.log("[CountlyCordova] onBodyLoad");
+            document.addEventListener("deviceready", onDeviceReady, false);
+        }
+        
+        function onDeviceReady() {
             console.log("[CountlyCordova] deviceready");
             Countly.onNotification(function(theNotification){
                 console.log("[CountlyCordova] onNotification : " + JSON.stringify(theNotification));
             });
-        });
+            app.init();
+        }
     app = {};
     function makeid() {
         var text = "";
@@ -188,6 +193,7 @@ <h1 class="ui center aligned header">Countly Cordova Demo App</h1>
                 Countly.pushTokenType(Countly.messagingMode.TEST); // Set messaging mode for push notifications
                 
                 Countly.init("https://try.count.ly", "YOUR_API_KEY").then((result) => {
+                    Countly.appLoadingFinished();
                 Countly.setStarRatingDialogTexts("Title", "Message", "Dismiss");
                     /** 
                      * Push notifications settings 
diff --git a/plugin.xml b/plugin.xml
index b813df5..8d2ccd6 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -74,6 +74,7 @@
     <config-file target="res/xml/config.xml" parent="/*">
       <feature name="CountlyCordova">
         <param name="android-package" value="ly.count.android.sdk.CountlyCordova" />
+        <param name="onload" value="true" />
       </feature>
       <preference name="GradlePluginGoogleServicesEnabled" value="true" />
       <preference name="GradlePluginGoogleServicesVersion" value="4.2.0" />
diff --git a/src/android/CountlyCordova.java b/src/android/CountlyCordova.java
index 6db400e..ff0cdda 100644
--- a/src/android/CountlyCordova.java
+++ b/src/android/CountlyCordova.java
@@ -25,12 +25,23 @@ public enum CountlyMessagingMode {
         TEST,
         PRODUCTION,
     }
-    public boolean execute(String action, JSONArray args, CallbackContext callbackContext) throws JSONException {
+
+    @Override
+    public void initialize(CordovaInterface cordova, CordovaWebView webView) {
+        super.initialize(cordova, webView);
         Context context = this.cordova.getActivity().getApplicationContext();
         if(countlyNative == null){
             countlyNative = new CountlyNative( this.cordova.getActivity(), this.cordova.getActivity().getApplicationContext());
         }
+    }
+
+    @Override
+    public void pluginInitialize() {
 
+    }
+    public boolean execute(String action, JSONArray args, CallbackContext callbackContext) throws JSONException {
+        Context context = this.cordova.getActivity().getApplicationContext();
+        
         if ("init".equals(action)) {
             callbackContext.success(countlyNative.init(args));
         }
@@ -230,6 +241,9 @@ public void callback(String result) {
                 }
             });
         }
+        else if("appLoadingFinished".equals(action)){
+            callbackContext.success(countlyNative.appLoadingFinished(args));
+        }
         else if ("getFeedbackWidgets".equals(action)) {
             countlyNative.getFeedbackWidgets(args, new CountlyNative.JSONObjectCallback() {
                 @Override
@@ -292,4 +306,20 @@ else if("enableApm".equals(action)){
         return true;
   }
 
+    @Override
+    public void onResume(boolean multitasking) {
+        super.onResume(multitasking);
+        countlyNative.onHostResume();
+    }
+
+    @Override
+    public void onPause(boolean multitasking) {
+        super.onPause(multitasking);
+        countlyNative.onHostPause();
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+    }
 }
diff --git a/src/android/CountlyNative.java b/src/android/CountlyNative.java
index 417c039..d47b2c2 100644
--- a/src/android/CountlyNative.java
+++ b/src/android/CountlyNative.java
@@ -46,6 +46,7 @@ public class CountlyNative {
     private CountlyConfig config = new CountlyConfig();
     private static Callback notificationListener = null;
     private static String lastStoredNotification = null;
+
     private final Set<String> validConsentFeatureNames = new HashSet<String>(Arrays.asList(
             Countly.CountlyFeatureNames.sessions,
             Countly.CountlyFeatureNames.events,
@@ -63,6 +64,9 @@ public class CountlyNative {
     public CountlyNative(Activity _activity, Context _context){
         this.activity = _activity;
         this.context = _context;
+        Countly.sharedInstance();
+        this.config.enableManualAppLoadedTrigger();
+        this.config.enableManualForegroundBackgroundTriggerAPM();
     }
     public static void onNotification(Map<String, String>  notification){
         JSONObject json = new JSONObject(notification);
@@ -113,6 +117,8 @@ public String init(JSONArray args){
                 this.config.setApplication(activity.getApplication());
             }
             Countly.sharedInstance().init(this.config);
+            Countly.sharedInstance().apm().triggerForeground();
+
             return "initialized: success";
         }catch (JSONException jsonException){
             return jsonException.toString();
@@ -904,6 +910,11 @@ public String askForStarRating(JSONArray args){
         return "askForStarRating success.";
     }
 
+    public String appLoadingFinished(JSONArray args){
+        this.log("appLoadingFinished", args);
+        Countly.sharedInstance().apm().setAppIsLoaded();
+        return "appLoadingFinished success!";
+    }
     public String getFeedbackWidgets(JSONArray args, final JSONObjectCallback theCallback){
         Countly.sharedInstance().feedback().getAvailableFeedbackWidgets(new RetrieveFeedbackWidgets() {
             @Override
@@ -1066,7 +1077,7 @@ public String recordNetworkTrace(JSONArray args){
 
     public String enableApm(JSONArray args){
         this.log("enableApm", args);
-        this.config.setRecordAppStartTime(false);
+        this.config.setRecordAppStartTime(true);
         return "enableApm success.";
     }
 
@@ -1098,5 +1109,17 @@ static void log(String message, Throwable tr, LogLevel logLevel)  {
         }
     }
 
+    public void onHostResume() {
+        if(Countly.sharedInstance().isInitialized()) {
+            Countly.sharedInstance().apm().triggerForeground();
+        }
+    }
+
+    public void onHostPause() {
+        if(Countly.sharedInstance().isInitialized()) {
+            Countly.sharedInstance().apm().triggerBackground();
+        }
+    }
+
 
 }
diff --git a/src/ios/CountlyCordova.h b/src/ios/CountlyCordova.h
index 3d0bdca..190fbc6 100644
--- a/src/ios/CountlyCordova.h
+++ b/src/ios/CountlyCordova.h
@@ -82,5 +82,6 @@
 - (void)endTrace:(CDVInvokedUrlCommand*)command;
 - (void)recordNetworkTrace:(CDVInvokedUrlCommand*)command;
 - (void)enableApm:(CDVInvokedUrlCommand*)command;
+- (void)appLoadingFinished:(CDVInvokedUrlCommand*)command;
 
 @end
diff --git a/src/ios/CountlyCordova.m b/src/ios/CountlyCordova.m
index 058f439..6f8bb4e 100644
--- a/src/ios/CountlyCordova.m
+++ b/src/ios/CountlyCordova.m
@@ -863,5 +863,17 @@ - (void)enableApm:(CDVInvokedUrlCommand*)command
      }];
 }
 
+- (void)appLoadingFinished:(CDVInvokedUrlCommand*)command
+{
+    if(countlyNative == nil){
+        countlyNative = CountlyNative.new;
+    }
+    [countlyNative onCall: @"appLoadingFinished" commandString: command.arguments callback: ^(NSString * theResult)
+     {
+         CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString: theResult];
+         [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+     }];
+}
+
 
 @end
diff --git a/src/ios/CountlyNative.m b/src/ios/CountlyNative.m
index c2bf321..2a474fa 100644
--- a/src/ios/CountlyNative.m
+++ b/src/ios/CountlyNative.m
@@ -1042,6 +1042,12 @@ - (void) onCall:(NSString *)method commandString:(NSArray *)command callback:(Re
         config.enablePerformanceMonitoring = YES;
         result(@"enableApm!");
 
+    }else if ([@"appLoadingFinished" isEqualToString:method]) {
+        dispatch_async(dispatch_get_main_queue(), ^ {
+            [Countly.sharedInstance appLoadingFinished];
+        });
+        result(@"appLoadingFinished!");
+
     } else {
         COUNTLY_CORDOVA_LOG(@"Countly Bridge Method Not Implemented %@", method);
         result(@"Countly Bridge Method Not Implemented");