Separated callbacks for Android TV & Android Device on home screens of Network Speed Bandwidth

app/src/main/java/com/vpn/fastestvpnservice/screens/bottomNavBarScreens/HomeScreen.kt

@@ -253,7 +253,7 @@ val networkSpeed = object : NetworkSpeedCallback {
 
         StringDownUnit.value = downUnit
         StringUpUnit.value = upUnit
-        Log.d("setNetworkSpeed", "Down: ${StringDown.value} Up: ${StringUp.value}")
+        Log.d("setNetworkSpeed_Android", "Down: ${StringDown.value} Up: ${StringUp.value}")
     }
 }
 

app/src/main/java/com/vpn/fastestvpnservice/screensTV/HomeScreenTV.kt

@@ -103,6 +103,7 @@ import com.vpn.fastestvpnservice.beans.toChangeServer
 import com.vpn.fastestvpnservice.constants.AppEnum
 import com.vpn.fastestvpnservice.constants.smartConnect
 import com.vpn.fastestvpnservice.helpers.BasePreferenceHelper
+import com.vpn.fastestvpnservice.interfaces.NetworkSpeedCallback
 import com.vpn.fastestvpnservice.interfaces.ServerCallbacksTV
 import com.vpn.fastestvpnservice.navigation.isFirstItemFocused
 import com.vpn.fastestvpnservice.navigation.isFirstItemPressed
@@ -236,6 +237,17 @@ val onServerTV = object : ServerCallbacksTV {
     }
 
 }
+val networkSpeedTV = object : NetworkSpeedCallback {
+    override fun setNetworkSpeed(down: Double, up: Double, downUnit: String, upUnit: String) {
+        StringDown.value = down
+        StringUp.value = up
+
+        StringDownUnit.value = downUnit
+        StringUpUnit.value = upUnit
+        Log.d("setNetworkSpeed_TV", "Down: ${StringDown.value} Up: ${StringUp.value}")
+    }
+}
+
 lateinit var activityGlobal: ComponentActivity
 
 @Composable

app/src/main/java/com/vpn/fastestvpnservice/utils/VPNConnectionsUtil.kt

@@ -37,6 +37,7 @@ import com.vpn.fastestvpnservice.screens.bottomNavBarScreens.StringDownUnit
 import com.vpn.fastestvpnservice.screens.bottomNavBarScreens.StringUp
 import com.vpn.fastestvpnservice.screens.bottomNavBarScreens.StringUpUnit
 import com.vpn.fastestvpnservice.screens.bottomNavBarScreens.networkSpeed
+import com.vpn.fastestvpnservice.screensTV.networkSpeedTV
 import com.vpn.fastestvpnservice.viewmodels.HomeViewModel
 import com.vpn.fastestvpnservice.widgets.SimpleAppWidget
 import com.wireguard.android.backend.Backend
