fix sort

Author: code3-dev

android/app/build.gradle.kts

@@ -27,7 +27,7 @@ android {
         minSdk = flutter.minSdkVersion
         targetSdk = flutter.targetSdkVersion
         versionCode = 14
-        versionName = "2.2.0"
+        versionName = "2.3.0"
     }
 
     buildTypes {

lib/models/app_update.dart

@@ -6,7 +6,7 @@ class AppUpdate {
   final String messText;
 
   // Current app version - manually set
-  static const String currentAppVersion = '2.2.0';
+  static const String currentAppVersion = '2.3.0';
 
   AppUpdate({required this.version, required this.url, required this.messText});
 
@@ -38,8 +38,12 @@ class AppUpdate {
       List<int> newer = newVersion.split('.').map(int.parse).toList();
 
       // Ensure both lists have at least 3 elements
-      while (current.length < 3) current.add(0);
-      while (newer.length < 3) newer.add(0);
+      while (current.length < 3) {
+        current.add(0);
+      }
+      while (newer.length < 3) {
+        newer.add(0);
+      }
 
       for (int i = 0; i < 3; i++) {
         if (newer[i] > current[i]) {

lib/providers/v2ray_provider.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/widgets.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 import '../models/v2ray_config.dart';
 import '../models/subscription.dart';
 import '../services/v2ray_service.dart';
@@ -8,7 +7,7 @@ import '../services/server_service.dart';
 class V2RayProvider with ChangeNotifier, WidgetsBindingObserver {
   final V2RayService _v2rayService = V2RayService();
   final ServerService _serverService = ServerService();
-  bool status_ping_only = false;
+  bool statusPingOnly = false;
   List<V2RayConfig> _configs = [];
   List<Subscription> _subscriptions = [];
   V2RayConfig? _selectedConfig;
@@ -69,7 +68,7 @@ class V2RayProvider with ChangeNotifier, WidgetsBindingObserver {
 
         // If we couldn't find the exact active config in our list,
         // try to find a matching one by address and port
-        if (_selectedConfig == null && activeConfig != null) {
+        if (_selectedConfig == null) {
           for (var config in _configs) {
             if (config.address == activeConfig.address &&
                 config.port == activeConfig.port) {
@@ -576,7 +575,12 @@ class V2RayProvider with ChangeNotifier, WidgetsBindingObserver {
     try {
       // Disconnect from current server if connected
       if (_v2rayService.activeConfig != null) {
-        await _v2rayService.disconnect();
+        try {
+          await _v2rayService.disconnect();
+        } catch (e) {
+          debugPrint('Error disconnecting from current server: $e');
+          // Continue with connection attempt even if disconnect failed
+        }
       }
 
       // Try to connect with automatic retry
@@ -585,26 +589,40 @@ class V2RayProvider with ChangeNotifier, WidgetsBindingObserver {
 
       for (int attempt = 1; attempt <= maxAttempts; attempt++) {
         try {
-          // Connect to server
-          success = await _v2rayService.connect(config, _isProxyMode);
+          debugPrint('Connection attempt $attempt/$maxAttempts for ${config.remark}');
+          
+          // Connect to server with timeout
+          success = await _v2rayService.connect(config, _isProxyMode)
+              .timeout(
+                const Duration(seconds: 30), // Timeout for connection
+                onTimeout: () {
+                  debugPrint('Connection timeout for ${config.remark}');
+                  return false;
+                },
+              );
 
           if (success) {
-            // Connection successful, break the retry loop
+            debugPrint('Connection successful for ${config.remark}');
             break;
           } else {
             // Connection failed but no exception was thrown
-            lastError = 'Failed to connect to server on attempt $attempt';
-            print(lastError);
+            lastError = 'Failed to connect to ${config.remark} on attempt $attempt';
+            debugPrint(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);
+          // Check if this is a timeout-related error
+          if (e.toString().contains('timeout')) {
+            lastError = 'Connection timeout on attempt $attempt: $e';
+            debugPrint(lastError);
+          } else {
+            lastError = 'Error on connection attempt $attempt: $e';
+            debugPrint(lastError);
+          }
 
           // If this is not the last attempt, wait before retrying
           if (attempt < maxAttempts) {
@@ -614,29 +632,48 @@ class V2RayProvider with ChangeNotifier, WidgetsBindingObserver {
       }
 
       if (success) {
-        // Wait for 3 seconds as requested
-        await Future.delayed(const Duration(seconds: 3));
+        try {
+          // Wait for connection to stabilize
+          await Future.delayed(const Duration(seconds: 2)); // Reduced from 3 to 2 seconds
 
-        // Update config status
-        for (int i = 0; i < _configs.length; i++) {
-          if (_configs[i].id == config.id) {
-            _configs[i].isConnected = true;
-          } else {
-            _configs[i].isConnected = false;
+          // Update config status safely
+          for (int i = 0; i < _configs.length; i++) {
+            if (_configs[i].id == config.id) {
+              _configs[i].isConnected = true;
+            } else {
+              _configs[i].isConnected = false;
+            }
           }
-        }
-        _selectedConfig = config;
+          _selectedConfig = config;
 
-        // Persist the changes
-        await _v2rayService.saveConfigs(_configs);
+          // Persist the changes with error handling
+          try {
+            await _v2rayService.saveConfigs(_configs);
+          } catch (e) {
+            debugPrint('Error saving configs after connection: $e');
+            // Don't fail the connection for this
+          }
 
-        // Reset usage statistics when connecting to a new server
-        await _v2rayService.resetUsageStats();
+          // Reset usage statistics when connecting to a new server
+          try {
+            await _v2rayService.resetUsageStats();
+          } catch (e) {
+            debugPrint('Error resetting usage stats: $e');
+            // Don't fail the connection for this
+          }
+          
+          debugPrint('Successfully connected to ${config.remark}');
+        } catch (e) {
+          debugPrint('Error in post-connection setup: $e');
+          // Connection succeeded but post-setup failed
+          _setError('Connected but failed to update settings: $e');
+        }
       } else {
-        _setError('Failed to connect after multiple attempts');
+        _setError('Failed to connect to ${config.remark} after $maxAttempts attempts: $lastError');
       }
     } catch (e) {
-      _setError('Error in connection process: $e');
+      debugPrint('Unexpected error in connection process: $e');
+      _setError('Unexpected error connecting to ${config.remark}: $e');
     } finally {
       _isConnecting = false;
       notifyListeners();
@@ -649,7 +686,7 @@ class V2RayProvider with ChangeNotifier, WidgetsBindingObserver {
 
     try {
       await _v2rayService.disconnect();
-      status_ping_only = false;
+      statusPingOnly = false;
       // Update config status
       for (int i = 0; i < _configs.length; i++) {
         _configs[i].isConnected = false;

lib/screens/about_screen.dart

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

lib/screens/blocked_apps_screen.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import '../theme/app_theme.dart';
 import '../services/v2ray_service.dart';
-import 'dart:io';
 import 'package:flutter/foundation.dart';
 
 class BlockedAppsScreen extends StatefulWidget {

lib/screens/home_screen.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 import '../providers/v2ray_provider.dart';
 import '../widgets/connection_button.dart';
 import '../widgets/server_selector.dart';

lib/screens/host_checker_screen.dart

@@ -82,7 +82,7 @@ class _HostCheckerScreenState extends State<HostCheckerScreen> {
           .timeout(
             const Duration(seconds: 10),
             onTimeout: () {
-              throw TimeoutException('Request timed out after 10 seconds');
+              throw Exception('Request timed out after 10 seconds');
             },
           );
 

lib/screens/ip_info_screen.dart

@@ -3,7 +3,6 @@ import 'package:provider/provider.dart';
 import 'package:http/http.dart' as http;
 import 'dart:convert';
 import '../providers/v2ray_provider.dart';
-import '../services/v2ray_service.dart';
 import '../theme/app_theme.dart';
 
 class IpInfoScreen extends StatefulWidget {

lib/screens/main_navigation_screen.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:url_launcher/url_launcher.dart';
-import '../providers/telegram_proxy_provider.dart';
 import '../providers/v2ray_provider.dart';
 import '../theme/app_theme.dart';
 import '../widgets/error_snackbar.dart';