Merge pull request #500 from Countly/hc_metrics_reverse

Hc metrics reverse

Author: turtledreams

CHANGELOG.md

@@ -2,6 +2,7 @@
 * Improved disk size calculation in crash reports.
 * Added "setRequestTimeoutDuration(requestTimeoutDuration)" init config method configure request timeout in seconds.
 
+* Rolled back Health Check metric information to previous state.
 * Mitigated an issue displaying Content on API level 35 and above.
 
 ## 25.4.3

sdk/src/main/java/ly/count/android/sdk/DeviceInfo.java

@@ -675,6 +675,32 @@ String getMetrics(@NonNull final Context context, @Nullable final Map<String, St
         return result;
     }
 
+    @NonNull
+    String getMetricsHealthCheck(@NonNull final Context context, @Nullable final Map<String, String> metricOverride) {
+        Map<String, Object> metrics = new ConcurrentHashMap<>();
+
+        String appVersion = mp.getAppVersion(context);
+
+        if (metricOverride != null) {
+            if (metricOverride.containsKey("_app_version")) {
+                appVersion = metricOverride.get("_app_version");
+            }
+        }
+
+        metrics.put("_app_version", appVersion);
+
+        String result = new JSONObject(metrics).toString();
+
+        try {
+            result = java.net.URLEncoder.encode(result, "UTF-8");
+        } catch (UnsupportedEncodingException ex) {
+            // should never happen because Android guarantees UTF-8 support
+            Countly.sharedInstance().L.e("[getMetrics] encode failed, [" + ex + "]");
+        }
+
+        return result;
+    }
+
     /**
      * Returns a JSON object containing the device crash report
      */

sdk/src/main/java/ly/count/android/sdk/ModuleHealthCheck.java

@@ -62,7 +62,7 @@ void sendHealthCheck() {
 
         healthCheckSent = true;
 
-        String preparedMetrics = deviceInfo.getMetrics(_cly.context_, _cly.config_.metricOverride, L);
+        String preparedMetrics = deviceInfo.getMetricsHealthCheck(_cly.context_, _cly.config_.metricOverride);
 
         StringBuilder requestData = new StringBuilder(requestQueueProvider.prepareHealthCheckRequest(preparedMetrics));
         ConnectionProcessor cp = requestQueueProvider.createConnectionProcessor();