diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e8f6148..4d0d1d3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,15 +32,14 @@ jobs: path: | app/libs/libcore.aar key: ${{ hashFiles('.github/workflows/*', 'golang_status', 'libcore_status') }} - - name: Golang Cache + - name: Install Golang if: steps.cache.outputs.cache-hit != 'true' - uses: actions/cache@v3 + uses: actions/setup-go@v3 with: - path: build/golang - key: go-${{ hashFiles('.github/workflows/*', 'golang_status') }} + go-version: ^1.20 - name: Native Build if: steps.cache.outputs.cache-hit != 'true' - run: ./run init action go && ./run lib core + run: ./run lib core build: name: Build OSS APK runs-on: ubuntu-latest diff --git a/app/src/main/java/io/nekohasekai/sagernet/Constants.kt b/app/src/main/java/io/nekohasekai/sagernet/Constants.kt index 95efeaa..8a6b06f 100644 --- a/app/src/main/java/io/nekohasekai/sagernet/Constants.kt +++ b/app/src/main/java/io/nekohasekai/sagernet/Constants.kt @@ -157,7 +157,7 @@ object Key { object TunImplementation { const val GVISOR = 0 const val SYSTEM = 1 - const val MIXED = 1 + const val MIXED = 2 } object IPv6Mode { diff --git a/app/src/main/java/io/nekohasekai/sagernet/group/RawUpdater.kt b/app/src/main/java/io/nekohasekai/sagernet/group/RawUpdater.kt index ee432be..f0c457f 100644 --- a/app/src/main/java/io/nekohasekai/sagernet/group/RawUpdater.kt +++ b/app/src/main/java/io/nekohasekai/sagernet/group/RawUpdater.kt @@ -471,7 +471,7 @@ object RawUpdater : GroupUpdater() { when (opt.key.replace("_", "-")) { "name" -> bean.name = opt.value.toString() "server" -> bean.serverAddress = opt.value as String - "port" -> bean.serverPort = opt.value.toString().toInt() + "port" -> bean.serverPorts = opt.value.toString() "ports" -> hopPorts = opt.value.toString() "obfs" -> bean.obfuscation = opt.value.toString() @@ -507,7 +507,6 @@ object RawUpdater : GroupUpdater() { val alpn = (opt.value as? (List)) bean.alpn = alpn?.joinToString("\n") ?: "h3" } - } } if (hopPorts.isNotBlank()) { diff --git a/app/src/main/res/xml/global_preferences.xml b/app/src/main/res/xml/global_preferences.xml index 09622a6..80efbaf 100644 --- a/app/src/main/res/xml/global_preferences.xml +++ b/app/src/main/res/xml/global_preferences.xml @@ -35,7 +35,7 @@ 100 { + content = content[:100] + " ..." + } return fmt.Sprint("HTTP ", h.Status, ": ", content) } @@ -214,7 +216,7 @@ func (h *httpResponse) GetHeader(key string) string { func (h *httpResponse) GetContent() ([]byte, error) { h.getContentOnce.Do(func() { defer h.Body.Close() - h.content, h.contentError = ioutil.ReadAll(h.Body) + h.content, h.contentError = io.ReadAll(h.Body) }) return h.content, h.contentError }