ios: change logic of not showing alerts on file auto-receive - only don't show on file cancelled errors (#2833)

This commit is contained in:
spaced4ndy
2023-08-03 14:25:56 +04:00
committed by GitHub
parent 760282cdfd
commit 80a77a1104
2 changed files with 17 additions and 11 deletions

View File

@@ -822,21 +822,19 @@ func apiReceiveFile(fileId: Int64, inline: Bool? = nil, auto: Bool = false) asyn
}
} else if let networkErrorAlert = networkErrorAlert(r) {
logger.error("apiReceiveFile network error: \(String(describing: r))")
if !auto {
am.showAlert(networkErrorAlert)
}
am.showAlert(networkErrorAlert)
} else {
switch r {
case .chatCmdError(_, .error(.fileAlreadyReceiving)):
switch chatError(r) {
case .fileCancelled:
logger.debug("apiReceiveFile ignoring fileCancelled error")
case .fileAlreadyReceiving:
logger.debug("apiReceiveFile ignoring fileAlreadyReceiving error")
default:
logger.error("apiReceiveFile error: \(String(describing: r))")
if !auto {
am.showAlertMsg(
title: "Error receiving file",
message: "Error: \(String(describing: r))"
)
}
am.showAlertMsg(
title: "Error receiving file",
message: "Error: \(String(describing: r))"
)
}
}
return nil

View File

@@ -821,6 +821,14 @@ public enum ChatResponse: Decodable, Error {
}
}
public func chatError(_ chatResponse: ChatResponse) -> ChatErrorType? {
switch chatResponse {
case let .chatCmdError(_, .error(error)): return error
case let .chatError(_, .error(error)): return error
default: return nil
}
}
struct NewUser: Encodable {
var profile: Profile?
var sameServers: Bool