diff --git a/app/src/amazon/AndroidManifest.xml b/app/src/amazon/AndroidManifest.xml index 4a6127db8e..7685088937 100644 --- a/app/src/amazon/AndroidManifest.xml +++ b/app/src/amazon/AndroidManifest.xml @@ -74,6 +74,8 @@ + + diff --git a/app/src/fdroid/AndroidManifest.xml b/app/src/fdroid/AndroidManifest.xml index 3d28dd6824..086d4d42d8 100644 --- a/app/src/fdroid/AndroidManifest.xml +++ b/app/src/fdroid/AndroidManifest.xml @@ -74,6 +74,8 @@ + + diff --git a/app/src/github/AndroidManifest.xml b/app/src/github/AndroidManifest.xml index 3d28dd6824..086d4d42d8 100644 --- a/app/src/github/AndroidManifest.xml +++ b/app/src/github/AndroidManifest.xml @@ -74,6 +74,8 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1adf86ab0a..e548bda08e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -74,6 +74,8 @@ + + diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java index 1a8ca03e30..7bef804c80 100644 --- a/app/src/main/java/eu/faircode/email/Helper.java +++ b/app/src/main/java/eu/faircode/email/Helper.java @@ -529,6 +529,16 @@ public class Helper { return (ris != null && ris.size() > 0); } + static boolean isInstalled(Context context, String pkg) { + try { + PackageManager pm = context.getPackageManager(); + pm.getPackageInfo(pkg, 0); + return true; + } catch (Throwable ex) { + return false; + } + } + static boolean isComponentEnabled(Context context, Class clazz) { PackageManager pm = context.getPackageManager(); int state = pm.getComponentEnabledSetting(new ComponentName(context, clazz)); diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java index 69082b038f..69e4118955 100644 --- a/app/src/main/java/eu/faircode/email/Log.java +++ b/app/src/main/java/eu/faircode/email/Log.java @@ -1959,9 +1959,10 @@ public class Log { size += write(os, "accounts=" + accounts.size() + " enabled=" + enabled + - " interval=" + pollInterval + - "\r\nmetered=" + metered + + " interval=" + pollInterval + "\r\n" + + " metered=" + metered + " VPN=" + ConnectionHelper.vpnActive(context) + + " NetGuard=" + Helper.isInstalled(context, "eu.faircode.netguard") + "\r\n" + " optimizing=" + (ignoring == null ? null : !ignoring) + " auto_optimize=" + auto_optimize + "\r\n\r\n"); diff --git a/app/src/play/AndroidManifest.xml b/app/src/play/AndroidManifest.xml index 23fd10d5d4..1d3044be00 100644 --- a/app/src/play/AndroidManifest.xml +++ b/app/src/play/AndroidManifest.xml @@ -74,6 +74,8 @@ + +