keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Respond to CR.

Browse Source 
// FREEBIE
pull/1/head
Matthew Chen 8 years ago
parent b90416f472
commit 21766732dd
2 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File

12
Signal/src/view controllers/MessagesViewController.m
Unescape Escape View File

@ -1950,7 +1950,7 @@ typedef enum : NSUInteger {
DDLogWarn(@"%@ %s Invalid attachment: %@.", DDLogWarn(@"%@ %s Invalid attachment: %@.",
self.tag, self.tag,
__PRETTY_FUNCTION__, __PRETTY_FUNCTION__,
attachment ? [attachment errorMessage] : @"Missing data"); attachment ? [attachment errorName] : @"Missing data");
[self showErrorAlertForAttachment:attachment]; [self showErrorAlertForAttachment:attachment];
failedToPickAttachment(nil); failedToPickAttachment(nil);
} else { } else {
@ -1997,7 +1997,7 @@ typedef enum : NSUInteger {
DDLogWarn(@"%@ %s Invalid attachment: %@.", DDLogWarn(@"%@ %s Invalid attachment: %@.",
self.tag, self.tag,
__PRETTY_FUNCTION__, __PRETTY_FUNCTION__,
attachment ? [attachment errorMessage] : @"Missing data"); attachment ? [attachment errorName] : @"Missing data");
[self showErrorAlertForAttachment:attachment]; [self showErrorAlertForAttachment:attachment];
failedToPickAttachment(nil); failedToPickAttachment(nil);
} else { } else {
@ -2083,7 +2083,7 @@ typedef enum : NSUInteger {
DDLogWarn(@"%@ %s Invalid attachment: %@.", DDLogWarn(@"%@ %s Invalid attachment: %@.",
self.tag, self.tag,
__PRETTY_FUNCTION__, __PRETTY_FUNCTION__,
attachment ? [attachment errorMessage] : @"Missing data"); attachment ? [attachment errorName] : @"Missing data");
[self showErrorAlertForAttachment:attachment]; [self showErrorAlertForAttachment:attachment];
} else { } else {
[self sendMessageAttachment:attachment]; [self sendMessageAttachment:attachment];
@ -2319,7 +2319,7 @@ typedef enum : NSUInteger {
DDLogWarn(@"%@ %s Invalid attachment: %@.", DDLogWarn(@"%@ %s Invalid attachment: %@.",
self.tag, self.tag,
__PRETTY_FUNCTION__, __PRETTY_FUNCTION__,
attachment ? [attachment errorMessage] : @"Missing data"); attachment ? [attachment errorName] : @"Missing data");
[self showErrorAlertForAttachment:attachment]; [self showErrorAlertForAttachment:attachment];
} else { } else {
[self sendMessageAttachment:attachment]; [self sendMessageAttachment:attachment];
@ -2559,7 +2559,7 @@ typedef enum : NSUInteger {
DDLogWarn(@"%@ %s Invalid attachment: %@.", DDLogWarn(@"%@ %s Invalid attachment: %@.",
self.tag, self.tag,
__PRETTY_FUNCTION__, __PRETTY_FUNCTION__,
attachment ? [attachment errorMessage] : @"Missing data"); attachment ? [attachment errorName] : @"Missing data");
[self showErrorAlertForAttachment:attachment]; [self showErrorAlertForAttachment:attachment];
} else { } else {
__weak MessagesViewController *weakSelf = self; __weak MessagesViewController *weakSelf = self;
@ -2578,7 +2578,7 @@ typedef enum : NSUInteger {
OWSAssert(attachment == nil || [attachment hasError]); OWSAssert(attachment == nil || [attachment hasError]);
NSString *errorMessage = (attachment NSString *errorMessage = (attachment
? [attachment errorMessage] ? [attachment localizedErrorDescription]
: [SignalAttachment missingDataErrorMessage]); : [SignalAttachment missingDataErrorMessage]);
DDLogError(@"%@ %s: %@", DDLogError(@"%@ %s: %@",

50
Signal/src/view controllers/SignalAttachment.swift
Unescape Escape View File

@ -5,7 +5,7 @@
import Foundation import Foundation
import MobileCoreServices import MobileCoreServices
enum SignalAttachmentError: Int { enum SignalAttachmentError: Error {
case missingData case missingData
case fileSizeTooLarge case fileSizeTooLarge
case invalidData case invalidData
@ -14,7 +14,26 @@ enum SignalAttachmentError: Int {
case invalidFileFormat case invalidFileFormat
} }
enum TSImageQuality: Int { extension SignalAttachmentError: LocalizedError {
public var errorDescription: String {
switch self {
case .missingData:
return NSLocalizedString("ATTACHMENT_ERROR_MISSING_DATA", comment: "Attachment error message for attachments without any data")
case .fileSizeTooLarge:
return NSLocalizedString("ATTACHMENT_ERROR_FILE_SIZE_TOO_LARGE", comment: "Attachment error message for attachments whose data exceed file size limits")
case .invalidData:
return NSLocalizedString("ATTACHMENT_ERROR_INVALID_DATA", comment: "Attachment error message for attachments with invalid data")
case .couldNotParseImage:
return NSLocalizedString("ATTACHMENT_ERROR_COULD_NOT_PARSE_IMAGE", comment: "Attachment error message for image attachments which cannot be parsed")
case .couldNotConvertToJpeg:
return NSLocalizedString("ATTACHMENT_ERROR_COULD_NOT_CONVERT_TO_JPEG", comment: "Attachment error message for image attachments which could not be converted to JPEG")
case .invalidFileFormat:
return NSLocalizedString("ATTACHMENT_ERROR_INVALID_FILE_FORMAT", comment: "Attachment error message for attachments with an invalid file format")
}
}
}
enum TSImageQuality {
case uncropped case uncropped
case high case high
case medium case medium
@ -91,31 +110,28 @@ class SignalAttachment: NSObject {
return error != nil return error != nil
} }
var errorMessage: String? { var errorName: String? {
guard let error = error else { guard let error = error else {
// This method should only be called if there is an error. // This method should only be called if there is an error.
assert(false) assert(false)
return nil return nil
} }
switch error { return "\(error)"
case .missingData: }
return NSLocalizedString("ATTACHMENT_ERROR_MISSING_DATA", comment: "Attachment error message for attachments without any data")
case .fileSizeTooLarge: var localizedErrorDescription: String? {
return NSLocalizedString("ATTACHMENT_ERROR_FILE_SIZE_TOO_LARGE", comment: "Attachment error message for attachments whose data exceed file size limits") guard let error = self.error else {
case .invalidData: // This method should only be called if there is an error.
return NSLocalizedString("ATTACHMENT_ERROR_INVALID_DATA", comment: "Attachment error message for attachments with invalid data") assert(false)
case .couldNotParseImage: return nil
return NSLocalizedString("ATTACHMENT_ERROR_COULD_NOT_PARSE_IMAGE", comment: "Attachment error message for image attachments which cannot be parsed")
case .couldNotConvertToJpeg:
return NSLocalizedString("ATTACHMENT_ERROR_COULD_NOT_CONVERT_TO_JPEG", comment: "Attachment error message for image attachments which could not be converted to JPEG")
case .invalidFileFormat:
return NSLocalizedString("ATTACHMENT_ERROR_INVALID_FILE_FORMAT", comment: "Attachment error message for attachments with an invalid file format")
} }
return "\(error.errorDescription)"
} }
class var missingDataErrorMessage: String { class var missingDataErrorMessage: String {
return NSLocalizedString("ATTACHMENT_ERROR_MISSING_DATA", comment: "Attachment error message for attachments without any data") return SignalAttachmentError.missingData.errorDescription
} }
// Returns the MIME type for this attachment or nil if no MIME type // Returns the MIME type for this attachment or nil if no MIME type

Write Preview
Loading…
Cancel
Save