Skip to content

Commit

Permalink
Minor adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
@wtoxin
wtoxin committed Apr 14, 2018
1 parent b1e9fd4 commit 3d37a0f
Show file tree
Hide file tree
Showing 16 changed files with 29 additions and 623 deletions.
Binary file modified app/.externalNativeBuild/cmake/debug/arm64-v8a/.ninja_deps
View file
Binary file not shown.
22 changes: 22 additions & 0 deletions app/.externalNativeBuild/cmake/debug/arm64-v8a/.ninja_log
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,25 @@
201 318 0 CMakeFiles/netguard.dir/src/main/jni/netguard/util.c.o 414b4793b279a6a1
3 324 0 CMakeFiles/netguard.dir/src/main/jni/netguard/tcp.c.o ef9e9e887b6d8c70
324 381 0 ../../../../build/intermediates/cmake/debug/obj/arm64-v8a/libnetguard.so 65a6fd510c31a506
4 270 0 CMakeFiles/netguard.dir/src/main/jni/netguard/session.c.o 1668ef7719a8b523
10 293 0 CMakeFiles/netguard.dir/src/main/jni/netguard/icmp.c.o e4278f56c1332979
6 311 0 CMakeFiles/netguard.dir/src/main/jni/netguard/ip.c.o f0fbe609ad32fd45
9 414 0 CMakeFiles/netguard.dir/src/main/jni/netguard/udp.c.o 7148d7dcc4ba1768
311 435 0 CMakeFiles/netguard.dir/src/main/jni/netguard/pcap.c.o c5956bd8890c39ea
2 461 0 CMakeFiles/netguard.dir/src/main/jni/netguard/netguard.c.o 878e0f583507c0f
293 464 0 CMakeFiles/netguard.dir/src/main/jni/netguard/dhcp.c.o 45f2413348591043
270 509 0 CMakeFiles/netguard.dir/src/main/jni/netguard/dns.c.o f81c9ce5f0ae5080
7 533 0 CMakeFiles/netguard.dir/src/main/jni/netguard/tcp.c.o ef9e9e887b6d8c70
414 598 0 CMakeFiles/netguard.dir/src/main/jni/netguard/util.c.o 414b4793b279a6a1
598 719 0 ../../../../build/intermediates/cmake/debug/obj/arm64-v8a/libnetguard.so 65a6fd510c31a506
10 189 0 CMakeFiles/netguard.dir/src/main/jni/netguard/icmp.c.o e4278f56c1332979
3 197 0 CMakeFiles/netguard.dir/src/main/jni/netguard/session.c.o 1668ef7719a8b523
8 216 0 CMakeFiles/netguard.dir/src/main/jni/netguard/udp.c.o 7148d7dcc4ba1768
4 232 0 CMakeFiles/netguard.dir/src/main/jni/netguard/ip.c.o f0fbe609ad32fd45
197 313 0 CMakeFiles/netguard.dir/src/main/jni/netguard/dhcp.c.o 45f2413348591043
216 320 0 CMakeFiles/netguard.dir/src/main/jni/netguard/pcap.c.o c5956bd8890c39ea
189 346 0 CMakeFiles/netguard.dir/src/main/jni/netguard/dns.c.o f81c9ce5f0ae5080
1 352 0 CMakeFiles/netguard.dir/src/main/jni/netguard/netguard.c.o 878e0f583507c0f
232 358 0 CMakeFiles/netguard.dir/src/main/jni/netguard/util.c.o 414b4793b279a6a1
6 383 0 CMakeFiles/netguard.dir/src/main/jni/netguard/tcp.c.o ef9e9e887b6d8c70
383 446 0 ../../../../build/intermediates/cmake/debug/obj/arm64-v8a/libnetguard.so 65a6fd510c31a506
2 changes: 2 additions & 0 deletions app/app.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,11 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-main-apk-res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
Expand Down
176 changes: 0 additions & 176 deletions app/src/main/java/anormals/ImageUtil.kt
View file

This file was deleted.

36 changes: 1 addition & 35 deletions app/src/main/java/edu/nudt/netlog/ActivityLog.java
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,5 @@
package edu.nudt.netlog;

/*
This file is part of NetGuard.
NetGuard is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
NetGuard is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
Copyright 2015-2018 by Marcel Bokhorst (M66B)
*/

import android.annotation.SuppressLint;
import android.content.Intent;
Expand Down Expand Up @@ -60,10 +42,8 @@
import java.text.SimpleDateFormat;
import java.util.Date;

import anormals.MyHandler;

public class ActivityLog extends AppCompatActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
private static final String TAG = "NetGuard.Log";
private static final String TAG = "NetLog.Log";

private boolean running = false;
private ListView lvLog;
Expand Down Expand Up @@ -257,20 +237,6 @@ public boolean onMenuItemClick(MenuItem menuItem) {
return true;
}

// case R.id.menu_whois:
// startActivity(lookupIP);
// return true;
//
// case R.id.menu_port:
// startActivity(lookupPort);
// return true;
//
// case R.id.menu_copy:
// ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
// ClipData clip = ClipData.newPlainText("netguard", dname == null ? daddr : dname);
// clipboard.setPrimaryClip(clip);
// return true;

default:
return false;
}
Expand Down
18 changes: 0 additions & 18 deletions app/src/main/java/edu/nudt/netlog/ActivityMain.java
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,5 @@
package edu.nudt.netlog;

/*
This file is part of NetGuard.
NetGuard is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
NetGuard is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
Copyright 2015-2018 by Marcel Bokhorst (M66B)
*/

import android.content.BroadcastReceiver;
import android.content.Context;
Expand Down
18 changes: 0 additions & 18 deletions app/src/main/java/edu/nudt/netlog/ActivitySettings.java
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,5 @@
package edu.nudt.netlog;

/*
This file is part of NetGuard.
NetGuard is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
NetGuard is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
Copyright 2015-2018 by Marcel Bokhorst (M66B)
*/

import android.Manifest;
import android.annotation.TargetApi;
Expand Down
18 changes: 0 additions & 18 deletions app/src/main/java/edu/nudt/netlog/AdapterAccess.java
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,5 @@
package edu.nudt.netlog;

/*
This file is part of NetGuard.
NetGuard is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
NetGuard is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
Copyright 2015-2018 by Marcel Bokhorst (M66B)
*/

import android.content.Context;
import android.content.res.TypedArray;
Expand Down
20 changes: 1 addition & 19 deletions app/src/main/java/edu/nudt/netlog/AdapterLog.java
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,5 @@
package edu.nudt.netlog;

/*
This file is part of NetGuard.
NetGuard is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
NetGuard is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with NetGuard. If not, see <http://www.gnu.org/licenses/>.
Copyright 2015-2018 by Marcel Bokhorst (M66B)
*/

import android.content.Context;
import android.content.SharedPreferences;
Expand Down Expand Up @@ -47,7 +29,7 @@
import java.util.List;

public class AdapterLog extends CursorAdapter {
private static String TAG = "NetGuard.Log";
private static String TAG = "NetLog.Log";

private boolean resolve;
private boolean organization;
Expand Down
Loading

0 comments on commit 3d37a0f

Please sign in to comment.