mirror/NetGuard
1
0
Fork 0
mirror of https://github.com/M66B/NetGuard.git synced 2025-03-15 16:29:42 +00:00
Code Issues Releases Wiki Activity

Logging

Browse source
This commit is contained in:
M66B 2015-10-25 11:55:49 +01:00
parent b2a59b695a
commit c2c5bd2004
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/eu/faircode/netguard/ActivityMain.java
View file

@ -52,7 +52,7 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
swEnabled.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (isChecked) {
Log.i(TAG, "On");
Log.i(TAG, "Switch on");
Intent intent = VpnService.prepare(ActivityMain.this);
if (intent == null) {
Log.e(TAG, "Prepare done");
@ -62,7 +62,7 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
startActivityForResult(intent, REQUEST_VPN);
}
} else {
Log.i(TAG, "Off");
Log.i(TAG, "Switch off");
prefs.edit().putBoolean("enabled", false).apply();
Intent intent = new Intent(ActivityMain.this, BlackHoleService.class);
intent.putExtra(BlackHoleService.EXTRA_COMMAND, BlackHoleService.Command.stop);

19
app/src/main/java/eu/faircode/netguard/BlackHoleService.java
View file

@ -34,7 +34,7 @@ public class BlackHoleService extends VpnService implements Runnable {
if (cmd == Command.reload || cmd == Command.stop) {
if (thread != null) {
Log.i(TAG, "Stopping");
Log.i(TAG, "Stopping thread=" + thread);
thread.interrupt();
}
if (cmd == Command.stop)
@ -46,6 +46,7 @@ public class BlackHoleService extends VpnService implements Runnable {
Log.i(TAG, "Starting");
thread = new Thread(this, "BlackHoleThread");
thread.start();
Log.i(TAG, "Started thread=" + thread);
}
}
@ -78,8 +79,10 @@ public class BlackHoleService extends VpnService implements Runnable {
@Override
public void onDestroy() {
Log.i(TAG, "Destroy");
if (thread != null)
if (thread != null) {
Log.i(TAG, "Interrupt thread=" + thread);
thread.interrupt();
}
unregisterReceiver(connectivityChangedReceiver);
super.onDestroy();
}
@ -87,8 +90,10 @@ public class BlackHoleService extends VpnService implements Runnable {
@Override
public void onRevoke() {
Log.i(TAG, "Revoke");
if (thread != null)
if (thread != null) {
Log.i(TAG, "Interrupt thread=" + thread);
thread.interrupt();
}
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
prefs.edit().putBoolean("enabled", false).apply();
super.onRevoke();
@ -96,7 +101,7 @@ public class BlackHoleService extends VpnService implements Runnable {
@Override
public synchronized void run() {
Log.i(TAG, "Run");
Log.i(TAG, "Run thread=" + Thread.currentThread());
ParcelFileDescriptor pfd = null;
try {
// Check if Wi-Fi connection
@ -127,11 +132,11 @@ public class BlackHoleService extends VpnService implements Runnable {
pfd = builder.establish();
// Drop all packets
Log.i(TAG, "Loop start");
Log.i(TAG, "Loop start thread=" + Thread.currentThread());
FileInputStream in = new FileInputStream(pfd.getFileDescriptor());
while (!Thread.currentThread().isInterrupted())
while (!Thread.currentThread().isInterrupted() && pfd.getFileDescriptor().valid())
in.skip(32768);
Log.i(TAG, "Loop exit");
Log.i(TAG, "Loop exit thread=" + Thread.currentThread());
} catch (Throwable ex) {
Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));