From 3f4aac0bc9f6c88242d946e046c86283a24c5ab7 Mon Sep 17 00:00:00 2001
From: arm64v8a <48624112+arm64v8a@users.noreply.github.com>
Date: Thu, 10 Aug 2023 15:21:56 +0900
Subject: [PATCH] update

---
 .github/workflows/release.yml                     |  9 ++++-----
 .../java/io/nekohasekai/sagernet/Constants.kt     |  2 +-
 .../io/nekohasekai/sagernet/group/RawUpdater.kt   |  3 +--
 app/src/main/res/xml/global_preferences.xml       |  2 +-
 buildScript/fdroid/prebuild.sh                    |  2 --
 buildScript/init/action/go.sh                     | 15 ---------------
 buildScript/init/env.sh                           |  6 ------
 libcore/http.go                                   |  6 ++++--
 8 files changed, 11 insertions(+), 34 deletions(-)
 delete mode 100755 buildScript/init/action/go.sh

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e8f61485..4d0d1d3f 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 95efeaa1..8a6b06f5 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 ee432be4..f0c457fc 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<String>))
                                         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 09622a6a..80efbaf4 100644
--- a/app/src/main/res/xml/global_preferences.xml
+++ b/app/src/main/res/xml/global_preferences.xml
@@ -35,7 +35,7 @@
         <moe.matsuri.nb4a.ui.SimpleMenuPreference
             app:defaultValue="2"
             app:entries="@array/tun_implementation"
-            app:entryValues="@array/int_array_2"
+            app:entryValues="@array/int_array_3"
             app:icon="@drawable/ic_baseline_flip_camera_android_24"
             app:key="tunImplementation"
             app:title="@string/tun_implementation"
diff --git a/buildScript/fdroid/prebuild.sh b/buildScript/fdroid/prebuild.sh
index 2642d5a1..3e852c57 100755
--- a/buildScript/fdroid/prebuild.sh
+++ b/buildScript/fdroid/prebuild.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# Setup go & external library
-buildScript/init/action/go.sh
 buildScript/init/action/gradle.sh
 
 # Build libcore
diff --git a/buildScript/init/action/go.sh b/buildScript/init/action/go.sh
deleted file mode 100755
index 0da703c2..00000000
--- a/buildScript/init/action/go.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-set -e
-
-source buildScript/init/env.sh
-mkdir -p $GOPATH
-cd $golang
-
-if [ ! -f "go/bin/go" ]; then
-    curl -Lso go.tar.gz https://go.dev/dl/go1.20.7.linux-amd64.tar.gz
-    echo "f0a87f1bcae91c4b69f8dc2bc6d7e6bfcd7524fceec130af525058c0c17b1b44 go.tar.gz" | sha256sum -c -
-    tar xzf go.tar.gz
-fi
-
-go version
-go env
diff --git a/buildScript/init/env.sh b/buildScript/init/env.sh
index e30b3d59..20639f2e 100755
--- a/buildScript/init/env.sh
+++ b/buildScript/init/env.sh
@@ -1,11 +1,5 @@
 #!/bin/bash
 
-# For CI build, use downloaded golang
-export golang=$PWD/build/golang
-export GOPATH=$golang/gopath
-export GOROOT=$golang/go
-export PATH=$golang/go/bin:$GOPATH/bin:$PATH
-
 source buildScript/init/env_ndk.sh
 
 if [[ "$OSTYPE" =~ ^darwin ]]; then
diff --git a/libcore/http.go b/libcore/http.go
index 39d4d27a..d4db1ff7 100644
--- a/libcore/http.go
+++ b/libcore/http.go
@@ -10,7 +10,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"net/url"
@@ -204,6 +203,9 @@ func (h *httpResponse) errorString() string {
 	if err != nil {
 		return fmt.Sprint("HTTP ", h.Status)
 	}
+	if len(content) > 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
 }