Finish 3.5.0

Author: Akkariiin

.gitmodules

@@ -20,8 +20,8 @@
 	branch = shadowsocks-android
 [submodule "src/main/jni/shadowsocks-libev"]
 	path = src/main/jni/shadowsocks-libev
-	url = https://github.com/shadowsocksr/shadowsocksr-libev.git
-	branch = master
+	url = https://github.com/shadowsocksrr/shadowsocksr-libev.git
+	branch = Akkariiin/master
 [submodule "src/main/jni/mbedtls"]
 	path = src/main/jni/mbedtls
 	url = https://github.com/ARMmbed/mbedtls

.travis.yml

@@ -45,12 +45,3 @@ install:
 
 script:
     - sbt native-build android:package-release
-deploy:
-  provider: releases
-  api_key:
-    secure: 
-fHITx5JBIyE4dTXsIui9pNUjiPY/KCQUyf1drvZe0b6lYq4JG+Vd/4gsYKDU64UYFtVFLAmWb1/arii9LGRJep8zlbXwawmTyJFzFA4FMTfiwPYlHv2E9ZDsuMEdz4cNUJ3ZxtMipV18/B5db42/sNf9mjeoulBYiWSVQF5Ef5EVZBFpUVTT4xuXBzDANS6URfdi6WVDlrKfSP6EzCwgsKL+T8igrQXAMeFySAM3247jsgAVvFjxaP32F5F4ShP+bFz8JhS7+XxViitXFenX7QG7gW6C2W90SIMkkfsyevwOJMwgbbZMWYRBlX6JoPubIFZ4x3U0pDRPIfsENNjJRhysrU7Ps4LKpozprDHwbkkg0rlSmk7UZvpmuFv5LCsasWIYuvIL7kS3jBiOrC0qAXvEDWugY3gPA1umDg2oLytA6B+LtDmbWZPMrczZAgea9D6eWoH1x2DG0OtU68S6kF11h3RH4RheK28Xk6qcxT5Up27B1Mmvl44ScWo7IBdCd91pyllYWT88ktPQXdcBGUTop5fdQ5cKs9P4AEtw2h1uXOCCEoyOzOWz6m88U7hEh1F/86DecYEhQ2xWZQutRvkg8Rn6cx7QV7nElrT8hrK+P38K845MjKDn8/d+HDwyJ+fk11lbQamwRf7DOA9a0tZYj4imNCv2zGIC0sEPs4Y=
-  file: "/home/travis/build/milkice233/shadowsocksr-android/target/android/output/shadowsocksr-release.apk"
-  skip_cleanup: true
-  on:
-    tags: true

README.md

