permissionlesstech/bitchat
1
0
Fork 0
mirror of https://github.com/permissionlesstech/bitchat.git synced 2026-07-25 02:25:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(iOS App): resolve merge artifacts in scenePhase handler\n- Remove duplicate didEnterBackground state\n- Fix switch/if braces and logic for foreground restart gating

Browse Source
This commit is contained in:
jack
2025-09-11 18:36:15 +02:00
parent ddadccc554
commit 3afacca7f6
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitchat/BitchatApp.swift
-7
View File
@@ -18,7 +18,6 @@ struct BitchatApp: App {
// Skip the very first .active-triggered Tor restart on cold launch // Skip the very first .active-triggered Tor restart on cold launch
@State private var didHandleInitialActive: Bool = false @State private var didHandleInitialActive: Bool = false
@State private var didEnterBackground: Bool = false @State private var didEnterBackground: Bool = false
@State private var didEnterBackground: Bool = false
#elseif os(macOS) #elseif os(macOS)
@NSApplicationDelegateAdaptor(MacAppDelegate.self) var appDelegate @NSApplicationDelegateAdaptor(MacAppDelegate.self) var appDelegate
#endif #endif
@@ -70,8 +69,6 @@ struct BitchatApp: App {
// Proactively disconnect Nostr to avoid spurious socket errors while Tor is down // Proactively disconnect Nostr to avoid spurious socket errors while Tor is down
NostrRelayManager.shared.disconnect() NostrRelayManager.shared.disconnect()
didEnterBackground = true didEnterBackground = true
didEnterBackground = true
break
case .active: case .active:
// Restart services when becoming active // Restart services when becoming active
chatViewModel.meshService.startServices() chatViewModel.meshService.startServices()
@@ -79,15 +76,11 @@ struct BitchatApp: App {
// On initial cold launch, Tor was just started in onAppear. // On initial cold launch, Tor was just started in onAppear.
// Skip the deterministic restart the first time we become active. // Skip the deterministic restart the first time we become active.
if didHandleInitialActive && didEnterBackground { if didHandleInitialActive && didEnterBackground {
// Ensure Tor is healthy; restart deterministically, then wait until ready
TorManager.shared.ensureRunningOnForeground() TorManager.shared.ensureRunningOnForeground()
} else { } else {
didHandleInitialActive = true didHandleInitialActive = true
} }
didEnterBackground = false didEnterBackground = false
} else {
didHandleInitialActive = true
}
Task.detached { Task.detached {
let _ = await TorManager.shared.awaitReady(timeout: 60) let _ = await TorManager.shared.awaitReady(timeout: 60)
await MainActor.run { await MainActor.run {