Skip to content

Commit 32bded1

Browse files
committed
Finish 3.5.3
A Beta version * deny screen capture * fix japanese translate * and some other thing....
2 parents 33162dd + da6634d commit 32bded1

File tree

6 files changed

+11
-9
lines changed

6 files changed

+11
-9
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
branch = shadowsocks-android
99
[submodule "src/main/jni/libevent"]
1010
path = src/main/jni/libevent
11-
url = https://github.com/shadowsocks/libevent.git
11+
url = https://github.com/shadowsocksrr/libevent.git
1212
branch = shadowsocks-android
1313
[submodule "src/main/jni/redsocks"]
1414
path = src/main/jni/redsocks

src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
22
xmlns:tools="http://schemas.android.com/tools" package="com.github.shadowsocks"
3-
android:versionCode="323"
4-
android:versionName="3.5.2">
3+
android:versionCode="324"
4+
android:versionName="3.5.3">
55

66
<uses-permission android:name="android.permission.INTERNET"/>
77
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -470,6 +470,8 @@ final class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClic
470470
is_sort = true
471471
}
472472

473+
getWindow.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE)
474+
getWindow.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
473475
setContentView(R.layout.layout_profiles)
474476

475477
val toolbar = findViewById(R.id.toolbar).asInstanceOf[Toolbar]

src/main/scala/com/github/shadowsocks/Shadowsocks.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,14 @@ import android.support.v4.content.ContextCompat
5454
import android.support.v7.app.AppCompatActivity
5555
import android.support.v7.widget.Toolbar
5656
import android.util.Log
57-
import android.view.{View, ViewGroup}
57+
import android.view.{View, ViewGroup, WindowManager}
5858
import android.widget._
5959
import com.github.jorgecastilloprz.FABProgressCircle
6060
import com.github.shadowsocks.aidl.IShadowsocksServiceCallback
6161
import com.github.shadowsocks.database._
6262
import com.github.shadowsocks.utils.CloseUtils._
6363
import com.github.shadowsocks.utils._
6464
import com.github.shadowsocks.job.SSRSubUpdateJob
65-
6665
import com.github.shadowsocks.ShadowsocksApplication.app
6766

6867
import scala.util.Random
@@ -250,8 +249,9 @@ class Shadowsocks extends AppCompatActivity with ServiceBoundContext {
250249
}
251250

252251
override def onCreate(savedInstanceState: Bundle) {
253-
254252
super.onCreate(savedInstanceState)
253+
getWindow.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE)
254+
getWindow.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
255255
setContentView(R.layout.layout_main)
256256
// Initialize Toolbar
257257
val toolbar = findViewById(R.id.toolbar).asInstanceOf[Toolbar]

src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
359359
})
360360
}
361361

362-
var black_list = profile.route match {
362+
val black_list = profile.route match {
363363
case Route.BYPASS_CHN | Route.BYPASS_LAN_CHN | Route.GFWLIST=> {
364364
getBlackList
365365
}
@@ -380,7 +380,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
380380
black_list, reject)
381381
}
382382

383-
var conf = profile.route match {
383+
val conf = profile.route match {
384384
case Route.BYPASS_CHN | Route.BYPASS_LAN_CHN | Route.GFWLIST => {
385385
ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, protect, getApplicationInfo.dataDir,
386386
"0.0.0.0", profile.localPort + 53, china_dns_settings, profile.localPort + 63, reject)

0 commit comments

Comments
 (0)