Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Delete more unnecessary logs #3129

Merged
merged 1 commit into from
Aug 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -343,8 +343,6 @@ class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol
return
}

MXLog.verbose("Updating rooms")

var rooms = [HomeScreenRoom]()

for summary in roomSummaryProvider.roomListPublisher.value {
Expand All @@ -353,8 +351,6 @@ class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol
}

state.rooms = rooms

MXLog.verbose("Finished updating rooms")
}

private func updateVisibleRange(_ range: Range<Int>) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,6 @@ class MessageForwardingScreenViewModel: MessageForwardingScreenViewModelType, Me
// MARK: - Private

private func updateRooms() {
MXLog.verbose("Updating rooms")

var rooms = [MessageForwardingRoom]()

for summary in roomSummaryProvider.roomListPublisher.value {
Expand All @@ -95,8 +93,6 @@ class MessageForwardingScreenViewModel: MessageForwardingScreenViewModelType, Me
}

state.rooms = rooms

MXLog.verbose("Finished updating rooms")
}

/// The actual range values don't matter as long as they contain the lower
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,6 @@ class TimelineTableViewController: UIViewController {
snapshot.appendItems(timelineItemsIDs)

let currentSnapshot = dataSource.snapshot()
MXLog.verbose("DIFF: \(snapshot.itemIdentifiers.difference(from: currentSnapshot.itemIdentifiers))")

// We only animate when new items come at the end of a live timeline, ignoring transitions through empty.
let newestItemIdentifier = snapshot.mainItemIdentifiers.first
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,6 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {

switch diff {
case .append(let values):
let debugIdentifiers = values.map { $0.id() }
for (index, value) in values.enumerated() {
let summary = buildRoomSummary(from: value)
changes.append(.insert(offset: rooms.count + index, element: summary, associatedWith: nil))
Expand Down Expand Up @@ -295,7 +294,6 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
let summary = rooms[Int(index)]
changes.append(.remove(offset: Int(index), element: summary, associatedWith: nil))
case .reset(let values):
let debugIdentifiers = values.map { $0.id() }
for (index, summary) in rooms.enumerated() {
changes.append(.remove(offset: index, element: summary, associatedWith: nil))
}
Expand Down
19 changes: 1 addition & 18 deletions ElementX/Sources/Services/Timeline/RoomTimelineProvider.swift
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,6 @@ class RoomTimelineProvider: RoomTimelineProviderProtocol {
span.exit()
}

MXLog.verbose("Received timeline diff")

itemProxies = diffs.reduce(itemProxies) { currentItems, diff in
guard let collectionDiff = buildDiff(from: diff, on: currentItems) else {
MXLog.error("Failed building CollectionDifference from \(diff)")
Expand All @@ -110,8 +108,6 @@ class RoomTimelineProvider: RoomTimelineProviderProtocol {
return updatedItems
}

MXLog.verbose("Finished applying diffs, current items (\(itemProxies.count)) : \(itemProxies.map(\.debugIdentifier))")

if let hasLoadedInitialItemsContinuation {
hasLoadedInitialItemsContinuation.resume()
self.hasLoadedInitialItemsContinuation = nil
Expand All @@ -126,7 +122,6 @@ class RoomTimelineProvider: RoomTimelineProviderProtocol {
case .append:
guard let items = diff.append() else { fatalError() }

MXLog.verbose("Append \(items.map(\.debugIdentifier))")
for (index, item) in items.enumerated() {
let itemProxy = TimelineItemProxy(item: item)

Expand All @@ -137,32 +132,25 @@ class RoomTimelineProvider: RoomTimelineProviderProtocol {
changes.append(.insert(offset: Int(itemProxies.count) + index, element: itemProxy, associatedWith: nil))
}
case .clear:
MXLog.verbose("Clear all items")
for (index, itemProxy) in itemProxies.enumerated() {
changes.append(.remove(offset: index, element: itemProxy, associatedWith: nil))
}
case .insert:
guard let update = diff.insert() else { fatalError() }

MXLog.verbose("Insert \(update.item.debugIdentifier) at \(update.index)")
let itemProxy = TimelineItemProxy(item: update.item)
changes.append(.insert(offset: Int(update.index), element: itemProxy, associatedWith: nil))
case .popBack:
guard let itemProxy = itemProxies.last else { fatalError() }

MXLog.verbose("Pop Back \(itemProxy.debugIdentifier)")

changes.append(.remove(offset: itemProxies.count - 1, element: itemProxy, associatedWith: nil))
case .popFront:
guard let itemProxy = itemProxies.first else { fatalError() }

MXLog.verbose("Pop Front \(itemProxy.debugIdentifier)")

changes.append(.remove(offset: 0, element: itemProxy, associatedWith: nil))
case .pushBack:
guard let item = diff.pushBack() else { fatalError() }

MXLog.verbose("Push Back \(item.debugIdentifier)")

let itemProxy = TimelineItemProxy(item: item)

if itemProxy.isMembershipChange {
Expand All @@ -173,21 +161,17 @@ class RoomTimelineProvider: RoomTimelineProviderProtocol {
case .pushFront:
guard let item = diff.pushFront() else { fatalError() }

MXLog.verbose("Push Front: \(item.debugIdentifier)")
let itemProxy = TimelineItemProxy(item: item)
changes.append(.insert(offset: 0, element: itemProxy, associatedWith: nil))
case .remove:
guard let index = diff.remove() else { fatalError() }

let itemProxy = itemProxies[Int(index)]

MXLog.verbose("Remove \(itemProxy.debugIdentifier) at: \(index)")

changes.append(.remove(offset: Int(index), element: itemProxy, associatedWith: nil))
case .reset:
guard let items = diff.reset() else { fatalError() }

MXLog.verbose("Replace all items with \(items.map(\.debugIdentifier))")
for (index, itemProxy) in itemProxies.enumerated() {
changes.append(.remove(offset: index, element: itemProxy, associatedWith: nil))
}
Expand All @@ -198,7 +182,6 @@ class RoomTimelineProvider: RoomTimelineProviderProtocol {
case .set:
guard let update = diff.set() else { fatalError() }

MXLog.verbose("Set \(update.item.debugIdentifier) at index \(update.index)")
let itemProxy = TimelineItemProxy(item: update.item)
changes.append(.remove(offset: Int(update.index), element: itemProxy, associatedWith: nil))
changes.append(.insert(offset: Int(update.index), element: itemProxy, associatedWith: nil))
Expand Down
2 changes: 1 addition & 1 deletion ElementX/Sources/Services/Timeline/TimelineProxy.swift
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ final class TimelineProxy: TimelineProxyProtocol {
}

func sendReadReceipt(for eventID: String, type: ReceiptType) async -> Result<Void, TimelineProxyError> {
MXLog.verbose("Sending read receipt for eventID: \(eventID)")
MXLog.info("Sending read receipt for eventID: \(eventID)")

do {
try await timeline.sendReadReceipt(receiptType: type, eventId: eventID)
Expand Down
Loading