Merge branch 'dev' into release

Author: goku-kamehameha

android/app/build.gradle.kts

@@ -11,6 +11,7 @@ plugins {
     id("com.android.application")
     id("kotlin-android")
     id("com.google.gms.google-services")
+    id("com.google.firebase.crashlytics")
     id("dev.flutter.flutter-gradle-plugin")
 }
 
@@ -71,6 +72,7 @@ repositories {
 dependencies {
     implementation(platform("com.google.firebase:firebase-bom:34.4.0"))
     implementation("com.google.firebase:firebase-analytics")
+    implementation("com.google.firebase:firebase-crashlytics")
     implementation("com.google.android.ump:user-messaging-platform:3.1.0")
 
     // Android TV support

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

@@ -57,6 +57,9 @@ class MainActivity : FlutterActivity() {
 
         EventChannel(flutterEngine.dartExecutor.binaryMessenger, "com.defyx.progress_events")
                 .setStreamHandler(ProgressStreamHandler())
+
+        EventChannel(flutterEngine.dartExecutor.binaryMessenger, "com.defyx.crash_events")
+                .setStreamHandler(CrashStreamHandler())
     }
     private fun grantNotificationPermission() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
@@ -451,3 +454,35 @@ class ProgressStreamHandler : EventChannel.StreamHandler, ProgressListener {
         CoroutineScope(Dispatchers.Main).launch { eventSink?.success(msg) }
     }
 }
+
+class CrashStreamHandler : EventChannel.StreamHandler {
+
+    private var eventSink: EventChannel.EventSink? = null
+
+    override fun onListen(arguments: Any?, events: EventChannel.EventSink?) {
+        this.eventSink = events
+        
+        // Register crash callback with Go library
+        Android.setCrashCallback(object : android.CrashListener {
+            override fun onCrash(functionName: String, errorMessage: String, stackTrace: String) {
+                // Forward crash info to Flutter via event channel
+                CoroutineScope(Dispatchers.Main).launch {
+                    eventSink?.success(
+                        mapOf(
+                            "functionName" to functionName,
+                            "errorMessage" to errorMessage,
+                            "stackTrace" to stackTrace,
+                            "platform" to "android"
+                        )
+                    )
+                }
+            }
+        })
+    }
+
+    override fun onCancel(arguments: Any?) {
+        this.eventSink = null
+        // Optionally unregister callback
+        Android.setCrashCallback(null)
+    }
+}

android/settings.gradle.kts

@@ -21,6 +21,7 @@ plugins {
     id("com.android.application") version "8.9.1" apply false
     // START: FlutterFire Configuration
     id("com.google.gms.google-services") version("4.3.15") apply false
+    id("com.google.firebase.crashlytics") version "3.0.2" apply false
     // END: FlutterFire Configuration
     id("org.jetbrains.kotlin.android") version "2.1.21" apply false
 }

ios/Podfile.lock

@@ -46,13 +46,20 @@ PODS:
     - Flutter
   - Firebase/CoreOnly (12.4.0):
     - FirebaseCore (~> 12.4.0)
+  - Firebase/Crashlytics (12.4.0):
+    - Firebase/CoreOnly
+    - FirebaseCrashlytics (~> 12.4.0)
   - firebase_analytics (12.0.4):
     - firebase_core
     - FirebaseAnalytics (= 12.4.0)
     - Flutter
   - firebase_core (4.2.1):
     - Firebase/CoreOnly (= 12.4.0)
     - Flutter
+  - firebase_crashlytics (5.0.5):
+    - Firebase/Crashlytics (= 12.4.0)
+    - firebase_core
+    - Flutter
   - FirebaseAnalytics (12.4.0):
     - FirebaseAnalytics/Default (= 12.4.0)
     - FirebaseCore (~> 12.4.0)
@@ -75,13 +82,34 @@ PODS:
     - FirebaseCoreInternal (~> 12.4.0)
     - GoogleUtilities/Environment (~> 8.1)
     - GoogleUtilities/Logger (~> 8.1)
+  - FirebaseCoreExtension (12.4.0):
+    - FirebaseCore (~> 12.4.0)
   - FirebaseCoreInternal (12.4.0):
     - "GoogleUtilities/NSData+zlib (~> 8.1)"
+  - FirebaseCrashlytics (12.4.0):
+    - FirebaseCore (~> 12.4.0)
+    - FirebaseInstallations (~> 12.4.0)
+    - FirebaseRemoteConfigInterop (~> 12.4.0)
+    - FirebaseSessions (~> 12.4.0)
+    - GoogleDataTransport (~> 10.1)
+    - GoogleUtilities/Environment (~> 8.1)
+    - nanopb (~> 3.30910.0)
+    - PromisesObjC (~> 2.4)
   - FirebaseInstallations (12.4.0):
     - FirebaseCore (~> 12.4.0)
     - GoogleUtilities/Environment (~> 8.1)
     - GoogleUtilities/UserDefaults (~> 8.1)
     - PromisesObjC (~> 2.4)
+  - FirebaseRemoteConfigInterop (12.4.0)
+  - FirebaseSessions (12.4.0):
+    - FirebaseCore (~> 12.4.0)
+    - FirebaseCoreExtension (~> 12.4.0)
+    - FirebaseInstallations (~> 12.4.0)
+    - GoogleDataTransport (~> 10.1)
+    - GoogleUtilities/Environment (~> 8.1)
+    - GoogleUtilities/UserDefaults (~> 8.1)
+    - nanopb (~> 3.30910.0)
+    - PromisesSwift (~> 2.1)
   - Flutter (1.0.0)
   - flutter_native_splash (2.4.3):
     - Flutter
@@ -122,6 +150,9 @@ PODS:
     - GoogleUtilities/Network (~> 8.1)
     - "GoogleUtilities/NSData+zlib (~> 8.1)"
     - nanopb (~> 3.30910.0)
+  - GoogleDataTransport (10.1.0):
+    - nanopb (~> 3.30910.0)
+    - PromisesObjC (~> 2.4)
   - GoogleUserMessagingPlatform (3.0.0)
   - GoogleUtilities/AppDelegateSwizzler (8.1.0):
     - GoogleUtilities/Environment
@@ -161,6 +192,8 @@ PODS:
     - Flutter
     - FlutterMacOS
   - PromisesObjC (2.4.0)
+  - PromisesSwift (2.4.0):
+    - PromisesObjC (= 2.4.0)
   - SDWebImage (5.21.7):
     - SDWebImage/Core (= 5.21.7)
   - SDWebImage/Core (5.21.7)
@@ -187,6 +220,7 @@ DEPENDENCIES:
   - file_picker (from `.symlinks/plugins/file_picker/ios`)
   - firebase_analytics (from `.symlinks/plugins/firebase_analytics/ios`)
   - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
+  - firebase_crashlytics (from `.symlinks/plugins/firebase_crashlytics/ios`)
   - Flutter (from `Flutter`)
   - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
   - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
@@ -208,15 +242,21 @@ SPEC REPOS:
     - Firebase
     - FirebaseAnalytics
     - FirebaseCore
+    - FirebaseCoreExtension
     - FirebaseCoreInternal
+    - FirebaseCrashlytics
     - FirebaseInstallations
+    - FirebaseRemoteConfigInterop
+    - FirebaseSessions
     - Google-Mobile-Ads-SDK
     - GoogleAdsOnDeviceConversion
     - GoogleAppMeasurement
+    - GoogleDataTransport
     - GoogleUserMessagingPlatform
     - GoogleUtilities
     - nanopb
     - PromisesObjC
+    - PromisesSwift
     - SDWebImage
     - SwiftyGif
 
@@ -237,6 +277,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/firebase_analytics/ios"
   firebase_core:
     :path: ".symlinks/plugins/firebase_core/ios"
+  firebase_crashlytics:
+    :path: ".symlinks/plugins/firebase_crashlytics/ios"
   Flutter:
     :path: Flutter
   flutter_native_splash:
@@ -274,10 +316,15 @@ SPEC CHECKSUMS:
   Firebase: f07b15ae5a6ec0f93713e30b923d9970d144af3e
   firebase_analytics: 67fbdd9f3c04e55048024f3da21cfc36f05e56cf
   firebase_core: f1aafb21c14f497e5498f7ffc4dc63cbb52b2594
+  firebase_crashlytics: c039028126cb45e32f4c217aa392408b0963d081
   FirebaseAnalytics: 0fc2b20091f0ddd21bf73397cf8f0eb5346dc24f
   FirebaseCore: bb595f3114953664e3c1dc032f008a244147cfd3
+  FirebaseCoreExtension: 7e1f7118ee970e001a8013719fb90950ee5e0018
   FirebaseCoreInternal: d7f5a043c2cd01a08103ab586587c1468047bca6
+  FirebaseCrashlytics: a6ece278a837c7e88de2d9b5da0a3542f2342395
   FirebaseInstallations: ae9f4902cb5bf1d0c5eaa31ec1f4e5495a0714e2
+  FirebaseRemoteConfigInterop: 1e31ec72b89c9924367c59bfb5ec9ab60d1d6766
+  FirebaseSessions: ba7c7a7ca8696a8d540eb3fe3800fbe98c79786d
   Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
   flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
   flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
@@ -286,12 +333,14 @@ SPEC CHECKSUMS:
   google_mobile_ads: 535223588a6791b7a3cc3513a1bc7b89d12f3e62
   GoogleAdsOnDeviceConversion: e03a386840803ea7eef3fd22a061930142c039c1
   GoogleAppMeasurement: 1e718274b7e015cefd846ac1fcf7820c70dc017d
+  GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
   GoogleUserMessagingPlatform: f8d0cdad3ca835406755d0a69aa634f00e76d576
   GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
   package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
   path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
+  PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
   SDWebImage: e9fc87c1aab89a8ab1bbd74eba378c6f53be8abf
   sensors_plus: 6a11ed0c2e1d0bd0b20b4029d3bad27d96e0c65b
   shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb

ios/Runner/AppDelegate.swift

@@ -32,7 +32,14 @@ import Flutter
       let progressHandler = ProgressStreamHandler()
       progressChannel.setStreamHandler(progressHandler)
 
+      let crashChannel = FlutterEventChannel(
+        name: "com.defyx.crash_events",
+        binaryMessenger: controller.binaryMessenger)
+      let crashHandler = CrashStreamHandler()
+      crashChannel.setStreamHandler(crashHandler)
+
       getLogs(progressHandler)
+      getCrashes(crashHandler)
     }
 
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
@@ -63,6 +70,32 @@ import Flutter
       defaults.synchronize()
     }
   }
