Skip to content

Commit f5e8785

Browse files
authored
Mark autoLoadMoreIfNecessary with @discardableResult.
There are six places where the result is unused vs one place where the result is used.
1 parent ca1a163 commit f5e8785

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

Signal/ConversationView/ConversationViewController+CVC.swift

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ extension ConversationViewController: CVLoadCoordinatorDelegate {
239239
DispatchQueue.main.async {
240240
self.reloadReactionsDetailSheetWithSneakyTransaction()
241241
if hasViewDidAppearEverCompleted {
242-
_ = self.autoLoadMoreIfNecessary()
242+
self.autoLoadMoreIfNecessary()
243243
}
244244
}
245245
}
@@ -791,6 +791,7 @@ extension ConversationViewController: CVViewStateDelegate {
791791
// MARK: - Load More
792792

793793
extension ConversationViewController {
794+
@discardableResult
794795
public func autoLoadMoreIfNecessary() -> Bool {
795796
AssertIsOnMainThread()
796797

@@ -815,7 +816,7 @@ extension ConversationViewController {
815816
if showLoadOlderHeader, isCloseToTop {
816817
if loadCoordinator.didLoadOlderRecently {
817818
DispatchQueue.main.asyncAfter(deadline: .now() + 1) { [weak self] in
818-
_ = self?.autoLoadMoreIfNecessary()
819+
self?.autoLoadMoreIfNecessary()
819820
}
820821
return false
821822
}
@@ -830,7 +831,7 @@ extension ConversationViewController {
830831
if showLoadNewerHeader, isCloseToBottom {
831832
if loadCoordinator.didLoadNewerRecently {
832833
DispatchQueue.main.asyncAfter(deadline: .now() + 1) { [weak self] in
833-
_ = self?.autoLoadMoreIfNecessary()
834+
self?.autoLoadMoreIfNecessary()
834835
}
835836
return false
836837
}

Signal/ConversationView/ConversationViewController+Delegates.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ extension ConversationViewController {
458458
scrollingAnimationCompletionTimer?.invalidate()
459459
scrollingAnimationCompletionTimer = nil
460460

461-
_ = autoLoadMoreIfNecessary()
461+
autoLoadMoreIfNecessary()
462462
}
463463

464464
func resetForSizeOrOrientationChange() {

Signal/ConversationView/ConversationViewController+UIScrollView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ extension ConversationViewController: UIScrollViewDelegate {
184184
return
185185
}
186186

187-
_ = autoLoadMoreIfNecessary()
187+
autoLoadMoreIfNecessary()
188188

189189
if !isUserScrolling, !isWaitingForDeceleration {
190190
saveLastVisibleSortIdAndOnScreenPercentage()

Signal/ConversationView/ConversationViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ public final class ConversationViewController: OWSViewController {
385385
self.markVisibleMessagesAsRead()
386386
self.startReadTimer()
387387
self.updateNavigationBarSubtitleLabel()
388-
_ = self.autoLoadMoreIfNecessary()
388+
self.autoLoadMoreIfNecessary()
389389

390390
let serviceIds = thread.recipientAddressesWithSneakyTransaction.compactMap(\.serviceId)
391391

Signal/src/ViewControllers/MediaGallery/MediaTileViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ class MediaTileViewController: UICollectionViewController, MediaGalleryDelegate,
385385
private var scrollFlagShouldBeVisible = false
386386

387387
override func scrollViewDidScroll(_ scrollView: UIScrollView) {
388-
self.autoLoadMoreIfNecessary()
388+
autoLoadMoreIfNecessary()
389389
showOrHideScrollFlag()
390390
if scrollFlag.superview != nil {
391391
updateScrollFlag()

0 commit comments

Comments
 (0)