mirror/NetGuard
1
0
Fork 0
mirror of https://github.com/M66B/NetGuard.git synced 2025-01-30 19:31:26 +00:00
Code Issues Releases Wiki Activity

2.143 release

Browse source 
Updated tools and libraries
Target SDK set to 27 (Android 8.1)
Minimum SDK set to 21 (Android 5.0)
This commit is contained in:
M66B 2017-10-25 21:23:53 +02:00
parent 7e0ec6fadb
commit a3b2876fa7
5 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/build.gradle
View file

@ -1,15 +1,15 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion = 26
buildToolsVersion = "26.0.2"
compileSdkVersion = 27
buildToolsVersion = "27"
defaultConfig {
applicationId = "eu.faircode.netguard"
versionName = "2.142"
minSdkVersion 14
targetSdkVersion 26
versionCode = 2017102301
versionName = "2.143"
minSdkVersion 21
targetSdkVersion 27
versionCode = 2017102601
archivesBaseName = "NetGuard-v$versionName"
externalNativeBuild {
@ -21,7 +21,7 @@ android {
}
ndk {
abiFilters 'armeabi', 'x86'
abiFilters 'armeabi', 'armeabi-v7a', 'x86', 'mips'
}
}
@ -49,8 +49,8 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
// https://developer.android.com/topic/libraries/support-library/revisions.html
implementation 'com.android.support:appcompat-v7:26.1.+'
implementation 'com.android.support:recyclerview-v7:26.1.+'
implementation 'com.android.support:appcompat-v7:27.+'
implementation 'com.android.support:recyclerview-v7:27.+'
// https://developers.google.com/android/guides/setup
implementation 'com.google.android.gms:play-services-base:11.4.+'

2
app/src/main/jni/netguard/netguard.c
View file

@ -418,7 +418,7 @@ void report_error(const struct arguments *args, jint error, const char *fmt, ...
static jmethodID midProtect = NULL;
int protect_socket(const struct arguments *args, int socket) {
if (args->sdk >= 23)
if (args->sdk >= 21)
return 0;
jclass cls = (*args->env)->GetObjectClass(args->env, args->instance);

16
app/src/main/res/layout/traffic.xml
View file

@ -15,7 +15,7 @@
android:id="@+id/tvTx"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Notification.Info"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:typeface="monospace" />
<TextView
@ -25,7 +25,7 @@
android:layout_marginStart="4dp"
android:alpha="0.5"
android:text="▲"
android:textAppearance="@style/TextAppearance.AppCompat.Notification.Info"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@color/colorSend" />
<TextView
@ -34,7 +34,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:textAppearance="@style/TextAppearance.AppCompat.Notification.Info"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:typeface="monospace" />
<TextView
@ -44,7 +44,7 @@
android:layout_marginStart="4dp"
android:alpha="0.5"
android:text="▼"
android:textAppearance="@style/TextAppearance.AppCompat.Notification.Info"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@color/colorReceive" />
</LinearLayout>
@ -55,7 +55,7 @@
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:textAppearance="@style/TextAppearance.AppCompat.Notification.Info"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textSize="10sp" />
<TextView
@ -66,7 +66,7 @@
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:singleLine="false"
android:textAppearance="@style/TextAppearance.AppCompat.Notification.Info"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textSize="10sp" />
<TextView
@ -76,7 +76,7 @@
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:textAppearance="@style/TextAppearance.AppCompat.Notification.Info"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textSize="10sp" />
<ImageView
@ -96,7 +96,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:paddingTop="10sp"
android:textAppearance="@style/TextAppearance.AppCompat.Notification.Info"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="@color/colorGrayed"
android:textSize="10sp"
android:typeface="monospace" />

2
build.gradle
View file

@ -8,7 +8,7 @@ buildscript {
// http://tools.android.com/tech-docs/new-build-system/gradle-experimental
// https://bintray.com/android/android-tools/com.android.tools.build.gradle-experimental/view
// https://bintray.com/android/android-tools/com.google.gms.google-services/view
classpath 'com.android.tools.build:gradle:3.0.0-rc2'
classpath 'com.android.tools.build:gradle:3.0.0'
classpath 'com.google.gms:google-services:3.1.0'
// NOTE: Do not place your application dependencies here; they belong

2
tools/addr2line.sh
View file

@ -1,4 +1,4 @@
#!/bin/sh
addr2line=/media/marcel/C720/android-ndk-r10e/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-addr2line
lib=./app/build/intermediates/binaries/debug/all/obj/armeabi-v7a/libnetguard.so
lib=./app/build/intermediates/cmake/release/obj/armeabi/libnetguard.so
addr2line -C -f -e $lib $1