Test

.gitmodules

@@ -6,9 +6,6 @@
 	path = src/main/jni/libancillary
 	url = https://github.com/shadowsocks/libancillary.git
 	branch = shadowsocks-android
-[submodule "src/main/jni/openssl"]
-	path = src/main/jni/openssl
-	url = https://github.com/shadowsocks/openssl-android.git
 [submodule "src/main/jni/libevent"]
 	path = src/main/jni/libevent
 	url = https://github.com/shadowsocks/libevent.git
@@ -23,5 +20,15 @@
 	branch = shadowsocks-android
 [submodule "src/main/jni/shadowsocks-libev"]
 	path = src/main/jni/shadowsocks-libev
-	url = https://github.com/glzjin/shadowsocks-libev.git
+	url = https://github.com/shadowsocksr-backup/shadowsocksr-libev.git
+	branch = master
+[submodule "src/main/jni/mbedtls"]
+	path = src/main/jni/mbedtls
+	url = https://github.com/ARMmbed/mbedtls
+[submodule "src/main/jni/pcre"]
+	path = src/main/jni/pcre
+	url = https://android.googlesource.com/platform/external/pcre
+[submodule "src/main/jni/proxychains"]
+	path = src/main/jni/proxychains
+	url = https://github.com/esdeathlove/proxychains-ng.git
 	branch = master

.travis.yml

@@ -1,5 +1,11 @@
 language: scala
 
+# safelist
+branches:
+  only:
+  - test
+  - stable
+
 jdk:
   - oraclejdk8
 
@@ -24,8 +30,15 @@ before_cache:
 
 cache:
     directories:
-        - $HOME/.ivy2/cache
-        - $HOME/.sbt/boot
+        - $HOME/.ivy2
+        - $HOME/.sbt
+
+android:
+    components:
+        - tools
+        - build-tools-25.0.2
+        - extra-android-m2repository
+        - extra-google-m2repository
 
 install:
     - ./travis-ci/setup.sh

README.md

@@ -1,6 +1,6 @@
-## Shadowsocks R for Android
+## ShadowsocksR for Android
 
