Sync latest NetGuard changes

Author: kasnder

app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java

@@ -106,13 +106,16 @@
 import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
+import java.net.InterfaceAddress;
+import java.net.NetworkInterface;
 import java.net.Socket;
 import java.net.URL;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -131,6 +134,7 @@ public class ServiceSinkhole extends VpnService {
 
     private boolean registeredUser = false;
     private boolean registeredIdleState = false;
+    private boolean registeredApState = false;
     private boolean registeredConnectivityChanged = false;
     private boolean registeredPackageChanged = false;
 
@@ -1490,6 +1494,24 @@ private Builder getBuilder(List<Rule> listAllowed, List<Rule> listRule) {
                 listExclude.add(new IPUtil.CIDR("192.168.44.0", 24));
                 // Wi-Fi direct 192.168.49.x
                 listExclude.add(new IPUtil.CIDR("192.168.49.0", 24));
+
+                try {
+                    Enumeration<NetworkInterface> nis = NetworkInterface.getNetworkInterfaces();
+                    if (nis != null)
+                        while (nis.hasMoreElements()) {
+                            NetworkInterface ni = nis.nextElement();
+                            if (ni != null && !ni.isLoopback() && ni.isUp() &&
+                                    ni.getName() != null && ni.getName().startsWith("ap_br_wlan")) {
+                                List<InterfaceAddress> ias = ni.getInterfaceAddresses();
+                                if (ias != null)
+                                    for (InterfaceAddress ia : ias)
+                                        if (ia.getAddress() instanceof Inet4Address)
+                                            listExclude.add(new IPUtil.CIDR(ia.getAddress().getHostAddress(), 24));
+                            }
+                        }
+                } catch (Throwable ex) {
+                    Log.e(TAG, ex.toString());
+                }
             }
 
             if (lan) {
@@ -2445,6 +2467,16 @@ public void onReceive(Context context, Intent intent) {
         }
     };
 
+    private BroadcastReceiver apStateReceiver = new BroadcastReceiver() {
+        @Override
+        @TargetApi(Build.VERSION_CODES.M)
+        public void onReceive(Context context, Intent intent) {
+            Log.i(TAG, "Received " + intent);
+            Util.logExtras(intent);
+            reload("AP state changed", ServiceSinkhole.this, false);
+        }
+    };
+
     private BroadcastReceiver connectivityChangedReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -2813,6 +2845,11 @@ public void onCreate() {
             registeredIdleState = true;
         }
 
+        IntentFilter ifAp = new IntentFilter();
+        ifAp.addAction("android.net.wifi.WIFI_AP_STATE_CHANGED");
+        ContextCompat.registerReceiver(this, apStateReceiver, ifAp, ContextCompat.RECEIVER_NOT_EXPORTED);
+        registeredApState = true;
+
         // Listen for added/removed applications
         IntentFilter ifPackage = new IntentFilter();
         ifPackage.addAction(Intent.ACTION_PACKAGE_ADDED);
@@ -3172,6 +3209,10 @@ public void onDestroy() {
                 unregisterReceiver(idleStateReceiver);
                 registeredIdleState = false;
             }
+            if (registeredApState) {
+                unregisterReceiver(apStateReceiver);
+                registeredApState = false;
+            }
             if (registeredPackageChanged) {
                 unregisterReceiver(packageChangedReceiver);
                 registeredPackageChanged = false;