+
+  func getCrashes(_ crashHandler: CrashStreamHandler) {
+    Timer.scheduledTimer(withTimeInterval: 0.5, repeats: true) { _ in
+      guard let defaults = UserDefaults(suiteName: "group.de.unboundtech.defyxvpn"),
+        var crashes = defaults.array(forKey: "go_crashes") as? [[String: String]],
+        !crashes.isEmpty
+      else { return }
+
+      let crashesToSend = crashes
+
+      for crash in crashesToSend {
+        crashHandler.send(crash)
+      }
+
+      var currentCrashes = defaults.array(forKey: "go_crashes") as? [[String: String]] ?? []
+
+      if currentCrashes.count >= crashesToSend.count {
+        currentCrashes.removeFirst(crashesToSend.count)
+      } else {
+        currentCrashes.removeAll()
+      }
+
+      defaults.set(currentCrashes, forKey: "go_crashes")
+      defaults.synchronize()
+    }
+  }
 }
 
 class ProgressStreamHandler: NSObject, FlutterStreamHandler {
@@ -105,3 +138,23 @@ class StatusStreamHandler: NSObject, FlutterStreamHandler {
     return nil
   }
 }
+
+class CrashStreamHandler: NSObject, FlutterStreamHandler {
+  private var eventSink: FlutterEventSink?
+
+  func onListen(withArguments arguments: Any?, eventSink events: @escaping FlutterEventSink)
+    -> FlutterError?
+  {
+    self.eventSink = events
+    return nil
+  }
+
+  func onCancel(withArguments arguments: Any?) -> FlutterError? {
+    self.eventSink = nil
+    return nil
+  }
+
+  func send(_ crashInfo: [String: String]) {
+    eventSink?(crashInfo)
+  }
+}

