From 01d7019c1182f605588f850fec46bea358e595ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= <i@nekox.me>
Date: Sat, 9 May 2020 18:11:26 +0800
Subject: [PATCH] [ss-rust] Use "none" as dummy cipher's ID replacing "plain"

---
 .github/workflows/build.yml                   | 36 ++++++++++++++++-
 .github/workflows/libs.yml                    | 40 -------------------
 .../tw/nekomimi/nekogram/ShadowsocksLoader.kt |  4 +-
 ss-rust/src/main/rust/shadowsocks-rust        |  2 +-
 4 files changed, 38 insertions(+), 44 deletions(-)
 delete mode 100644 .github/workflows/libs.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a3828e69f..8f05e9224 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,7 +9,7 @@ jobs:
   canaryBuild:
     name: Canary Build
     runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, '[R]') && !contains(github.event.head_commit.message, '[RELEASE]') && !contains(github.event.head_commit.message, '[N]')"
+    if: "!contains(github.event.head_commit.message, '[ss-rust]') && !contains(github.event.head_commit.message, '[RELEASE]') && !contains(github.event.head_commit.message, '[N]')"
     steps:
       - uses: actions/checkout@v2
       - uses: actions/cache@v1
@@ -197,4 +197,36 @@ jobs:
       - uses: actions/upload-artifact@master
         with:
           name: Ffmpeg Library
-          path: "TMessagesProj/jni/ffmpeg/build"
\ No newline at end of file
+          path: "TMessagesProj/jni/ffmpeg/build"
+  ssBuild:
+    name: SS-Rust Build
+    runs-on: ubuntu-latest
+    if: "contains(github.event.head_commit.message, '[ss-rust]')"
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v1
+        with:
+          path: ~/.gradle
+          key: native-${{ hashFiles('**/*.gradle') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - run: git submodule update --init --recursive
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: install rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+          profile: minimal
+      - name: setup rust targets
+        run: rustup target install armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android
+      - name: assemble
+        run: |
+          ./gradlew ss-rust:assembleRelease
+          ls ss-rust/build/outputs/aar
+      - uses: actions/upload-artifact@master
+        with:
+          name: ss-rust
+          path: ss-rust/build/outputs/aar
\ No newline at end of file
diff --git a/.github/workflows/libs.yml b/.github/workflows/libs.yml
deleted file mode 100644
index 2e85be3cd..000000000
--- a/.github/workflows/libs.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: Build
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  ssBuild:
-    name: SS-Rust Build
-    runs-on: ubuntu-latest
-    if: "contains(github.event.head_commit.message, '[R]')"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v1
-        with:
-          path: ~/.gradle
-          key: native-${{ hashFiles('**/*.gradle') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-      - run: git submodule update --init --recursive
-      - uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-      - name: install rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          override: true
-          profile: minimal
-      - name: setup rust targets
-        run: rustup target install armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android
-      - name: assemble
-        run: |
-          ./gradlew ss-rust:assembleRelease
-          ls ss-rust/build/outputs/aar
-      - uses: actions/upload-artifact@master
-        with:
-          name: NekoX-Foss
-          path: ss-rust/build/outputs/aar
\ No newline at end of file
diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/ShadowsocksLoader.kt b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/ShadowsocksLoader.kt
index e080794c3..951e3cbf9 100644
--- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/ShadowsocksLoader.kt
+++ b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/ShadowsocksLoader.kt
@@ -97,6 +97,8 @@ class ShadowsocksLoader {
 
         init {
 
+            if (method == "plain") method = "none"
+
             val pl = PluginConfiguration(plugin)
 
             if (pl.selected.contains("v2ray") && pl.selected != "v2ray") {
@@ -224,7 +226,7 @@ class ShadowsocksLoader {
 
         val methods = arrayOf(
 
-                "plain",
+                "none",
                 "rc4-md5",
                 "aes-128-cfb",
                 "aes-192-cfb",
diff --git a/ss-rust/src/main/rust/shadowsocks-rust b/ss-rust/src/main/rust/shadowsocks-rust
index b6c3fb0ba..2ea466d3a 160000
--- a/ss-rust/src/main/rust/shadowsocks-rust
+++ b/ss-rust/src/main/rust/shadowsocks-rust
@@ -1 +1 @@
-Subproject commit b6c3fb0babd621a2fc6749931f3a140e5833a693
+Subproject commit 2ea466d3a2a1583d2dfbd98ad35519dd506960aa