Fix rebase error

android/app/src/main/kotlin/net/defined/mobile_nebula/DNUpdateWorker.kt

@@ -45,7 +45,6 @@ class DNUpdateWorker(ctx: Context, params: WorkerParameters) : Worker(ctx, param
                 // Reload Nebula if this is the currently active site
                 if (res == DNSiteUpdater.Result.CONFIG_UPDATED) {
                     Intent().also { intent ->
-                        intent.setPackage(context.getPackageName())
                         intent.action = NebulaVpnService.ACTION_RELOAD
                         intent.putExtra("id", site.id)
                         context.sendBroadcast(intent)
@@ -55,7 +54,6 @@ class DNUpdateWorker(ctx: Context, params: WorkerParameters) : Worker(ctx, param
                 // Update the UI on any change
                 if (res != DNSiteUpdater.Result.NOOP) {
                     Intent().also { intent ->
-                        intent.setPackage(context.getPackageName())
                         intent.action = MainActivity.ACTION_REFRESH_SITES
                         context.sendBroadcast(intent)
                     }

android/app/src/main/kotlin/net/defined/mobile_nebula/MainActivity.kt

@@ -11,7 +11,6 @@ import android.content.pm.PackageManager
 import android.net.VpnService
 import android.os.*
 import android.util.Log
-import androidx.core.content.ContextCompat
 import androidx.work.*
 import com.google.gson.Gson
 import io.flutter.embedding.android.FlutterActivity
@@ -99,7 +98,12 @@ class MainActivity: FlutterActivity() {
 
         apiClient = APIClient(context)
 
-        ContextCompat.registerReceiver(context, refreshReceiver, IntentFilter(ACTION_REFRESH_SITES), RECEIVER_NOT_EXPORTED)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            registerReceiver(refreshReceiver, IntentFilter(ACTION_REFRESH_SITES), RECEIVER_NOT_EXPORTED)
+        } else {
+            @Suppress("UnspecifiedRegisterReceiverFlag")
+            registerReceiver(refreshReceiver, IntentFilter(ACTION_REFRESH_SITES))
+        }
 
         enqueueDNUpdater()
     }

android/app/src/main/kotlin/net/defined/mobile_nebula/NebulaVpnService.kt

@@ -10,7 +10,6 @@ import android.net.*
 import android.os.*
 import android.system.OsConstants
 import android.util.Log
-import androidx.core.content.ContextCompat
 import androidx.work.*
 import mobileNebula.CIDR
 import java.io.File
@@ -214,7 +213,12 @@ class NebulaVpnService : VpnService() {
     }
 
     private fun registerReloadReceiver() {
-        ContextCompat.registerReceiver(this, reloadReceiver, IntentFilter(ACTION_RELOAD), RECEIVER_NOT_EXPORTED)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            registerReceiver(reloadReceiver, IntentFilter(ACTION_RELOAD), RECEIVER_NOT_EXPORTED)
+        } else {
+            @Suppress("UnspecifiedRegisterReceiverFlag")
+            registerReceiver(reloadReceiver, IntentFilter(ACTION_RELOAD))
+        }
     }
 
     private fun unregisterReloadReceiver() {

ios/NebulaNetworkExtension/CtlInfo.h

@@ -1,5 +1,4 @@
 #include <stdint.h>
-#include <sys/types.h>
 
 /* <sys/kern_control.h> */
 #define CTLIOCGINFO 0xc0644e03UL

ios/fastlane/Fastfile

@@ -19,12 +19,43 @@ platform :ios do
   desc "Push a new beta build to TestFlight"
 
   lane :checkBuild do
+      # Do some things like setting up a temporary keystore to host secrets in CI
+      setup_ci
+
+      # Change signing behavior to work in CI
+      update_code_signing_settings(
+        # Automatic signing seems to be a good thing to have on in dev but will not work in CI
+        use_automatic_signing: false,
+        # The default value for this is iOS Development which is not appropriate for release
+        code_sign_identity: "Apple Distribution",
+      )
+
+      # Find our signing certs and profiles, these come from a private repository and managed by `fastlane match`
+      match(type: 'appstore', app_identifier: ["net.defined.mobileNebula","net.defined.mobileNebula.NebulaNetworkExtension"], readonly: true)
+
+      # Update our main program to have the correct provisioning profile from Apple
+      update_project_provisioning(
+        xcodeproj: "Runner.xcodeproj",
+        target_filter: "Runner",
+        # This comes from match() above
+        profile:ENV["sigh_net.defined.mobileNebula_appstore_profile-path"],
+        build_configuration: "Release"
+      )
+
+      # Update our network extension to have the correct provisioning profile from Apple
+      update_project_provisioning(
+        xcodeproj: "Runner.xcodeproj",
+        target_filter: "NebulaNetworkExtension",
+        # This comes from match() above
+        profile:ENV["sigh_net.defined.mobileNebula.NebulaNetworkExtension_appstore_profile-path"],
+        build_configuration: "Release"
+      )
+
       build_app(
         output_name: "MobileNebula.ipa",
         workspace: "Runner.xcworkspace",
         scheme: "Runner",
-        configuration: "Debug",
+        export_method: "app-store",
-        export_method: "development",
         export_options: {
           manageAppVersionAndBuildNumber: false
         }

lib/components/FormPage.dart

@@ -39,7 +39,7 @@ class _FormPageState extends State<FormPage> {
     changed = widget.changed || changed;
 
     return PopScope<Object?>(
-        canPop: !changed,
+        canPop: false,
         onPopInvokedWithResult: (bool didPop, Object? result) async {
           if (didPop) {
             return;

nebula/Makefile

@@ -1,8 +1,6 @@
 111MODULE = on
 export GO111MODULE
 
-unexport SWIFT_DEBUG_INFORMATION_VERSION
-unexport SWIFT_DEBUG_INFORMATION_FORMAT
 
 clean:
 	rm -rf mobileNebula.aar MobileNebula.xcframework

nebula/go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/DefinedNet/dnapi v0.0.0-20240611201323-4589547bd270
 	github.com/sirupsen/logrus v1.9.3
 	github.com/slackhq/nebula v1.9.3
-	golang.org/x/crypto v0.28.0
+	golang.org/x/crypto v0.27.0
 	gopkg.in/yaml.v2 v2.4.0
 )
 
@@ -34,13 +34,13 @@ require (
 	github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8 // indirect
 	github.com/vishvananda/netlink v1.2.1-beta.2 // indirect
 	github.com/vishvananda/netns v0.0.4 // indirect
-	golang.org/x/mobile v0.0.0-20241004191011-08a83c5af9f8 // indirect
+	golang.org/x/mobile v0.0.0-20240909163608-642950227fb3 // indirect
 	golang.org/x/mod v0.21.0 // indirect
-	golang.org/x/net v0.30.0 // indirect
+	golang.org/x/net v0.29.0 // indirect
 	golang.org/x/sync v0.8.0 // indirect
-	golang.org/x/sys v0.26.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
-	golang.org/x/term v0.25.0 // indirect
+	golang.org/x/term v0.24.0 // indirect
-	golang.org/x/tools v0.26.0 // indirect
+	golang.org/x/tools v0.25.0 // indirect
 	golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
 	golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 // indirect
 	golang.zx2c4.com/wireguard/windows v0.5.3 // indirect

nebula/go.sum

@@ -147,12 +147,9 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
 golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
-golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mobile v0.0.0-20240909163608-642950227fb3 h1:HOa20LMHFElnLsGI9j8/sxTIHpogkTuHZlyoIjl3kkw=
 golang.org/x/mobile v0.0.0-20240909163608-642950227fb3/go.mod h1:5EJr05J3jS1A5hwVNxs4vC0pIRxtWmwM15D1ZxCj93s=
-golang.org/x/mobile v0.0.0-20241004191011-08a83c5af9f8 h1:W8YtRRiKAvbIbqAh+xpWKecxEO8w1oaD6DrZhMyotF8=
-golang.org/x/mobile v0.0.0-20241004191011-08a83c5af9f8/go.mod h1:snk1Mn2ZpdKCt90JPEsDh4sL3ReK520U2t0d7RHBnSU=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -170,7 +167,6 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
 golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
-golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -198,11 +194,9 @@ golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
 golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
 golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
-golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -213,8 +207,6 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE=
 golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg=
-golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
-golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=