@@ -790,7 +791,11 @@ class VPNConnectionsUtil: VpnStatus.StateListener {
 
         Log.d("test_network_stat_final", "Down: $StringDown2 Up: $StringUp2")
 
-        networkSpeed.setNetworkSpeed(StringDown2, StringUp2, StringDownUnit, StringUpUnit)
+        if (StaticMethods.isTV(context)) {
+            networkSpeedTV.setNetworkSpeed(StringDown2, StringUp2, StringDownUnit, StringUpUnit)
+        } else {
+            networkSpeed.setNetworkSpeed(StringDown2, StringUp2, StringDownUnit, StringUpUnit)
+        }
 
         // Update last update time and byte counts for next calculation
         lastUpdateTime = SystemClock.elapsedRealtime().toDouble()

app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java

@@ -6,6 +6,8 @@ package de.blinkt.openvpn.core;
 
 import static android.content.res.Configuration.UI_MODE_TYPE_TELEVISION;
 import static com.vpn.fastestvpnservice.openVpnUtils.Data.LongDataUsage;
+import static com.vpn.fastestvpnservice.screens.bottomNavBarScreens.HomeScreenKt.getNetworkSpeed;
+import static com.vpn.fastestvpnservice.screensTV.HomeScreenTVKt.getNetworkSpeedTV;
 import static de.blinkt.openvpn.core.ConnectionStatus.LEVEL_CONNECTED;
 import static de.blinkt.openvpn.core.ConnectionStatus.LEVEL_WAITING_FOR_USER_INPUT;
 import static de.blinkt.openvpn.core.NetworkSpace.ipAddress;
@@ -61,6 +63,7 @@ import com.vpn.fastestvpnservice.constants.AppEnum;
 import com.vpn.fastestvpnservice.helpers.BasePreferenceHelper;
 import com.vpn.fastestvpnservice.openVpnUtils.Data;
 import com.vpn.fastestvpnservice.screens.bottomNavBarScreens.HomeScreenKt;
+import com.vpn.fastestvpnservice.utils.StaticMethods;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -340,7 +343,12 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
 
         Log.d("test_network_stat_final", "Down: " + StringDown2 + " Up: " + StringUp2);
 
-        HomeScreenKt.getNetworkSpeed().setNetworkSpeed(StringDown2, StringUp2, StringDownUnit, StringUpUnit);
+        if (StaticMethods.isTV(getBaseContext())) {
+            getNetworkSpeedTV().setNetworkSpeed(StringDown2, StringUp2, StringDownUnit, StringUpUnit);
+        } else {
+            getNetworkSpeed().setNetworkSpeed(StringDown2, StringUp2, StringDownUnit, StringUpUnit);
+        }
+//        HomeScreenKt.getNetworkSpeed().setNetworkSpeed(StringDown2, StringUp2, StringDownUnit, StringUpUnit);
 
         // Update last update time and byte counts for next calculation
         lastUpdateTime = SystemClock.elapsedRealtime();

app/src/main/java/org/strongswan/android/logic/CharonVpnService.java

@@ -19,6 +19,9 @@ package org.strongswan.android.logic;
 
 import static android.content.res.Configuration.UI_MODE_TYPE_TELEVISION;
 
+import static com.vpn.fastestvpnservice.screens.bottomNavBarScreens.HomeScreenKt.getNetworkSpeed;
+import static com.vpn.fastestvpnservice.screensTV.HomeScreenTVKt.getNetworkSpeedTV;
+
 import android.annotation.TargetApi;
 import android.app.Notification;
 import android.app.NotificationChannel;
@@ -64,6 +67,7 @@ import com.vpn.fastestvpnservice.constants.AppConstant;
 import com.vpn.fastestvpnservice.constants.AppEnum;
 import com.vpn.fastestvpnservice.helpers.BasePreferenceHelper;
 import com.vpn.fastestvpnservice.screens.bottomNavBarScreens.HomeScreenKt;
+import com.vpn.fastestvpnservice.utils.StaticMethods;
 import com.vpn.fastestvpnservice.widgets.SimpleAppWidget;
 
 import org.strongswan.android.data.VpnProfile;
@@ -429,7 +433,12 @@ public class CharonVpnService extends VpnService implements Runnable, VpnStateSe
 
         Log.d("test_network_stat_final", "Down: " + StringDown2 + " Up: " + StringUp2);
 
-        HomeScreenKt.getNetworkSpeed().setNetworkSpeed(StringDown2, StringUp2, StringDownUnit, StringUpUnit);
+        if (StaticMethods.isTV(getBaseContext())) {
+            getNetworkSpeedTV().setNetworkSpeed(StringDown2, StringUp2, StringDownUnit, StringUpUnit);
+        } else {
+            getNetworkSpeed().setNetworkSpeed(StringDown2, StringUp2, StringDownUnit, StringUpUnit);
+        }
+//        HomeScreenKt.getNetworkSpeed().setNetworkSpeed(StringDown2, StringUp2, StringDownUnit, StringUpUnit);
 
         // Update last update time and byte counts for next calculation
         lastUpdateTime = SystemClock.elapsedRealtime();