mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-02-07 14:18:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix refresh messages received when application switches to background/foreground

Browse source 
Fix reloadItem when receive presence notification
This commit is contained in:
Benoit Martins 2023-06-09 16:16:08 +02:00 • committed by QuentinArguillere
parent e70190dc2c
commit 989257f802
2 changed files with 59 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
Classes/Swift/Chat/Views/ChatConversationTableViewSwift.swift
View file

@ -125,13 +125,19 @@ class ChatConversationTableViewSwift: UIViewController, UICollectionViewDataSour
let indexPathsVisible = self.collectionView.indexPathsForVisibleItems
if indexPathsVisible.count > 0 {
for i in 0...indexPathsVisible.count-1 {
let contact = ChatConversationTableViewModel.sharedModel.getMessage(index: indexPathsVisible[i].row)?.chatMessage?.fromAddress
if (contact != nil){
let uri = "sip:" + contact!.username + "@" + contact!.domain
let cell = self.collectionView.cellForItem(at: indexPathsVisible[i])
if cell != nil {
let multilineCell = cell as! MultilineMessageCell
if multilineCell.imageUser.isHidden == false {
let contact = ChatConversationTableViewModel.sharedModel.getMessage(index: indexPathsVisible[i].row)?.chatMessage?.fromAddress
if (contact != nil){
let uri = "sip:" + contact!.username + "@" + contact!.domain
if(uri == friend as! String){
let indexPath = indexPathsVisible[i]
collectionView.reloadItems(at: [indexPath])
if(uri == friend as! String){
let indexPath = indexPathsVisible[i]
collectionView.reloadItems(at: [indexPath])
}
}
}
}
}
@ -154,6 +160,12 @@ class ChatConversationTableViewSwift: UIViewController, UICollectionViewDataSour
scrollBadge!.text = "0"
}
func refreshDataAfterForeground(){
DispatchQueue.main.async {
self.collectionView.reloadData()
}
}
func refreshData(isOutgoing: Bool){
if (ChatConversationTableViewModel.sharedModel.getNBMessages() > 1){
let isDisplayingBottomOfTable = collectionView.contentOffset.y <= 20
@ -168,26 +180,25 @@ class ChatConversationTableViewSwift: UIViewController, UICollectionViewDataSour
collectionView.reloadData()
self.scrollToBottom(animated: true)
} else if !isOutgoing {
let selectedCellIndex = collectionView.indexPathsForVisibleItems.sorted().first!
let selectedCell = collectionView.cellForItem(at: selectedCellIndex)
let visibleRect = collectionView.convert(collectionView.bounds, to: selectedCell)
UIView.performWithoutAnimation {
collectionView.reloadData()
DispatchQueue.main.asyncAfter(deadline: .now() + 0.2){
let newSelectedCell = self.collectionView.cellForItem(at: IndexPath(row: selectedCellIndex.row + 1, section: 0))
let updatedVisibleRect = self.collectionView.convert(self.collectionView.bounds, to: newSelectedCell)
if !collectionView.indexPathsForVisibleItems.isEmpty {
let selectedCellIndex = collectionView.indexPathsForVisibleItems.sorted().first!
let selectedCell = collectionView.cellForItem(at: selectedCellIndex)
let visibleRect = collectionView.convert(collectionView.bounds, to: selectedCell)
UIView.performWithoutAnimation {
collectionView.reloadData()
DispatchQueue.main.asyncAfter(deadline: .now() + 0.2){
let newSelectedCell = self.collectionView.cellForItem(at: IndexPath(row: selectedCellIndex.row + 1, section: 0))
let updatedVisibleRect = self.collectionView.convert(self.collectionView.bounds, to: newSelectedCell)
var contentOffset = self.collectionView.contentOffset
contentOffset.y = contentOffset.y + (visibleRect.origin.y - updatedVisibleRect.origin.y)
self.collectionView.contentOffset = contentOffset
}
var contentOffset = self.collectionView.contentOffset
contentOffset.y = contentOffset.y + (visibleRect.origin.y - updatedVisibleRect.origin.y)
self.collectionView.contentOffset = contentOffset
}
}
scrollBadge!.isHidden = false
scrollBadge!.text = "\(ChatConversationViewModel.sharedModel.chatRoom?.unreadMessagesCount ?? 0)"
}
scrollBadge!.isHidden = false
scrollBadge!.text = "\(ChatConversationViewModel.sharedModel.chatRoom?.unreadMessagesCount ?? 0)"
} else {
collectionView.reloadData()
self.scrollToBottom(animated: false)

26
Classes/Swift/Chat/Views/ChatConversationViewSwift.swift
View file

@ -222,6 +222,30 @@ class ChatConversationViewSwift: BackActionsNavigationView, PHPickerViewControll
self.action2Delete.isEnabled = false
}
}
let notificationCenter = NotificationCenter.default
notificationCenter.addObserver(self, selector: #selector(appMovedToForeground), name: UIApplication.willEnterForegroundNotification, object: nil) }
@objc func appMovedToForeground() {
if(PhoneMainView.instance().currentView == ChatConversationViewSwift.compositeViewDescription()){
let lc: Core = Core.getSwiftObject(cObject: LinphoneManager.getLc())
if(lc.globalState.rawValue == LinphoneGlobalOn.rawValue){
do {
let peerAddress = try Factory.Instance.createAddress(addr: (ChatConversationViewModel.sharedModel.chatRoom?.peerAddress?.asStringUriOnly())!)
let localAddress = try Factory.Instance.createAddress(addr: (ChatConversationViewModel.sharedModel.chatRoom?.localAddress?.asStringUriOnly())!)
if (peerAddress.isValid && localAddress.isValid) {
ChatConversationViewModel.sharedModel.chatRoom = lc.searchChatRoom(params: nil, localAddr: localAddress, remoteAddr: peerAddress, participants: nil)
if (ChatConversationViewModel.sharedModel.chatRoom != nil) {
ChatConversationViewModel.sharedModel.createChatConversation()
PhoneMainView.instance().currentRoom = ChatConversationViewModel.sharedModel.chatRoom?.getCobject
tableControllerSwift.refreshDataAfterForeground()
}
}
}catch{
}
}
}
}
override func viewWillAppear(_ animated: Bool) {
@ -253,8 +277,6 @@ class ChatConversationViewSwift: BackActionsNavigationView, PHPickerViewControll
messageView.ephemeralIndicator.isHidden = !ChatConversationViewModel.sharedModel.chatRoom!.ephemeralEnabled
}
handlePendingTransferIfAny()
configureMessageField()
ChatConversationViewModel.sharedModel.shareFile()