diff --git a/FAQ.md b/FAQ.md index 283dc933..c46b07d7 100644 --- a/FAQ.md +++ b/FAQ.md @@ -14,8 +14,8 @@ Frequently Asked Questions (FAQ) You can use the settings menu to change from blacklist mode (allow all in *Settings* but block unwanted applications in list) to whitelist mode (block all in *Settings* but allow favorite applications in list). -* Orange = denied internet access -* Green = allowed internet access +* Red/orange/yellow/amber = internet access denied +* Teal/blue/purple/grey = internet access allowd **(1) Can NetGuard completely protect my privacy?** @@ -164,6 +164,12 @@ If you block internet access for an application, there is no way around it. However, applications could access the internet through other applications, like Google Play services. You can prevent this by blocking internet access for the other application as well. +Note that some applications keep trying to access the internet, +which is done by sending a connection request packet. +This packet goes into the VPN sinkhole when internet access for the application is blocked. +This packet consists of less than 100 bytes and is counted as outgoing traffic +and will be visible in the speed graph notification as well. + **(20) Can I Greenify/hibernate NetGuard?** @@ -210,12 +216,6 @@ There is no need for a select all function, because you can switch from black list to white list mode using the settings. See also [question 0](#FAQ0). - -**(26) Can you make the colors configurable?** - -NetGuard is not an application you will use regularly once you have setup the rules, -so IMHO it is not worth the effort to make the colors configurable. -
**If you didn't found the answer to your question, you can ask your questions [here](http://forum.xda-developers.com/showthread.php?t=3233012)**. diff --git a/app/src/main/java/eu/faircode/netguard/ActivityMain.java b/app/src/main/java/eu/faircode/netguard/ActivityMain.java index c5ea501b..f328d79e 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivityMain.java +++ b/app/src/main/java/eu/faircode/netguard/ActivityMain.java @@ -258,6 +258,14 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences public void onReady(IAB iab) { try { iab.updatePurchases(); + + if (!IAB.isPurchased(ActivityPro.SKU_THEME, ActivityMain.this)) { + if (!"teal".equals(prefs.getString("theme", "teal"))) + prefs.edit().putString("theme", "teal").apply(); + } + if (!IAB.isPurchased(ActivityPro.SKU_SPEED, ActivityMain.this)) + prefs.edit().putBoolean("show_stats", false).apply(); + iab.unbind(); } catch (Throwable ex) { Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex)); diff --git a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java index ff4925c4..9750a126 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java +++ b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java @@ -734,7 +734,7 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere enabled = Boolean.parseBoolean(value); else { // Pro features - if (current == application) { + if (current == application) if ("theme".equals(key)) { if (!IAB.isPurchased(ActivityPro.SKU_THEME, context)) return; @@ -742,7 +742,6 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere if (!IAB.isPurchased(ActivityPro.SKU_SPEED, context)) return; } - } if ("boolean".equals(type)) current.put(key, Boolean.parseBoolean(value)); diff --git a/app/src/main/java/eu/faircode/netguard/Util.java b/app/src/main/java/eu/faircode/netguard/Util.java index 733bd6cd..99253739 100644 --- a/app/src/main/java/eu/faircode/netguard/Util.java +++ b/app/src/main/java/eu/faircode/netguard/Util.java @@ -319,6 +319,12 @@ public class Util { context.setTheme(dark ? R.style.AppThemeTealDark : R.style.AppThemeTeal); else if (theme.equals("blue")) context.setTheme(dark ? R.style.AppThemeBlueDark : R.style.AppThemeBlue); + else if (theme.equals("purple")) + context.setTheme(dark ? R.style.AppThemePurpleDark : R.style.AppThemePurple); + else if (theme.equals("amber")) + context.setTheme(dark ? R.style.AppThemeAmberDark : R.style.AppThemeAmber); + else if (theme.equals("orange")) + context.setTheme(dark ? R.style.AppThemeOrangeDark : R.style.AppThemeOrange); } public static int dips2pixels(int dips, Context context) { diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index f98a8682..2f5e641a 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,20 +1,36 @@ - - #009688 - - #00796B - - #FF5722 + + #009688 + #00796B + #FF5722 #009688 #FF5722 - #0066CC - #003366 - #FF3333 - #0066CC - #FF3333 + #2196F3 + #1976D2 + #FF5722 + #2196F3 + #FF5722 + + #9C27B0 + #7B1FA2 + #FF5252 + #9C27B0 + #FF5252 + + #FFC107 + #FFA000 + #448AFF + #448AFF + #FFC107 + + #FF5722 + #E64A19 + #607D8B + #607D8B + #FF5722 #FF0000 #0000FF diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 23e91658..ad36c570 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -109,13 +109,19 @@ Since NetGuard has no internet permission, you know your internet traffic is not Response - Teal/Orange - Blue/Red + teal/orange + blue/orange + purple/red + amber/blue + orange/grey teal blue + purple + amber + orange ef46f813d2c8a064d72c936b9b96d1cccc989378 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 795cd3cf..de5a62ef 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -42,4 +42,64 @@ @drawable/expander_white true + + + + + + + + + + + +