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

Added development option to set log level

This commit is contained in:
M66B 2016-01-20 15:19:28 +01:00
parent 1b55e3557d
commit 0b3de63c40
4 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/faircode/netguard/ActivitySettings.java
View File

@ -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

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

@ -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)

16
app/src/main/res/values/strings.xml
View File

@ -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>

10
app/src/main/res/xml/preferences.xml
View File

@ -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">