Merge branch 'master' into junyi/cordova-err-propagation-merge

client/src/cordova/apple/OutlineAppleLib/Package.swift

@@ -37,24 +37,12 @@ let package = Package(
             name: "OutlineTunnel",
             targets: ["OutlineTunnel"]
         ),
-        .library(
-            name: "OutlineLauncher",
-            targets: ["OutlineLauncher"]
-        ),
     ],
     dependencies: [
         .package(url: "https://github.com/CocoaLumberjack/CocoaLumberjack.git", from: "3.8.5"),
         .package(url: "https://github.com/getsentry/sentry-cocoa", from: "8.26.0"),
     ],
     targets: [
-        .target(
-            name: "OutlineLauncher",
-            dependencies: [
-                "CocoaLumberjack",
-                .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
-                "OutlineCatalystApp",
-            ]
-        ),
         .target(
             name: "OutlineCatalystApp",
             dependencies: [

client/src/cordova/apple/OutlineAppleLib/Sources/OutlineCatalystApp/CatalystApp.swift

@@ -53,9 +53,6 @@
             { _ in
                 appKitController._AppKitBridge_setConnectionStatus(.disconnected)
             }
-
-            // Enable app launcher to start on boot.
-            appKitController._AppKitBridge_setAppLauncherEnabled(true)
         }
     }
 

client/src/cordova/apple/OutlineAppleLib/Sources/OutlineCatalystApp/NSObject+Outline.swift

@@ -24,6 +24,5 @@ public enum ConnectionStatus: Int {
 public extension NSObject {
     @objc func _AppKitBridge_terminate() {}
     @objc func _AppKitBridge_setConnectionStatus(_: ConnectionStatus) {}
-    @objc func _AppKitBridge_setAppLauncherEnabled(_: Bool) {}
     @objc func _AppKitBridge_loadMainApp(_: String) {}
 }

client/src/cordova/apple/OutlineAppleLib/Sources/OutlineTunnel/OutlineVpn.swift

@@ -131,23 +131,6 @@ public class OutlineVpn: NSObject {
     return nil
   }
 
-  /** Starts the last successful VPN tunnel. */
-  @objc public func startLastSuccessfulTunnel(_ completion: @escaping (Callback)) {
-    Task {
-      guard let manager = await getTunnelManager() else {
-        DDLogDebug("Tunnel manager not setup")
-        completion("Failed to get TunnelManager")
-        return
-      }
-      do {
-        try manager.connection.startVPNTunnel()
-        completion(nil)
-      } catch {
-        completion("Failed to start VPN")
-      }
-    }
-  }
-
   /** Tears down the VPN if the tunnel with id |tunnelId| is active. */
   public func stop(_ tunnelId: String) async {
     guard let manager = await getTunnelManager(),

client/src/cordova/apple/OutlineAppleLib/Tests/OutlineTunnelTest/OutlineTunnelTest.swift

@@ -22,12 +22,6 @@ final class OutlineTunnelTest: XCTestCase {
 
     static let kAppGroup = "outline.spm.tests"
 
-    // Example test
-    func testTunnelStoreDoesNotLoadBeforeSetup() throws {
-        let tunnelStore = OutlineTunnelStore(appGroup: OutlineTunnelTest.kAppGroup)
-        XCTAssertNil(tunnelStore.load())
-    }
-
     func testSelectVpnAddress() {
         XCTAssertEqual("10.111.222.0", selectVpnAddress(interfaceAddresses:["172.16.9.2", "192.168.20.2", "169.254.19.1"]))
         XCTAssertEqual("172.16.9.1", selectVpnAddress(interfaceAddresses:["10.111.222.1", "192.168.20.2", "169.254.19.1"]))