signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Merge pull request #3873 from signalapp/martin/IOS-2048b

Browse Source 
avoiding duplicate timers and crashes in "debug" environment
This commit is contained in:
Martin Böttcher 2022-01-05 14:21:40 +01:00 committed by GitHub
commit 681c22e2ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Signal/src/ViewControllers/HomeView/HVRenderState.swift
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2021 Open Whisper Systems. All rights reserved.
// Copyright (c) 2022 Open Whisper Systems. All rights reserved.
//
import Foundation
@ -42,27 +42,35 @@ public class HVRenderState: NSObject {
}
@objc
func thread(forIndexPath indexPath: IndexPath) -> TSThread? {
func thread(forIndexPath indexPath: IndexPath, expectsSuccess: Bool = true) -> TSThread? {
guard let section = HomeViewSection(rawValue: indexPath.section) else {
owsFailDebug("Invalid section: \(indexPath.section).")
if expectsSuccess {
owsFailDebug("Invalid section: \(indexPath.section).")
}
return nil
}
switch section {
case .pinned:
guard let thread = pinnedThreads[safe: indexPath.row]?.value else {
owsFailDebug("No thread for index path: \(indexPath)")
if expectsSuccess {
owsFailDebug("No thread for index path: \(indexPath)")
}
return nil
}
return thread
case .unpinned:
guard let thread = unpinnedThreads[safe: indexPath.row] else {
owsFailDebug("No thread for index path: \(indexPath)")
if expectsSuccess {
owsFailDebug("No thread for index path: \(indexPath)")
}
return nil
}
return thread
default:
owsFailDebug("Invalid index path: \(indexPath).")
if expectsSuccess {
owsFailDebug("Invalid index path: \(indexPath).")
}
return nil
}
}

17
Signal/src/ViewControllers/HomeView/HVTableDataSource.swift
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2021 Open Whisper Systems. All rights reserved.
// Copyright (c) 2022 Open Whisper Systems. All rights reserved.
//
import Foundation
@ -33,6 +33,8 @@ public class HVTableDataSource: NSObject {
return
}
updateTimer?.invalidate()
updateTimer = nil
if let interval = nextUpdateAt?.timeIntervalSinceNow {
updateTimer = Timer.scheduledTimer(withTimeInterval: interval, repeats: false) { [weak self] (_) in
if let self = self {
@ -44,9 +46,6 @@ public class HVTableDataSource: NSObject {
}
self?.updateAndSetRefreshTimer()
}
} else if updateTimer != nil {
updateTimer?.invalidate()
updateTimer = nil
}
}
}
@ -86,15 +85,15 @@ extension HVTableDataSource {
}
@objc
func threadViewModel(forIndexPath indexPath: IndexPath) -> ThreadViewModel? {
guard let thread = self.thread(forIndexPath: indexPath) else {
func threadViewModel(forIndexPath indexPath: IndexPath, expectsSuccess: Bool = true) -> ThreadViewModel? {
guard let thread = self.thread(forIndexPath: indexPath, expectsSuccess: expectsSuccess) else {
return nil
}
return self.threadViewModel(forThread: thread)
}
func thread(forIndexPath indexPath: IndexPath) -> TSThread? {
renderState.thread(forIndexPath: indexPath)
func thread(forIndexPath indexPath: IndexPath, expectsSuccess: Bool = true) -> TSThread? {
renderState.thread(forIndexPath: indexPath, expectsSuccess: expectsSuccess)
}
}
@ -770,7 +769,7 @@ extension HVTableDataSource {
public func updateVisibleCellContent(at indexPath: IndexPath, for tableView: UITableView) -> Bool {
AssertIsOnMainThread()
if let primKey = threadViewModel(forIndexPath: indexPath)?.threadRecord.uniqueId, (tableView.indexPathsForVisibleRows ?? []).contains(indexPath) {
if let primKey = threadViewModel(forIndexPath: indexPath, expectsSuccess: false)?.threadRecord.uniqueId, (tableView.indexPathsForVisibleRows ?? []).contains(indexPath) {
for cell in tableView.visibleCells {
if let homeCell = cell as? HomeViewCell, let myKey = homeCell.thread?.uniqueId, myKey == primKey, let token = buildCellConfigurationAndContentTokenSync(forIndexPath: indexPath)?.contentToken {
homeCell.reset()