From 5ff4eb011c24826d3ace9eb318b127a0425c27fd Mon Sep 17 00:00:00 2001
From: armv9 <48624112+arm64v8a@users.noreply.github.com>
Date: Wed, 26 Feb 2025 18:11:24 +0900
Subject: [PATCH] go 1.24 & fix

---
 .github/workflows/release.yml                                   | 2 +-
 app/src/main/java/io/nekohasekai/sagernet/database/DataStore.kt | 2 +-
 app/src/main/java/io/nekohasekai/sagernet/ui/MainActivity.kt    | 1 -
 libcore/geoip.go                                                | 1 +
 libcore/nb4a.go                                                 | 2 --
 libcore/platform_java.go                                        | 1 +
 6 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1ac31c0..0cd2341 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -33,7 +33,7 @@ jobs:
         if: steps.cache.outputs.cache-hit != 'true'
         uses: actions/setup-go@v5
         with:
-          go-version: "1.23.6"
+          go-version: ^1.24
       - name: Native Build
         if: steps.cache.outputs.cache-hit != 'true'
         run: ./run lib core
diff --git a/app/src/main/java/io/nekohasekai/sagernet/database/DataStore.kt b/app/src/main/java/io/nekohasekai/sagernet/database/DataStore.kt
index e076971..6688d78 100644
--- a/app/src/main/java/io/nekohasekai/sagernet/database/DataStore.kt
+++ b/app/src/main/java/io/nekohasekai/sagernet/database/DataStore.kt
@@ -124,7 +124,7 @@ object DataStore : OnPreferenceDataStoreChangeListener {
         get() = getLocalPort(Key.MIXED_PORT, 2080)
         set(value) = saveLocalPort(Key.MIXED_PORT, value)
 
-        fun initGlobal() {
+    fun initGlobal() {
         if (configurationStore.getString(Key.MIXED_PORT) == null) {
             mixedPort = mixedPort
         }
diff --git a/app/src/main/java/io/nekohasekai/sagernet/ui/MainActivity.kt b/app/src/main/java/io/nekohasekai/sagernet/ui/MainActivity.kt
index 0040889..250a2dd 100644
--- a/app/src/main/java/io/nekohasekai/sagernet/ui/MainActivity.kt
+++ b/app/src/main/java/io/nekohasekai/sagernet/ui/MainActivity.kt
@@ -37,7 +37,6 @@ import io.nekohasekai.sagernet.group.GroupUpdater
 import io.nekohasekai.sagernet.ktx.*
 import io.nekohasekai.sagernet.widget.ListHolderListener
 import moe.matsuri.nb4a.utils.Util
-import java.util.*
 
 class MainActivity : ThemedActivity(),
     SagerConnection.Callback,
diff --git a/libcore/geoip.go b/libcore/geoip.go
index cee4212..6ea92d5 100644
--- a/libcore/geoip.go
+++ b/libcore/geoip.go
@@ -64,6 +64,7 @@ func init() {
 		if err := g.Open(filepath.Join(externalAssetsPath, "geoip.db")); err != nil {
 			return nil, err
 		}
+		defer g.geoipReader.Close()
 		return g.Rules(name)
 	}
 }
diff --git a/libcore/nb4a.go b/libcore/nb4a.go
index d049dca..775bb5c 100644
--- a/libcore/nb4a.go
+++ b/libcore/nb4a.go
@@ -20,8 +20,6 @@ import (
 //go:linkname resourcePaths github.com/sagernet/sing-box/constant.resourcePaths
 var resourcePaths []string
 
-var isBgProcess bool
-
 func NekoLogPrintln(s string) {
 	log.Println(s)
 }
diff --git a/libcore/platform_java.go b/libcore/platform_java.go
index 1b76c2d..a826318 100644
--- a/libcore/platform_java.go
+++ b/libcore/platform_java.go
@@ -4,6 +4,7 @@ var intfBox BoxPlatformInterface
 var intfNB4A NB4AInterface
 
 var useProcfs bool
+var isBgProcess bool
 
 type NB4AInterface interface {
 	UseOfficialAssets() bool