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

Merge branch 'charlesmchen/fixes.2021.05.26'

Browse Source
This commit is contained in:
Matthew Chen 2021-05-26 16:12:40 -03:00
commit cca6eebf19
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Signal/src/Calls/CallService.swift
View File

@ -556,10 +556,12 @@ public final class CallService: NSObject {
// MARK: -
private func updateGroupMembersForCurrentCallIfNecessary() {
guard let call = currentCall, call.isGroupCall,
let groupThread = call.thread as? TSGroupThread,
let memberInfo = groupMemberInfo(for: groupThread) else { return }
call.groupCall.updateGroupMembers(members: memberInfo)
DispatchQueue.main.async {
guard let call = self.currentCall, call.isGroupCall,
let groupThread = call.thread as? TSGroupThread,
let memberInfo = self.groupMemberInfo(for: groupThread) else { return }
call.groupCall.updateGroupMembers(members: memberInfo)
}
}
private func groupMemberInfo(for thread: TSGroupThread) -> [GroupMemberInfo]? {
@ -701,6 +703,7 @@ extension CallService {
@objc @available(swift, obsoleted: 1.0)
func peekCallAndUpdateThread(_ thread: TSGroupThread) {
AssertIsOnMainThread()
self.peekCallAndUpdateThread(thread)
}
@ -716,12 +719,11 @@ extension CallService {
Logger.info("Ignoring peek request for the current call")
return
}
guard let memberInfo = self.groupMemberInfo(for: thread) else {
owsFailDebug("Failed to fetch group member info to peek \(thread.uniqueId)")
return
}
firstly(on: .global()) {
guard let memberInfo = self.groupMemberInfo(for: thread) else {
owsFailDebug("Failed to fetch group member info to peek \(thread.uniqueId)")
return
}
if let expectedEraId = expectedEraId {
// If we're expecting a call with `expectedEraId`, prepopulate an entry in the database.
// If it's the current call, we'll update with the PeekInfo once fetched

11
SignalServiceKit/src/Messages/Stickers/StickerManager.swift
View File

@ -699,8 +699,15 @@ public class StickerManager: NSObject {
try OWSFileSystem.deleteFileIfExists(url: stickerDataUrl)
try FileManager.default.copyItem(at: stickerTemporaryUrl, to: stickerDataUrl)
} catch let error as NSError {
owsFailDebug("File write failed: \(error)")
return false
if error.domain == NSCocoaErrorDomain,
error.code == NSFileWriteFileExistsError,
OWSFileSystem.fileOrFolderExists(url: stickerDataUrl) {
// Races can occur; ignore and proceed.
Logger.warn("File already exists: \(error)")
} else {
owsFailDebug("File write failed: \(error)")
return false
}
}
return databaseStorage.write { (transaction) -> Bool in