Merge 4c6d9d0745 into 6d9bcc9ba1

John found an issue in gomobile that seems to be the culprit of one of these issues: https://github.com/golang/go/issues/53316#issuecomment-2407626810

.github/workflows/flutterfmt.yml

@@ -24,4 +24,4 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Check formating
-        run: dart format -l120 lib/ --set-exit-if-changed --suppress-analytics --output none
+        run: dart format -l120 lib/ --set-exit-if-changed --suppress-analytics --output none

.github/workflows/smoke.yml

@@ -0,0 +1,104 @@
+# This workflow builds the iOS and Android apps, just to check they build without error
+
+name: Smoke build
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  build-android:
+    name: Android
+    runs-on: macos-latest
+    steps:
+      - name: Set up Go 1.22
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.22"
+
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+
+      - name: Install flutter
+        uses: subosito/flutter-action@v2
+        with:
+          flutter-version: '3.24.1'
+
+      - name: Check out code
+        uses: actions/checkout@v3
+
+      - name: install dependencies
+        env:
+          TOKEN: ${{ secrets.MACHINE_USER_PAT }}
+        run: |
+          go install golang.org/x/mobile/cmd/gomobile@latest
+          gomobile init
+          flutter pub get
+          touch env.sh
+
+      - name: Build Android debug
+        run: flutter build appbundle --debug
+
+  build-ios:
+    name: iOS
+    runs-on: macos-latest
+
+    steps:
+      - name: Set up Go 1.22
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.22"
+
+      - name: Install flutter
+        uses: subosito/flutter-action@v2
+        with:
+          flutter-version: '3.24.1'
+
+      - name: Check out code
+        uses: actions/checkout@v3
+
+      - name: Install the appstore connect key material
+        env:
+          AC_API_KEY_SECRET_BASE64: ${{ secrets.AC_API_KEY_SECRET_BASE64 }}
+        run: |
+          AC_API_KEY_SECRET_PATH="$RUNNER_TEMP/key.p8"
+          echo "APP_STORE_CONNECT_API_KEY_KEY_FILEPATH=$AC_API_KEY_SECRET_PATH" >> $GITHUB_ENV
+          echo -n "$AC_API_KEY_SECRET_BASE64" | base64 --decode --output "$AC_API_KEY_SECRET_PATH"
+
+      - name: Place Github token for fastlane match
+        env:
+          TOKEN: ${{ secrets.MACHINE_USER_PAT }}
+        run:
+          echo "MATCH_GIT_BASIC_AUTHORIZATION=$(echo -n "defined-machine:${TOKEN}" | base64)" >> $GITHUB_ENV
+
+      - name: install dependencies
+        env:
+          TOKEN: ${{ secrets.MACHINE_USER_PAT }}
+        run: |
+          go install golang.org/x/mobile/cmd/gomobile@latest
+          gomobile init
+          flutter pub get
+          touch env.sh
+      
+      - name: Build iOS
+        env:
+          TOKEN: ${{ secrets.MACHINE_USER_PAT }}
+          MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
+        run: |
+          cd ios
+          pod install
+          fastlane checkBuild
+          cd -
+
+          # verify that the github token didn't make it into the output
+          mkdir -p build/app/test-ios
+          cp ios/MobileNebula.ipa build/app/test-ios
+          cd build/app/test-ios
+          unzip MobileNebula.ipa
+          if find . | xargs strings 2>/dev/null | grep -qF "${TOKEN}" ; then
+            echo "Token found in iOS build"
+            exit 1
+          fi

ios/NebulaNetworkExtension/CtlInfo.h

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

ios/fastlane/Fastfile

@@ -18,6 +18,19 @@ default_platform(:ios)
 platform :ios do
   desc "Push a new beta build to TestFlight"
 
+  lane :checkBuild do
+      build_app(
+        output_name: "MobileNebula.ipa",
+        workspace: "Runner.xcworkspace",
+        scheme: "Runner",
+        configuration: "Debug",
+        export_method: "development",
+        export_options: {
+          manageAppVersionAndBuildNumber: false
+        }
+      )
+    end
+
   lane :build do
     # Do some things like setting up a temporary keystore to host secrets in CI
     setup_ci

lib/components/FormPage.dart

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

nebula/Makefile

@@ -1,13 +1,15 @@
 111MODULE = on
 export GO111MODULE
 
+unexport SWIFT_DEBUG_INFORMATION_VERSION
+unexport SWIFT_DEBUG_INFORMATION_FORMAT
 
 clean:
 	rm -rf mobileNebula.aar MobileNebula.xcframework
 
 mobileNebula.aar: *.go go.sum
 	go get -d golang.org/x/mobile/cmd/gomobile
-	gomobile bind -trimpath -v --target=android -androidapi 26
+	gomobile bind -trimpath -v --target=android -androidapi=26
 
 MobileNebula.xcframework: *.go go.sum
 	go get -d golang.org/x/mobile/cmd/gomobile