Refactoring

M66B · Nov 2, 2023 · d80ae38 · d80ae38
1 parent 2861b11
commit d80ae38
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java b/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java
@@ -2603,14 +2603,15 @@ private void listenNetworkChanges() {
 
         ConnectivityManager.NetworkCallback nc = new ConnectivityManager.NetworkCallback() {
             private Boolean last_connected = null;
-            private Boolean last_unmetered = null;
+            private Boolean last_metered = null;
             private String last_generation = null;
             private List<InetAddress> last_dns = null;
 
             @Override
             public void onAvailable(Network network) {
                 Log.i(TAG, "Available network=" + network);
                 last_connected = Util.isConnected(ServiceSinkhole.this);
+                last_metered = Util.isMeteredNetwork(ServiceSinkhole.this);
                 reload("network available", ServiceSinkhole.this, false);
             }
 
@@ -2637,18 +2638,18 @@ public void onCapabilitiesChanged(Network network, NetworkCapabilities networkCa
                 Log.i(TAG, "Changed capabilities=" + network + " caps=" + networkCapabilities);
 
                 boolean connected = Util.isConnected(ServiceSinkhole.this);
-                boolean unmetered = networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED);
+                boolean metered = Util.isMeteredNetwork(ServiceSinkhole.this);
                 String generation = Util.getNetworkGeneration(ServiceSinkhole.this);
                 Log.i(TAG, "Connected=" + connected + "/" + last_connected +
-                        " unmetered=" + unmetered + "/" + last_unmetered +
+                        " unmetered=" + metered + "/" + last_metered +
                         " generation=" + generation + "/" + last_generation);
 
                 String reason = null;
 
                 if (reason == null && last_connected != null && !last_connected.equals(connected))
                     reason = "Connected state changed";
 
-                if (reason == null && last_unmetered != null && !last_unmetered.equals(unmetered))
+                if (reason == null && last_metered != null && !last_metered.equals(metered))
                     reason = "Unmetered state changed";
 
                 if (reason == null && last_generation != null && !last_generation.equals(generation)) {
@@ -2663,7 +2664,7 @@ public void onCapabilitiesChanged(Network network, NetworkCapabilities networkCa
                     reload(reason, ServiceSinkhole.this, false);
 
                 last_connected = connected;
-                last_unmetered = unmetered;
+                last_metered = metered;
                 last_generation = generation;
             }