some metrics fixes

vtosters · Mar 26, 2024 · d5e85a7 · d5e85a7
1 parent daca8ef
commit d5e85a7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/app/src/main/java/com/vk/libvideo/VideoTracker.java b/app/src/main/java/com/vk/libvideo/VideoTracker.java
@@ -2,7 +2,6 @@
 
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.app.NotificationCompat;
@@ -11,7 +10,6 @@
 import com.vk.media.player.PlayerTypes;
 import com.vk.navigation.NavigatorKeys;
 import com.vk.statistic.Statistic;
-import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import ru.vtosters.hooks.other.Preferences;
@@ -333,6 +331,6 @@ public void sendMetrics(String event) throws JSONException {
         jsonObject.put("position_sec", 0);
         jsonObject.put("cur_quality", "auto");
 
-        Metrics.trackEvents(jsonObject);
+        Metrics.trackEvents(jsonObject, false);
     }
 }
diff --git a/app/src/main/java/com/vk/music/stats/VKMusicStatsTracker.java b/app/src/main/java/com/vk/music/stats/VKMusicStatsTracker.java
@@ -11,7 +11,6 @@
 import com.vk.navigation.NavigatorKeys;
 import com.vtosters.lite.data.Analytics;
 import kotlin.jvm.b.Functions2;
-import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import ru.vtosters.hooks.other.Preferences;
@@ -185,7 +184,7 @@ private void makeMetricsRequest(MusicPlaybackParams musicPlaybackParams, String
             }
         }
 
-        Metrics.trackEvents(event);
+        Metrics.trackEvents(event, true);
     }
 
     private Analytics.l a(MusicPlaybackParams musicPlaybackParams, String str) {

diff --git a/app/src/main/java/ru/vtosters/lite/utils/Metrics.java b/app/src/main/java/ru/vtosters/lite/utils/Metrics.java
@@ -24,13 +24,25 @@
 public class Metrics {
     private static JSONArray events = new JSONArray();
 
-    public static void trackEvents(JSONObject object) {
-        if (!NetworkUtils.isNetworkConnected()) {
-            events.put(object);
-        } else if (shouldSaveUserTraffic() || events.length() > 0) {
-            trackEventList(object);
+    public static void trackEvents(JSONObject object, boolean isMusic) {
+        if (NetworkUtils.isNetworkConnected()) {
+            handleNetworkConnected(object, isMusic);
         } else {
+            handleNetworkDisconnected(object, isMusic);
+        }
+    }
+
+    private static void handleNetworkConnected(JSONObject object, boolean isMusic) {
+        if (isMusic || shouldSaveUserTraffic() || events.length() > 0) {
             trackEventsImmediately(object);
+        } else {
+            trackEventList(object);
+        }
+    }
+
+    private static void handleNetworkDisconnected(JSONObject object, boolean isMusic) {
+        if (!isMusic) {
+            events.put(object);
         }
     }