update

bannedbook · Jun 14, 2020 · 0ec9cd7 · 0ec9cd7
1 parent 9b94f0e
commit 0ec9cd7
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 4 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 = 439
-        versionName = '5.0.6.8R'
+        versionCode = 441
+        versionName = '5.0.6.9R'
         resConfigs = ['ar', 'es', 'fa', 'fr', 'ja', 'ko', 'ru', 'tr', 'zh-rCN', 'zh-rTW']
     }
 

diff --git a/core/src/main/java/com/github/shadowsocks/database/ProfileManager.kt b/core/src/main/java/com/github/shadowsocks/database/ProfileManager.kt
@@ -87,6 +87,7 @@ object ProfileManager {
     }
 
     fun createProfilesFromSub(profiles: List<Profile>, group: String) {
+        if (profiles.isNullOrEmpty())return
         val old = getAllProfilesByGroup(group).toMutableList()
         profiles.filter {
             for (i: Profile in old) if (it.isSameAs(i)) {

diff --git a/core/src/main/java/com/github/shadowsocks/database/SSRSub.kt b/core/src/main/java/com/github/shadowsocks/database/SSRSub.kt
@@ -51,4 +51,7 @@ class SSRSub(
     fun isBuiltin(): Boolean {
         return VpnEncrypt.vpnGroupName == url_group
     }
+    fun isBuiltin2(): Boolean {
+        return VpnEncrypt.freesubGroupName == url_group
+    }
 }
diff --git a/core/src/main/java/com/github/shadowsocks/subscription/SubscriptionService.kt b/core/src/main/java/com/github/shadowsocks/subscription/SubscriptionService.kt
@@ -122,6 +122,7 @@ class SubscriptionService : Service(), CoroutineScope {
 
     private suspend fun fetchJson(ssrSub: SSRSub, max: Int, notification: NotificationCompat.Builder) {
         try {
+            if (ssrSub.isBuiltin()||ssrSub.isBuiltin2())return
             SSRSubManager.update(ssrSub)
         } catch (e: Exception) {
             ssrSub.status = SSRSub.NETWORK_ERROR

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.8 -m "release v5.0.6.8"
+git tag -a v5.0.6.9 -m "release v5.0.6.9"
 git push origin --tags
 pause
diff --git a/mobile/src/main/java/com/github/shadowsocks/subscription/SubscriptionFragment.kt b/mobile/src/main/java/com/github/shadowsocks/subscription/SubscriptionFragment.kt
@@ -148,13 +148,14 @@ class SubscriptionFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener
 
         @SuppressLint("SetTextI18n")
         fun bind(item: SSRSub) {
+            if(item.isBuiltin()||item.isBuiltin2())return
             this.item = item
             text.text = "${item.getStatue(requireContext())}\t${item.url_group}"
         }
 
         override fun onClick(v: View?) {
             if (item.id == 0L) return
-            if (item.isBuiltin() || VpnEncrypt.freesubGroupName == item.url_group) return
+            if(item.isBuiltin()||item.isBuiltin2()) return
             SubDialogFragment().withArg(SubItem(adapterPosition, item.url, item.url_group))
                     .show(this@SubscriptionFragment, REQUEST_CODE_EDIT)
         }