mirror of https://github.com/NekoX-Dev/NekoX.git
[ss-rust] Use "none" as dummy cipher's ID replacing "plain"
This commit is contained in:
parent
1ddf944049
commit
01d7019c11
|
@ -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"
|
||||
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
|
|
@ -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
|
|
@ -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",
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit b6c3fb0babd621a2fc6749931f3a140e5833a693
|
||||
Subproject commit 2ea466d3a2a1583d2dfbd98ad35519dd506960aa
|
Loading…
Reference in New Issue