feat: disk metric impl

Author: arifBurakDemiray

sdk/src/androidTest/java/ly/count/android/sdk/DeviceInfoTests.java

@@ -31,7 +31,6 @@ of this software and associated documentation files (the "Software"), to deal
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
-import java.util.AbstractMap;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -330,9 +329,9 @@ public void testMetricProviderOverride_fullOverride() {
         assertEquals("Z", deviceInfo.mp.hasHinge(TestUtils.getContext()));
         assertEquals("88", deviceInfo.mp.getRunningTime());
 
-        Map.Entry<String, String> diskSpaces = deviceInfo.mp.getDiskSpaces(TestUtils.getContext());
-        assertEquals("45", diskSpaces.getKey());
-        assertEquals("23", diskSpaces.getValue());
+        DiskMetric diskMetric = deviceInfo.mp.getDiskSpaces(TestUtils.getContext());
+        assertEquals("45", diskMetric.totalMb);
+        assertEquals("23", diskMetric.usedMb);
     }
 
     @Test
@@ -384,15 +383,15 @@ public void testMetricProviderOverride_emptyOverride() {
     @Test
     public void testMetricProviderOverride_diskSpacesOverride() {
         MetricProvider diskOverride = new MetricProvider() {
-            @Override public Map.Entry<String, String> getDiskSpaces(Context context) {
-                return new AbstractMap.SimpleEntry<>("100", "50");
+            @Override public DiskMetric getDiskSpaces(Context context) {
+                return new DiskMetric("100", "50");
             }
         };
         DeviceInfo deviceInfo = new DeviceInfo(diskOverride);
 
-        Map.Entry<String, String> diskSpaces = deviceInfo.mp.getDiskSpaces(TestUtils.getContext());
-        assertEquals("100", diskSpaces.getKey());
-        assertEquals("50", diskSpaces.getValue());
+        DiskMetric diskMetric = deviceInfo.mp.getDiskSpaces(TestUtils.getContext());
+        assertEquals("100", diskMetric.totalMb);
+        assertEquals("50", diskMetric.usedMb);
 
         // other metrics should be defaults
         assertEquals("Android", deviceInfo.mp.getOS());

sdk/src/androidTest/java/ly/count/android/sdk/MockedMetricProvider.java

@@ -4,8 +4,6 @@
 import android.util.DisplayMetrics;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import java.util.AbstractMap;
-import java.util.Map;
 
 public class MockedMetricProvider implements MetricProvider {
 
@@ -113,7 +111,7 @@ public MockedMetricProvider() {
         return new DisplayMetrics();
     }
 
-    @Override public Map.Entry<String, String> getDiskSpaces(Context context) {
-        return new AbstractMap.SimpleEntry<>("45", "23");
+    @Override public DiskMetric getDiskSpaces(Context context) {
+        return new DiskMetric("45", "23");
     }
 }

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

@@ -45,7 +45,6 @@ of this software and associated documentation files (the "Software"), to deal
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.io.UnsupportedEncodingException;
-import java.util.AbstractMap;
 import java.util.Date;
 import java.util.Locale;
 import java.util.Map;
@@ -310,8 +309,8 @@ public String getOpenGL(Context context) {
             }
 
             @NonNull
-            public Map.Entry<String, String> getDiskSpaces(Context context) {
-                Map.Entry<String, String> ov = DeviceInfo.this.mpOverride.getDiskSpaces(context);
+            public DiskMetric getDiskSpaces(Context context) {
+                DiskMetric ov = DeviceInfo.this.mpOverride.getDiskSpaces(context);
                 if (ov != null) return ov;
                 long totalBytes = 0;
                 long usedBytes = 0;
@@ -352,7 +351,7 @@ public Map.Entry<String, String> getDiskSpaces(Context context) {
                 long usedMb = usedBytes / 1024 / 1024;
 
                 Countly.sharedInstance().L.d("[DeviceInfo] getDiskSpaces, totalSpaceInMB:[" + totalMb + "], usedSpaceInMB:[" + usedMb + "]");
-                return new AbstractMap.SimpleEntry<>(Long.toString(totalMb), Long.toString(usedMb));
+                return new DiskMetric(Long.toString(totalMb), Long.toString(usedMb));
             }
 
             @Nullable
@@ -681,18 +680,18 @@ JSONObject getCrashDataJSON(@NonNull CrashData crashData, final boolean isNative
     Map<String, Object> getCrashMetrics(@NonNull final Context context, boolean isNativeCrash, @Nullable final Map<String, String> metricOverride, @NonNull ModuleLog L) {
         Map<String, Object> metrics = getCommonMetrics(context, metricOverride, L);
 
-        Map.Entry<String, String> storageMb = mp.getDiskSpaces(context);
+        DiskMetric diskMetric = mp.getDiskSpaces(context);
 
         putIfNotNullAndNotEmpty(metrics, "_cpu", mp.getCpu());
         putIfNotNullAndNotEmpty(metrics, "_opengl", mp.getOpenGL(context));
         putIfNotNullAndNotEmpty(metrics, "_root", mp.isRooted());
         putIfNotNullAndNotEmpty(metrics, "_ram_total", mp.getRamTotal());
-        putIfNotNullAndNotEmpty(metrics, "_disk_total", storageMb.getKey());
+        putIfNotNullAndNotEmpty(metrics, "_disk_total", diskMetric.totalMb);
 
         if (!isNativeCrash) {
             //if is not a native crash
             putIfNotNullAndNotEmpty(metrics, "_ram_current", mp.getRamCurrent(context));
-            putIfNotNullAndNotEmpty(metrics, "_disk_current", storageMb.getValue());
+            putIfNotNullAndNotEmpty(metrics, "_disk_current", diskMetric.usedMb);
             putIfNotNullAndNotEmpty(metrics, "_bat", mp.getBatteryLevel(context));
             putIfNotNullAndNotEmpty(metrics, "_run", mp.getRunningTime());
             putIfNotNullAndNotEmpty(metrics, "_orientation", mp.getOrientation(context));

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

@@ -0,0 +1,21 @@
+package ly.count.android.sdk;
+
+/**
+ * Holds disk usage metrics in megabytes.
+ */
+public class DiskMetric {
+    /**
+     * Total disk space in megabytes
+     */
+    public final String totalMb;
+
+    /**
+     * Used (current) disk space in megabytes
+     */
+    public final String usedMb;
+
+    public DiskMetric(String totalMb, String usedMb) {
+        this.totalMb = totalMb;
+        this.usedMb = usedMb;
+    }
+}

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

@@ -3,7 +3,6 @@
 import android.content.Context;
 import android.util.DisplayMetrics;
 import androidx.annotation.Nullable;
-import java.util.Map;
 
 public interface MetricProvider {
     default String getOS() {
@@ -106,7 +105,7 @@ default DisplayMetrics getDisplayMetrics(Context context) {
         return null;
     }
 
-    default Map.Entry<String, String> getDiskSpaces(Context context) {
+    default DiskMetric getDiskSpaces(Context context) {
         return null;
     }
 }