-A [shadowsocks R](https://github.com/breakwa11/shadowsocks-rss/) client for Android, written in Scala.
+A [shadowsocksR](https://github.com/breakwa11/shadowsocks-rss/) client for Android, written in Scala.
 
 <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>
 
@@ -12,14 +12,16 @@ A [shadowsocks R](https://github.com/breakwa11/shadowsocks-rss/) client for Andr
 
 * JDK 1.8
 * SBT 0.13.0+
-* Android SDK r25+
+* Android SDK
+  - Build Tools 25+
+  - Android Support Repository and Google Repository (see `build.sbt` for version)
 * Android NDK r12b+
 
 ### BUILD
 
 * Set environment variable `ANDROID_HOME` to `/path/to/android-sdk`
 * Set environment variable `ANDROID_NDK_HOME` to `/path/to/android-ndk`
-* Create your key following the instructions at https://developer.android.com/studio/publish/app-signing.html
+* Create your key following the instructions at https://developer.android.com/studio/publish/app-signing.htmlf
 * Put your key in ~/.keystore
 * Create `local.properties` from `local.properties.example` with your own key information
 * Invoke the building like this

build.sbt

@@ -1,72 +1,66 @@
-import android.Keys._
-
-android.Plugin.androidBuild
-
-platformTarget in Android := "android-24"
-
-name := "shadowsocksr"
-
-applicationId  := "in.zhaoj.shadowsocksr"
-
 scalaVersion := "2.11.8"
+dexMaxHeap := "4g"
 
-compileOrder in Compile := CompileOrder.JavaThenScala
-
-javacOptions ++= Seq("-source", "1.6", "-target", "1.6")
-
-scalacOptions ++= Seq("-target:jvm-1.6", "-Xexperimental")
-
-ndkJavah in Android := List()
-
-ndkBuild in Android := List()
-
-shrinkResources in Android := true
+enablePlugins(AndroidApp)
+android.useSupportVectors
 
-typedResources in Android := false
-
-resConfigs in Android := Seq("ru", "zh", "zh-rCN")
+name := "shadowsocksr"
 
-dexMaxHeap in Android := "4g"
+applicationId := "in.zhaoj.shadowsocksr"
+
+platformTarget := "android-25"
+
+compileOrder := CompileOrder.JavaThenScala
+javacOptions ++= "-source" :: "1.7" :: "-target" :: "1.7" :: Nil
+scalacOptions ++= "-target:jvm-1.7" :: "-Xexperimental" :: Nil
+ndkJavah := Seq()
+ndkBuild := Seq()
+
+proguardVersion := "5.3.2"
+proguardCache := Seq()
+proguardOptions ++=
+  "-keep class com.github.shadowsocks.System { *; }" ::
+  "-keep class okhttp3.** { *; }" ::
+  "-keep interface okhttp3.** { *; }" ::
+  "-keep class okio.** { *; }" ::
+  "-keep interface okio.** { *; }" ::
+  "-dontwarn okio.**" ::
+  "-dontwarn com.google.android.gms.internal.**" ::
+  "-dontwarn com.j256.ormlite.**" ::
+  "-dontwarn org.xbill.**" ::
+  "-dontwarn javax.annotation.Nullable" ::
+  "-dontwarn javax.annotation.ParametersAreNonnullByDefault" ::
+  Nil
+
+shrinkResources := true
+typedResources := false
+resConfigs := Seq("ja", "ru", "zh-rCN", "zh-rTW")
 
 resolvers += Resolver.jcenterRepo
-
-resolvers += "JRAF" at "http://JRAF.org/static/maven/2"
-
-useSupportVectors
-
-libraryDependencies ++= Seq(
-  "dnsjava" % "dnsjava" % "2.1.7",
-  "com.github.kevinsawicki" % "http-request" % "6.0",
-  "eu.chainfire" % "libsuperuser" % "1.0.0.201607041850",
-  "net.glxn.qrgen" % "android" % "2.0",
-
-  //"com.google.android.gms" % "play-services-ads" % "9.2.1",
-  "com.google.android.gms" % "play-services-analytics" % "9.2.1",
-  "com.android.support" % "design" % "24.1.0",
-  "com.android.support" % "gridlayout-v7" % "24.1.0",
-  "com.android.support" % "cardview-v7" % "24.1.0",
-
-  "com.github.jorgecastilloprz" % "fabprogresscircle" % "1.01",
-  "com.j256.ormlite" % "ormlite-android" % "4.48",
-  "com.twofortyfouram" % "android-plugin-api-for-locale" % "1.0.2",
-  "com.github.clans" % "fab" % "1.6.4",
-  "me.dm7.barcodescanner" % "zxing" % "1.8.4"
-)
-
-proguardVersion in Android := "5.2.1"
-
-proguardCache in Android := Seq()
-
-proguardOptions in Android ++= Seq(
-  "-keep class com.github.shadowsocks.System { *; }",
-  "-dontnote com.google.android.gms.internal.**",
-  "-dontnote com.j256.ormlite.**",
-  "-dontnote me.dm7.barcodescannerview.**",
-  "-dontnote org.xbill.**",
-  "-dontwarn org.xbill.**")
+libraryDependencies ++=
+  "com.android.support" % "cardview-v7" % "25.1.0" ::
+  "com.android.support" % "design" % "25.1.0" ::
+  "com.android.support" % "gridlayout-v7" % "25.1.0" ::
+  "com.android.support" % "preference-v14" % "25.1.0" ::
+  "com.evernote" % "android-job" % "1.1.3" ::
+  "com.github.clans" % "fab" % "1.6.4" ::
+  "com.github.jorgecastilloprz" % "fabprogresscircle" % "1.01" ::
+  "com.google.android.gms" % "play-services-analytics" % "10.0.1" ::
+  "com.google.android.gms" % "play-services-gcm" % "10.0.1" ::
+  "com.j256.ormlite" % "ormlite-android" % "5.0" ::
+  "com.mikepenz" % "fastadapter" % "2.1.5" ::
+  "com.mikepenz" % "iconics-core" % "2.8.2" ::
+  "com.mikepenz" % "materialdrawer" % "5.8.1" ::
+  "com.mikepenz" % "materialize" % "1.0.0" ::
+  "com.twofortyfouram" % "android-plugin-api-for-locale" % "1.0.2" ::
+  "dnsjava" % "dnsjava" % "2.1.7" ::
+  "eu.chainfire" % "libsuperuser" % "1.0.0.+" ::
+  "net.glxn.qrgen" % "android" % "2.0" ::
+  "com.squareup.okhttp3" % "okhttp" % "3.8.0" ::
+  "com.google.code.findbugs" % "jsr305" % "1.3.+" ::
+  Nil
 
 lazy val nativeBuild = TaskKey[Unit]("native-build", "Build native executables")
-
 nativeBuild := {
   val logger = streams.value.log
   Process("./build.sh") ! logger match {

build.sh

@@ -15,7 +15,7 @@ rm -rf assets/armeabi-v7a
 rm -rf assets/x86
 mkdir -p assets/armeabi-v7a
 mkdir -p assets/x86
-for app in pdnsd redsocks ss-local ss-tunnel tun2socks
+for app in pdnsd redsocks ss-local tun2socks
 do
     try mv libs/armeabi-v7a/$app assets/armeabi-v7a/
     try mv libs/x86/$app assets/x86/

project/build.properties

@@ -0,0 +1 @@
+sbt.version=0.13.15

project/plugins.sbt

@@ -1,4 +1,4 @@
-addSbtPlugin("org.scala-android" % "sbt-android" % "1.6.8")
+addSbtPlugin("org.scala-android" % "sbt-android" % "1.7.7")
 
 addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.10")
 

src/main/AndroidManifest.xml

@@ -1,13 +1,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools" package="com.github.shadowsocks"
-          android:versionCode="146"
-          android:versionName="2.10.8.5">
+          android:versionCode="318"
+          android:versionName="3.4.0.8">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.NFC" />
-    <uses-permission android:name="android.permission.CAMERA" />
 
     <uses-feature android:name="android.hardware.touchscreen"
                   android:required="false"/>
@@ -20,13 +19,14 @@
 
     <uses-sdk
             android:minSdkVersion="16"
-            android:targetSdkVersion="24"/>
+            android:targetSdkVersion="25"/>
 
     <application
             android:allowBackup="true"
             android:name=".ShadowsocksApplication"
             android:hardwareAccelerated="true"
-            android:icon="@drawable/ic_launcher"
+            android:icon="@mipmap/ic_launcher"
+            android:roundIcon="@mipmap/ic_launcher"
             android:backupAgent=".ShadowsocksBackupAgent"
             android:label="@string/app_name"
             android:theme="@style/Theme.Material"
@@ -51,14 +51,17 @@
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="android.service.quicksettings.action.QS_TILE" />
+                <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
             </intent-filter>
+            <meta-data android:name="android.app.shortcuts"
+                       android:resource="@xml/shortcuts"/>
         </activity>
 
         <activity
                 android:name=".ShadowsocksRunnerActivity"
-                android:theme="@android:style/Theme.NoDisplay"
+                android:theme="@android:style/Theme.Translucent.NoTitleBar"
                 android:excludeFromRecents="true"
+		            android:taskAffinity=""
                 android:launchMode="singleTask">
         </activity>
 
@@ -72,6 +75,14 @@
                 <action android:name="com.github.shadowsocks.ProfileManagerActivity"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
+            <intent-filter>
+                <action android:name="in.zhaoj.shadowsocksr.intent.action.SORT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="in.zhaoj.shadowsocksr.intent.action.SCAN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
                 <category android:name="android.intent.category.DEFAULT"/>
@@ -110,23 +121,36 @@
                 android:launchMode="singleTask"/>
 
         <activity android:name=".TaskerActivity"
-                  android:icon="@drawable/ic_launcher">
+                  android:icon="@mipmap/ic_launcher">
             <intent-filter>
                 <action android:name="com.twofortyfouram.locale.intent.action.EDIT_SETTING" />
             </intent-filter>
         </activity>
 
         <activity android:name=".ShadowsocksQuickSwitchActivity"
+                  android:label="@string/quick_switch"
                   android:launchMode="singleInstance"
                   android:excludeFromRecents="true"
                   android:taskAffinity=""
                   android:theme="@style/PopupTheme.QuickSwitch">
             <intent-filter>
-                <action android:name="com.github.shadowsocks.QUICK_SWITCH" />
+                <action android:name="in.zhaoj.shadowsocksr.QUICK_SWITCH" />
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
 
+        <activity
+                android:name=".QuickToggleShortcut"
+                android:label="@string/quick_toggle"
+                android:theme="@android:style/Theme.Translucent.NoTitleBar"
+                android:excludeFromRecents="true"
+                android:taskAffinity=""
+                android:launchMode="singleTask">
+            <intent-filter>
+                <action android:name="android.intent.action.CREATE_SHORTCUT" />
+            </intent-filter>
+        </activity>
+
         <service
                 android:name=".ShadowsocksRunnerService"
                 android:exported="false">
@@ -169,6 +193,18 @@
                 <action android:name="com.twofortyfouram.locale.intent.action.FIRE_SETTING"/>
             </intent-filter>
         </receiver>
+
+        <!-- android-job components -->
+        <service android:name="com.evernote.android.job.v21.PlatformJobService"
+                 android:process=":bg"/>
+        <service android:name="com.evernote.android.job.v14.PlatformAlarmService"
+                 android:process=":bg"/>
+        <service android:name="com.evernote.android.job.gcm.PlatformGcmService"
+                 android:process=":bg"/>
+        <receiver android:name="com.evernote.android.job.v14.PlatformAlarmReceiver"
+                  android:process=":bg"/>
+        <receiver android:name="com.evernote.android.job.JobBootReceiver"
+                  android:process=":bg"/>
     </application>
 
 </manifest>

src/main/aidl/com/github/shadowsocks/aidl/IShadowsocksService.aidl

@@ -4,6 +4,7 @@ import com.github.shadowsocks.aidl.IShadowsocksServiceCallback;
 
 interface IShadowsocksService {
   int getState();
+  String getProfileName();
 
   oneway void registerCallback(IShadowsocksServiceCallback cb);
   oneway void unregisterCallback(IShadowsocksServiceCallback cb);

src/main/aidl/com/github/shadowsocks/aidl/IShadowsocksServiceCallback.aidl

@@ -1,6 +1,6 @@
 package com.github.shadowsocks.aidl;
 
 interface IShadowsocksServiceCallback {
-  oneway void stateChanged(int state, String msg);
+  oneway void stateChanged(int state, String profileName, String msg);
   oneway void trafficUpdated(long txRate, long rxRate, long txTotal, long rxTotal);
 }