fix sort

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 = 13
-        versionName = "2.1.5"
+        versionCode = 14
+        versionName = "2.2.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.1.5';
+  static const String currentAppVersion = '2.2.0';
 
   AppUpdate({required this.version, required this.url, required this.messText});
 

lib/screens/about_screen.dart

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

lib/screens/server_selection_screen.dart

@@ -118,7 +118,9 @@ class _ServerSelectionScreenState extends State<ServerSelectionScreen> {
   }
 
   Future<void> _loadAllPings() async {
-    final groupedConfigs = _groupConfigsByHost(widget.configs);
+    final provider = Provider.of<V2RayProvider>(context, listen: false);
+    final configs = provider.configs;
+    final groupedConfigs = _groupConfigsByHost(configs);
     for (var host in groupedConfigs.keys) {
       if (!mounted) return;
       final configsForHost = groupedConfigs[host]!;
@@ -344,8 +346,9 @@ class _ServerSelectionScreenState extends State<ServerSelectionScreen> {
 
   @override
   Widget build(BuildContext context) {
-    final provider = Provider.of<V2RayProvider>(context, listen: false);
+    final provider = Provider.of<V2RayProvider>(context, listen: true);
     final subscriptions = provider.subscriptions;
+    final configs = provider.configs;
 
     final filterOptions = ['All', 'Local', ...subscriptions.map((sub) => sub.name)];
 
@@ -385,7 +388,9 @@ class _ServerSelectionScreenState extends State<ServerSelectionScreen> {
                       final allSubscriptionConfigIds = subscriptions
                           .expand((sub) => sub.configIds)
                           .toSet();
-                      final localConfigs = widget.configs
+                      final provider = Provider.of<V2RayProvider>(context, listen: false);
+                      final allConfigs = provider.configs;
+                      final localConfigs = allConfigs
                           .where((config) => !allSubscriptionConfigIds.contains(config.id))
                           .toList();
 
@@ -406,8 +411,10 @@ class _ServerSelectionScreenState extends State<ServerSelectionScreen> {
                               configIds: [],
                             ),
                       );
+                      final provider = Provider.of<V2RayProvider>(context, listen: false);
+                      final allConfigs = provider.configs;
                       final configsToTest =
-                          widget.configs
+                          allConfigs
                               .where(
                                 (config) =>
                                     subscription.configIds.contains(config.id),
@@ -449,13 +456,13 @@ class _ServerSelectionScreenState extends State<ServerSelectionScreen> {
 
     List<V2RayConfig> filteredConfigs = [];
     if (_selectedFilter == 'All') {
-      filteredConfigs = List.from(widget.configs);
+      filteredConfigs = List.from(configs);
     } else if (_selectedFilter == 'Local') {
       // Filter configs that don't belong to any subscription
       final allSubscriptionConfigIds = subscriptions
           .expand((sub) => sub.configIds)
           .toSet();
-      filteredConfigs = widget.configs
+      filteredConfigs = configs
           .where((config) => !allSubscriptionConfigIds.contains(config.id))
           .toList();
     } else {
@@ -471,7 +478,7 @@ class _ServerSelectionScreenState extends State<ServerSelectionScreen> {
             ),
       );
       filteredConfigs =
-          widget.configs
+          configs
               .where((config) => subscription.configIds.contains(config.id))
               .toList();
     }
@@ -482,13 +489,17 @@ class _ServerSelectionScreenState extends State<ServerSelectionScreen> {
         final pingA = _pings[a.id];
         final pingB = _pings[b.id];
 
-        // Handle null pings - put them at the bottom
-        if (pingA == null && pingB == null) return 0;
-        if (pingA == null) return 1;
-        if (pingB == null) return -1;
+        // Check if ping values are valid (not null, -1, or 0)
+        final isValidPingA = pingA != null && pingA > 0;
+        final isValidPingB = pingB != null && pingB > 0;
+
+        // Handle invalid pings - put them at the bottom
+        if (!isValidPingA && !isValidPingB) return 0;
+        if (!isValidPingA) return 1;
+        if (!isValidPingB) return -1;
 
-        // Sort by ping value
-        return _sortAscending ? pingA.compareTo(pingB) : pingB.compareTo(pingA);
+        // Sort by ping value (only valid pings reach here)
+        return _sortAscending ? pingA!.compareTo(pingB!) : pingB!.compareTo(pingA!);
       });
     }
 
@@ -783,7 +794,7 @@ class _ServerSelectionScreenState extends State<ServerSelectionScreen> {
 
                         final config = filteredConfigs[index - 1];
                         final isSelected =
-                            widget.selectedConfig?.id == config.id;
+                            provider.selectedConfig?.id == config.id;
 
                         return Card(
                           margin: const EdgeInsets.only(bottom: 12),

pubspec.lock

@@ -766,5 +766,5 @@ packages:
     source: hosted
     version: "6.5.0"
 sdks:
-  dart: ">=3.7.2 <4.0.0"
+  dart: ">=3.8.1 <4.0.0"
   flutter: ">=3.27.0"

pubspec.yaml

@@ -19,7 +19,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.2.0+1
 
 environment:
-  sdk: ^3.7.2
+  sdk: ^3.8.1
 
 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions