Suggestions from CD for Async Call backs and Core object using @Published

ios/swift/4-CallKitTutorial/CallKitTutorial/CallKitTutorial.swift

@@ -13,9 +13,8 @@ import Combine
 
 class CallKitExampleContext : ObservableObject
 {
-	var mCore: Core!
-	var mAccount: Account?
-	var mIterateTimer : Timer!
+	@Published var mCore: Core? = nil
+	@Published var factory = Factory.Instance
 
 	@Published var coreVersion: String = Core.getVersion
 	@Published var username : String = "quentindev"
@@ -30,6 +29,10 @@ class CallKitExampleContext : ObservableObject
 	@Published var isSpeakerEnabled : Bool = false
 	@Published var isMicrophoneEnabled : Bool = false
 	
+	var cancellables = Set<AnyCancellable>()
+	var icancellables = Set<AnyCancellable>()
+
+	
 	/* Async */
 	let linphoneAsyncHelper = LinphoneAsyncHelper()
 
@@ -101,51 +104,41 @@ class CallKitExampleContext : ObservableObject
 	init()
 	{
 		LoggingService.Instance.logLevel = LogLevel.Debug
-		
-		// IMPORTANT : In this tutorial, we require the use of a core configuration file.
-		// This way, once the registration is done, and until it is cleared, it will return to the LoggedIn state on launch.
-		// This allows us to have a functional call when the app was closed and is started by a VOIP push notification (incoming call
-		// We also need to enable "Push Notitifications" and "Background Mode - Voice Over IP"
-		
-		linphoneAsyncHelper.postOnCoreQueue {
-			let factory = Factory.Instance
+		factory = Factory.Instance
+		$factory.receive(on: coreQueue).sink { factory in
 			let configDir = factory.getConfigDir(context: nil)
-			let corePublisher = self.linphoneAsyncHelper.createLinphoneObjectWithPublisher(createAction: {
-				try factory.createCore(configPath: "\(configDir)/MyConfig", factoryConfigPath: "", systemContext: nil)
-			})
-			corePublisher
-				.postOnCoreQueue (
-				onError: { error in
-					NSLog("failed creating core \(error)")
-				},
-				receiveValue: { core in
-					self.mCore = core
-					// enabling push notifications management in the core
-					self.mCore.callkitEnabled = true
-					self.mCore.pushNotificationEnabled = true
-					self.mCore.autoIterateEnabled = false
-					self.addRegistrationStateCallBack(core: core)
-					self.addCallStateChangedCallBack(core: core)
-					try? core.start()
-				})
-				.postOnMainQueue { core in
-				self.mIterateTimer = Timer.scheduledTimer(withTimeInterval: 0.02, repeats: true) { [weak self] timer in
-					self?.linphoneAsyncHelper.postOnCoreQueue {
-						core.iterate()
-					}
+			do {
+				let core = try factory.createCore(configPath: "\(configDir)/MyConfig", factoryConfigPath: "", systemContext: nil)
+				core.callkitEnabled = true
+				core.pushNotificationEnabled = true
+				core.autoIterateEnabled = false
+				self.addRegistrationStateCallBack(core: core)
+				self.addCallStateChangedCallBack(core: core)
+				try? core.start()
+				LinphoneAsyncHelper.postOnMainQueue {
+					self.mCore = core // @Publisher assignment can be done on main queue only
 				}
+			} catch {
+				NSLog("failed creating core \(error)")
 			}
-			
+		}.store(in: &cancellables)
+		
+		Timer.scheduledTimer(withTimeInterval: 0.02, repeats: true) { _ in
+			self.icancellables.removeAll()
+			self.$mCore.receive(on: coreQueue).sink { core in
+				core?.iterate()
+			}.store(in: &self.icancellables)
 		}
-						
+		
+		
+		
 		mProviderDelegate = CallKitProviderDelegate(context: self)
-		
-		
 	}
 	
+	
 	func login() {
-
-		linphoneAsyncHelper.postOnCoreQueue {
+		
+		$factory.receive(on: coreQueue).sink { factory in
 			do {
 				var transport : TransportType
 				if (self.transportType == "TLS") { transport = TransportType.Tls }
@@ -153,44 +146,42 @@ class CallKitExampleContext : ObservableObject
 				else  { transport = TransportType.Udp }
 				
 				let authInfo = try Factory.Instance.createAuthInfo(username: self.username, userid: "", passwd: self.passwd, ha1: "", realm: "", domain: self.domain)
-				let accountParams = try self.mCore.createAccountParams()
+				let accountParams = try self.mCore?.createAccountParams()
 				let identity = try Factory.Instance.createAddress(addr: String("sip:" + self.username + "@" + self.domain))
-				try! accountParams.setIdentityaddress(newValue: identity)
+				try! accountParams?.setIdentityaddress(newValue: identity)
 				let address = try Factory.Instance.createAddress(addr: String("sip:" + self.domain))
 				try address.setTransport(newValue: transport)
-				try accountParams.setServeraddress(newValue: address)
-				accountParams.registerEnabled = true
+				try accountParams?.setServeraddress(newValue: address)
+				accountParams?.registerEnabled = true
 				// Enable push notifications on this account
-				accountParams.pushNotificationAllowed = true
+				accountParams?.pushNotificationAllowed = true
 				// We're in a sandbox application, so we must set the provider to "apns.dev" since it will be "apns" by default, which is used only for production apps
-				accountParams.pushNotificationConfig?.provider = "apns.dev"
-				self.mAccount = try self.mCore.createAccount(params: accountParams)
-				self.mCore.addAuthInfo(info: authInfo)
-				try self.mCore.addAccount(account: self.mAccount!)
-				self.mCore.defaultAccount = self.mAccount
+				accountParams?.pushNotificationConfig?.provider = "apns.dev"
+				let account = try self.mCore?.createAccount(params: accountParams!)
+				self.mCore?.addAuthInfo(info: authInfo)
+				try self.mCore?.addAccount(account: account!)
+				self.mCore?.defaultAccount = account
 				
 			} catch { NSLog(error.localizedDescription) }
-		}
+		}.store(in: &cancellables)
+	
 	}
 	
-	func unregister()
-	{
-		linphoneAsyncHelper.postOnCoreQueue {
-			if let account = self.mCore.defaultAccount {
-				let params = account.params
-				let clonedParams = params?.clone()
-				clonedParams?.registerEnabled = false
-				account.params = clonedParams
-			}
-		}
+	func unregister() {
+		$mCore.receive(on: coreQueue).sink { core in
+			guard let account = core?.defaultAccount else {return}
+			let params = account.params
+			let clonedParams = params?.clone()
+			clonedParams?.registerEnabled = false
+			account.params = clonedParams
+		}.store(in: &cancellables)
 	}
 	func delete() {
-		linphoneAsyncHelper.postOnCoreQueue {
-			if let account = self.mCore.defaultAccount {
-				self.mCore.removeAccount(account: account)
-				self.mCore.clearAccounts()
-				self.mCore.clearAllAuthInfo()
-			}
-		}
+		$mCore.receive(on: coreQueue).sink { core in
+			guard let account = core?.defaultAccount else {return}
+			self.mCore?.removeAccount(account: account)
+			self.mCore?.clearAccounts()
+			self.mCore?.clearAllAuthInfo()
+		}.store(in: &cancellables)
 	}
 }