From 8560cad72fd09a96088be23f299e91da3dc96b4b Mon Sep 17 00:00:00 2001 From: Akkariiin Date: Fri, 13 Oct 2017 17:15:25 +0800 Subject: [PATCH 1/7] fix auth_chain_e/f --- src/main/jni/shadowsocks-libev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/jni/shadowsocks-libev b/src/main/jni/shadowsocks-libev index 146fd025db..d4904568c0 160000 --- a/src/main/jni/shadowsocks-libev +++ b/src/main/jni/shadowsocks-libev @@ -1 +1 @@ -Subproject commit 146fd025db23c8973bc11efde888fd8c50d75f2d +Subproject commit d4904568c0bd7e0861c0cbfeaa43740f404db214 From ea7ca876240e80bbb62af4b2651220b726db29fb Mon Sep 17 00:00:00 2001 From: SakuraSa233 <1402557187@qq.com> Date: Mon, 2 Oct 2017 17:05:26 +0800 Subject: [PATCH 2/7] update japanese (cherry picked from commit 6b8e7fd10beb0a39650475353b994fca0649581d) --- src/main/res/values-ja/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index 02ed702bac..c69174d969 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -10,7 +10,9 @@ 新規作成または既存ファイルを開く サーバーアドレス リモートポート + %d (リモートサーバーのポート) ローカルポート + %d (ロカールサーバーのポート) パスワード 暗号化方式 ファンクション設定 From ae10f7a0dec34cf5c96df3132c8559e735609bfb Mon Sep 17 00:00:00 2001 From: Akkariiin Date: Fri, 1 Dec 2017 17:00:40 +0800 Subject: [PATCH 3/7] fix typo --- .../scala/com/github/shadowsocks/ShadowsocksVpnService.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala index 13e730856d..71624406d3 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala @@ -359,7 +359,7 @@ class ShadowsocksVpnService extends VpnService with BaseService { }) } - var black_list = profile.route match { + val black_list = profile.route match { case Route.BYPASS_CHN | Route.BYPASS_LAN_CHN | Route.GFWLIST=> { getBlackList } @@ -380,7 +380,7 @@ class ShadowsocksVpnService extends VpnService with BaseService { black_list, reject) } - var conf = profile.route match { + val conf = profile.route match { case Route.BYPASS_CHN | Route.BYPASS_LAN_CHN | Route.GFWLIST => { ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, protect, getApplicationInfo.dataDir, "0.0.0.0", profile.localPort + 53, china_dns_settings, profile.localPort + 63, reject) From 5e8927a20719cd8ca77f568e378f72bdfde2a13b Mon Sep 17 00:00:00 2001 From: Akkariiin Date: Fri, 1 Dec 2017 17:02:36 +0800 Subject: [PATCH 4/7] change libevent to ssrr to avoid upsteam break change --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 2311923ab5..ee7d79a121 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,7 +8,7 @@ branch = shadowsocks-android [submodule "src/main/jni/libevent"] path = src/main/jni/libevent - url = https://github.com/shadowsocks/libevent.git + url = https://github.com/shadowsocksrr/libevent.git branch = shadowsocks-android [submodule "src/main/jni/redsocks"] path = src/main/jni/redsocks From 02745c62bd79ca7f96ba760311aec3b93f3d0517 Mon Sep 17 00:00:00 2001 From: Akkariiin Date: Wed, 7 Mar 2018 14:47:33 +0800 Subject: [PATCH 5/7] deny screen capture --- .../com/github/shadowsocks/ProfileManagerActivity.scala | 2 ++ src/main/scala/com/github/shadowsocks/Shadowsocks.scala | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala b/src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala index 6f3b37087a..c166dd40ff 100644 --- a/src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala +++ b/src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala @@ -470,6 +470,8 @@ final class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClic is_sort = true } + getWindow.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE) + getWindow.addFlags(WindowManager.LayoutParams.FLAG_SECURE) setContentView(R.layout.layout_profiles) val toolbar = findViewById(R.id.toolbar).asInstanceOf[Toolbar] diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala index 468380bf46..037d792493 100644 --- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala +++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala @@ -54,7 +54,7 @@ import android.support.v4.content.ContextCompat import android.support.v7.app.AppCompatActivity import android.support.v7.widget.Toolbar import android.util.Log -import android.view.{View, ViewGroup} +import android.view.{View, ViewGroup, WindowManager} import android.widget._ import com.github.jorgecastilloprz.FABProgressCircle import com.github.shadowsocks.aidl.IShadowsocksServiceCallback @@ -62,7 +62,6 @@ import com.github.shadowsocks.database._ import com.github.shadowsocks.utils.CloseUtils._ import com.github.shadowsocks.utils._ import com.github.shadowsocks.job.SSRSubUpdateJob - import com.github.shadowsocks.ShadowsocksApplication.app import scala.util.Random @@ -250,8 +249,9 @@ class Shadowsocks extends AppCompatActivity with ServiceBoundContext { } override def onCreate(savedInstanceState: Bundle) { - super.onCreate(savedInstanceState) + getWindow.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE) + getWindow.addFlags(WindowManager.LayoutParams.FLAG_SECURE) setContentView(R.layout.layout_main) // Initialize Toolbar val toolbar = findViewById(R.id.toolbar).asInstanceOf[Toolbar] From 92dfb5f4d84be037fed036096c62a7a61d77de70 Mon Sep 17 00:00:00 2001 From: Akkariiin Date: Wed, 7 Mar 2018 14:49:06 +0800 Subject: [PATCH 6/7] update libev lib version --- src/main/jni/shadowsocks-libev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/jni/shadowsocks-libev b/src/main/jni/shadowsocks-libev index d4904568c0..d63ff86380 160000 --- a/src/main/jni/shadowsocks-libev +++ b/src/main/jni/shadowsocks-libev @@ -1 +1 @@ -Subproject commit d4904568c0bd7e0861c0cbfeaa43740f404db214 +Subproject commit d63ff863800a5645aca4309d5dd5962bd1e95543 From da6634d2086389fd02c7b8b4ae8d0ae456018673 Mon Sep 17 00:00:00 2001 From: Akkariiin Date: Wed, 7 Mar 2018 14:50:25 +0800 Subject: [PATCH 7/7] bump version --- src/main/AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 670b043923..fb9469410f 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + android:versionCode="324" + android:versionName="3.5.3">