update

bannedbook · May 5, 2020 · 0c60cfd · 0c60cfd
1 parent 34e6f5a
commit 0c60cfd
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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
@@ -211,7 +211,7 @@
 <meta http-equiv='Content-Type' content='text/html; charset=UTF-8' />
 </head>
     <body style=\'margin:0 auto;padding:5px 0;font-size:14px;text-align:center\'>
-      <a href=\'https://www.bannedbook.org/bnews/zh-tw/?utm_source=speedup.vpn.b5\' style=\'color:#e4f2fd\'>必讀:每日熱點禁聞,武漢肺炎內幕挖掘,疫情追蹤</a>
+      <a href=\'https://www.bannedbook.org/bnews/zh-tw/?utm_source=speedup.vpn.b5\' style=\'color:#e4f2fd\'>中美港臺時事熱點：每日火爆新聞，焦點評論</a>
     </body>
     </html>
   ]]>"</string>

diff --git 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
diff --git 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) }