Fix compatibility with Android 14

This commit is contained in:
世界
2023-10-08 22:29:31 +08:00
parent 01ba4668b6
commit 7b4e4ca2d0
4 changed files with 7 additions and 8 deletions

View File

@@ -7,10 +7,10 @@ import (
"sync"
"time"
"github.com/sagernet/bbolt"
bboltErrors "github.com/sagernet/bbolt/errors"
"github.com/sagernet/sing-box/adapter"
"github.com/sagernet/sing/common"
"go.etcd.io/bbolt"
)
var (
@@ -44,7 +44,7 @@ func Open(path string, cacheID string) (*CacheFile, error) {
options := bbolt.Options{Timeout: time.Second}
db, err := bbolt.Open(path, fileMode, &options)
switch err {
case bbolt.ErrInvalid, bbolt.ErrChecksum, bbolt.ErrVersionMismatch:
case bboltErrors.ErrInvalid, bboltErrors.ErrChecksum, bboltErrors.ErrVersionMismatch:
if err = os.Remove(path); err != nil {
break
}

View File

@@ -5,11 +5,10 @@ import (
"os"
"time"
"github.com/sagernet/bbolt"
"github.com/sagernet/sing-box/adapter"
"github.com/sagernet/sing/common/logger"
M "github.com/sagernet/sing/common/metadata"
"go.etcd.io/bbolt"
)
const fakeipBucketPrefix = "fakeip_"