From ec6126e8b2e1ae390688191bb3e9596dbab219ae Mon Sep 17 00:00:00 2001 From: Diego Romar Date: Thu, 18 Dec 2025 14:46:29 -0300 Subject: [PATCH 1/3] Add value assingment to isRestarting and isRestartInProgress in the monitor queue's context --- NetbirdNetworkExtension/PacketTunnelProvider.swift | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/NetbirdNetworkExtension/PacketTunnelProvider.swift b/NetbirdNetworkExtension/PacketTunnelProvider.swift index c8b38a8..f7aeeec 100644 --- a/NetbirdNetworkExtension/PacketTunnelProvider.swift +++ b/NetbirdNetworkExtension/PacketTunnelProvider.swift @@ -216,8 +216,11 @@ class PacketTunnelProvider: NEPacketTunnelProvider { // Cancel timeout whether start succeeds or not timeoutWorkItem.cancel() - self?.adapter.isRestarting = false - self?.isRestartInProgress = false + self?.monitorQueue.async { + self?.adapter.isRestarting = false + self?.isRestartInProgress = false + } + if let error = error { AppLogger.shared.log("restartClient: start failed - \(error.localizedDescription)") } else { From 60885a9feaf7e032c913ed078cdcf1193555b969 Mon Sep 17 00:00:00 2001 From: Diego Romar Date: Thu, 18 Dec 2025 16:49:44 -0300 Subject: [PATCH 2/3] Apply navigation bar modifiers to the ZStack inside the NavigationView Fixes white bar showing up on versions prior to iOS 16 --- NetBird/Source/App/Views/MainView.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NetBird/Source/App/Views/MainView.swift b/NetBird/Source/App/Views/MainView.swift index 82b60b8..99c9065 100644 --- a/NetBird/Source/App/Views/MainView.swift +++ b/NetBird/Source/App/Views/MainView.swift @@ -242,9 +242,9 @@ struct MainView: View { } } } + .navigationBarTitleDisplayMode(.inline) + .navigationBarHidden(true) } - .navigationBarTitleDisplayMode(.inline) - .navigationBarHidden(true) } .navigationViewStyle(StackNavigationViewStyle()) } From f4fd16b63461aa42f755c0d8c80bcfbbb27d030c Mon Sep 17 00:00:00 2001 From: Diego Romar Date: Thu, 18 Dec 2025 17:01:14 -0300 Subject: [PATCH 3/3] Bump version (0.0.14.16) --- NetBird.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NetBird.xcodeproj/project.pbxproj b/NetBird.xcodeproj/project.pbxproj index 2ecfa61..40aabcd 100644 --- a/NetBird.xcodeproj/project.pbxproj +++ b/NetBird.xcodeproj/project.pbxproj @@ -929,7 +929,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = NetBird/NetBird.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 15; + CURRENT_PROJECT_VERSION = 16; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = TA739QLA7A; ENABLE_PREVIEWS = YES; @@ -981,7 +981,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = NetBird/NetBird.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 15; + CURRENT_PROJECT_VERSION = 16; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = TA739QLA7A; ENABLE_PREVIEWS = YES;