fix bugs - add dns settings

Author: code3-dev

android/app/build.gradle.kts

@@ -26,8 +26,8 @@ android {
         // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = flutter.minSdkVersion
         targetSdk = flutter.targetSdkVersion
-        versionCode = 5
-        versionName = "1.5.0"
+        versionCode = 6
+        versionName = "1.6.0"
     }
 
     buildTypes {

lib/models/v2ray_config.dart

@@ -6,6 +6,7 @@ class V2RayConfig {
   final String configType; // vmess, vless, etc.
   final String fullConfig;
   bool isConnected;
+  bool isProxyMode;
 
   V2RayConfig({
     required this.id,
@@ -15,6 +16,7 @@ class V2RayConfig {
     required this.configType,
     required this.fullConfig,
     this.isConnected = false,
+    this.isProxyMode = false,
   });
 
   Map<String, dynamic> toJson() {
@@ -26,6 +28,7 @@ class V2RayConfig {
       'configType': configType,
       'fullConfig': fullConfig,
       'isConnected': isConnected,
+      'isProxyMode': isProxyMode,
     };
   }
 
@@ -38,6 +41,7 @@ class V2RayConfig {
       configType: json['configType'],
       fullConfig: json['fullConfig'],
       isConnected: json['isConnected'] ?? false,
+      isProxyMode: json['isProxyMode'] ?? false,
     );
   }
 }

lib/providers/v2ray_provider.dart

@@ -51,6 +51,9 @@ class V2RayProvider with ChangeNotifier, WidgetsBindingObserver {
       // Load servers from the default URL without creating a default subscription
       await fetchServers();
 
+      // Update all subscriptions on app start
+      await updateAllSubscriptions();
+      
       // Fetch the current notification status to sync with the app
       await fetchNotificationStatus();
 
@@ -134,8 +137,17 @@ class V2RayProvider with ChangeNotifier, WidgetsBindingObserver {
       final servers = await _serverService.fetchServers(customUrl: customUrl);
 
       if (servers.isNotEmpty) {
-        // Load and display servers immediately
-        _configs = servers;
+        // Get all subscription config IDs to preserve them
+        final subscriptionConfigIds = <String>{};
+        for (var subscription in _subscriptions) {
+          subscriptionConfigIds.addAll(subscription.configIds);
+        }
+        
+        // Keep existing subscription configs
+        final subscriptionConfigs = _configs.where((c) => subscriptionConfigIds.contains(c.id)).toList();
+        
+        // Add default servers to the configs list
+        _configs = [...subscriptionConfigs, ...servers];
 
         // Save configs and update UI immediately to show servers
         await _v2rayService.saveConfigs(_configs);
@@ -470,14 +482,51 @@ class V2RayProvider with ChangeNotifier, WidgetsBindingObserver {
     _errorMessage = '';
     notifyListeners();
 
+    // Maximum number of connection attempts
+    const int maxAttempts = 3;
+    // Delay between attempts in seconds
+    const int retryDelaySeconds = 1;
+    
     try {
       // Disconnect from current server if connected
       if (_v2rayService.activeConfig != null) {
         await _v2rayService.disconnect();
       }
 
-      // Connect to new server
-      final success = await _v2rayService.connect(config);
+      // Try to connect with automatic retry
+      bool success = false;
+      String lastError = '';
+      
+      for (int attempt = 1; attempt <= maxAttempts; attempt++) {
+        try {
+          // Connect to server
+          success = await _v2rayService.connect(config);
+          
+          if (success) {
+            // Connection successful, break the retry loop
+            break;
+          } else {
+            // Connection failed but no exception was thrown
+            lastError = 'Failed to connect to server on attempt $attempt';
+            print(lastError);
+            
+            // If this is not the last attempt, wait before retrying
+            if (attempt < maxAttempts) {
+              await Future.delayed(Duration(seconds: retryDelaySeconds));
+            }
+          }
+        } catch (e) {
+          // Exception during connection attempt
+          lastError = 'Error on connection attempt $attempt: $e';
+          print(lastError);
+          
+          // If this is not the last attempt, wait before retrying
+          if (attempt < maxAttempts) {
+            await Future.delayed(Duration(seconds: retryDelaySeconds));
+          }
+        }
+      }
+      
       if (success) {
         // Wait for 3 seconds as requested
         await Future.delayed(const Duration(seconds: 3));
@@ -498,10 +547,10 @@ class V2RayProvider with ChangeNotifier, WidgetsBindingObserver {
         // Reset usage statistics when connecting to a new server
         await _v2rayService.resetUsageStats();
       } else {
-        _setError('Failed to connect to server');
+        _setError('Failed to connect after multiple attempts');
       }
     } catch (e) {
-      _setError('Error connecting to server: $e');
+      _setError('Error in connection process: $e');
     } finally {
       _isConnecting = false;
       notifyListeners();

lib/screens/about_screen.dart

@@ -51,7 +51,7 @@ class AboutScreen extends StatelessWidget {
 
             // App Version
             const Text(
-              'Version 1.5.0',
+              'Version 1.6.0',
               style: TextStyle(fontSize: 16, color: Colors.grey),
             ),
 

lib/screens/server_selection_screen.dart

@@ -69,20 +69,34 @@ class _ServerSelectionScreenState extends State<ServerSelectionScreen> {
         backgroundColor: AppTheme.primaryDark,
         elevation: 0,
         actions: [
-          if (_selectedFilter == 'All')
-            IconButton(
-              icon: const Icon(Icons.refresh),
-              onPressed: () async {
-                try {
-                  // Show loading indicator
-                  ScaffoldMessenger.of(context).showSnackBar(
-                    const SnackBar(content: Text('Updating servers...'), duration: Duration(seconds: 1)),
-                  );
-                  
+          IconButton(
+            icon: const Icon(Icons.refresh),
+            onPressed: () async {
+              try {
+                // Show loading indicator
+                ScaffoldMessenger.of(context).showSnackBar(
+                  const SnackBar(content: Text('Updating servers...'), duration: Duration(seconds: 1)),
+                );
+                
+                if (_selectedFilter == 'All') {
                   // Update all subscriptions when 'All' is selected
                   await provider.updateAllSubscriptions();
+                } else if (_selectedFilter != 'Default') {
+                  // Update individual subscription
+                  final subscription = subscriptions.firstWhere(
+                    (sub) => sub.name == _selectedFilter,
+                    orElse: () => Subscription(id: '', name: '', url: '', lastUpdated: DateTime.now(), configIds: []),
+                  );
 
-                  // Always check if there was an error
+                  if (subscription.id.isNotEmpty) {
+                    await provider.updateSubscription(subscription);
+                  }
+                }
+                
+                // Refresh the UI to show updated server list
+                setState(() {});
+                
+                // Always check if there was an error
                 if (provider.errorMessage.isNotEmpty) {
                   ScaffoldMessenger.of(context).showSnackBar(
                     SnackBar(

lib/screens/tools_screen.dart

@@ -5,6 +5,7 @@ import 'ip_info_screen.dart';
 import 'host_checker_screen.dart';
 import 'speedtest_screen.dart';
 import 'subscription_management_screen.dart';
+import 'vpn_settings_screen.dart';
 
 class ToolsScreen extends StatelessWidget {
   const ToolsScreen({Key? key}) : super(key: key);
@@ -77,6 +78,20 @@ class ToolsScreen extends StatelessWidget {
               );
             },
           ),
+          _buildToolCard(
+            context,
+            title: 'VPN Settings',
+            description: 'Configure bypass subnets and other VPN options',
+            icon: Icons.settings,
+            onTap: () {
+              Navigator.push(
+                context,
+                MaterialPageRoute(
+                  builder: (context) => const VpnSettingsScreen(),
+                ),
+              );
+            },
+          ),
           // Add more tools here in the future
         ],
       ),