@@ -13,6 +13,8 @@ final class DeviceTransferServerDataSource {
1313 private let fromDate : String ?
1414 private let needsFilterData : Bool
1515
16+ private var transcriptMessageCount = 0
17+
1618 init ( key: DeviceTransferKey , remotePlatform: DeviceTransferPlatform , filter: DeviceTransferFilter ) {
1719 self . key = key
1820 self . remotePlatform = remotePlatform
@@ -53,7 +55,7 @@ extension DeviceTransferServerDataSource {
5355 + MessageMentionDAO. shared. messageMentionsCount ( matching: conversationIDs)
5456 + ExpiredMessageDAO. shared. expiredMessagesCount ( )
5557 + attachmentsCount
56- Logger . general. info ( category: " DeviceTransferServerDataSource " , message: " Total: \( total) , Messages: \( messagesCount) , attachments : \( attachmentsCount) , transcriptMessageCount : \( transcriptMessageCount) " )
58+ Logger . general. info ( category: " DeviceTransferServerDataSource " , message: " Total: \( total) , Messages: \( messagesCount) , Attachments : \( attachmentsCount) , TranscriptMessages : \( transcriptMessageCount) " )
5759 return total
5860 }
5961
@@ -129,7 +131,7 @@ extension DeviceTransferServerDataSource {
129131 var fileCount = 0
130132 while let location = nextLocation {
131133 let ( databaseItemCount, transferItems, nextPrimaryID, nextSecondaryID) = items ( on: location)
132- if transferItems. isEmpty {
134+ if transferItems. isEmpty && ! ( needsFilterData && location . type == . transcriptMessage ) {
133135 Logger . general. info ( category: " DeviceTransferServerDataSource " , message: " \( location. type) is empty " )
134136 }
135137 recordCount += transferItems. count
@@ -151,7 +153,18 @@ extension DeviceTransferServerDataSource {
151153 } else {
152154 nextLocation = nil
153155 }
154- Logger . general. info ( category: " DeviceTransferServerDataSource " , message: " Send \( location. type) \( recordCount) " )
156+ if needsFilterData, location. type == . message {
157+ let message : String
158+ if transcriptMessageCount == 0 {
159+ message = " \( DeviceTransferRecordType . transcriptMessage) is empty "
160+ } else {
161+ message = " Send \( DeviceTransferRecordType . transcriptMessage) \( transcriptMessageCount) "
162+ }
163+ Logger . general. info ( category: " DeviceTransferServerDataSource " , message: message)
164+ }
165+ if !needsFilterData || location. type != . transcriptMessage {
166+ Logger . general. info ( category: " DeviceTransferServerDataSource " , message: " Send \( location. type) \( recordCount) " )
167+ }
155168 recordCount = 0
156169 } else {
157170 nextLocation = Location ( type: location. type, primaryID: nextPrimaryID, secondaryID: nextSecondaryID)
@@ -317,7 +330,6 @@ extension DeviceTransferServerDataSource {
317330 nextSecondaryID = nil
318331 var messageItems = [ TransferItem] ( )
319332 var transcriptMessageItems = [ TransferItem] ( )
320- var transcriptMessageCount = 0
321333 for message in messages {
322334 let deviceTransferMessage = DeviceTransferMessage ( message: message, to: remotePlatform)
323335 do {
@@ -342,9 +354,6 @@ extension DeviceTransferServerDataSource {
342354 transcriptMessageItems = transcriptTransferItems ( for: transcriptMessages)
343355 }
344356 }
345- if transcriptMessageCount != 0 {
346- Logger . general. info ( category: " DeviceTransferServerDataSource " , message: " Send transcriptMessages along with messages: \( transcriptMessageCount) " )
347- }
348357 transferItems = transcriptMessageItems + messageItems
349358 case . messageMention:
350359 let messageMentions = MessageMentionDAO . shared. messageMentions ( limit: limit,
0 commit comments