From ecfb339680dd2916f7eb9ce84637de03d15c9fa4 Mon Sep 17 00:00:00 2001
From: kr328 <kr328app@outlook.com>
Date: Sun, 12 Sep 2021 11:26:27 +0800
Subject: [PATCH] Chore: fix code style
---
core/src/main/golang/native/all/imports.go | 1 +
core/src/main/golang/native/config/fetch.go | 6 +++---
core/src/main/golang/native/delegate/init.go | 12 ++++++------
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/core/src/main/golang/native/all/imports.go b/core/src/main/golang/native/all/imports.go
index 7d5fcd4c..edc18af3 100644
--- a/core/src/main/golang/native/all/imports.go
+++ b/core/src/main/golang/native/all/imports.go
@@ -11,5 +11,6 @@ import (
_ "cfa/native/tunnel"
_ "golang.org/x/sync/semaphore"
+
_ "github.com/Dreamacro/clash/log"
)
diff --git a/core/src/main/golang/native/config/fetch.go b/core/src/main/golang/native/config/fetch.go
index 065623bf..81425cf0 100644
--- a/core/src/main/golang/native/config/fetch.go
+++ b/core/src/main/golang/native/config/fetch.go
@@ -11,7 +11,7 @@ import (
"runtime"
"time"
- app2 "cfa/native/app"
+ "cfa/native/app"
"github.com/Dreamacro/clash/component/dialer"
)
@@ -39,7 +39,7 @@ func openUrl(url string) (io.ReadCloser, error) {
return nil, err
}
- request.Header.Set("User-Agent", "ClashForAndroid/"+app2.VersionName())
+ request.Header.Set("User-Agent", "ClashForAndroid/"+app.VersionName())
response, err := client.Do(request)
if err != nil {
@@ -50,7 +50,7 @@ func openUrl(url string) (io.ReadCloser, error) {
}
func openContent(url string) (io.ReadCloser, error) {
- return app2.OpenContent(url)
+ return app.OpenContent(url)
}
func fetch(url *U.URL, file string) error {
diff --git a/core/src/main/golang/native/delegate/init.go b/core/src/main/golang/native/delegate/init.go
index 536079ec..61780ec1 100644
--- a/core/src/main/golang/native/delegate/init.go
+++ b/core/src/main/golang/native/delegate/init.go
@@ -6,7 +6,7 @@ import (
"cfa/blob"
- app2 "cfa/native/app"
+ "cfa/native/app"
"cfa/native/platform"
"github.com/Dreamacro/clash/component/process"
"github.com/Dreamacro/clash/log"
@@ -21,8 +21,8 @@ var errBlocked = errors.New("blocked")
func Init(home, versionName string, platformVersion int) {
mmdb.LoadFromBytes(blob.GeoipDatabase)
constant.SetHomeDir(home)
- app2.ApplyVersionName(versionName)
- app2.ApplyPlatformVersion(platformVersion)
+ app.ApplyVersionName(versionName)
+ app.ApplyPlatformVersion(platformVersion)
process.DefaultPackageNameResolver = func(metadata *constant.Metadata) (string, error) {
src, dst := metadata.RawSrcAddr, metadata.RawDstAddr
@@ -31,8 +31,8 @@ func Init(home, versionName string, platformVersion int) {
return "", process.ErrInvalidNetwork
}
- uid := app2.QuerySocketUid(metadata.RawSrcAddr, metadata.RawDstAddr)
- pkg := app2.QueryAppByUid(uid)
+ uid := app.QuerySocketUid(metadata.RawSrcAddr, metadata.RawDstAddr)
+ pkg := app.QueryAppByUid(uid)
log.Debugln("[PKG] %s --> %s by %d[%s]", metadata.SourceAddress(), metadata.RemoteAddress(), uid, pkg)
@@ -45,7 +45,7 @@ func Init(home, versionName string, platformVersion int) {
}
return conn.Control(func(fd uintptr) {
- app2.MarkSocket(int(fd))
+ app.MarkSocket(int(fd))
})
}
}
--
GitLab