ios/Runner/VPNPlugin.swift

@@ -17,6 +17,10 @@ class VpnPlugin: VpnStatusDelegate {
         VpnService.shared.statusDelegate = self
         let progressStream = ProgressStreamHandlerIOS()
         IosSetProgressListener(progressStream)
+        
+        // Set up crash callback
+        let crashHandler = CrashStreamHandlerIOS()
+        IosSetCrashCallback(crashHandler)
     }
 
     // MARK: - Event Sink
@@ -438,3 +442,33 @@ class ProgressStreamHandlerIOS: NSObject, IosProgressListenerProtocol {
         }
     }
 }
+
+class CrashStreamHandlerIOS: NSObject, IosCrashListenerProtocol {
+    func onCrash(_ functionName: String?, errorMessage: String?, stackTrace: String?) {
+        // Store crash info in UserDefaults for main app to retrieve
+        if let defaults = UserDefaults(suiteName: "group.de.unboundtech.defyxvpn") {
+            var crashes = defaults.array(forKey: "go_crashes") as? [[String: String]] ?? []
+            
+            let crashInfo: [String: String] = [
+                "functionName": functionName ?? "unknown",
+                "errorMessage": errorMessage ?? "unknown",
+                "stackTrace": stackTrace ?? "",
+                "platform": "ios",
+                "timestamp": ISO8601DateFormatter().string(from: Date())
+            ]
+            
+            crashes.append(crashInfo)
+            
+            // Keep only last 100 crashes to avoid excessive storage
+            if crashes.count > 100 {
+                crashes = Array(crashes.suffix(100))
+            }
+            
+            defaults.set(crashes, forKey: "go_crashes")
+            defaults.synchronize()
+            
+            // Also log to console for debugging
+            print("🔥 Go panic recovered: \(functionName ?? "unknown") - \(errorMessage ?? "unknown")")
+        }
+    }
+}