Fix quickStart change proxy error

Add resources page

Optimize more detail

README.md

@@ -34,8 +34,6 @@ on Mobile:
 
 💡 Based on Material You Design, [Surfboard](https://github.com/getsurfboard/surfboard)-like UI
 
-☁️ Supports data sync via WebDAV
-
 ✨ Support subscription link, Dark mode
 
 ## Contact

README_zh_CN.md

@@ -34,8 +34,6 @@ on Mobile:
 
 💡 基本 Material You 设计, 类[Surfboard](https://github.com/getsurfboard/surfboard)用户界面
 
-☁️ 支持通过WebDAV同步数据
-
 ✨ 支持一键导入订阅, 深色模式
 
 ## Contact

core/common.go

@@ -325,14 +325,11 @@ func overwriteConfig(targetConfig *config.RawConfig, patchConfig config.RawConfi
 	targetConfig.ExternalUI = ""
 	targetConfig.Interface = ""
 	targetConfig.ExternalUIURL = ""
-	targetConfig.GeodataMode = false
 	//targetConfig.IPv6 = patchConfig.IPv6
 	targetConfig.LogLevel = patchConfig.LogLevel
-	targetConfig.Port = 0
-	targetConfig.SocksPort = 0
-	targetConfig.MixedPort = patchConfig.MixedPort
 	targetConfig.FindProcessMode = process.FindProcessAlways
 	targetConfig.AllowLan = patchConfig.AllowLan
+	targetConfig.MixedPort = patchConfig.MixedPort
 	targetConfig.Mode = patchConfig.Mode
 	targetConfig.Tun.Enable = patchConfig.Tun.Enable
 	targetConfig.Tun.Device = patchConfig.Tun.Device

core/hub.go

@@ -65,7 +65,12 @@ func validateConfig(s *C.char, port C.longlong) {
 	i := int64(port)
 	go func() {
 		bytes := []byte(C.GoString(s))
-		_, err := config.UnmarshalRawConfig(bytes)
+		rawConfig, err := config.UnmarshalRawConfig(bytes)
+		if err != nil {
+			bridge.SendToPort(i, err.Error())
+			return
+		}
+		_, err = config.ParseRawConfig(rawConfig)
 		if err != nil {
 			bridge.SendToPort(i, err.Error())
 			return

lib/common/request.dart

@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:dio/dio.dart';
 import 'package:dio/io.dart';
 import 'package:fl_clash/common/common.dart';
+import 'package:fl_clash/models/ip.dart';
 import 'package:fl_clash/state.dart';
 
 class Request {
@@ -26,7 +27,7 @@ class Request {
     ));
   }
 
-  _syncProxy(){
+  _syncProxy() {
     final port = globalState.appController.clashConfig.mixedPort;
     if (_port != port) {
       _port = port;
@@ -45,14 +46,14 @@ class Request {
   Future<Response> getFileResponseForUrl(String url) async {
     final response = await _dio
         .get(
-      url,
-      options: Options(
-        responseType: ResponseType.bytes,
-      ),
-    )
+          url,
+          options: Options(
+            responseType: ResponseType.bytes,
+          ),
+        )
         .timeout(
-      httpTimeoutDuration,
-    );
+          httpTimeoutDuration,
+        );
     return response;
   }
 
@@ -73,6 +74,29 @@ class Request {
     if (!hasUpdate) return null;
     return data;
   }
+
+  final Map<String, IpInfo Function(Map<String, dynamic>)> _ipInfoSources = {
+    "https://ipwho.is/": IpInfo.fromIpwhoIsJson,
+    "https://api.ip.sb/geoip/": IpInfo.fromIpSbJson,
+    "https://ipapi.co/json/": IpInfo.fromIpApiCoJson,
+    "https://ipinfo.io/json/": IpInfo.fromIpInfoIoJson,
+  };
+
+  Future<IpInfo> checkIp() async {
+    for (final source in _ipInfoSources.entries) {
+      try {
+        final response = await _dio.get<Map<String, dynamic>>(
+          source.key,
+        );
+        if (response.statusCode == 200 && response.data != null) {
+          return source.value(response.data!);
+        }
+      } catch (e) {
+        continue;
+      }
+    }
+    throw "无法检索ip";
+  }
 }
 
 final request = Request();

lib/controller.dart

@@ -101,9 +101,7 @@ class AppController {
   updateProfile(String id) async {
     final profile = config.getCurrentProfileForId(id);
     if (profile != null) {
-      final tempProfile = profile.copyWith();
-      await tempProfile.update();
-      config.setProfile(tempProfile);
+      await profile.update();
     }
   }
 

lib/fragments/profiles/edit_profile.dart

@@ -40,7 +40,7 @@ class _EditProfileState extends State<EditProfile> {
   _handleConfirm() {
     if (!_formKey.currentState!.validate()) return;
     final config = widget.context.read<Config>();
-    final hasUpdate = urlController.text.isNotEmpty && widget.profile.url != urlController.text;
+    final hasUpdate = widget.profile.url != urlController.text;
     widget.profile.url = urlController.text;
     widget.profile.label = labelController.text;
     widget.profile.autoUpdate = autoUpdate;
@@ -82,7 +82,7 @@ class _EditProfileState extends State<EditProfile> {
           },
         ),
       ),
-      if (widget.profile.url != null && widget.profile.url!.isNotEmpty == true)...[
+      if (widget.profile.url != null)...[
         ListItem(
           title: TextFormField(
             controller: urlController,

lib/fragments/profiles/profiles.dart

@@ -139,10 +139,9 @@ class _ProfilesFragmentState extends State<ProfilesFragment> {
       ),
       child: Selector2<AppState, Config, ProfilesSelectorState>(
         selector: (_, appState, config) => ProfilesSelectorState(
-          profiles: config.profiles,
-          currentProfileId: config.currentProfileId,
-          viewMode: appState.viewMode,
-        ),
+            profiles: config.profiles,
+            currentProfileId: config.currentProfileId,
+            viewMode: appState.viewMode),
         builder: (context, state, child) {
           if (state.profiles.isEmpty) {
             return NullStatus(

lib/models/ip.dart

@@ -0,0 +1,65 @@
+class IpInfo {
+  final String ip;
+  final String countryCode;
+
+  const IpInfo({
+    required this.ip,
+    required this.countryCode,
+  });
+
+  static IpInfo fromIpInfoIoJson(Map<String, dynamic> json) {
+    return switch (json) {
+      {
+        "ip": final String ip,
+        "country": final String country,
+      } =>
+        IpInfo(
+          ip: ip,
+          countryCode: country,
+        ),
+      _ => throw const FormatException("invalid json"),
+    };
+  }
+
+  static IpInfo fromIpApiCoJson(Map<String, dynamic> json) {
+    return switch (json) {
+      {
+        "ip": final String ip,
+        "country_code": final String countryCode,
+      } =>
+        IpInfo(
+          ip: ip,
+          countryCode: countryCode,
+        ),
+      _ => throw const FormatException("invalid json"),
+    };
+  }
+
+  static IpInfo fromIpSbJson(Map<String, dynamic> json) {
+    return switch (json) {
+      {
+        "ip": final String ip,
+        "country_code": final String countryCode,
+      } =>
+        IpInfo(
+          ip: ip,
+          countryCode: countryCode,
+        ),
+      _ => throw const FormatException("invalid json"),
+    };
+  }
+
+  static IpInfo fromIpwhoIsJson(Map<String, dynamic> json) {
+    return switch (json) {
+      {
+        "ip": final String ip,
+        "country_code": final String countryCode,
+      } =>
+        IpInfo(
+          ip: ip,
+          countryCode: countryCode,
+        ),
+      _ => throw const FormatException("invalid json"),
+    };
+  }
+}

lib/models/models.dart

@@ -12,4 +12,5 @@ export 'package.dart';
 export 'ffi.dart';
 export 'selector.dart';
 export 'navigation.dart';
-export 'dav.dart';
+export 'dav.dart';
+export 'ip.dart';

lib/models/profile.dart

@@ -95,6 +95,9 @@ class Profile {
   }
 
   Future<void> update() async {
+    if (url == null) {
+      throw appLocalizations.unableToUpdateCurrentProfileDesc;
+    }
     final response = await request.getFileResponseForUrl(url!);
     final disposition = response.headers.value("content-disposition");
     label ??= other.getFileNameForDisposition(disposition) ?? id;

pubspec.yaml

@@ -1,7 +1,7 @@
 name: fl_clash
 description: A multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free.
 publish_to: 'none'
-version: 0.8.12
+version: 0.8.11
 environment:
   sdk: '>=3.1.0 <4.0.0'
 

test/command_test.dart

@@ -1,4 +1,5 @@
 // ignore_for_file: avoid_print
+
 void main() async {
   String input = """
 您