更新 ssr 协议库

修复界面 ssr 协议识别为unknown

Author: naicfeng

core/src/main/cpp/main.cpp

@@ -41,6 +41,7 @@ Master::Master(JavaVM *vm, JNIEnv *env): vm(vm) {
     sDirect = g<jstring>(env, env->NewStringUTF("Direct"));
     sReject = g<jstring>(env, env->NewStringUTF("Reject"));
     sShadowsocks = g<jstring>(env, env->NewStringUTF("Shadowsocks"));
+    sShadowsocksR = g<jstring>(env, env->NewStringUTF("ShadowsocksR"));
     sSnell = g<jstring>(env, env->NewStringUTF("Snell"));
     sSocks5 = g<jstring>(env, env->NewStringUTF("Socks5"));
     sHttp = g<jstring>(env, env->NewStringUTF("Http"));
@@ -166,6 +167,9 @@ jobject Master::Context::createProxy(char const *name, proxy_type_t type, jlong
         case Shadowsocks:
             ts = master->sShadowsocks;
             break;
+        case ShadowsocksR:
+            ts = master->sShadowsocksR;
+            break;
         case Vmess:
             ts = master->sVmess;
             break;

core/src/main/cpp/main.h

@@ -46,6 +46,7 @@ class Master {
     jstring sDirect;
     jstring sReject;
     jstring sShadowsocks;
+    jstring sShadowsocksR;
     jstring sSnell;
     jstring sSocks5;
     jstring sHttp;

core/src/main/golang/clash

@@ -136,6 +136,8 @@ func typeToProxyTypeC(t constant.AdapterType) C.proxy_type_t {
 
 	case constant.Shadowsocks:
 		return C.Shadowsocks
+	case constant.ShadowsocksR:
+		return C.ShadowsocksR
 	case constant.Snell:
 		return C.Snell
 	case constant.Socks5:

core/src/main/golang/go.sum

@@ -5,7 +5,7 @@ extern "C" {
 #endif
 
 typedef enum proxy_type_t {
-    Direct, Reject, Socks5, Http, Shadowsocks, Vmess, Snell, Trojan, Selector, Fallback, LoadBalance, URLTest, Relay, Unknown
+    Direct, Reject, Socks5, Http, Shadowsocks, ShadowsocksR, Vmess, Snell, Trojan, Selector, Fallback, LoadBalance, URLTest, Relay, Unknown
 } proxy_type_t;
 
 typedef struct proxy_t {

core/src/main/golang/proxies.go

@@ -17,7 +17,7 @@ data class Proxy constructor(
         REJECT("Reject", false),
 
         SHADOWSOCKS("Shadowsocks", false),
-	SHADOWSOCKSR("ShadowsocksR", false),
+        SHADOWSOCKSR("ShadowsocksR", false),
         SNELL("Snell", false),
         SOCKS5("Socks5", false),
         HTTP("Http", false),

core/src/main/golang/proxies.h

@@ -29,8 +29,8 @@ gCompileSdkVersion=android-29
 gMinSdkVersion=24
 gTargetSdkVersion=29
 
-gVersionCode=10303
-gVersionName=1.3.3
+gVersionCode=10304
+gVersionName=1.3.4R
 gKotlinVersion=1.3.72
 gKotlinCoroutineVersion=1.3.7
 gKotlinSerializationVersion=0.20.0

core/src/main/java/com/github/kr328/clash/core/model/Proxy.kt

@@ -4,4 +4,4 @@ include(":service")
 include(":design")
 include(":common")
 
-rootProject.name = "ClashForAndroid"
+rootProject.name = "ClashRForAndroid"