mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

More predefined rules

This commit is contained in:
M66B 2015-12-31 20:03:03 +01:00
parent 6c889c645b
commit 1f937ab3d3
2 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/eu/faircode/netguard/Rule.java
View File

@ -122,7 +122,8 @@ public class Rule {
long now = SystemClock.elapsedRealtime(); long now = SystemClock.elapsedRealtime();
// Get predefined rules // 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, Boolean> pre_roaming = new HashMap<>();
Map<String, String[]> pre_related = new HashMap<>(); Map<String, String[]> pre_related = new HashMap<>();
Map<String, Boolean> pre_system = new HashMap<>(); Map<String, Boolean> pre_system = new HashMap<>();
@ -131,13 +132,19 @@ public class Rule {
int eventType = xml.getEventType(); int eventType = xml.getEventType();
while (eventType != XmlPullParser.END_DOCUMENT) { while (eventType != XmlPullParser.END_DOCUMENT) {
if (eventType == XmlPullParser.START_TAG) 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"); String pkg = xml.getAttributeValue(null, "package");
boolean pblocked = xml.getAttributeBooleanValue(null, "blocked", false); boolean pblocked = xml.getAttributeBooleanValue(null, "blocked", false);
boolean proaming = xml.getAttributeBooleanValue(null, "roaming", default_roaming); boolean proaming = xml.getAttributeBooleanValue(null, "roaming", default_roaming);
pre_blocked.put(pkg, pblocked); pre_other_blocked.put(pkg, pblocked);
pre_roaming.put(pkg, proaming); 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())) { } else if ("relation".equals(xml.getName())) {
String pkg = xml.getAttributeValue(null, "package"); String pkg = xml.getAttributeValue(null, "package");
@ -171,8 +178,8 @@ public class Rule {
(show_nointernet ? true : rule.internet) && (show_nointernet ? true : rule.internet) &&
(show_disabled ? true : rule.enabled))) { (show_disabled ? true : rule.enabled))) {
rule.wifi_default = (pre_blocked.containsKey(info.packageName) ? pre_blocked.get(info.packageName) : default_wifi); rule.wifi_default = (pre_wifi_blocked.containsKey(info.packageName) ? pre_wifi_blocked.get(info.packageName) : default_wifi);
rule.other_default = (pre_blocked.containsKey(info.packageName) ? pre_blocked.get(info.packageName) : default_other); 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_wifi_default = default_screen_wifi;
rule.screen_other_default = default_screen_other; rule.screen_other_default = default_screen_other;
rule.roaming_default = (pre_roaming.containsKey(info.packageName) ? pre_roaming.get(info.packageName) : default_roaming); rule.roaming_default = (pre_roaming.containsKey(info.packageName) ? pre_roaming.get(info.packageName) : default_roaming);

28
app/src/main/res/xml/predefined.xml
View File

@ -1,18 +1,32 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<predefined> <predefined>
<rule <wifi
blocked="false"
package="com.google.android.apps.adm" />
<other
blocked="false" blocked="false"
package="com.google.android.apps.adm" package="com.google.android.apps.adm"
roaming="false" roaming="false" />
title="Android Device Manager" />
<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 <relation
package="com.android.vending" package="com.android.vending"
related="com.google.android.gms,com.android.providers.downloads" related="com.google.android.gms,com.android.providers.downloads" />
title="Google Play Store" />
<relation <relation
package="com.android.chrome" package="com.android.chrome"
related="com.android.providers.downloads" related="com.android.providers.downloads" />
title="Chrome" />
<type <type
package="com.facebook.katana" package="com.facebook.katana"
system="false" /> system="false" />