narayana/another.im-ios
narayana/another.im-ios
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

wip

Browse source
This commit is contained in:
Woit 2024-11-27 16:49:36 +01:00
parent 9b8b5d1ae6
commit 2b876e5ae6
4 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Monal/another.im/AnotherIMApp.swift
View file

@ -20,7 +20,10 @@ struct AnotherIMApp: App {
class AppDelegate: UIResponder, UIApplicationDelegate {
func applicationWillEnterForeground(_: UIApplication) {
// let manager = MLXMPPManager.sharedInstance()
// manager.nowForegrounded()
MLXMPPManager.sharedInstance().nowForegrounded()
}
func applicationDidEnterBackground(_: UIApplication) {
MLXMPPManager.sharedInstance().nowBackgrounded()
}
}

4
Monal/another.im/Views/Conversation/ConversationScreen.swift
View file

@ -53,7 +53,9 @@ struct ConversationScreen: View {
firstIsVisible = true
autoScroll = true
}
// messagesStore.scrolledMessage(message.id)
if message.id == chatWrapper.messages.last?.id {
chatWrapper.requestMAM()
}
}
.onDisappear {
if message.id == chatWrapper.messages.first?.id {

2
Monal/another.im/XMPP/MonalWrapperModels.swift
View file

@ -86,6 +86,7 @@ struct Message: Identifiable {
let accountId: Int
let participantJid: String
let dbId: Int
let stanzaId: String
let timestamp: Date
let body: String
let isInbound: Bool
@ -99,6 +100,7 @@ struct Message: Identifiable {
accountId = accId
participantJid = obj.participantJid
self.dbId = dbId
stanzaId = obj.stanzaId
timestamp = obj.timestamp
body = obj.messageText
isInbound = obj.inbound

18
Monal/another.im/XMPP/MonalXmppWrapper.swift
View file

@ -189,6 +189,7 @@ final class MonalChatWrapper: ObservableObject {
private let xmpp: MLXMPPManager
private let db: DataLayer
private var notificationObservers: [AnyObject] = []
private var mamRequestInProgress = false
init(account: Account, contact: Contact, db: DataLayer, xmpp: MLXMPPManager) {
self.contact = contact
@ -223,6 +224,23 @@ final class MonalChatWrapper: ObservableObject {
print(newMessageId)
xmpp.sendMessage(text, to: monalContact, isEncrypted: monalContact.isEncrypted, isUpload: false, messageId: newMessageId)
}
func requestMAM() {
if mamRequestInProgress { return }
mamRequestInProgress = true
guard let acc = xmpp.getEnabledAccount(forID: NSNumber(value: account.id)) else { return }
let lastStanzaId = messages.last?.stanzaId // last here because list is reversed
?? db.lastStanzaId(forAccount: NSNumber(value: account.id))
acc.setMAMQueryMostRecentFor(monalContact, before: lastStanzaId) { [weak self] msgs, _ in
self?.mamRequestInProgress = false
if !(msgs ?? []).isEmpty {
self?.refreshMessages()
}
}
}
}
private extension MonalChatWrapper {