pagination is mostly OK now

tinode · Jun 8, 2022 · f3736da · f3736da
1 parent bd84a2f
commit f3736da
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/Tinodios/MessageInteractor.swift b/Tinodios/MessageInteractor.swift
@@ -374,16 +374,13 @@ class MessageInteractor: DefaultComTopic.Listener, MessageBusinessLogic, Message
 
     /// Load the most recent `kMessagesPerPage` messages from cache.
     func loadMessagesFromCache(scrollToMostRecentMessage: Bool = true) {
+        guard let t = self.topic else { return }
         self.messageInteractorQueue.async {
-            self.topic?.loadMessagePage(startWithSeq: Int.max, pageSize: MessageInteractor.kMessagesPerPage, forward: false, onLoaded: {(messagePage, error) in
-                if let err = error {
-                    Cache.log.error("Failed to load message page: %@", err.localizedDescription)
-                } else {
-                    // Replace messages with the new page.
-                    self.messages = messagePage!.map { $0 as! StoredMessage }.reversed()
-                    self.presenter?.presentMessages(messages: self.messages, scrollToMostRecentMessage)
-                }
-            })
+            if let messagePage = BaseDb.sharedInstance.sqlStore?.getMessagePage(topic: t, from: Int.max, limit: MessageInteractor.kMessagesPerPage, forward: false) {
+                // Replace messages with the new page.
+                self.messages = messagePage.map { $0 as! StoredMessage }.reversed()
+                self.presenter?.presentMessages(messages: self.messages, scrollToMostRecentMessage)
+            }
         }
     }
 

diff --git a/TinodiosDB/BaseDb.swift b/TinodiosDB/BaseDb.swift
@@ -2,7 +2,7 @@
 //  BaseDb.swift
 //  ios
 //
-//  Copyright © 2019 Tinode. All rights reserved.
+//  Copyright © 2019-2022 Tinode. All rights reserved.
 //
 
 import Foundation

diff --git a/TinodiosDB/MessageDb.swift b/TinodiosDB/MessageDb.swift
@@ -336,6 +336,7 @@ public class MessageDb {
         }
         return nil
     }
+
     func queryDeleted(topicId: Int64?, hard: Bool) -> [MsgRange]? {
         guard let topicId = topicId else { return nil }
         let status = hard ? BaseDb.Status.deletedHard : BaseDb.Status.deletedSoft