Merge pull request #2 from shadowsocks/master

Sync

.github/faq.md

@@ -31,9 +31,10 @@ The exclamation mark in the Wi-Fi/cellular icon appears because the system fails
 
 1. Some ROM has broken VPNService implementation, especially for IPv6;
 2. Some ROM has aggressive (or called broken) background service killing policy;
-3. If you have Xposed framework and/or battery saver apps, it's likely that this app wouldn't work well with these either.
+3. Some ROM like [Flyme](https://github.com/shadowsocks/shadowsocks-android/issues/1589) has **very** broken direct boot support;
+4. If you have Xposed framework and/or battery saver apps, it's likely that this app wouldn't work well with these either.
 
-* Fixes for MIUI: [#772](https://github.com/shadowsocks/shadowsocks-android/issues/772)
+* Fixes for MIUI: [#772](https://github.com/shadowsocks/shadowsocks-android/issues/772) [#888](https://github.com/shadowsocks/shadowsocks-android/issues/888)
 * Fixes for Huawei: [#1091 (comment)](https://github.com/shadowsocks/shadowsocks-android/issues/1091#issuecomment-276949836)
 * Related to Xposed: [#1414](https://github.com/shadowsocks/shadowsocks-android/issues/1414)
 * Samsung and/or Brevent: [#1410](https://github.com/shadowsocks/shadowsocks-android/issues/1410)

.gitignore

@@ -24,3 +24,6 @@ core/src/overture/src/gopkg.in
 # work in progress
 tv/
 things/
+
+# release apks
+*.apk

README.md

@@ -1,7 +1,9 @@
 ## Shadowsocks for Android
 
 [![Build Status](https://api.travis-ci.org/shadowsocks/shadowsocks-android.svg)](https://travis-ci.org/shadowsocks/shadowsocks-android)
+[![API](https://img.shields.io/badge/API-21%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=21)
 [![Releases](https://img.shields.io/github/downloads/shadowsocks/shadowsocks-android/total.svg)](https://github.com/shadowsocks/shadowsocks-android/releases)
+[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 
 A [shadowsocks](http://shadowsocks.org) client for Android, written in Kotlin.  
 <a href="https://play.google.com/store/apps/details?id=com.github.shadowsocks"><img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" height="48"></a>

build.gradle

@@ -1,9 +1,11 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
+apply plugin: 'com.github.ben-manes.versions'
+
 buildscript {
     ext {
-        kotlinVersion = '1.2.10'
-        minSdkVersion = 19
+        kotlinVersion = '1.2.21'
+        minSdkVersion = 21
         sdkVersion = 27
         buildToolsVersion = '27.0.3'
         supportLibraryVersion = '27.0.2'
@@ -21,7 +23,8 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.1'
-        classpath 'com.google.gms:google-services:3.1.1'
+        classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
+        classpath 'com.google.gms:google-services:3.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
 }

core/build.gradle

@@ -36,19 +36,28 @@ android {
 }
 
 task goBuild(type: Exec) {
-    executable "sh"
-    args "-c", "src/overture/make.bash " + minSdkVersion
+    if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+        executable "cmd.exe"
+        args "/c", "src\\overture\\make.bat " + minSdkVersion
+    } else {
+        executable "sh"
+        args "-c", "src/overture/make.bash " + minSdkVersion
+    }
 }
 
 task goClean(type: Exec) {
-    executable "sh"
-    args "-c", "src/overture/clean.bash"
+    if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+        executable "cmd.exe"
+        args "/c", "src\\overture\\clean.bat"
+    } else {
+        executable "sh"
+        args "-c", "src/overture/clean.bash"
+    }
 }
 
 tasks.whenTaskAdded { task ->
   if ((task.name == 'generateJsonModelDebug' ||
-          task.name == 'generateJsonModelRelease') &&
-          !Os.isFamily(Os.FAMILY_WINDOWS)) {
+          task.name == 'generateJsonModelRelease')) {
       task.dependsOn(goBuild)
     }
 }

core/src/main/java/com/github/shadowsocks/JniHelper.java

@@ -43,8 +43,6 @@
 import android.support.annotation.Nullable;
 import android.system.ErrnoException;
 
-import java.net.InetAddress;
-
 public class JniHelper {
     static {
         System.loadLibrary("jni-helper");
@@ -54,8 +52,7 @@ public class JniHelper {
     public static void sigtermCompat(@NonNull Process process) throws Exception {
         if (Build.VERSION.SDK_INT >= 24) throw new UnsupportedOperationException("Never call this method in OpenJDK!");
         int errno = sigterm(process);
-        if (errno != 0) throw Build.VERSION.SDK_INT >= 21
-                ? new ErrnoException("kill", errno) : new Exception("kill failed: " + errno);
+        if (errno != 0) throw new ErrnoException("kill", errno);
     }
 
     @Deprecated // only implemented for before API 24

core/src/main/jni/Application.mk

@@ -1,4 +1,4 @@
 APP_ABI                 := armeabi-v7a arm64-v8a x86
-APP_PLATFORM            := android-19
+APP_PLATFORM            := android-21
 APP_STL                 := c++_static
 NDK_TOOLCHAIN_VERSION   := clang

core/src/main/jni/build-shared-executable.mk

@@ -16,8 +16,8 @@
 # executable program
 #
 # Modified by @Mygod, based on:
-#   https://android.googlesource.com/platform/ndk/+/f2e98f8c066aed59caf61163d4b87c2b858f9814/build/core/build-shared-library.mk
-#   https://android.googlesource.com/platform/ndk/+/f2e98f8c066aed59caf61163d4b87c2b858f9814/build/core/build-executable.mk
+#   https://android.googlesource.com/platform/ndk/+/a355a4e/build/core/build-shared-library.mk
+#   https://android.googlesource.com/platform/ndk/+/a355a4e/build/core/build-executable.mk
 LOCAL_BUILD_SCRIPT := BUILD_EXECUTABLE
 LOCAL_MAKEFILE     := $(local-makefile)
 $(call check-defined-LOCAL_MODULE,$(LOCAL_BUILD_SCRIPT))

core/src/overture/clean.bat

@@ -0,0 +1,10 @@
+@ECHO OFF
+
+SET DIR=%~dp0
+SET DEPS=%DIR%\.deps
+
+RD /S /Q %DEPS%
+RD /S /Q %DIR%\go\bin
+RD /S /Q %DIR%\bin
+
+ECHO "Successfully clean overture"

core/src/overture/make.bash

@@ -12,7 +12,7 @@ TARGET=$DIR/bin
 DEPS=$DIR/.deps
 
 ANDROID_ARM_TOOLCHAIN=$DEPS/android-toolchain-${MIN_API}-arm
-ANDROID_ARM64_TOOLCHAIN=$DEPS/android-toolchain-21-arm64
+ANDROID_ARM64_TOOLCHAIN=$DEPS/android-toolchain-${MIN_API}-arm64
 ANDROID_X86_TOOLCHAIN=$DEPS/android-toolchain-${MIN_API}-x86
 
 ANDROID_ARM_CC=$ANDROID_ARM_TOOLCHAIN/bin/arm-linux-androideabi-clang
@@ -35,7 +35,7 @@ fi
 if [ ! -f "$ANDROID_ARM64_CC" ]; then
     echo "Make standalone toolchain for ARM64 arch"
     $ANDROID_NDK_HOME/build/tools/make_standalone_toolchain.py --arch arm64 \
-        --api 21 --install-dir $ANDROID_ARM64_TOOLCHAIN
+        --api $MIN_API --install-dir $ANDROID_ARM64_TOOLCHAIN
 fi
 
 if [ ! -f "$ANDROID_X86_CC" ]; then

core/src/overture/make.bat

@@ -0,0 +1,121 @@
+@ECHO OFF
+SETLOCAL
+
+IF NOT DEFINED ANDROID_NDK_HOME (
+	SET ANDROID_NDK_HOME=%ANDROID_HOME%\ndk-bundle
+)
+
+SET DIR=%~dp0
+SET MIN_API=%1%
+SET TARGET=%DIR%\bin
+SET DEPS=%DIR%\.deps
+
+SET ANDROID_ARM_TOOLCHAIN=%DEPS%\android-toolchain-%MIN_API%-arm
+SET ANDROID_ARM64_TOOLCHAIN=%DEPS%\android-toolchain-%MIN_API%-arm64
+SET ANDROID_X86_TOOLCHAIN=%DEPS%\android-toolchain-%MIN_API%-x86
+
+SET ANDROID_ARM_CC=%ANDROID_ARM_TOOLCHAIN%\bin\arm-linux-androideabi-clang
+SET ANDROID_ARM_STRIP=%ANDROID_ARM_TOOLCHAIN%\bin\arm-linux-androideabi-strip
+
+SET ANDROID_ARM64_CC=%ANDROID_ARM64_TOOLCHAIN%\bin\aarch64-linux-android-clang
+SET ANDROID_ARM64_STRIP=%ANDROID_ARM64_TOOLCHAIN%\bin\aarch64-linux-android-strip
+
+SET ANDROID_X86_CC=%ANDROID_X86_TOOLCHAIN%\bin\i686-linux-android-clang
+SET ANDROID_X86_STRIP=%ANDROID_X86_TOOLCHAIN%\bin\i686-linux-android-strip
+
+MKDIR %DEPS%>nul 2>nul 
+MKDIR %TARGET%\armeabi-v7a>nul 2>nul 
+MKDIR %TARGET%\x86>nul 2>nul 
+MKDIR %TARGET%\arm64-v8a>nul 2>nul 
+
+IF NOT EXIST %ANDROID_ARM_CC% (
+	ECHO "Make standalone toolchain for ARM arch"
+    %ANDROID_NDK_HOME%\build\tools\make_standalone_toolchain.py --arch arm ^
+        --api %MIN_API% --install-dir %ANDROID_ARM_TOOLCHAIN%
+)
+
+IF NOT EXIST %ANDROID_ARM64_CC% (
+    ECHO "Make standalone toolchain for ARM64 arch"
+    %ANDROID_NDK_HOME%\build\tools\make_standalone_toolchain.py --arch arm64 ^
+        --api %MIN_API% --install-dir %ANDROID_ARM64_TOOLCHAIN%
+)
+
+IF NOT EXIST %ANDROID_X86_CC% (
+    ECHO "Make standalone toolchain for X86 arch"
+    %ANDROID_NDK_HOME%\build\tools\make_standalone_toolchain.py --arch x86 ^
+        --api %MIN_API% --install-dir %ANDROID_X86_TOOLCHAIN%
+)
+
+IF NOT EXIST %DIR%\go\bin\go.exe (
+    ECHO "Build the custom go"
+
+    PUSHD %DIR%\go\src
+    CALL make.bat
+    POPD
+)
+
+SET GOROOT=%DIR%\go
+SET GOPATH=%DIR%
+SET PATH=%GOROOT%\bin;%GOPATH%\bin;%PATH%
+
+SET BUILD=1
+IF EXIST "%TARGET%\armeabi-v7a\liboverture.so" (
+	IF EXIST "%TARGET%\arm64-v8a\liboverture.so" (
+		IF EXIST "%TARGET%\x86\liboverture.so" (
+			SET BUILD=0
+		)
+	)
+)
+
+IF %BUILD% == 1 (
+	ECHO "Get dependences for overture"
+	go.exe get -u github.com\tools\godep
+
+	PUSHD %GOPATH%\src\github.com\shadowsocks\overture\main
+	godep.exe restore
+
+	ECHO "Cross compile overture for arm"
+	IF NOT EXIST "%TARGET%\armeabi-v7a\liboverture.so" (
+		SETLOCAL
+	    SET CGO_ENABLED=1
+	    SET CC=%ANDROID_ARM_CC%
+	    SET GOOS=android
+	    SET GOARCH=arm
+	    SET GOARM=7
+	    go.exe build -ldflags="-s -w"
+	    %ANDROID_ARM_STRIP% main
+	    MOVE main %TARGET%\armeabi-v7a\liboverture.so>nul 2>nul 
+	    ENDLOCAL
+	)
+
+	ECHO "Cross compile overture for arm64"
+	IF NOT EXIST "%TARGET%\arm64-v8a\liboverture.so" (
+		SETLOCAL
+	    SET CGO_ENABLED=1
+	    SET CC=%ANDROID_ARM64_CC%
+	    SET GOOS=android
+	    SET GOARCH=arm64
+	    go.exe build -ldflags="-s -w"
+	    %ANDROID_ARM64_STRIP% main
+	    MOVE main %TARGET%\arm64-v8a\liboverture.so>nul 2>nul 
+	    ENDLOCAL
+	)
+
+	ECHO "Cross compile overture for x86"
+	IF NOT EXIST "%TARGET%\x86\liboverture.so" (
+		SETLOCAL
+	    SET CGO_ENABLED=1
+	    SET CC=%ANDROID_X86_CC%
+	    SET GOOS=android
+	    SET GOARCH=386
+	    go.exe build -ldflags="-s -w"
+	    %ANDROID_X86_STRIP% main
+	    MOVE main %TARGET%\x86\liboverture.so>nul 2>nul 
+	    ENDLOCAL
+	)
+
+	POPD
+)
+
+ECHO "Successfully build overture"
+ENDLOCAL

mobile/build.gradle

@@ -1,3 +1,4 @@
+import com.android.build.OutputFile
 import java.util.regex.Matcher
 import java.util.regex.Pattern
 
@@ -7,7 +8,7 @@ apply plugin: 'kotlin-android'
 def getCurrentFlavor() {
     String task = getGradle().getStartParameter().getTaskRequests().toString()
     Matcher matcher = Pattern.compile("(assemble|generate)\\w*(Release|Debug)").matcher(task)
-    if (matcher.find()) return matcher.group(1).toLowerCase() else {
+    if (matcher.find()) return matcher.group(2).toLowerCase() else {
         println "Warning: No match found for $task"
         return "debug"
     }
@@ -20,11 +21,10 @@ android {
         applicationId "com.github.shadowsocks"
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.sdkVersion
-        versionCode 204
-        versionName "4.4.4"
+        versionCode 4040600
+        versionName "4.4.6"
         testApplicationId "com.github.shadowsocks.test"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        vectorDrawables.useSupportLibrary true
         resConfigs "fa", "fr", "ja", "ko", "ru", "zh-rCN", "zh-rTW"
     }
     buildTypes {
@@ -37,6 +37,15 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    lintOptions.checkReleaseBuilds false
+    splits {
+        abi {
+            enable true
+            reset()
+            include 'armeabi-v7a', 'arm64-v8a', 'x86'
+            universalApk true
+        }
+    }
     sourceSets.main.jniLibs.srcDirs +=
             new File(project(':core').buildDir, "intermediates/bundles/${getCurrentFlavor()}/jni")
     sourceSets.main.jniLibs.srcDirs += new File(project(':core').projectDir, "src/overture/bin")
@@ -48,17 +57,13 @@ dependencies {
     implementation "com.android.support:design:$supportLibraryVersion"
     implementation "com.android.support:gridlayout-v7:$supportLibraryVersion"
     implementation 'com.futuremind.recyclerfastscroll:fastscroll:0.2.5'
-    implementation 'com.evernote:android-job:1.2.1'
+    implementation 'com.evernote:android-job:1.2.2'
     implementation "com.google.android.gms:play-services-ads:$playServicesVersion"
     implementation "com.google.android.gms:play-services-analytics:$playServicesVersion"
-    implementation "com.google.android.gms:play-services-gcm:$playServicesVersion"
     implementation "com.google.firebase:firebase-config:$playServicesVersion"
     implementation 'com.j256.ormlite:ormlite-android:5.0'
-    implementation 'com.mikepenz:crossfader:1.5.1'
-    implementation 'com.mikepenz:fastadapter:3.0.4'
-    implementation 'com.mikepenz:iconics-core:3.0.0'
-    implementation 'com.mikepenz:materialdrawer:6.0.2'
-    implementation 'com.mikepenz:materialize:1.1.2'
+    implementation 'com.mikepenz:crossfader:1.5.2'
+    implementation 'com.mikepenz:materialdrawer:6.0.3'
     implementation 'com.squareup.okhttp3:okhttp:3.9.1'
     implementation "com.takisoft.fix:preference-v7-simplemenu:$takisoftFixVersion"
     implementation 'com.twofortyfouram:android-plugin-api-for-locale:1.0.2'
@@ -76,3 +81,11 @@ repositories {
 }
 
 apply plugin: 'com.google.gms.google-services'
+
+ext.abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, x86: 3]
+if (getCurrentFlavor() == 'release') android.applicationVariants.all { variant ->
+    variant.outputs.each { output ->
+        def offset = project.ext.abiCodes.get(output.getFilter(OutputFile.ABI))
+        if (offset != null) output.versionCodeOverride = variant.versionCode + offset
+    }
+}

mobile/src/main/AndroidManifest.xml

@@ -171,9 +171,11 @@
         <service android:name="com.evernote.android.job.v14.PlatformAlarmService"
                  android:process=":bg"
                  android:directBootAware="true"/>
-        <service android:name="com.evernote.android.job.gcm.PlatformGcmService"
+        <service android:name="com.evernote.android.job.v14.PlatformAlarmServiceExact"
                  android:process=":bg"
                  android:directBootAware="true"/>
+        <service android:name="com.evernote.android.job.gcm.PlatformGcmService"
+                 tools:node="remove"/>
         <service android:name="com.evernote.android.job.JobRescheduleService"
                  android:process=":bg"
                  android:directBootAware="true"/>