Merge branch 'master' into remote-desktop
This commit is contained in:
@@ -165,6 +165,8 @@ struct CIRcvDecryptionError: View {
|
||||
message = Text("\(msgCount) messages failed to decrypt.") + Text("\n") + why
|
||||
case .other:
|
||||
message = Text("\(msgCount) messages failed to decrypt.") + Text("\n") + why
|
||||
case .ratchetSync:
|
||||
message = Text("Encryption re-negotiation failed.")
|
||||
}
|
||||
return message
|
||||
}
|
||||
|
||||
@@ -2676,6 +2676,7 @@ public enum MsgDecryptError: String, Decodable {
|
||||
case tooManySkipped
|
||||
case ratchetEarlier
|
||||
case other
|
||||
case ratchetSync
|
||||
|
||||
var text: String {
|
||||
switch self {
|
||||
@@ -2683,6 +2684,7 @@ public enum MsgDecryptError: String, Decodable {
|
||||
case .tooManySkipped: return NSLocalizedString("Permanent decryption error", comment: "message decrypt error item")
|
||||
case .ratchetEarlier: return NSLocalizedString("Decryption error", comment: "message decrypt error item")
|
||||
case .other: return NSLocalizedString("Decryption error", comment: "message decrypt error item")
|
||||
case .ratchetSync: return NSLocalizedString("Encryption re-negotiation error", comment: "message decrypt error item")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user