From 0b3de63c40c27119dcf3e680f409aef21be34fa3 Mon Sep 17 00:00:00 2001
From: M66B <marcel@faircode.eu>
Date: Wed, 20 Jan 2016 15:19:28 +0100
Subject: [PATCH] Added development option to set log level

---
 .../eu/faircode/netguard/ActivitySettings.java   |  6 +++++-
 .../eu/faircode/netguard/SinkholeService.java    |  6 ++++--
 app/src/main/res/values/strings.xml              | 16 ++++++++++++++++
 app/src/main/res/xml/preferences.xml             | 10 ++++++++++
 4 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java
index e07842c1..086a5e2f 100644
--- a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java
+++ b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java
@@ -219,6 +219,9 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
             options.removePreference(screen.findPreference("unmetered_4g"));
             options.removePreference(screen.findPreference("national_roaming"));
         }
+
+        if (!Util.isDebuggable(this))
+            screen.removePreference(screen.findPreference("category_development"));
     }
 
     @Override
@@ -418,7 +421,8 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
         } else if ("stats_samples".equals(name)) {
             getPreferenceScreen().findPreference(name).setTitle(getString(R.string.setting_stats_samples, prefs.getString(name, "90")));
 
-        }
+        } else if ("loglevel".equals(name))
+            SinkholeService.reload(null, "setting changed", this);
     }
 
     @Override
diff --git a/app/src/main/java/eu/faircode/netguard/SinkholeService.java b/app/src/main/java/eu/faircode/netguard/SinkholeService.java
index 584fe16a..bdfc9c5e 100644
--- a/app/src/main/java/eu/faircode/netguard/SinkholeService.java
+++ b/app/src/main/java/eu/faircode/netguard/SinkholeService.java
@@ -329,7 +329,8 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
                     for (int i = 0; i < listAllowed.size(); i++)
                         uid[i] = listAllowed.get(i).info.applicationInfo.uid;
 
-                    jni_start(vpn.getFd(), uid, log, filter, Log.INFO);
+                    int prio = Integer.parseInt(prefs.getString("loglevel", Integer.toString(Log.INFO)));
+                    jni_start(vpn.getFd(), uid, log, filter, prio);
                 }
 
                 removeDisabledNotification();
@@ -372,7 +373,8 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
                 for (int i = 0; i < listAllowed.size(); i++)
                     uid[i] = listAllowed.get(i).info.applicationInfo.uid;
 
-                jni_start(vpn.getFd(), uid, log, filter, Log.INFO);
+                int prio = Integer.parseInt(prefs.getString("loglevel", Integer.toString(Log.INFO)));
+                jni_start(vpn.getFd(), uid, log, filter, prio);
             }
 
             if (prev != null)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 79a8690f..3bf534eb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -145,5 +145,21 @@ Since NetGuard has no internet permission, you know your internet traffic is not
         <item>green</item>
     </string-array>
 
+    <string-array name="logLevelNames" translatable="false">
+        <item>Verbose</item>
+        <item>Debug</item>
+        <item>Info</item>
+        <item>Warning</item>
+        <item>Error</item>
+    </string-array>
+
+    <string-array name="logLevelValues" translatable="false">
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+    </string-array>
+
     <string name="fingerprint" translatable="false">ef46f813d2c8a064d72c936b9b96d1cccc989378</string>
 </resources>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index c1ded604..97655aec 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -134,6 +134,16 @@
             android:key="import"
             android:title="@string/setting_import" />
     </PreferenceCategory>
+    <PreferenceCategory
+        android:key="category_development"
+        android:title="Development">
+        <ListPreference
+            android:defaultValue="4"
+            android:entries="@array/logLevelNames"
+            android:entryValues="@array/logLevelValues"
+            android:key="loglevel"
+            android:title="Loglevel" />
+    </PreferenceCategory>
     <PreferenceCategory
         android:key="category_technical"
         android:title="@string/setting_technical">