mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-04-18 04:38:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'fix/app_extension_imdn' into 'master'

Browse source 
(NEED FLEXISIP 2.5) App extension - usage de stop async et iterate pour terminer l'envoi d'imdn dés que possible

See merge request BC/public/linphone-iphone!405
This commit is contained in:
Quentin Arguillere 2026-03-26 15:32:02 +00:00
commit bf81c9aa10
1 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
msgNotificationService/NotificationService.swift
View file

@ -21,6 +21,7 @@
import UserNotifications
import linphonesw
import Combine
#if USE_CRASHLYTICS
import Firebase
#endif
@ -80,6 +81,8 @@ class NotificationService: UNNotificationServiceExtension {
var bestAttemptContent: UNMutableNotificationContent?
var lc: Core?
var coreDelegate: CoreDelegate?
private var mIteratePublisher: AnyCancellable?
override init() {
super.init()
@ -89,7 +92,6 @@ class NotificationService: UNNotificationServiceExtension {
}
override func didReceive(_ request: UNNotificationRequest, withContentHandler contentHandler: @escaping (UNNotificationContent) -> Void) {
let timeStart = Date.now
self.contentHandler = contentHandler
bestAttemptContent = (request.content.mutableCopy() as? UNMutableNotificationContent)
@ -173,6 +175,12 @@ class NotificationService: UNNotificationServiceExtension {
if let message = message {
if message.reactionContent == " " {
// Do not display notification if it was a reaction being removed
contentHandler(UNNotificationContent())
return
}
let nilParams: ConferenceParams? = nil
if let peerAddr = message.peerAddr
, let chatroom = lc!.searchChatRoom(params: nilParams, localAddr: nil, remoteAddr: peerAddr, participants: nil), chatroom.muted {
@ -205,17 +213,24 @@ class NotificationService: UNNotificationServiceExtension {
bestAttemptContent.userInfo.updateValue(msgData?.peerAddr as Any, forKey: "peer_addr")
bestAttemptContent.userInfo.updateValue(msgData?.localAddr as Any, forKey: "local_addr")
// start remaining time count 25 instead of 30 to make sure we keep at least 5 seconds to finish the message processing
let remainingTime = max(0, 25 - Date.now.timeIntervalSince(timeStart))
DispatchQueue.main.asyncAfter(deadline: .now() + min(3, remainingTime)) {
self.lc?.iterate()
self.stopCore()
if message.reactionContent != " " {
coreDelegate = CoreDelegateStub(onGlobalStateChanged: { (core: Core, gstate: GlobalState, _: String) in
// Wait for core full stop to display the notification
if gstate == .Off {
self.mIteratePublisher = nil
contentHandler(bestAttemptContent)
} else {
contentHandler(UNNotificationContent())
}
}
})
lc?.addDelegate(delegate: coreDelegate!)
lc?.stopAsync()
// Auto iterate does not work for app extension, so we manualy add
mIteratePublisher = Timer.publish(every: 0.1, on: .main, in: .common)
.autoconnect()
.receive(on: DispatchQueue.main)
.sink { [weak self] _ in
self?.lc?.iterate()
}
return
} else {
Log.info("Message not found for callid ["+callId+"]")
@ -329,7 +344,7 @@ class NotificationService: UNNotificationServiceExtension {
lc.stop()
}
}
func updateBadge() -> Int {
var count = 0
count += lc!.unreadChatMessageCount