Merge remote-tracking branch 'origin/dev' into release

Author: goku-kamehameha

android/app/src/main/kotlin/com/defyx/defyx/VpnService.kt

@@ -235,7 +235,7 @@ class DefyxVpnService : VpnService() {
                     updateNotification("DefyxVPN", "Disconnecting...")
                 }
 
-                Android.stop()
+                Android.stopVPN()
 
                 try {
                     vpnInterface?.close()

ios/PacketTunnel/PacketTunnelProvider.swift

@@ -74,7 +74,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
         os_log("⏹ VPN stopped with reason: %d", reason.rawValue)
         os_log("⏹ Stopping VPN tunnel...")
         Socks5Tunnel.quit()
-        IosStop()
+        IosStopVPN()
         os_log("✅ Tunnel stopped successfully.")
         completionHandler()
     }

lib/modules/core/vpn.dart

@@ -26,6 +26,7 @@ class VPN {
   final log = Log();
   final analyticsService = FirebaseAnalyticsService();
   final alertService = AlertService();
+  bool _isReconnectMode = false;
 
   factory VPN(ProviderContainer container) {
     _instance._init(container);
@@ -215,8 +216,7 @@ class VPN {
       return;
     }
 
-    final isTunnelRunning = await _vpnBridge.isTunnelRunning();
-    if (!isTunnelRunning) {
+    if (!_isReconnectMode) {
       await _createTunnel();
     }
     connectionNotifier?.setConnected();
@@ -251,6 +251,7 @@ class VPN {
     loggerNotifier?.setLoading();
     connectionNotifier?.setAnalyzing();
     await vpnData?.disableVPN();
+    _isReconnectMode = true;
   }
 
   Future<void> refreshPing() async {
@@ -267,6 +268,7 @@ class VPN {
     await _vpnBridge.stopVPN();
     _clearData(ref);
     connectionNotifier.setDisconnected();
+    _isReconnectMode = false;
   }
 
   Future<void> _disconnect(WidgetRef ref) async {

lib/modules/main/presentation/widgets/connection_state_widgets.dart

@@ -254,23 +254,10 @@ class AnalyzingContent extends ConsumerWidget {
         Consumer(builder: (context, ref, child) {
           final deepScanEnabled =
               ref.read(settingsProvider.notifier).isDeepScanEnabled();
-          if (deepScanEnabled) {
-            return Container(
-                margin: const EdgeInsets.only(bottom: 3.0),
-                child: Text(
-                  "∞",
-                  style: TextStyle(
-                    color: const Color(0xFFA7A7A7),
-                    fontSize: 24.sp,
-                    fontFamily: 'Lato',
-                    fontWeight: FontWeight.w400,
-                  ),
-                ));
-          }
 
           final flowLineState = ref.watch(flowLineStepProvider);
           final currentStep = flowLineState.step;
-          final totalSteps = flowLineState.totalSteps;
+          final totalSteps = deepScanEnabled ? "∞" : flowLineState.totalSteps;
 
           if (totalSteps == 0 || currentStep == 0) {
             return Shimmer.fromColors(
@@ -281,16 +268,28 @@ class AnalyzingContent extends ConsumerWidget {
             );
           }
 
-          return Text(
-            "$currentStep/$totalSteps",
-            textAlign: TextAlign.start,
-            style: TextStyle(
-              color: const Color(0xFFA7A7A7),
-              fontSize: 16.sp,
-              fontFamily: 'Lato',
-              fontWeight: FontWeight.w300,
+          return Row(children: [
+            Text(
+              "$currentStep/",
+              textAlign: TextAlign.start,
+              style: TextStyle(
+                color: const Color(0xFFA7A7A7),
+                fontSize: 16.sp,
+                fontFamily: 'Lato',
+                fontWeight: FontWeight.w300,
+              ),
             ),
-          );
+            Text(
+              "$totalSteps",
+              textAlign: TextAlign.start,
+              style: TextStyle(
+                color: const Color(0xFFA7A7A7),
+                fontSize: deepScanEnabled ? 24.sp : 16.sp,
+                fontFamily: 'Lato',
+                fontWeight: FontWeight.w400,
+              ),
+            ),
+          ]);
         }),
         SizedBox(width: 10.w),
         AppIcons.arrowLeft(width: 14.w, height: 14.h),

pubspec.yaml

@@ -1,7 +1,7 @@
 name: defyx_vpn
 description: "A new Vpn app"
 publish_to: "none"
-version: 4.3.0+240
+version: 4.3.1+241
 
 environment:
   sdk: ^3.5.3
@@ -103,7 +103,7 @@ msix_config:
   display_name: Defyx VPN
   publisher_display_name: UnboundTech UG
   identity_name: UnboundTechUG.6065AEC5A207
-  msix_version: 4.3.0.0
+  msix_version: 4.3.1.0
   publisher: "CN=62937938-2AE2-4C12-9ED8-4C418C0CADF2"
   logo_path: assets/images/logo.png
   capabilities: runFullTrust,internetClientServer,privateNetworkClientServer,unvirtualizedResources