Skip to content

fix(model-b): first-launch onboarding + background-delivery gate (fixes the Connecting-to-network hang) #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
torlando-tech merged 9 commits into from
Jun 19, 2026
Merged

fix(model-b): first-launch onboarding + background-delivery gate (fixes the Connecting-to-network hang) #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
67120ab
fix(model-b): first-launch background-delivery gate so fresh installs…
torlando-agent[bot] Jun 18, 2026
8b8db52
feat(onboarding): revive the onboarding flow for Model B (enable + cl…
torlando-agent[bot] Jun 18, 2026
cc60a24
feat(onboarding): make background-delivery an in-flow step before Finish
torlando-agent[bot] Jun 19, 2026
6354163
feat(onboarding): request Bluetooth permission in-flow on the Permiss…
torlando-agent[bot] Jun 19, 2026
8f98242
address greptile review feedback (greploop #92 iter 1)
torlando-agent[bot] Jun 19, 2026
77c30ff
fix(onboarding): seed the TCP relay BEFORE starting the NE (no-TCP re…
torlando-agent[bot] Jun 19, 2026
1f004fe
fix(ne): bring up ALL configured TCP relays, not just the first (issu…
torlando-agent[bot] Jun 19, 2026
7c9cc13
Model B: live-reconcile TCP relays on interface change + per-relay st…
torlando-agent[bot] Jun 19, 2026
0e50dd6
Model B: Settings network card lists actually-connected relays, not f…
torlando-agent[bot] Jun 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions Columba.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
71FAB7848D244A6D2FC1628A /* AudioManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00A8D344945F752C18EF2D9E /* AudioManager.swift */; };
779118E89F4D38BF960DB3D0 /* PyAnnounce.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C562D79BB3B6559A1B1EFDA /* PyAnnounce.swift */; };
7BE550B9F4D32F6346EBD2F2 /* CodecProfileInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = ACA6D4C7151A87D862FF9B8A /* CodecProfileInfo.swift */; };
80D0868B2491DB301F772D63 /* BackgroundDeliveryPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 894C730FEB9AE4CDB4B949F8 /* BackgroundDeliveryPage.swift */; };
8768F2E6CD7941D82997A1BB /* CallControlButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 71922EC204982A357F814F23 /* CallControlButton.swift */; };
886AB689C7699471510BAF9A /* CallManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 86E428836698BA8A8973A92F /* CallManager.swift */; };
8A321B0938566F0D62D64562 /* Python.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BEE6E339CC852C9BA8C5D75 /* Python.xcframework */; };
Expand Down Expand Up @@ -183,6 +184,7 @@
F4CA7E2F745F05E21D45E11A /* RNSAPI in Frameworks */ = {isa = PBXBuildFile; productRef = 0FD6A68A52A54D21FDB70324 /* RNSAPI */; };
F4E9991226B4D464017DA247 /* Lucide.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA586EB5F8EB62D2579CEAAB /* Lucide.swift */; };
F80B09722B3A7CCA7C99DE0C /* DiscoveredDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9630845DA60F57A34819CC4B /* DiscoveredDevice.swift */; };
F83A2212E43B329830919AFF /* BackgroundDeliveryGateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56CFC5EC819F4ED82FCC4B07 /* BackgroundDeliveryGateView.swift */; };
FB2F3248AE405614B36BC798 /* RNSAPI in Frameworks */ = {isa = PBXBuildFile; productRef = E049A7D4D6D58690C0B674CE /* RNSAPI */; };
FDE0DB7957C9D877D3E67367 /* AppGroupRNodeSeamWire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34E6D26205158570EA4228EF /* AppGroupRNodeSeamWire.swift */; };
NERN2 /* NEReticulumNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = NERN1 /* NEReticulumNode.swift */; };
Expand Down Expand Up @@ -254,12 +256,14 @@
51D8CBCF7E546028A043E1C7 /* PyConversation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PyConversation.swift; path = Python/Models/PyConversation.swift; sourceTree = "<group>"; };
550749F04079B0D39E4DAD05 /* AppGroupRNodeSeamTransport.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AppGroupRNodeSeamTransport.swift; sourceTree = "<group>"; };
55FE6D8CFA13376BCD23AE86 /* PropagationSeam.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PropagationSeam.swift; sourceTree = "<group>"; };
56CFC5EC819F4ED82FCC4B07 /* BackgroundDeliveryGateView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = BackgroundDeliveryGateView.swift; sourceTree = "<group>"; };
67B5525A88EBCEAF05E9DE3F /* SyncStatusBottomSheet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SyncStatusBottomSheet.swift; sourceTree = "<group>"; };
6FE282FA3937E59BC026E072 /* AudioManagerConfigChangeTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AudioManagerConfigChangeTests.swift; sourceTree = "<group>"; };
710EBCE55DCC9E71A9AB0E86 /* PythonBridge.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PythonBridge.swift; sourceTree = "<group>"; };
71922EC204982A357F814F23 /* CallControlButton.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = CallControlButton.swift; sourceTree = "<group>"; };
7529BF99835005DE07E1B65F /* CodecSelectionSheet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = CodecSelectionSheet.swift; sourceTree = "<group>"; };
86E428836698BA8A8973A92F /* CallManager.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = CallManager.swift; sourceTree = "<group>"; };
894C730FEB9AE4CDB4B949F8 /* BackgroundDeliveryPage.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = BackgroundDeliveryPage.swift; sourceTree = "<group>"; };
8CAFC5BF3DDB882B1864F1C0 /* PythonRNSBackend.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PythonRNSBackend.swift; sourceTree = "<group>"; };
8CBD293157E715F490613984 /* PyMessage.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PyMessage.swift; path = Python/Models/PyMessage.swift; sourceTree = "<group>"; };
9630845DA60F57A34819CC4B /* DiscoveredDevice.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = DiscoveredDevice.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -663,6 +667,8 @@
F050 /* PermissionsPage.swift */,
F051 /* CompletePage.swift */,
F079 /* OnboardingRestoreSheet.swift */,
56CFC5EC819F4ED82FCC4B07 /* BackgroundDeliveryGateView.swift */,
894C730FEB9AE4CDB4B949F8 /* BackgroundDeliveryPage.swift */,
);
path = Onboarding;
sourceTree = "<group>";
Expand Down Expand Up @@ -1218,6 +1224,8 @@
F4E9991226B4D464017DA247 /* Lucide.swift in Sources */,
AAD9231170B11C89EF80F9B8 /* PropagationSeam.swift in Sources */,
1FC4483D48CABE8BF49850EF /* SyncStatusBottomSheet.swift in Sources */,
F83A2212E43B329830919AFF /* BackgroundDeliveryGateView.swift in Sources */,
80D0868B2491DB301F772D63 /* BackgroundDeliveryPage.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -1352,7 +1360,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) COLUMBA_BACKEND_SWIFT ENABLE_NETWORK_EXTENSION";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) COLUMBA_BACKEND_SWIFT ENABLE_NETWORK_EXTENSION COLUMBA_ONBOARDING_ENABLED";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_OBJC_BRIDGING_HEADER = "Sources/PythonBridge/ColumbaPython-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand Down Expand Up @@ -1398,7 +1406,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) COLUMBA_BACKEND_SWIFT ENABLE_NETWORK_EXTENSION";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) COLUMBA_BACKEND_SWIFT ENABLE_NETWORK_EXTENSION COLUMBA_ONBOARDING_ENABLED";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_OBJC_BRIDGING_HEADER = "Sources/PythonBridge/ColumbaPython-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand Down Expand Up @@ -1924,7 +1932,7 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/torlando-tech/reticulum-swift.git";
requirement = {
branch = "main";
branch = main;
kind = branch;
};
};
Expand Down
13 changes: 13 additions & 0 deletions Sources/ColumbaApp/App/ColumbaApp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,7 @@ struct RootView: View {
OnboardingView(
identityManager: identityManager,
settingsRepository: settingsRepository,
appServices: appServices,
onComplete: {
showOnboarding = false
identitySwitchTrigger = UUID()
Expand Down Expand Up @@ -521,7 +522,19 @@ struct RootView: View {
// Voice / CallKit removed in the Python RNS migration (Phase 0).
// Will return in v2 once canonical Python LXST is ported to iOS audio.
} else {
// Not yet initialized. Under Model B, init suspends before the proxy
// backend starts until the NE/VPN tunnel is up; on first launch that
// means showing the background-delivery gate instead of an indefinite
// "Connecting to network…" spinner on a tunnel that doesn't exist yet.
#if ENABLE_NETWORK_EXTENSION
if appServices.needsBackgroundDeliveryApproval {
BackgroundDeliveryGateView(appServices: appServices)
} else {
loadingView
}
#else
loadingView
#endif
}
}
.onChange(of: colorScheme) { _, newScheme in
Expand Down
8 changes: 7 additions & 1 deletion Sources/ColumbaApp/Models/TcpCommunityServer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,13 @@ extension TcpCommunityServer {
// Bootstrap-class servers (well-established, reliable nodes).
// Reticulum-Swift does not yet support the bootstrap interface mode,
// so the iOS UI surfaces these alongside other community servers.
TcpCommunityServer(name: "Beleth RNS Hub", host: "rns.beleth.net", port: 4242, isBootstrap: true),
// NOTE: Beleth's :4242 is currently unreachable (host up, but the RNS
// port drops connections), so it is NOT flagged bootstrap — otherwise
// `defaultServer` would seed it as the SOLE TCP path on a skipped/empty
// onboarding and the node would come up with no reachable relay. It
// stays in the directory as a selectable option in case it recovers.
// (Diverges intentionally from Android's list until Beleth is back.)
TcpCommunityServer(name: "Beleth RNS Hub", host: "rns.beleth.net", port: 4242, isBootstrap: false),
TcpCommunityServer(name: "Quad4 TCP Node 1", host: "rns.quad4.io", port: 4242, isBootstrap: true),
TcpCommunityServer(name: "FireZen", host: "firezen.com", port: 4242, isBootstrap: true),

Expand Down
Loading
Loading