浏览代码

Update relaybaton

世界 4 年之前
父节点
当前提交
20496622db

+ 4 - 1
app/src/main/java/io/nekohasekai/sagernet/fmt/naive/NaiveFmt.kt

@@ -22,6 +22,7 @@
 package io.nekohasekai.sagernet.fmt.naive
 
 import cn.hutool.json.JSONObject
+import io.nekohasekai.sagernet.BuildConfig
 import io.nekohasekai.sagernet.ktx.linkBuilder
 import io.nekohasekai.sagernet.ktx.toLink
 import io.nekohasekai.sagernet.ktx.unUrlSafe
@@ -75,6 +76,8 @@ fun NaiveBean.buildNaiveConfig(port: Int): String {
         if (extraHeaders.isNotBlank()) {
             it["extra-headers"] = extraHeaders.split("\n").joinToString("\r\n")
         }
-        it["log"] = ""
+        if (BuildConfig.DEBUG) {
+            it["log"] = ""
+        }
     }.toStringPretty()
 }

+ 3 - 2
app/src/main/java/io/nekohasekai/sagernet/fmt/relaybaton/RelayBatonFmt.kt

@@ -21,6 +21,7 @@
 
 package io.nekohasekai.sagernet.fmt.relaybaton
 
+import io.nekohasekai.sagernet.BuildConfig
 import io.nekohasekai.sagernet.ktx.linkBuilder
 import io.nekohasekai.sagernet.ktx.toLink
 import io.nekohasekai.sagernet.ktx.urlSafe
@@ -68,7 +69,7 @@ fun RelayBatonBean.buildRelayBatonConfig(port: Int): String {
         type = "default"
        
         [log]
-        file = "/dev/null"
-        level = "info"
+        file = "stdout"
+        level = "${if (BuildConfig.DEBUG) "trace" else "warn"}"
     """.trimIndent()
 }

+ 2 - 2
rb-plugin/build.gradle

@@ -37,8 +37,8 @@ android {
         applicationId "io.nekohasekai.sagernet.plugin.relaybaton"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 1
-        versionName "0.6.0-ech"
+        versionCode 2
+        versionName "0.6.0-ech-1"
     }
 
     signingConfigs {

+ 1 - 1
rb-plugin/src/main/go/relaybaton

@@ -1 +1 @@
-Subproject commit 735f7560681745293b5c66726592f01590bcda1a
+Subproject commit 3c55b2b271b05f87c89f4ae31fa5a24c42a613e9

+ 2 - 2
sager.properties

@@ -16,5 +16,5 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 PACKAGE_NAME=io.nekohasekai.sagernet
-VERSION_NAME=0.1-rc12
-VERSION_CODE=39
+VERSION_NAME=0.1-rc13
+VERSION_CODE=40