From 359c7c593d57d4e09559066a695e03443d6b94bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= <i@nekox.me>
Date: Tue, 12 Jan 2021 11:13:37 +0800
Subject: [PATCH] Fix shadowsocks

---
 .../main/java/com/github/shadowsocks/plugin/PluginList.kt   | 6 ++++--
 bin/update_libs.sh                                          | 2 +-
 ss-rust/build.gradle.kts                                    | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/TMessagesProj/src/main/java/com/github/shadowsocks/plugin/PluginList.kt b/TMessagesProj/src/main/java/com/github/shadowsocks/plugin/PluginList.kt
index beb540cd9..af5b186e0 100644
--- a/TMessagesProj/src/main/java/com/github/shadowsocks/plugin/PluginList.kt
+++ b/TMessagesProj/src/main/java/com/github/shadowsocks/plugin/PluginList.kt
@@ -43,10 +43,12 @@ import org.telegram.messenger.R
         }
     }
     val lookupNames get() = lookup.values.map {
-        if (it.label.isNotBlank()) {
+        if (it.label.isNotBlank() && it.id.isNotBlank()) {
             "${it.label} (${it.id})"
+        } else if (it.label.isNotBlank()) {
+            it.label
         } else if (it.id.isNotBlank()) {
             it.id
-        } else ""
+        } else it.packageName
     }.map { it.takeIf { it.isNotBlank() } ?: LocaleController.getString("Disable", R.string.Disable) }.toTypedArray()
 }
diff --git a/bin/update_libs.sh b/bin/update_libs.sh
index 7fe104b2d..4fd1dd397 100755
--- a/bin/update_libs.sh
+++ b/bin/update_libs.sh
@@ -51,7 +51,7 @@ rm -rf TMessagesProj/libs/*.aar
   ./gradlew ssr-libev:assembleRelease &&
   cp ssr-libev/build/outputs/aar/* TMessagesProj/libs &&
   cd TMessagesProj/libs &&
-  go get -v golang.org/x/mobile/cmd/...
+  go get -v golang.org/x/mobile/cmd/... || exit 1
 
 v2rayCore="$(go env GOPATH)/src/v2ray.com/core"
 
diff --git a/ss-rust/build.gradle.kts b/ss-rust/build.gradle.kts
index 46c054d69..a6e0d3098 100644
--- a/ss-rust/build.gradle.kts
+++ b/ss-rust/build.gradle.kts
@@ -25,7 +25,8 @@ cargo {
     profile = findProperty("CARGO_PROFILE")?.toString() ?: "release"
     extraCargoBuildArguments = listOf("--bin", "sslocal")
     featureSpec.noDefaultBut(arrayOf(
-            "single-threaded",
+            "stream-cipher",
+            "logging",
             "local-flow-stat",
             "local-dns"))
     exec = { spec, toolchain ->