Merge branch 'dev' into release

# Conflicts:
#	pubspec.yaml

Author: goku-kamehameha

android/app/src/main/AndroidManifest.xml

@@ -27,6 +27,7 @@
         android:label="DefyxVPN"
         android:icon="@mipmap/ic_launcher"
         android:banner="@drawable/tv_banner"
+        android:usesCleartextTraffic="true"
         tools:ignore="ForegroundServicePermission">
 
         <receiver

ios/Runner/Info.plist

@@ -33,7 +33,7 @@
 		<key>NSVPNConfigurationUsageDescription</key>
 		<string>Defyx needs access to VPN configurations to secure your connection.</string>
 		<key>NSUserTrackingUsageDescription</key>
-		<string>We show personalized ads to support this free VPN service. Your data stays private and secure.</string>	
+		<string>We need permission to show you personalized ads. This helps support our free VPN service. Declining means you'll see generic ads instead.</string>	
 		<key>NSPhotoLibraryUsageDescription</key>
 		<string>Defyx needs access to your photo library to let you select and share images, such as profile pictures or VPN connection QR codes.</string>		
 		<key>UIApplicationSupportsIndirectInputEvents</key>

lib/modules/main/presentation/screens/main_screen.dart

@@ -292,7 +292,11 @@ class _MainScreenState extends ConsumerState<MainScreen> {
         );
 
       default:
-        // Show ads only when connected to VPN and ad is loaded
+        // MainScreen controls ad visibility (Strategy Pattern approach)
+        // Works for both GoogleAdStrategy and InternalAdStrategy
+        // - nativeAdIsLoaded: true when ad is ready (Google or Internal)
+        // - showCountdown: true during 60-second display window
+        // - connected: only show when VPN is active
         final shouldShowAd = status == ConnectionStatus.connected && 
                              adsState.showCountdown && 
                              adsState.nativeAdIsLoaded;

lib/modules/main/presentation/widgets/ads/ads_state.dart

@@ -162,13 +162,9 @@ class AdsNotifier extends StateNotifier<AdsState> {
   }
 
   /// Start the countdown timer after ad is loaded and VPN connects
