From b966c34868122eb60bc93b4abdd64c95c0d55e1e Mon Sep 17 00:00:00 2001 From: Christophe Deschamps Date: Wed, 20 Sep 2023 11:13:58 +0200 Subject: [PATCH] LocalPush - Fix label not displaying at first app install --- Classes/Swift/LocalPushManager.swift | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Classes/Swift/LocalPushManager.swift b/Classes/Swift/LocalPushManager.swift index c3515d10c..ce9181ed3 100644 --- a/Classes/Swift/LocalPushManager.swift +++ b/Classes/Swift/LocalPushManager.swift @@ -46,9 +46,7 @@ let localPushProviderBundleIdentifier = "org.linphone.phone.localpushprovider" super.init() NEAppPushManager.loadAllFromPreferences { managers, error in if let error = error { - Log.e("[LocalPushManager] Failed to load all NEAppPushManager's from preferences: \(error)") - self.isInitialized.value = true - return + Log.w("[LocalPushManager] Failed to load all NEAppPushManager's from preferences: \(error)") } self.appPushManager = managers?.first ?? NEAppPushManager() let appPushManager = self.appPushManager! @@ -89,10 +87,18 @@ let localPushProviderBundleIdentifier = "org.linphone.phone.localpushprovider" .subscribe(self.pushManagerIsActiveSubject) appPushManager.saveToPreferences { error in if (error != nil) { - Log.e("[LocalPushManager] error saving Local Push preferences \(String(describing: error))") + Log.e("[LocalPushManager] error saving Local Push preferences \(String(describing: error)) enabled=\(String(describing: appPushManager.isEnabled)) ssids=\(String(describing: appPushManager.matchSSIDs))") } else { Log.i("[LocalPushManager] NEAppPushManager saved : enabled=\(String(describing: appPushManager.isEnabled)) ssids=\(String(describing: appPushManager.matchSSIDs))") } + appPushManager.loadFromPreferences { error in + if (error != nil) { + Log.e("[LocalPushManager] error post save reloading Local Push preferences \(String(describing: error)) enabled=\(String(describing: appPushManager.isEnabled)) ssids=\(String(describing: appPushManager.matchSSIDs))") + } else { + Log.i("[LocalPushManager] NEAppPushManager post save reloaded : enabled=\(String(describing: appPushManager.isEnabled)) ssids=\(String(describing: appPushManager.matchSSIDs))") + } + + } } } else { pushManagerIsActiveSubject.send(false)