From 1f937ab3d3864c16109a4d3be1acb294c6c6df4a Mon Sep 17 00:00:00 2001
From: M66B <marcel@faircode.eu>
Date: Thu, 31 Dec 2015 20:03:03 +0100
Subject: [PATCH] More predefined rules

---
 .../main/java/eu/faircode/netguard/Rule.java  | 19 +++++++++----
 app/src/main/res/xml/predefined.xml           | 28 ++++++++++++++-----
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/eu/faircode/netguard/Rule.java b/app/src/main/java/eu/faircode/netguard/Rule.java
index 06acf7fa..7369d9fa 100644
--- a/app/src/main/java/eu/faircode/netguard/Rule.java
+++ b/app/src/main/java/eu/faircode/netguard/Rule.java
@@ -122,7 +122,8 @@ public class Rule {
         long now = SystemClock.elapsedRealtime();
 
         // Get predefined rules
-        Map<String, Boolean> pre_blocked = new HashMap<>();
+        Map<String, Boolean> pre_wifi_blocked = new HashMap<>();
+        Map<String, Boolean> pre_other_blocked = new HashMap<>();
         Map<String, Boolean> pre_roaming = new HashMap<>();
         Map<String, String[]> pre_related = new HashMap<>();
         Map<String, Boolean> pre_system = new HashMap<>();
@@ -131,13 +132,19 @@ public class Rule {
             int eventType = xml.getEventType();
             while (eventType != XmlPullParser.END_DOCUMENT) {
                 if (eventType == XmlPullParser.START_TAG)
-                    if ("rule".equals(xml.getName())) {
+                    if ("wifi".equals(xml.getName())) {
+                        String pkg = xml.getAttributeValue(null, "package");
+                        boolean pblocked = xml.getAttributeBooleanValue(null, "blocked", false);
+                        pre_wifi_blocked.put(pkg, pblocked);
+                        Log.d(tag, "Wifi " + pkg + " blocked=" + pblocked);
+
+                    } else if ("other".equals(xml.getName())) {
                         String pkg = xml.getAttributeValue(null, "package");
                         boolean pblocked = xml.getAttributeBooleanValue(null, "blocked", false);
                         boolean proaming = xml.getAttributeBooleanValue(null, "roaming", default_roaming);
-                        pre_blocked.put(pkg, pblocked);
+                        pre_other_blocked.put(pkg, pblocked);
                         pre_roaming.put(pkg, proaming);
-                        Log.d(tag, "Predefined " + pkg + " blocked=" + pblocked + " roaming=" + proaming);
+                        Log.d(tag, "Other " + pkg + " blocked=" + pblocked + " roaming=" + proaming);
 
                     } else if ("relation".equals(xml.getName())) {
                         String pkg = xml.getAttributeValue(null, "package");
@@ -171,8 +178,8 @@ public class Rule {
                             (show_nointernet ? true : rule.internet) &&
                             (show_disabled ? true : rule.enabled))) {
 
-                rule.wifi_default = (pre_blocked.containsKey(info.packageName) ? pre_blocked.get(info.packageName) : default_wifi);
-                rule.other_default = (pre_blocked.containsKey(info.packageName) ? pre_blocked.get(info.packageName) : default_other);
+                rule.wifi_default = (pre_wifi_blocked.containsKey(info.packageName) ? pre_wifi_blocked.get(info.packageName) : default_wifi);
+                rule.other_default = (pre_other_blocked.containsKey(info.packageName) ? pre_other_blocked.get(info.packageName) : default_other);
                 rule.screen_wifi_default = default_screen_wifi;
                 rule.screen_other_default = default_screen_other;
                 rule.roaming_default = (pre_roaming.containsKey(info.packageName) ? pre_roaming.get(info.packageName) : default_roaming);
diff --git a/app/src/main/res/xml/predefined.xml b/app/src/main/res/xml/predefined.xml
index 79d6487b..4aafefa6 100644
--- a/app/src/main/res/xml/predefined.xml
+++ b/app/src/main/res/xml/predefined.xml
@@ -1,18 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <predefined>
-    <rule
+    <wifi
+        blocked="false"
+        package="com.google.android.apps.adm" />
+    <other
         blocked="false"
         package="com.google.android.apps.adm"
-        roaming="false"
-        title="Android Device Manager" />
+        roaming="false" />
+
+    <wifi
+        blocked="false"
+        package="com.google.android.backuptransport" />
+
+    <wifi
+        blocked="false"
+        package="com.google.android.apps.gcs" />
+    <other
+        blocked="false"
+        package="com.google.android.apps.gcs"
+        roaming="false" />
+
     <relation
         package="com.android.vending"
-        related="com.google.android.gms,com.android.providers.downloads"
-        title="Google Play Store" />
+        related="com.google.android.gms,com.android.providers.downloads" />
     <relation
         package="com.android.chrome"
-        related="com.android.providers.downloads"
-        title="Chrome" />
+        related="com.android.providers.downloads" />
+
     <type
         package="com.facebook.katana"
         system="false" />