From 0bcf43d232c23688298efdb211369db62a0d8361 Mon Sep 17 00:00:00 2001
From: donghongyu <donghongyu@zhidaoauto.om>
Date: Wed, 30 Oct 2024 16:23:09 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=8CCountly=E3=80=8D=201=E3=80=81=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=8D=E5=B1=80=E5=9F=9F=E7=BD=91=E8=B0=83=E9=80=9A=E4=BA=86?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E9=93=BE=E8=B7=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/cloud/MoGoApplication.java  |  2 +-
 .../src/main/AndroidManifest.xml              |  1 +
 .../java/ly/count/android/benchmark/App.java  | 18 +++++++------
 .../main/res/xml/network_security_config.xml  |  4 +++
 .../app-kotlin/src/main/AndroidManifest.xml   |  1 +
 .../java/ly/count/android/demo/kotlin/App.kt  | 12 ++++-----
 .../main/res/xml/network_security_config.xml  |  4 +++
 .../app-native/src/main/AndroidManifest.xml   | 10 +++++--
 .../java/ly/count/android/demo/crash/App.java | 26 +++++++++++--------
 .../main/res/xml/network_security_config.xml  |  4 +++
 .../countly/app/src/main/AndroidManifest.xml  |  1 +
 .../main/java/ly/count/android/demo/App.java  | 16 ++++++------
 .../main/res/xml/network_security_config.xml  |  4 +++
 13 files changed, 67 insertions(+), 36 deletions(-)
 create mode 100644 libraries/countly/app-benchmark/src/main/res/xml/network_security_config.xml
 create mode 100644 libraries/countly/app-kotlin/src/main/res/xml/network_security_config.xml
 create mode 100644 libraries/countly/app-native/src/main/res/xml/network_security_config.xml
 create mode 100644 libraries/countly/app/src/main/res/xml/network_security_config.xml

