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

Added predefined rules

This commit is contained in:
M66B 2015-11-01 09:38:51 +01:00
parent 7d4f222357
commit eab0234419
4 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/faircode/netguard/ActivityMain.java
View File

@ -240,7 +240,7 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
@Override
protected List<Rule> doInBackground(Object... arg) {
return Rule.getRules(false, ActivityMain.this);
return Rule.getRules(false, TAG, ActivityMain.this);
}
@Override

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

@ -6,12 +6,18 @@ import android.content.SharedPreferences;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.res.XmlResourceParser;
import android.graphics.drawable.Drawable;
import android.preference.PreferenceManager;
import android.util.Log;
import org.xmlpull.v1.XmlPullParser;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class Rule implements Comparable<Rule> {
public PackageInfo info;
@ -40,30 +46,57 @@ public class Rule implements Comparable<Rule> {
this.intent = pm.getLaunchIntentForPackage(info.packageName);
}
public static List<Rule> getRules(boolean all, Context context) {
public static List<Rule> getRules(boolean all, String tag, Context context) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
SharedPreferences wifi = context.getSharedPreferences("wifi", Context.MODE_PRIVATE);
SharedPreferences other = context.getSharedPreferences("other", Context.MODE_PRIVATE);
SharedPreferences unused = context.getSharedPreferences("unused", Context.MODE_PRIVATE);
// Get settings
boolean whitelist_wifi = prefs.getBoolean("whitelist_wifi", true);
boolean whitelist_other = prefs.getBoolean("whitelist_other", true);
boolean manage_system = prefs.getBoolean("manage_system", false);
// Get predifined rules
Map<String, Boolean> predefined = new HashMap<>();
try {
XmlResourceParser xml = context.getResources().getXml(R.xml.predefined);
int eventType = xml.getEventType();
while (eventType != XmlPullParser.END_DOCUMENT) {
if (eventType == XmlPullParser.START_TAG && "rule".equals(xml.getName())) {
String pkg = xml.getAttributeValue(null, "package");
boolean blocked = xml.getAttributeBooleanValue(null, "blocked", false);
predefined.put(pkg, blocked);
Log.i(tag, "Predefined " + pkg + "=" + blocked);
}
eventType = xml.next();
}
} catch (Throwable ex) {
Log.e(tag, ex.toString() + "\n" + Log.getStackTraceString(ex));
}
// Build rule list
List<Rule> listRules = new ArrayList<>();
for (PackageInfo info : context.getPackageManager().getInstalledPackages(0)) {
boolean system = ((info.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0);
if (!system || manage_system || all) {
Rule rule = new Rule(info, context);
rule.system = system;
rule.wifi_blocked = (system && !manage_system ? false : wifi.getBoolean(info.packageName, whitelist_wifi));
rule.other_blocked = (system && !manage_system ? false : other.getBoolean(info.packageName, whitelist_other));
rule.wifi_blocked = (system && !manage_system ? false :
wifi.getBoolean(info.packageName, predefined.containsKey(info.packageName)
? predefined.get(info.packageName)
: whitelist_wifi));
rule.other_blocked = (system && !manage_system ? false :
other.getBoolean(info.packageName, predefined.containsKey(info.packageName)
? predefined.get(info.packageName)
: whitelist_other));
rule.unused = unused.getBoolean(info.packageName, false);
rule.changed = (rule.wifi_blocked != whitelist_wifi || rule.other_blocked != whitelist_other);
listRules.add(rule);
}
}
// Sort rule list
Collections.sort(listRules);
return listRules;

2
app/src/main/java/eu/faircode/netguard/SinkholeService.java
View File

@ -106,7 +106,7 @@ public class SinkholeService extends VpnService {
builder.addRoute("0:0:0:0:0:0:0:0", 0);
// Add list of allowed applications
for (Rule rule : Rule.getRules(true, this))
for (Rule rule : Rule.getRules(true, TAG, this))
if (!(wifi ? rule.wifi_blocked : rule.other_blocked) || (rule.unused && interactive)) {
Log.i(TAG, "Allowing " + rule.info.packageName);
try {

6
app/src/main/res/xml/predefined.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<rule
blocked="false"
package="com.google.android.apps.adm" />
</resources>