Merge remote-tracking branch 'origin/main' into atavism/linux-arm

Author: atavism

android/app/src/main/kotlin/org/getlantern/lantern/service/LanternVpnService.kt

@@ -20,6 +20,7 @@ import org.getlantern.lantern.BuildConfig
 import org.getlantern.lantern.MainActivity
 import org.getlantern.lantern.constant.VPNStatus
 import org.getlantern.lantern.notification.NotificationHelper
+import org.getlantern.lantern.service.LanternVpnService.Companion.ACTION_STOP_VPN
 import org.getlantern.lantern.utils.AppLogger
 import org.getlantern.lantern.utils.DeviceUtil
 import org.getlantern.lantern.utils.FlutterEventListener
@@ -146,8 +147,20 @@ class LanternVpnService :
             closeTunInterface()
             // Clean up synchronously — cannot use serviceScope here because
             // it is cancelled in the finally block below.
-            runCatching { Mobile.stopVPN() }
-                .onFailure { e -> AppLogger.e(TAG, "Mobile.stopVPN() failed during destroy", e) }
+            // Only call stopVPN if Radiance IPC is actually running; calling it before
+            // setup completes results in a misleading "IPC not running" error.
+            if (Mobile.isRadianceConnected()) {
+                runCatching { Mobile.stopVPN() }
+                    .onFailure { e ->
+                        AppLogger.e(
+                            TAG,
+                            "Mobile.stopVPN() failed during destroy",
+                            e
+                        )
+                    }
+            } else {
+                AppLogger.d(TAG, "Skipping stopVPN — Radiance IPC not running")
+            }
             runCatching {
                 runBlocking(Dispatchers.IO) { DefaultNetworkMonitor.stop() }
             }.onFailure { e ->
@@ -263,6 +276,14 @@ class LanternVpnService :
         // VPN service starts, replaced by connected notification on success.
         notificationHelper.showStartingVPNConnectedNotification(this@LanternVpnService)
         runCatching {
+            // Radiance is pre-warmed via ACTION_START_RADIANCE, but as a background
+            // service it may have been killed by the OS before setup completed.
+            // Re-run setup here under the foreground notification so it is guaranteed
+            // to finish before we attempt to start the VPN tunnel.
+            if (!Mobile.isRadianceConnected()) {
+                AppLogger.d(TAG, "Radiance not ready, setting up before VPN start")
+                Mobile.setupRadiance(opts(), flutterEventListener)
+            }
             DefaultNetworkMonitor.start()
             connect()
             VpnStatusManager.postVPNStatus(VPNStatus.Connected)
@@ -296,7 +317,13 @@ class LanternVpnService :
     private suspend fun stopVPNTunnel() {
         try {
             closeTunInterface()
-            runCatching { Mobile.stopVPN() }
+            runCatching {
+                if (!Mobile.isVPNConnected()) {
+                    AppLogger.d(TAG, "VPN is not connected, skipping stopVPN")
+                    return@runCatching
+                }
+                Mobile.stopVPN()
+            }
                 .onFailure { e -> AppLogger.e(TAG, "Mobile.stopVPN() failed", e) }
 
             runCatching { DefaultNetworkMonitor.stop() }

android/app/src/main/kotlin/org/getlantern/lantern/utils/LanternLogger.kt

@@ -51,9 +51,16 @@ object AppLogger {
         writeAsync("INFO", tag, message)
     }
 
-    fun w(tag: String, message: String, tr: Throwable? = null) {
-        Log.w(tag, message, tr)
-        writeAsync("WARN", tag, message)
+    fun w(tag: String, message: String, throwable: Throwable? = null) {
+        Log.w(tag, message, throwable)
+        val errorMessage = buildString {
+            append(message)
+            if (throwable != null) {
+                append("\n")
+                append(throwable.stackTraceToString())
+            }
+        }
+        writeAsync("WARN", tag, errorMessage)
     }
 
     fun e(tag: String, message: String, throwable: Throwable? = null) {

go.mod

@@ -25,7 +25,7 @@ require (
 	github.com/alecthomas/assert/v2 v2.3.0
 	github.com/getlantern/common v1.2.1-0.20260224184656-5aefb9c21c85
 	github.com/getlantern/lantern-server-provisioner v0.0.0-20251031121934-8ea031fccfa9
-	github.com/getlantern/radiance v0.0.0-20260318170544-725ad379e90b
+	github.com/getlantern/radiance v0.0.0-20260320012916-fcb0501214cd
 	github.com/sagernet/sing-box v1.12.22
 	golang.org/x/mobile v0.0.0-20250711185624-d5bb5ecc55c0
 	golang.org/x/sys v0.40.0
@@ -174,11 +174,11 @@ require (
 	github.com/getlantern/amp v0.0.0-20260305201851-782bc8045e58 // indirect
 	github.com/getlantern/appdir v0.0.0-20250324200952-507a0625eb01 // indirect
 	github.com/getlantern/dnstt v0.0.0-20260112160750-05100563bd0d // indirect
-	github.com/getlantern/fronted v0.0.0-20260316001628-14e5f21104b5 // indirect
+	github.com/getlantern/fronted v0.0.0-20260319225233-cf2160f85053 // indirect
 	github.com/getlantern/golog v0.0.0-20230503153817-8e72de7e0a65 // indirect
 	github.com/getlantern/iptool v0.0.0-20230112135223-c00e863b2696 // indirect
 	github.com/getlantern/keepcurrent v0.0.0-20260304213122-017d542145ae // indirect
-	github.com/getlantern/kindling v0.0.0-20260305202005-ca73a10f13ac // indirect
+	github.com/getlantern/kindling v0.0.0-20260319225424-4736208dd171 // indirect
 	github.com/getlantern/lantern-box v0.0.42 // indirect
 	github.com/getlantern/lantern-water v0.0.0-20260313142412-dfc64287c8c8 // indirect
 	github.com/getlantern/mtime v0.0.0-20200417132445-23682092d1f7 // indirect

go.sum

@@ -238,10 +238,13 @@ github.com/getlantern/dnstt v0.0.0-20260112160750-05100563bd0d/go.mod h1:LA7cwZQ
 github.com/getlantern/errors v1.0.1/go.mod h1:l+xpFBrCtDLpK9qNjxs+cHU6+BAdlBaxHqikB6Lku3A=
 github.com/getlantern/errors v1.0.4 h1:i2iR1M9GKj4WuingpNqJ+XQEw6i6dnAgKAmLj6ZB3X0=
 github.com/getlantern/errors v1.0.4/go.mod h1:/Foq8jtSDGP8GOXzAjeslsC4Ar/3kB+UiQH+WyV4pzY=
+github.com/getlantern/fdcount v0.0.0-20190912142506-f89afd7367c4 h1:JdD4XSaT6/j6InM7MT1E4WRvzR8gurxfq53A3ML3B/Q=
 github.com/getlantern/fdcount v0.0.0-20210503151800-5decd65b3731 h1:v+vJ3LgV4nW4xRPZo+xkADDflXLpRbG+Lv69XKWFjTQ=
 github.com/getlantern/fdcount v0.0.0-20210503151800-5decd65b3731/go.mod h1:XZwE+iIlAgr64OFbXKFNCllBwV4wEipPx8Hlo2gZdbM=
 github.com/getlantern/fronted v0.0.0-20260316001628-14e5f21104b5 h1:TEVUZpGVQ3+jAf+Oq/Ahx/TltaWHRT2Crj7upb7GZJo=
 github.com/getlantern/fronted v0.0.0-20260316001628-14e5f21104b5/go.mod h1:1a+iv1xzGxZWj/vCHzr8Z3dF9H1sNTuMSPHUqRsgbl0=
+github.com/getlantern/fronted v0.0.0-20260319225233-cf2160f85053 h1:bq5D3qSjLg2PVBPOqhLE5nQCJpfYHYu8MYavHfPJC78=
+github.com/getlantern/fronted v0.0.0-20260319225233-cf2160f85053/go.mod h1:2miS+mgq6csnGAUvW3w+VUODRAeo08rohkpkR99YGyM=
 github.com/getlantern/golog v0.0.0-20210606115803-bce9f9fe5a5f/go.mod h1:ZyIjgH/1wTCl+B+7yH1DqrWp6MPJqESmwmEQ89ZfhvA=
 github.com/getlantern/golog v0.0.0-20230503153817-8e72de7e0a65 h1:NlQedYmPI3pRAXJb+hLVVDGqfvvXGRPV8vp7XOjKAZ0=
 github.com/getlantern/golog v0.0.0-20230503153817-8e72de7e0a65/go.mod h1:+ZU1h+iOVqWReBpky6d5Y2WL0sF2Llxu+QcxJFs2+OU=
@@ -257,6 +260,8 @@ github.com/getlantern/keepcurrent v0.0.0-20260304213122-017d542145ae h1:NMq3K7h3
 github.com/getlantern/keepcurrent v0.0.0-20260304213122-017d542145ae/go.mod h1:ag5g9aWUw2FJcX5RVRpJ9EBQBy5yJuy2WXDouIn/m4w=
 github.com/getlantern/kindling v0.0.0-20260305202005-ca73a10f13ac h1:ev9Y7AsmNVtUdH1bhSGFLU2CUbAMs83KhtbkHa8geAo=
 github.com/getlantern/kindling v0.0.0-20260305202005-ca73a10f13ac/go.mod h1:gKsfk+rBgfIEEF71fn/PHNHp5RaDD1avj2MODUpc2WA=
+github.com/getlantern/kindling v0.0.0-20260319225424-4736208dd171 h1:UEjX+Gg+T6oGVUbzHJ4JfLhlsIh8Wl8PmTXZYWGS43A=
+github.com/getlantern/kindling v0.0.0-20260319225424-4736208dd171/go.mod h1:c5cFjpNrqX8wQ0PUE2blHrO7knAlRCVx3j1/G6zaVlY=
 github.com/getlantern/lantern-box v0.0.42 h1:Cn8f41dNWC21RQBtljV1D2uNd3hm29OjELG2Stq1/7o=
 github.com/getlantern/lantern-box v0.0.42/go.mod h1:HhBd4LrHj0vIo8XFwvJVONoAySo8kz7jaqDQOzaZVRo=
 github.com/getlantern/lantern-server-provisioner v0.0.0-20251031121934-8ea031fccfa9 h1:6seyD2f9tz2am0YQd/Qn+q7LFiiQgnmxgwWFnVceGZw=
@@ -277,8 +282,10 @@ github.com/getlantern/osversion v0.0.0-20240418205916-2e84a4a4e175 h1:JWH5BB2o0e
 github.com/getlantern/osversion v0.0.0-20240418205916-2e84a4a4e175/go.mod h1:h3S9LBmmzN/xM+lwYZHE4abzTtCTtidKtG+nxZcCZX0=
 github.com/getlantern/pluriconfig v0.0.0-20251126214241-8cc8bc561535 h1:rtDmW8YLAuT8r51ApR5z0d8/qjhHu3TW+divQ2C98Ac=
 github.com/getlantern/pluriconfig v0.0.0-20251126214241-8cc8bc561535/go.mod h1:WKJEdjMOD4IuTRYwjQHjT4bmqDl5J82RShMLxPAvi0Q=
-github.com/getlantern/radiance v0.0.0-20260318170544-725ad379e90b h1:TYLWfqi5L3ijG0TdonpA4M0kgzWRKgndy7OIUqn8WMs=
-github.com/getlantern/radiance v0.0.0-20260318170544-725ad379e90b/go.mod h1:QG9fHG/GresYdPa3Tr5gYeg8yDkE+crdyvg6KXChQdQ=
+github.com/getlantern/radiance v0.0.0-20260318200641-bf610b5661c5 h1:2Ygz2U1eqTVPDSD/9coWmGwcr1bb2/Eor3Q9M2d/iDI=
+github.com/getlantern/radiance v0.0.0-20260318200641-bf610b5661c5/go.mod h1:QG9fHG/GresYdPa3Tr5gYeg8yDkE+crdyvg6KXChQdQ=
+github.com/getlantern/radiance v0.0.0-20260320012916-fcb0501214cd h1:C1C97PpN8zHX3xjrNJA2GqNIGyZJJccz0tGG/x5M9Sc=
+github.com/getlantern/radiance v0.0.0-20260320012916-fcb0501214cd/go.mod h1:54gfT+9fEFJAXLxSynr31iaeksM/M+uGhSvtJPoGEnE=
 github.com/getlantern/samizdat v0.0.3-0.20260310125445-325cf1bd1b60 h1:m9eXjDK9vllbVH467+QXbrxUFFM9Yp7YJ90wZLw4dwU=
 github.com/getlantern/samizdat v0.0.3-0.20260310125445-325cf1bd1b60/go.mod h1:uEeykQSW2/6rTjfPlj3MTTo59poSHXfAHTGgzYDkbr0=
 github.com/getlantern/sing v0.7.18-lantern h1:QKGgIUA3LwmKYP/7JlQTRkxj9jnP4cX2Q/B+nd8XEjo=

ios/Podfile.lock

@@ -26,11 +26,6 @@ PODS:
   - OrderedSet (6.0.3)
   - package_info_plus (0.4.5):
     - Flutter
-  - Sentry/HybridSDK (8.56.2)
-  - sentry_flutter (9.14.0):
-    - Flutter
-    - FlutterMacOS
-    - Sentry/HybridSDK (= 8.56.2)
   - share_plus (0.0.1):
     - Flutter
   - shared_preferences_foundation (0.0.1):
@@ -112,7 +107,6 @@ DEPENDENCIES:
   - integration_test (from `.symlinks/plugins/integration_test/ios`)
   - mobile_scanner (from `.symlinks/plugins/mobile_scanner/darwin`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
-  - sentry_flutter (from `.symlinks/plugins/sentry_flutter/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - store_checker (from `.symlinks/plugins/store_checker/ios`)
@@ -122,7 +116,6 @@ DEPENDENCIES:
 SPEC REPOS:
   https://github.com/CocoaPods/Specs.git:
     - OrderedSet
-    - Sentry
     - Stripe
     - StripeApplePay
     - StripeCore
@@ -154,8 +147,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/mobile_scanner/darwin"
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
-  sentry_flutter:
-    :path: ".symlinks/plugins/sentry_flutter/ios"
   share_plus:
     :path: ".symlinks/plugins/share_plus/ios"
   shared_preferences_foundation:
@@ -179,8 +170,6 @@ SPEC CHECKSUMS:
   mobile_scanner: 77265f3dc8d580810e91849d4a0811a90467ed5e
   OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
   package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
-  Sentry: b53951377b78e21a734f5dc8318e333dbfc682d7
-  sentry_flutter: a9f60d84bfddcae9a0ebf834547702f8854766a1
   share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f
   shared_preferences_foundation: 5086985c1d43c5ba4d5e69a4e8083a389e2909e6
   store_checker: a7be624ac44a4ba88e7917e71afe8433f197161e

lantern-core/core.go

@@ -60,7 +60,7 @@ type App interface {
 	IsVPNRunning() (bool, error)
 	GetAvailableServers() []byte
 	MyDeviceId() string
-	GetServerByTag(tag string) (servers.Server, bool)
+	GetServerByTagJSON(tag string) ([]byte, bool, error)
 	ReferralAttachment(referralCode string) (bool, error)
 	UpdateLocale(locale string) error
 	StartBackgroundListeners()
@@ -230,7 +230,7 @@ func (lc *LanternCore) initialize(opts *utils.Opts, eventEmitter utils.FlutterEv
 func (lc *LanternCore) listeningServerLocationChanges() {
 	events.Subscribe(func(evt vpn.AutoSelectionsEvent) {
 		tag := evt.Selections.Lantern
-		servers, ok := lc.GetServerByTag(tag)
+		servers, ok := lc.serverManager.GetServerByTag(tag)
 		if !ok {
 			slog.Error("no server found with tag", "tag", tag)
 			return
@@ -347,9 +347,11 @@ func (lc *LanternCore) StopBackgroundListeners() {
 	slog.Info("Background listeners stopped")
 }
 
-func (lc *LanternCore) GetServerByTag(tag string) (servers.Server, bool) {
-	return lc.serverManager.GetServerByTag(tag)
-
+// GetServerByTagJSON returns the server for a given tag as pre-marshalled JSON.
+// This is safe to call from CGo callback stacks because the pointer-rich Server
+// types are marshalled here rather than being returned to the caller.
+func (lc *LanternCore) GetServerByTagJSON(tag string) ([]byte, bool, error) {
+	return lc.serverManager.GetServerByTagJSON(tag)
 }
 
 func (lc *LanternCore) VPNStatus() (vpn.Status, error) {
@@ -394,13 +396,13 @@ func (lc *LanternCore) AvailableFeatures() []byte {
 }
 
 func (lc *LanternCore) GetAvailableServers() []byte {
-	serversList := lc.rad.ServerManager().Servers()
-	jsonBytes, err := json.Marshal(serversList)
+	// Use ServersJSON which marshals under the lock, avoiding GC write barrier
+	// panics when pointer-rich sing-box types are copied on a CGo callback stack.
+	jsonBytes, err := lc.rad.ServerManager().ServersJSON()
 	if err != nil {
 		slog.Error("Error marshalling servers", "error", err)
 		return nil
 	}
-	slog.Debug("Available servers JSON", "json", string(jsonBytes))
 	return jsonBytes
 }
 

lantern-core/ffi/ffi.go

@@ -265,14 +265,15 @@ func getAutoLocation() *C.char {
 		return SendError(err)
 	}
 
-	servers, ok := c.GetServerByTag(location.Lantern)
-	if !ok {
-		return SendError(fmt.Errorf("error finding server with tag: %s", location.Lantern))
-	}
-	jsonBytes, err := json.Marshal(servers)
+	// Use GetServerByTagJSON which marshals internally, avoiding GC write
+	// barrier panics when pointer-rich Server types are copied on the CGo stack.
+	jsonBytes, ok, err := c.GetServerByTagJSON(location.Lantern)
 	if err != nil {
 		return SendError(fmt.Errorf("error marshalling server: %v", err))
 	}
+	if !ok {
+		return SendError(fmt.Errorf("error finding server with tag: %s", location.Lantern))
+	}
 	return C.CString(string(jsonBytes))
 }
 

lantern-core/mobile/mobile.go

@@ -217,8 +217,7 @@ func StopAutoLocationListener() error {
 	})
 }
 
-// // GetAvailableServers returns the available servers in JSON format.
-// // This function retrieves the servers from lantern
+// GetAvailableServers returns the available servers in JSON format.
 func GetAvailableServers() ([]byte, error) {
 	return withCoreR(func(c lanterncore.Core) ([]byte, error) { return c.GetAvailableServers(), nil })
 }
@@ -237,14 +236,13 @@ func GetAutoLocation() (string, error) {
 		return "", err
 	}
 	return withCoreR(func(c lanterncore.Core) (string, error) {
-		servers, ok := c.GetServerByTag(location.Lantern)
-		if !ok {
-			return "", fmt.Errorf("no server found with tag: %s", location.Lantern)
-		}
-		jsonBytes, err := json.Marshal(servers)
+		jsonBytes, ok, err := c.GetServerByTagJSON(location.Lantern)
 		if err != nil {
 			return "", fmt.Errorf("error marshalling server: %v", err)
 		}
+		if !ok {
+			return "", fmt.Errorf("no server found with tag: %s", location.Lantern)
+		}
 		slog.Debug("Auto location server:", "server", string(jsonBytes))
 		return string(jsonBytes), nil
 	})

lib/core/common/app_secrets.dart

@@ -1,5 +1,3 @@
-import 'dart:io';
-
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 
 class AppSecrets {
@@ -18,13 +16,4 @@ class AppSecrets {
 
   static String get lanternPackageName => "org.getlantern.lantern";
 
-  static String dnsConfig() {
-    if (Platform.isAndroid) {
-      return "https://4753d78f885f4b79a497435907ce4210@o75725.ingest.sentry.io/5850353";
-    }
-    if (Platform.isIOS) {
-      return "https://c14296fdf5a6be272e1ecbdb7cb23f76@o75725.ingest.sentry.io/4506081382694912";
-    }
-    return "https://7397d9db6836eb599f41f2c496dee648@o75725.ingest.us.sentry.io/4507734480912384";
-  }
 }

lib/core/models/feature_flags.dart

@@ -1,9 +1,8 @@
 enum FeatureFlag {
-  sentry('sentry'),
   privateGcp('private.gcp'),
-  autoUpdateEnabled('autoUpdateEnabled'),
   metrics('otel.metrics'),
-  traces('otel.traces');
+  traces('otel.traces'),
+  autoUpdateEnabled('autoUpdateEnabled');
 
   final String key;