|
|
|
@ -82,7 +82,11 @@ public class ConversationViewModel: OWSAudioPlayerDelegate {
|
|
|
|
|
// distinct stutter)
|
|
|
|
|
self.pagedDataObserver = self.setupPagedObserver(
|
|
|
|
|
for: threadId,
|
|
|
|
|
userPublicKey: getUserHexEncodedPublicKey()
|
|
|
|
|
userPublicKey: getUserHexEncodedPublicKey(),
|
|
|
|
|
blindedPublicKey: SessionThread.getUserHexEncodedBlindedKey(
|
|
|
|
|
threadId: threadId,
|
|
|
|
|
threadVariant: threadVariant
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
// Run the initial query on a background thread so we don't block the push transition
|
|
|
|
@ -166,7 +170,7 @@ public class ConversationViewModel: OWSAudioPlayerDelegate {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private func setupPagedObserver(for threadId: String, userPublicKey: String) -> PagedDatabaseObserver<Interaction, MessageViewModel> {
|
|
|
|
|
private func setupPagedObserver(for threadId: String, userPublicKey: String, blindedPublicKey: String?) -> PagedDatabaseObserver<Interaction, MessageViewModel> {
|
|
|
|
|
return PagedDatabaseObserver(
|
|
|
|
|
pagedTable: Interaction.self,
|
|
|
|
|
pageSize: ConversationViewModel.pageSize,
|
|
|
|
@ -214,6 +218,7 @@ public class ConversationViewModel: OWSAudioPlayerDelegate {
|
|
|
|
|
orderSQL: MessageViewModel.orderSQL,
|
|
|
|
|
dataQuery: MessageViewModel.baseQuery(
|
|
|
|
|
userPublicKey: userPublicKey,
|
|
|
|
|
blindedPublicKey: blindedPublicKey,
|
|
|
|
|
orderSQL: MessageViewModel.orderSQL,
|
|
|
|
|
groupSQL: MessageViewModel.groupSQL
|
|
|
|
|
),
|
|
|
|
@ -443,7 +448,8 @@ public class ConversationViewModel: OWSAudioPlayerDelegate {
|
|
|
|
|
self.observableThreadData = self.setupObservableThreadData(for: updatedThreadId)
|
|
|
|
|
self.pagedDataObserver = self.setupPagedObserver(
|
|
|
|
|
for: updatedThreadId,
|
|
|
|
|
userPublicKey: getUserHexEncodedPublicKey()
|
|
|
|
|
userPublicKey: getUserHexEncodedPublicKey(),
|
|
|
|
|
blindedPublicKey: nil
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
// Try load everything up to the initial visible message, fallback to just the initial page of messages
|
|
|
|
|