浏览代码

On bandwidth monitoring, /sec is removed from unit of upload/download speed

Khubaib 7 月之前
父节点
当前提交
aae49b0376

+ 1 - 1
.idea/deploymentTargetSelector.xml

@@ -4,7 +4,7 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-09-13T12:02:16.437554256Z">
+        <DropdownSelection timestamp="2024-09-16T12:40:42.801642745Z">
           <Target type="DEFAULT_BOOT">
             <handle>
               <DeviceId pluginId="PhysicalDevice" identifier="serial=1C051FDF60048Z" />

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

@@ -769,24 +769,24 @@ class VPNConnectionsUtil: VpnStatus.StateListener {
 
         if (finalTxBytes < 1000) {
             StringUp2 = finalTxBytes
-            StringUpUnit = "Byte/s"
+            StringUpUnit = "Byte"
         } else if ((finalTxBytes >= 1000) && (finalTxBytes <= 1000000)) {
             StringUp2 = finalTxBytes / 1000
-            StringUpUnit = "KB/S"
+            StringUpUnit = "KB"
         } else {
             StringUp2 = finalTxBytes / 1000000
-            StringUpUnit = "MB/S"
+            StringUpUnit = "MB"
         }
 
         if (finalRxBytes < 1000) {
             StringDown2 = finalRxBytes
-            StringDownUnit = "Byte/s"
+            StringDownUnit = "Byte"
         } else if ((finalRxBytes >= 1000) && (finalRxBytes <= 1000000)) {
             StringDown2 = finalRxBytes / 1000
-            StringDownUnit = "KB/S"
+            StringDownUnit = "KB"
         } else {
             StringDown2 = finalRxBytes / 1000000
-            StringDownUnit = "MB/S"
+            StringDownUnit = "MB"
         }
 
         Log.d("test_network_stat_final", "Down: $StringDown2 Up: $StringUp2")

+ 6 - 6
app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java

@@ -321,24 +321,24 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
 
         if (finalTxBytes < 1000) {
             StringUp2 = finalTxBytes;
-            StringUpUnit = "Byte/s";
+            StringUpUnit = "Byte";
         } else if ((finalTxBytes >= 1000) && (finalTxBytes <= 1000_000)) {
             StringUp2 = finalTxBytes / 1000;
-            StringUpUnit = "KB/S";
+            StringUpUnit = "KB";
         } else {
             StringUp2 = finalTxBytes / 1000_000;
-            StringUpUnit = "MB/S";
+            StringUpUnit = "MB";
         }
 
         if (finalRxBytes < 1000) {
             StringDown2 = finalRxBytes;
-            StringDownUnit = "Byte/s";
+            StringDownUnit = "Byte";
         } else if ((finalRxBytes >= 1000) && (finalRxBytes <= 1000_000)) {
             StringDown2 = finalRxBytes / 1000;
-            StringDownUnit = "KB/S";
+            StringDownUnit = "KB";
         } else {
             StringDown2 = finalRxBytes / 1000_000;
-            StringDownUnit = "MB/S";
+            StringDownUnit = "MB";
         }
 
         Log.d("test_network_stat_final", "Down: " + StringDown2 + " Up: " + StringUp2);

+ 6 - 6
app/src/main/java/org/strongswan/android/logic/CharonVpnService.java

@@ -411,24 +411,24 @@ public class CharonVpnService extends VpnService implements Runnable, VpnStateSe
 
         if (finalTxBytes < 1000) {
             StringUp2 = finalTxBytes;
-            StringUpUnit = "Byte/s";
+            StringUpUnit = "Byte";
         } else if ((finalTxBytes >= 1000) && (finalTxBytes <= 1000_000)) {
             StringUp2 = finalTxBytes / 1000;
-            StringUpUnit = "KB/S";
+            StringUpUnit = "KB";
         } else {
             StringUp2 = finalTxBytes / 1000_000;
-            StringUpUnit = "MB/S";
+            StringUpUnit = "MB";
         }
 
         if (finalRxBytes < 1000) {
             StringDown2 = finalRxBytes;
-            StringDownUnit = "Byte/s";
+            StringDownUnit = "Byte";
         } else if ((finalRxBytes >= 1000) && (finalRxBytes <= 1000_000)) {
             StringDown2 = finalRxBytes / 1000;
-            StringDownUnit = "KB/S";
+            StringDownUnit = "KB";
         } else {
             StringDown2 = finalRxBytes / 1000_000;
-            StringDownUnit = "MB/S";
+            StringDownUnit = "MB";
         }
 
         Log.d("test_network_stat_final", "Down: " + StringDown2 + " Up: " + StringUp2);