@@ -15,24 +15,52 @@ A [shadowsocksR](https://github.com/breakwa11/shadowsocks-rss/) client for Andro
 * Android SDK
   - Build Tools 25+
   - Android Support Repository and Google Repository (see `build.sbt` for version)
-* Android NDK r12b+
+* Android NDK r12b `High version may case something build fail`
 
 ### BUILD
 
+*Warnning: Cannot build in windows*
+
 * Set environment variable `ANDROID_HOME` to `/path/to/android-sdk`
 * Set environment variable `ANDROID_NDK_HOME` to `/path/to/android-ndk`
+* And you can set http.proxy for sbt
 * Create your key following the instructions at https://developer.android.com/studio/publish/app-signing.htmlf
-* Put your key in ~/.keystore
+* Put your key in ~/.keystore or any other place
 * Create `local.properties` from `local.properties.example` with your own key information
 * Invoke the building like this
 
 ```bash
+    export ANDROID_HOME=/path/to/Android/Sdk/
+    export ANDROID_NDK_HOME=/path/to/Android/Sdk/ndk-bundle/
+    export JAVA_OPTS="$JAVA_OPTS -Dhttp.proxyHost=yourserver -Dhttp.proxyPort=port -Dhttp.proxyUser=username -Dhttp.proxyPassword=password"
+```
+
+```bash
+    # install and update all git submodule
     git submodule update --init
 
     # Build the App
     sbt native-build clean android:package-release
 ```
 
+##### If you use x64 linux like Archlinux x86_64, or your linux have new version ncurses lib, you may need install the 32bit version ncurses and link it as follow:
+
+```bash
+    # use Archlinux x86_64 as example
+    
+    # install ncurses x64 and x86 version
+    sudo pacman -S lib32-ncurses ncurses
+    
+    # link the version-6 ncurses to version-5
+    sudo ln -s /usr/lib/libncursesw.so /usr/lib/libncurses.so.5
+    sudo ln -s /usr/lib32/libncursesw.so /usr/lib32/libncurses.so.5
+    
+    # link libncurses to libtinfo
+    sudo ln -s /usr/lib/libncurses.so.5 /usr/lib/libtinfo.so.5
+    sudo ln -s /usr/lib32/libncurses.so.5 /usr/lib32/libtinfo.so.5
+```
+
+
 #### BUILD on Mac OS X (with HomeBrew)
 
 * Install Android SDK and NDK by run `brew install android-ndk android-sdk`

build.sbt

@@ -6,7 +6,7 @@ android.useSupportVectors
 
 name := "shadowsocksr"
 
-applicationId := "in.zhaoj.shadowsocksr.nobackground"
+applicationId := "in.zhaoj.shadowsocksrr"
 
 platformTarget := "android-25"
 

src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools" package="com.github.shadowsocks"
-          android:versionCode="315"
-          android:versionName="3.4.0.5">
+          android:versionCode="320"
+          android:versionName="3.5.0">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
@@ -76,11 +76,11 @@
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="in.zhaoj.shadowsocksr.nobackground.intent.action.SORT"/>
+                <action android:name="in.zhaoj.shadowsocksrr.intent.action.SORT"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="in.zhaoj.shadowsocksr.nobackground.intent.action.SCAN"/>
+                <action android:name="in.zhaoj.shadowsocksrr.intent.action.SCAN"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
             <intent-filter>
@@ -134,7 +134,7 @@
                   android:taskAffinity=""
                   android:theme="@style/PopupTheme.QuickSwitch">
             <intent-filter>
-                <action android:name="in.zhaoj.shadowsocksr.nobackground.QUICK_SWITCH" />
+                <action android:name="in.zhaoj.shadowsocksrr.QUICK_SWITCH" />
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>

src/main/jni/Android.mk

@@ -607,8 +607,8 @@ LOCAL_CFLAGS :=  	-fPIC -pthread -ldl -Wl,--no-as-needed -Wl,-soname=libproxycha
 									-I$(LOCAL_PATH)/include/proxychains \
 									-I$(LOCAL_PATH)/proxychains/src \
 				   				-I$(LOCAL_PATH)/libancillary \
-									-DLIB_DIR=\"/data/user/0/in.zhaoj.shadowsocksr.nobackground/lib\" -DINSTALL_PREFIX=\"/data/user/0/in.zhaoj.shadowsocksr.nobackground/\" \
-									-DDLL_NAME=\"libproxychains4.so\" -DSYSCONFDIR=\"/data/user/0/in.zhaoj.shadowsocksr.nobackground/\"
+									-DLIB_DIR=\"/data/user/0/in.zhaoj.shadowsocksrr/lib\" -DINSTALL_PREFIX=\"/data/user/0/in.zhaoj.shadowsocksrr/\" \
+									-DDLL_NAME=\"libproxychains4.so\" -DSYSCONFDIR=\"/data/user/0/in.zhaoj.shadowsocksrr/\"
 
 LOCAL_STATIC_LIBRARIES := libancillary
 

src/main/jni/shadowsocks-libev

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="app_name">SSR</string>
+  <string name="app_name">SSRR</string>
   <string name="quick_toggle">スイッチ</string>
 
   <string name="misc_cat">その他</string>

src/main/res/values-ja/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="app_name">SSR</string>
+  <string name="app_name">SSRR</string>
   <string name="quick_toggle">开关</string>
 
   <string name="misc_cat">其他</string>

src/main/res/values-zh-rCN/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-  <string name="app_name">SSR</string>
+  <string name="app_name">SSRR</string>
   <string name="quick_toggle">開關</string>
 
   <string name="misc_cat">其他</string>