diff --git a/build.gradle b/build.gradle index 9839f640a7..747f50d9d8 100644 --- a/build.gradle +++ b/build.gradle @@ -10,8 +10,8 @@ buildscript { compileSdkVersion = 29 buildToolsVersion = '29.0.3' desugarLibsVersion = '1.0.5' - versionCode = 423 - versionName = '5.0.6.3R' + versionCode = 424 + versionName = '5.0.6.4R' resConfigs = ['ar', 'es', 'fa', 'fr', 'ja', 'ko', 'ru', 'tr', 'zh-rCN', 'zh-rTW'] } @@ -24,7 +24,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0-beta04' + classpath 'com.android.tools.build:gradle:4.0.0-beta05' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" classpath 'com.google.gms:google-services:4.3.3' classpath 'io.fabric.tools:gradle:1.31.2' diff --git a/core/src/main/java/com/github/shadowsocks/Core.kt b/core/src/main/java/com/github/shadowsocks/Core.kt index 11cd602071..a0a6f19e72 100644 --- a/core/src/main/java/com/github/shadowsocks/Core.kt +++ b/core/src/main/java/com/github/shadowsocks/Core.kt @@ -117,7 +117,7 @@ object Core { activity?.runOnUiThread(){alertMessage(app.getString(R.string.status_network_error),activity)} }else {//如果不是APP启动时更新，则停止服务，提醒重新连接 //stopService() - activity?.runOnUiThread(){alertMessage(app.getString(R.string.update_servers_ok),activity)} + //activity?.runOnUiThread(){alertMessage(app.getString(R.string.update_servers_ok),activity)} } } } diff --git a/core/src/main/res/values-zh-rTW/strings.xml b/core/src/main/res/values-zh-rTW/strings.xml index 4be628397a..3501e18ba3 100644 --- a/core/src/main/res/values-zh-rTW/strings.xml +++ b/core/src/main/res/values-zh-rTW/strings.xml @@ -211,7 +211,7 @@ - 必讀:每日熱點禁聞,武漢肺炎內幕挖掘,疫情追蹤 + 中美港臺時事熱點：每日火爆新聞，焦點評論 ]]>" diff --git a/gitupdate.bat b/gitupdate.bat index 667a7287d5..b7c808db59 100644 --- a/gitupdate.bat +++ b/gitupdate.bat @@ -3,6 +3,6 @@ git pull origin master git add -A git commit -m "update" git push origin master -git tag -a v5.0.6.3 -m "release v5.0.6.3" +git tag -a v5.0.6.4 -m "release v5.0.6.4" git push origin --tags pause \ No newline at end of file diff --git a/mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt b/mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt index 494ac10253..5f6491f905 100644 --- a/mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt +++ b/mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt @@ -129,7 +129,7 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener { var viewHolder = profilesList.findViewHolderForAdapterPosition(i) if(viewHolder==null)continue viewHolder = viewHolder as ProfileViewHolder - if (true /*viewHolder.item.isBuiltin()*/) { + if (viewHolder.item.isBuiltin()) { viewHolder.populateUnifiedNativeAdView(nativeAd!!, nativeAdView!!) // might be in the middle of a layout after scrolling, need to wait withContext(Dispatchers.Main) { profilesAdapter.notifyItemChanged(i) }