+  /// Always restarts to 60 seconds on each connection
   void startCountdownTimer() async {
-    if (_countdownTimer != null && _countdownTimer!.isActive) {
-      debugPrint('⏱️ Countdown already running, ignoring duplicate start');
-      return;
-    }
-
-    debugPrint('▶️ Starting new countdown timer');
+    debugPrint('▶️ Starting new countdown timer (60 seconds)');
     _countdownTimer?.cancel();
 
     // Clear any old persisted countdown before starting new one
@@ -189,10 +185,14 @@ class AdsNotifier extends StateNotifier<AdsState> {
   void _startCountdownFromValue(int startValue) {
     _countdownTimer?.cancel();
 
+    debugPrint('⏱️ Timer starting from $startValue seconds');
     _countdownTimer = Timer.periodic(const Duration(seconds: 1), (timer) {
       if (state.countdown > 0) {
-        state = state.copyWith(countdown: state.countdown - 1);
+        final newCount = state.countdown - 1;
+        debugPrint('⏱️ Countdown: $newCount');
+        state = state.copyWith(countdown: newCount);
       } else {
+        debugPrint('⏱️ Countdown finished - hiding ad');
         state = state.copyWith(
           showCountdown: false,
           // Keep ad loaded - just hide it until next connection

lib/modules/main/presentation/widgets/ads/strategy/google_ad_strategy.dart

@@ -68,10 +68,13 @@ class GoogleAdStrategy implements AdLoadingStrategy {
       // Check if we need to load a new ad
       if (_nativeAd != null) {
         final adsState = ref.read(adsProvider);
+        debugPrint('🔍 Cached ad found. State: nativeAdIsLoaded=${adsState.nativeAdIsLoaded}');
         if (adsState.nativeAdIsLoaded) {
           debugPrint('✅ Using existing valid ad');
           _hasInitialized = true;
           return;
+        } else {
+          debugPrint('⚠️ Cached ad exists but state says not loaded - will reload');
         }
       }
 
@@ -98,15 +101,19 @@ class GoogleAdStrategy implements AdLoadingStrategy {
       );
     }
 
-    // Reset ad loaded state BEFORE disposing to prevent showing disposed ad
-    if (_nativeAd != null) {
-      ref.read(adsProvider.notifier).setAdLoaded(false);
+    // Check if we already have a valid cached ad
+    final adsState = ref.read(adsProvider);
+    if (_nativeAd != null && adsState.nativeAdIsLoaded && !adsState.needsRefresh) {
+      debugPrint('✅ Reusing cached ad (still fresh)');
+      return AdLoadResult.success();
     }
 
     _isLoading = true;
 
-    // Dispose previous ad if exists
+    // Only dispose if we're reloading (ad is stale or failed)
     if (_nativeAd != null) {
+      debugPrint('🔄 Disposing stale/failed ad before reload');
+      ref.read(adsProvider.notifier).setAdLoaded(false);
       try {
         _nativeAd!.dispose();
         debugPrint('🗑️ Disposed previous ad');
@@ -233,7 +240,10 @@ class GoogleAdStrategy implements AdLoadingStrategy {
             analytics.logEvent(name: 'ad_impression', parameters: {});
           },
         ),
-        request: const AdRequest(),
+        request: const AdRequest(
+          keywords: ['privacy', 'security', 'technology', 'mobile', 'internet safety', 'data protection'],
+          contentUrl: 'defyxvpn://home',
+        ),
         nativeTemplateStyle: templateStyle,
       );
 
@@ -296,16 +306,17 @@ class GoogleAdStrategy implements AdLoadingStrategy {
 
       final adsState = ref.read(adsProvider);
 
-      // Load ad if we don't have one or previous load failed
-      if (_nativeAd == null || !adsState.nativeAdIsLoaded) {
+      // Check if we need to reload (no ad, failed load, or stale)
+      if (_nativeAd == null || !adsState.nativeAdIsLoaded || adsState.needsRefresh) {
         if (_isLoading) {
           debugPrint('⏳ Ad load already in progress...');
           return;
         }
 
         debugPrint('📱 Loading ad with real IP');
-        _hasInitialized = false;
-        initialize(ref);
+        loadAd(ref: ref);
+      } else {
+        debugPrint('✅ Keeping existing cached ad');
       }
       return;
     }

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

@@ -16,6 +16,12 @@
 /// - Widget (this file): UI rendering, strategy selection, lifecycle management
 /// - Strategies: Ad loading logic, connection state handling, resource cleanup
 /// - State (ads_state.dart): Centralized state shared across all strategies
+/// - MainScreen: Controls when to show/hide ads (single source of truth)
+/// 
+/// **Visibility Control:**
+/// - MainScreen decides when to render AdsWidget (based on connection + countdown)
+/// - AdsWidget trusts MainScreen and renders when called (no duplicate checks)
+/// - This approach works cleanly with Strategy Pattern (both ad types use same state)
 /// 
 /// **UI Features:**
 /// - "ADVERTISEMENT" label (top-right corner)
@@ -79,6 +85,21 @@ class _AdsWidgetState extends ConsumerState<AdsWidget> {
       // Initialize strategy (this also loads the initial ad)
       await _strategy!.initialize(ref);
 
+      // Trigger rebuild to show the ad
+      if (mounted && !_isDisposed) {
+        setState(() {});
+      }
+      
+      // Check current connection state and start countdown if already connected
+      final currentConnectionState = ref.read(connectionStateProvider).status;
+      if (currentConnectionState == ConnectionStatus.connected) {
+        final adsState = ref.read(adsProvider);
+        if (adsState.nativeAdIsLoaded) {
+          debugPrint('⏰ Already connected on init - starting countdown');
+          ref.read(adsProvider.notifier).startCountdownTimer();
+        }
+      }
+      
       // Listen to connection changes and delegate to strategy
       ref.listenManual(connectionStateProvider, (previous, next) {
         if (_strategy == null || _isDisposed) return;
@@ -106,23 +127,18 @@ class _AdsWidgetState extends ConsumerState<AdsWidget> {
   Widget build(BuildContext context) {
     final adsState = ref.watch(adsProvider);
 
-    // Hide ad panel completely if loading failed (don't show errors to users)
+    // Safety check: Hide if loading failed (MainScreen should already handle this)
     if (adsState.adLoadFailed) {
       return const SizedBox.shrink();
     }
 
-    // For internal ads: Don't show container until we have a valid image URL
-    if (_useInternalAds) {
-      if (adsState.customImageUrl == null || adsState.customImageUrl!.isEmpty) {
-        return const SizedBox.shrink();
-      }
-    }
-
-    // For Google ads: Don't show container until ad is actually loaded
-    if (!_useInternalAds && !adsState.nativeAdIsLoaded) {
+    // Wait for strategy to initialize (happens in postFrameCallback)
+    if (_strategy == null) {
       return const SizedBox.shrink();
     }
 
+    // Render ad container - MainScreen controls visibility via shouldShowAd
+    // No need to check ad loaded state here, MainScreen already does that
     return SizedBox(
       height: 280.h,
       width: 336.w,

lib/shared/layout/navbar/widgets/custom_webview_screen.dart

@@ -4,6 +4,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:webview_flutter/webview_flutter.dart';
+import 'package:webview_flutter_android/webview_flutter_android.dart';
+import 'package:webview_flutter_wkwebview/webview_flutter_wkwebview.dart';
 
 class CustomWebViewScreen extends StatefulWidget {
   final String url;
@@ -20,7 +22,7 @@ class CustomWebViewScreen extends StatefulWidget {
 }
 
 class _CustomWebViewScreenState extends State<CustomWebViewScreen> {
-  late final WebViewController _controller;
+  WebViewController? _controller;
   bool _isLoading = true;
 
   @override
@@ -32,23 +34,69 @@ class _CustomWebViewScreenState extends State<CustomWebViewScreen> {
       return;
     }
 
-    _controller = WebViewController()
+    _initializeWebView();
+  }
+
+  Future<void> _initializeWebView() async {
+    // Clear all cookies before loading to prevent tracking
+    await WebViewCookieManager().clearCookies();
+    
+    // Use platform-specific params for native cookie blocking
+    late final PlatformWebViewControllerCreationParams params;
+    
+    if (Platform.isIOS) {
+      // iOS: Use WKWebView which blocks 3rd-party cookies by default (iOS 14+)
+      params = WebKitWebViewControllerCreationParams(
+        allowsInlineMediaPlayback: true,
+        mediaTypesRequiringUserAction: const {},
+      );
+    } else if (Platform.isAndroid) {
+      // Android: Use native WebView with built-in privacy features
+      params = AndroidWebViewControllerCreationParams();
+    } else {
+      params = const PlatformWebViewControllerCreationParams();
+    }
+    
+    final controller = WebViewController.fromPlatformCreationParams(params)
       ..setJavaScriptMode(JavaScriptMode.unrestricted)
       ..setNavigationDelegate(
         NavigationDelegate(
-          onPageStarted: (String url) {
-            setState(() {
-              _isLoading = true;
-            });
+          onNavigationRequest: (NavigationRequest request) {
+            // Clear cookies before every navigation to prevent tracking persistence
+            WebViewCookieManager().clearCookies();
+            debugPrint('🍪 Cookies cleared before navigation to: ${request.url}');
+            return NavigationDecision.navigate;
+          },
+          onPageStarted: (String url) async {
+            // Clear cookies when page starts loading as an additional safeguard
+            await WebViewCookieManager().clearCookies();
+            if (mounted) {
+              setState(() {
+                _isLoading = true;
+              });
+            }
           },
           onPageFinished: (String url) {
-            setState(() {
-              _isLoading = false;
-            });
+            if (mounted) {
+              setState(() {
+                _isLoading = false;
+              });
+            }
           },
         ),
       )
-      ..loadRequest(Uri.parse(widget.url));
+      ..setUserAgent('Mozilla/5.0 (iPhone; CPU iPhone OS 16_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 DNT/1');
+    
+    // Load the URL
+    await controller.loadRequest(Uri.parse(widget.url));
+    
+    _controller = controller;
+    
+    if (mounted) {
+      setState(() {});
+    }
+    
+    debugPrint('🍪 WebView initialized: Native privacy + continuous cookie blocking');
   }
 
   Future<void> _openInBrowser() async {
@@ -137,7 +185,10 @@ class _CustomWebViewScreenState extends State<CustomWebViewScreen> {
       ),
       body: Stack(
         children: [
-          WebViewWidget(controller: _controller),
+          if (_controller != null)
+            WebViewWidget(controller: _controller!)
+          else
+            const SizedBox.shrink(),
           if (_isLoading)
             Center(
               child: CircularProgressIndicator(

pubspec.yaml

@@ -1,7 +1,7 @@
 name: defyx_vpn
 description: "A new Vpn app"
 publish_to: "none"
-version: 5.1.0+247
+version: 5.1.2+249
 
 environment:
   sdk: ^3.8.0
@@ -105,7 +105,7 @@ msix_config:
   display_name: Defyx VPN
   publisher_display_name: UnboundTech UG
   identity_name: UnboundTechUG.6065AEC5A207
-  msix_version: 5.0.7.247
+  msix_version: 5.1.2.0
   publisher: "CN=62937938-2AE2-4C12-9ED8-4C418C0CADF2"
   logo_path: assets/images/logo.png
   capabilities: runFullTrust,internetClientServer,privateNetworkClientServer,unvirtualizedResources