diff --git a/app/build.gradle b/app/build.gradle index c3e8ea87..cbe0c867 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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.+' diff --git a/app/src/main/jni/netguard/netguard.c b/app/src/main/jni/netguard/netguard.c index 5ee2aa08..1d2d4a46 100644 --- a/app/src/main/jni/netguard/netguard.c +++ b/app/src/main/jni/netguard/netguard.c @@ -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); diff --git a/app/src/main/res/layout/traffic.xml b/app/src/main/res/layout/traffic.xml index 7a64e1c2..4378727c 100644 --- a/app/src/main/res/layout/traffic.xml +++ b/app/src/main/res/layout/traffic.xml @@ -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" /> @@ -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" /> diff --git a/build.gradle b/build.gradle index 328f439f..277d555b 100644 --- a/build.gradle +++ b/build.gradle @@ -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 diff --git a/tools/addr2line.sh b/tools/addr2line.sh index b1ced971..9d226d50 100644 --- a/tools/addr2line.sh +++ b/tools/addr2line.sh @@ -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