diff --git a/app/src/main/java/com/mogo/cloud/MoGoApplication.java b/app/src/main/java/com/mogo/cloud/MoGoApplication.java
index 99da621..0fd3b4d 100644
--- a/app/src/main/java/com/mogo/cloud/MoGoApplication.java
+++ b/app/src/main/java/com/mogo/cloud/MoGoApplication.java
@@ -25,7 +25,7 @@ public class MoGoApplication extends MultiDexApplication {
     private static final String TAG = "MoGoApplication";
 
 
-    private String COUNTLY_APP_KEY = "b03e1aeb596d75cc8a7d186db0889ed7d1f55ce1";
+    private String COUNTLY_APP_KEY = "5efc02a15444c88cbf8056ec66ab291ea3cd3240";
     private String COUNTLY_SERVER_URL = "http://172.30.10.190";
 
     @Override
diff --git a/libraries/countly/app-benchmark/src/main/AndroidManifest.xml b/libraries/countly/app-benchmark/src/main/AndroidManifest.xml
index 8007939..0fcaf2b 100644
--- a/libraries/countly/app-benchmark/src/main/AndroidManifest.xml
+++ b/libraries/countly/app-benchmark/src/main/AndroidManifest.xml
@@ -14,6 +14,7 @@
         android:allowBackup="false"
         android:icon="@mipmap/icon"
         android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true">
         <activity
diff --git a/libraries/countly/app-benchmark/src/main/java/ly/count/android/benchmark/App.java b/libraries/countly/app-benchmark/src/main/java/ly/count/android/benchmark/App.java
index 9cc20a6..8070d9a 100644
--- a/libraries/countly/app-benchmark/src/main/java/ly/count/android/benchmark/App.java
+++ b/libraries/countly/app-benchmark/src/main/java/ly/count/android/benchmark/App.java
@@ -1,6 +1,7 @@
 package ly.count.android.benchmark;
 
 import android.app.Application;
+
 import ly.count.android.sdk.Countly;
 import ly.count.android.sdk.CountlyConfig;
 import ly.count.android.sdk.CountlyStore;
@@ -8,8 +9,8 @@ import ly.count.android.sdk.ModuleLog;
 import ly.count.android.sdk.PerformanceCounterCollector;
 
 public class App extends Application {
-    private final static String COUNTLY_SERVER_URL = "https://xxx.count.ly";
-    private final static String COUNTLY_APP_KEY = "YOUR_APP_KEY";
+    private final static String COUNTLY_SERVER_URL = "http://172.30.10.190";
+    private final static String COUNTLY_APP_KEY = "5efc02a15444c88cbf8056ec66ab291ea3cd3240";
     private final static String DEVICE_ID = "YOUR_DEVICE_ID";
 
     public static PerformanceCounterCollector appPcc;
@@ -19,12 +20,13 @@ public class App extends Application {
         super.onCreate();
 
         CountlyConfig config = new CountlyConfig(this, COUNTLY_APP_KEY, COUNTLY_SERVER_URL)
-            .setDeviceId(DEVICE_ID)
-            .setLoggingEnabled(true)
-            .giveAllConsents()
-            .setRequestDropAgeHours(10)//to trigger the age blocks
-            .setEventQueueSizeToSend(100)//for testing the main use case
-            .setParameterTamperingProtectionSalt("test-benchmark-salt");
+                .setDeviceId(DEVICE_ID)
+                .setLoggingEnabled(true)
+                .giveAllConsents()
+                .setRequestDropAgeHours(10)//to trigger the age blocks
+                .setEventQueueSizeToSend(100)//for testing the main use case
+                .setHttpPostForced(true)
+                .setParameterTamperingProtectionSalt("mogo_auto");
 
         appPcc = new PerformanceCounterCollector();
         config.pcc = appPcc;
diff --git a/libraries/countly/app-benchmark/src/main/res/xml/network_security_config.xml b/libraries/countly/app-benchmark/src/main/res/xml/network_security_config.xml
new file mode 100644
index 0000000..dca93c0
--- /dev/null
+++ b/libraries/countly/app-benchmark/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true" />
+</network-security-config>
\ No newline at end of file
diff --git a/libraries/countly/app-kotlin/src/main/AndroidManifest.xml b/libraries/countly/app-kotlin/src/main/AndroidManifest.xml
index 5987f38..af393eb 100644
--- a/libraries/countly/app-kotlin/src/main/AndroidManifest.xml
+++ b/libraries/countly/app-kotlin/src/main/AndroidManifest.xml
@@ -10,6 +10,7 @@
       android:allowBackup="true"
       android:label="@string/app_name"
       android:supportsRtl="true"
+      android:networkSecurityConfig="@xml/network_security_config"
       android:theme="@style/Theme.Kotlin">
     <activity
         android:name=".MainActivity"
diff --git a/libraries/countly/app-kotlin/src/main/java/ly/count/android/demo/kotlin/App.kt b/libraries/countly/app-kotlin/src/main/java/ly/count/android/demo/kotlin/App.kt
index 9dd9dc0..1889c55 100644
--- a/libraries/countly/app-kotlin/src/main/java/ly/count/android/demo/kotlin/App.kt
+++ b/libraries/countly/app-kotlin/src/main/java/ly/count/android/demo/kotlin/App.kt
@@ -9,15 +9,15 @@ import ly.count.android.sdk.CountlyConfig
  * Main Application class
  */
 class App : Application() {
-  private val COUNTLY_SERVER_URL = "https://your.server.ly"
-  private val COUNTLY_APP_KEY = "YOUR_APP_KEY"
+  private val COUNTLY_SERVER_URL = "http://172.30.10.190"
+  private val COUNTLY_APP_KEY = "5efc02a15444c88cbf8056ec66ab291ea3cd3240"
   override fun onCreate() {
     super.onCreate()
 
-//    if (COUNTLY_SERVER_URL == "https://your.server.ly" || COUNTLY_APP_KEY == "YOUR_APP_KEY") {
-//      Log.e("CountlyDemo", "Please provide correct COUNTLY_SERVER_URL and COUNTLY_APP_KEY")
-//      return
-//    }
+    if (COUNTLY_SERVER_URL == "https://your.server.ly" || COUNTLY_APP_KEY == "YOUR_APP_KEY") {
+      Log.e("CountlyDemo", "Please provide correct COUNTLY_SERVER_URL and COUNTLY_APP_KEY")
+      return
+    }
 
     val countlyConfig = CountlyConfig(
       this,
diff --git a/libraries/countly/app-kotlin/src/main/res/xml/network_security_config.xml b/libraries/countly/app-kotlin/src/main/res/xml/network_security_config.xml
new file mode 100644
index 0000000..dca93c0
--- /dev/null
+++ b/libraries/countly/app-kotlin/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true" />
+</network-security-config>
\ No newline at end of file
diff --git a/libraries/countly/app-native/src/main/AndroidManifest.xml b/libraries/countly/app-native/src/main/AndroidManifest.xml
index 31ac7e9..6987ff4 100644
--- a/libraries/countly/app-native/src/main/AndroidManifest.xml
+++ b/libraries/countly/app-native/src/main/AndroidManifest.xml
@@ -1,15 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="ly.count.android.demo.crash">
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
     <application
         android:name=".App"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity"
+        <activity
+            android:name=".MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/libraries/countly/app-native/src/main/java/ly/count/android/demo/crash/App.java b/libraries/countly/app-native/src/main/java/ly/count/android/demo/crash/App.java
index 88a7d1d..7c2d190 100644
--- a/libraries/countly/app-native/src/main/java/ly/count/android/demo/crash/App.java
+++ b/libraries/countly/app-native/src/main/java/ly/count/android/demo/crash/App.java
@@ -2,32 +2,36 @@ package ly.count.android.demo.crash;
 
 import android.app.Application;
 import android.util.Log;
+
 import ly.count.android.sdk.Countly;
 import ly.count.android.sdk.CountlyConfig;
 import ly.count.android.sdknative.CountlyNative;
 
 public class App extends Application {
 
-    private final static String COUNTLY_SERVER_URL = "https://your.server.ly";
-    private final static String COUNTLY_APP_KEY = "YOUR_APP_KEY";
+    private final static String COUNTLY_SERVER_URL = "http://172.30.10.190";
+    private final static String COUNTLY_APP_KEY = "5efc02a15444c88cbf8056ec66ab291ea3cd3240";
     private final static String DEFAULT_URL = "https://your.server.ly";
     private final static String DEFAULT_APP_KEY = "YOUR_APP_KEY";
 
-    @Override public void onCreate() {
+    @Override
+    public void onCreate() {
         super.onCreate();
 
-//        if (DEFAULT_URL.equals(COUNTLY_SERVER_URL) || DEFAULT_APP_KEY.equals(COUNTLY_APP_KEY)) {
-//            Log.e("CountlyCrashDemo", "Please provide correct COUNTLY_SERVER_URL and COUNTLY_APP_KEY");
-//            return;
-//        }
+        if (DEFAULT_URL.equals(COUNTLY_SERVER_URL) || DEFAULT_APP_KEY.equals(COUNTLY_APP_KEY)) {
+            Log.e("CountlyCrashDemo", "Please provide correct COUNTLY_SERVER_URL and COUNTLY_APP_KEY");
+            return;
+        }
 
         Countly.applicationOnCreate();
 
         CountlyConfig config = new CountlyConfig(this, COUNTLY_APP_KEY, COUNTLY_SERVER_URL).setDeviceId("4432")
-            .setLoggingEnabled(true)
-            .enableCrashReporting()
-            .setViewTracking(true)
-            .setRequiresConsent(false);
+                .setLoggingEnabled(true)
+                .enableCrashReporting()
+                .setViewTracking(true)
+                .setHttpPostForced(true)
+                .setParameterTamperingProtectionSalt("mogo_auto")
+                .setRequiresConsent(false);
         Countly.sharedInstance().init(config);
 
         CountlyNative.initNative(getApplicationContext());
diff --git a/libraries/countly/app-native/src/main/res/xml/network_security_config.xml b/libraries/countly/app-native/src/main/res/xml/network_security_config.xml
new file mode 100644
index 0000000..dca93c0
--- /dev/null
+++ b/libraries/countly/app-native/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true" />
+</network-security-config>
\ No newline at end of file
diff --git a/libraries/countly/app/src/main/AndroidManifest.xml b/libraries/countly/app/src/main/AndroidManifest.xml
index 9df57ad..34b1439 100644
--- a/libraries/countly/app/src/main/AndroidManifest.xml
+++ b/libraries/countly/app/src/main/AndroidManifest.xml
@@ -17,6 +17,7 @@
       android:allowBackup="false"
       android:icon="@mipmap/icon"
       android:label="@string/app_name"
+      android:networkSecurityConfig="@xml/network_security_config"
       android:theme="@style/AppTheme">
     <activity
         android:name=".MainActivity"
diff --git a/libraries/countly/app/src/main/java/ly/count/android/demo/App.java b/libraries/countly/app/src/main/java/ly/count/android/demo/App.java
index 27ec26b..57ec8ea 100644
--- a/libraries/countly/app/src/main/java/ly/count/android/demo/App.java
+++ b/libraries/countly/app/src/main/java/ly/count/android/demo/App.java
@@ -30,8 +30,8 @@ import static ly.count.android.sdk.messaging.CountlyPush.COUNTLY_BROADCAST_PERMI
 
 public class App extends Application {
     /** You should use try.count.ly instead of YOUR_SERVER for the line below if you are using Countly trial service */
-    private final static String COUNTLY_SERVER_URL = "https://your.server.ly";
-    private final static String COUNTLY_APP_KEY = "YOUR_APP_KEY";
+    private final static String COUNTLY_SERVER_URL = "http://172.30.10.190";
+    private final static String COUNTLY_APP_KEY = "5efc02a15444c88cbf8056ec66ab291ea3cd3240";
     private final static String DEFAULT_URL = "https://your.server.ly";
     private final static String DEFAULT_APP_KEY = "YOUR_APP_KEY";
 
@@ -41,10 +41,10 @@ public class App extends Application {
     public void onCreate() {
         super.onCreate();
 
-//        if (DEFAULT_URL.equals(COUNTLY_SERVER_URL) || DEFAULT_APP_KEY.equals(COUNTLY_APP_KEY)) {
-//            Log.e("CountlyDemo", "Please provide correct COUNTLY_SERVER_URL and COUNTLY_APP_KEY");
-//            return;
-//        }
+        if (DEFAULT_URL.equals(COUNTLY_SERVER_URL) || DEFAULT_APP_KEY.equals(COUNTLY_APP_KEY)) {
+            Log.e("CountlyDemo", "Please provide correct COUNTLY_SERVER_URL and COUNTLY_APP_KEY");
+            return;
+        }
 
         if (false) {
             //setting up strict mode for additional validation
@@ -209,8 +209,8 @@ public class App extends Application {
             //    Countly.CountlyFeatureNames.apm, Countly.CountlyFeatureNames.remoteConfig, Countly.CountlyFeatureNames.feedback
             //})
 
-            .setHttpPostForced(false)
-            .setParameterTamperingProtectionSalt("test-salt-checksum")
+            .setHttpPostForced(true)
+            .setParameterTamperingProtectionSalt("mogo_auto")
             .addCustomNetworkRequestHeaders(customHeaderValues)
             //.enableCertificatePinning(certificates)
             //.enablePublicKeyPinning(certificates)
diff --git a/libraries/countly/app/src/main/res/xml/network_security_config.xml b/libraries/countly/app/src/main/res/xml/network_security_config.xml
new file mode 100644
index 0000000..dca93c0
--- /dev/null
+++ b/libraries/countly/app/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true" />
+</network-security-config>
\ No newline at end of file