purgatory/ClashMetaForAndroid
1
0
Fork 0
mirror of https://github.com/MetaCubeX/ClashMetaForAndroid.git synced 2025-02-16 23:03:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix fetch context cancel

Browse Source
This commit is contained in:
wwqgtxx 2023-10-22 21:27:21 +08:00
parent f2de7bb124
commit 184a19dbb4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/golang/native/config/fetch.go
View File

@ -24,9 +24,7 @@ type Status struct {
MaxProgress int `json:"max"`
}
func openUrl(url string) (io.ReadCloser, error) {
ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
defer cancel()
func openUrl(ctx context.Context, url string) (io.ReadCloser, error) {
response, err := clashHttp.HttpRequest(ctx, url, http.MethodGet, http.Header{"User-Agent": {"ClashMetaForAndroid/" + app.VersionName()}}, nil)
if err != nil {
@ -41,12 +39,15 @@ func openContent(url string) (io.ReadCloser, error) {
}
func fetch(url *U.URL, file string) error {
ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
defer cancel()
var reader io.ReadCloser
var err error
switch url.Scheme {
case "http", "https":
reader, err = openUrl(url.String())
reader, err = openUrl(ctx, url.String())
case "content":
reader, err = openContent(url.String())
default: