mirror/NetGuard
1
0
Fork 0
mirror of https://github.com/M66B/NetGuard.git synced 2025-01-02 21:34:12 +00:00
Code Issues Releases Wiki Activity

Revert "Explicitly reload on active network changes"

Browse source 
This reverts commit eaea05832e.
This commit is contained in:
M66B 2023-10-29 10:52:40 +01:00
parent b068900a3e
commit 6ad2e037ee
1 changed files with 4 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java
View file

@ -104,7 +104,6 @@ import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.TreeMap; import java.util.TreeMap;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
@ -2600,7 +2599,6 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
builder.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED); builder.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
ConnectivityManager.NetworkCallback nc = new ConnectivityManager.NetworkCallback() { ConnectivityManager.NetworkCallback nc = new ConnectivityManager.NetworkCallback() {
private Network last_active = null;
private Boolean last_connected = null; private Boolean last_connected = null;
private Boolean last_unmetered = null; private Boolean last_unmetered = null;
private String last_generation = null; private String last_generation = null;
@ -2635,32 +2633,20 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
public void onCapabilitiesChanged(Network network, NetworkCapabilities networkCapabilities) { public void onCapabilitiesChanged(Network network, NetworkCapabilities networkCapabilities) {
Log.i(TAG, "Changed capabilities=" + network + " caps=" + networkCapabilities); Log.i(TAG, "Changed capabilities=" + network + " caps=" + networkCapabilities);
Network active = (Build.VERSION.SDK_INT < Build.VERSION_CODES.M ? null : cm.getActiveNetwork());
boolean connected = Util.isConnected(ServiceSinkhole.this); boolean connected = Util.isConnected(ServiceSinkhole.this);
boolean unmetered = networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED); boolean unmetered = networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED);
String generation = Util.getNetworkGeneration(ServiceSinkhole.this); String generation = Util.getNetworkGeneration(ServiceSinkhole.this);
Log.i(TAG, "Active=" + network + Log.i(TAG, "Connected=" + connected + "/" + last_connected +
" connected=" + connected + "/" + last_connected +
" unmetered=" + unmetered + "/" + last_unmetered + " unmetered=" + unmetered + "/" + last_unmetered +
" generation=" + generation + "/" + last_generation); " generation=" + generation + "/" + last_generation);
boolean reloading = false; if (last_connected != null && !last_connected.equals(connected))
if (!Objects.equals(active, last_active)) {
reloading = true;
reload("Active network changed", ServiceSinkhole.this, false);
}
if (last_connected != null && !last_connected.equals(connected) && !reloading) {
reloading = true;
reload("Connected state changed", ServiceSinkhole.this, false); reload("Connected state changed", ServiceSinkhole.this, false);
}
if (last_unmetered != null && !last_unmetered.equals(unmetered) && !reloading) { if (last_unmetered != null && !last_unmetered.equals(unmetered))
reloading = true;
reload("Unmetered state changed", ServiceSinkhole.this, false); reload("Unmetered state changed", ServiceSinkhole.this, false);
}
if (last_generation != null && !last_generation.equals(generation) && !reloading) { if (last_generation != null && !last_generation.equals(generation)) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ServiceSinkhole.this); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ServiceSinkhole.this);
if (prefs.getBoolean("unmetered_2g", false) || if (prefs.getBoolean("unmetered_2g", false) ||
prefs.getBoolean("unmetered_3g", false) || prefs.getBoolean("unmetered_3g", false) ||
@ -2668,7 +2654,6 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
reload("Generation changed", ServiceSinkhole.this, false); reload("Generation changed", ServiceSinkhole.this, false);
} }
last_active = active;
last_connected = connected; last_connected = connected;
last_unmetered = unmetered; last_unmetered = unmetered;
last_generation = generation; last_generation = generation;