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

Native exception handling

This commit is contained in:
M66B 2016-01-10 17:10:52 +01:00
parent 5ebbf82ef3
commit 1dca134061
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/app.iml
View File

@ -98,6 +98,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/objectFiles" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/objectFiles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />

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

@ -726,7 +726,6 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
// Called from native code // Called from native code
private void logPacket(int version, String saddr, int sport, String daddr, int dport, int protocol, String flags, int uid) { private void logPacket(int version, String saddr, int sport, String daddr, int dport, int protocol, String flags, int uid) {
try {
new DatabaseHelper(SinkholeService.this).insertLog( new DatabaseHelper(SinkholeService.this).insertLog(
version, version,
daddr, daddr,
@ -736,9 +735,6 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
uid, uid,
(last_connected ? last_metered ? 2 : 1 : 0), (last_connected ? last_metered ? 2 : 1 : 0),
last_interactive).close(); last_interactive).close();
} catch (Throwable ex) {
Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
}
} }
private void stopReceiving() { private void stopReceiving() {

7
app/src/main/jni/netguard/netguard.c
View File

@ -155,6 +155,13 @@ void decode(JNIEnv *env, jobject instance, jbyte *buffer, int length) {
(*env)->DeleteLocalRef(env, jsource); (*env)->DeleteLocalRef(env, jsource);
(*env)->DeleteLocalRef(env, jdest); (*env)->DeleteLocalRef(env, jdest);
(*env)->DeleteLocalRef(env, jflags); (*env)->DeleteLocalRef(env, jflags);
jthrowable ex = (*env)->ExceptionOccurred(env);
if (ex) {
(*env)->ExceptionDescribe(env);
(*env)->ExceptionClear(env);
(*env)->DeleteLocalRef(env, ex);
}
} }
} }