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

Show retryable error alert when fetching GIF fails

Browse Source 
// FREEBIE
pull/1/head
Michael Kirk 8 years ago
parent 3939e8a6ac
commit e4ad169d71
8 changed files with 54 additions and 22 deletions
Show Stats Download Patch File Download Diff File

2
Signal/src/UserInterface/Strings.swift
Unescape Escape View File

@ -11,7 +11,7 @@ import Foundation
@objc class CommonStrings: NSObject {
static let dismissButton = NSLocalizedString("DISMISS_BUTTON_TEXT", comment: "Short text to dismiss current modal / actionsheet / screen")
static let cancelButton = NSLocalizedString("TXT_CANCEL_TITLE", comment:"Label for the cancel button in an alert or action sheet.")
static let retryButton = NSLocalizedString("RETRY_BUTTON_TEXT", comment:"Generic text for button that retries whatever the last action was.")
}
@objc class MessageStrings: NSObject {

13
Signal/src/ViewControllers/FingerprintViewScanController.m
Unescape Escape View File

@ -239,14 +239,11 @@ NS_ASSUME_NONNULL_BEGIN
preferredStyle:UIAlertControllerStyleAlert];
if (retryBlock) {
[alertController
addAction:[UIAlertAction
actionWithTitle:NSLocalizedString(@"RETRY_BUTTON_TEXT",
@"Generic text for button that retries whatever the last action was.")
style:UIAlertActionStyleDefault
handler:^(UIAlertAction *action) {
retryBlock();
}]];
[alertController addAction:[UIAlertAction actionWithTitle:[CommonStrings retryButton]
style:UIAlertActionStyleDefault
handler:^(UIAlertAction *action) {
retryBlock();
}]];
}
[alertController addAction:[OWSAlerts cancelAction]];

10
Signal/src/ViewControllers/GifPicker/GifPickerCell.swift
Unescape Escape View File

@ -9,10 +9,6 @@ class GifPickerCell: UICollectionViewCell {
let TAG = "[GifPickerCell]"
// MARK: Properties
enum GifPickerCellError: Error {
case assertionError(description: String)
case fetchFailure
}
var imageInfo: GiphyImageInfo? {
didSet {
@ -211,7 +207,7 @@ class GifPickerCell: UICollectionViewCell {
public func requestRenditionForSending() -> Promise<GiphyAsset> {
guard let renditionForSending = self.renditionForSending else {
owsFail("\(TAG) renditionForSending was unexpectedly nil")
return Promise(error: GifPickerCellError.assertionError(description: "renditionForSending was unexpectedly nil"))
return Promise(error: GiphyError.assertionError(description: "renditionForSending was unexpectedly nil"))
}
let (promise, fulfill, reject) = Promise<GiphyAsset>.pending()
@ -227,8 +223,8 @@ class GifPickerCell: UICollectionViewCell {
failure: { _ in
// TODO GiphyDownloader API shoudl pass through a useful failing error
// so we can pass it through here
reject(GifPickerCellError.fetchFailure)
Logger.error("\(self.TAG) request failed")
reject(GiphyError.fetchFailure)
})
return promise

17
Signal/src/ViewControllers/GifPicker/GifPickerViewController.swift
Unescape Escape View File

@ -333,6 +333,10 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect
self.collectionView.isUserInteractionEnabled = false
getFileForCell(cell)
}
public func getFileForCell(_ cell: GifPickerCell) {
GiphyDownloader.sharedInstance.cancelAllRequests()
cell.requestRenditionForSending().then { (asset: GiphyAsset) -> Void in
let filePath = asset.filePath
@ -349,7 +353,20 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect
self.delegate?.gifPickerDidSend(outgoingMessage: outgoingMessage)
self.dismiss(animated: true, completion: nil)
}.catch { error in
let alert = UIAlertController(title: NSLocalizedString("GIF_PICKER_FAILURE_ALERT_TITLE", comment: "Shown when selected gif couldn't be fetched"),
message: error.localizedDescription,
preferredStyle: .alert)
alert.addAction(UIAlertAction(title: CommonStrings.retryButton, style: .default) { _ in
self.getFileForCell(cell)
})
alert.addAction(UIAlertAction(title: CommonStrings.dismissButton, style: .cancel) { _ in
self.dismiss(animated: true, completion: nil)
})
UIApplication.shared.frontmostViewController?.present(alert, animated: true, completion: nil)
}.retainUntilComplete()
}
public func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {

2
Signal/src/ViewControllers/OWSLinkDeviceViewController.m
Unescape Escape View File

@ -185,7 +185,7 @@ NS_ASSUME_NONNULL_BEGIN
message:error.localizedDescription
preferredStyle:UIAlertControllerStyleAlert];
UIAlertAction *retryAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"RETRY_BUTTON_TEXT", nil)
UIAlertAction *retryAction = [UIAlertAction actionWithTitle:[CommonStrings retryButton]
style:UIAlertActionStyleDefault
handler:^(UIAlertAction *action) {
retryBlock();

6
Signal/src/ViewControllers/OWSLinkedDevicesTableViewController.m
Unescape Escape View File

@ -158,9 +158,7 @@ int const OWSLinkedDevicesTableViewControllerSectionAddDevice = 1;
message:error.localizedDescription
preferredStyle:UIAlertControllerStyleAlert];
NSString *retryTitle = NSLocalizedString(
@"RETRY_BUTTON_TEXT", @"Generic text for button that retries whatever the last action was.");
UIAlertAction *retryAction = [UIAlertAction actionWithTitle:retryTitle
UIAlertAction *retryAction = [UIAlertAction actionWithTitle:[CommonStrings retryButton]
style:UIAlertActionStyleDefault
handler:^(UIAlertAction *action) {
[wself refreshDevices];
@ -368,7 +366,7 @@ int const OWSLinkedDevicesTableViewControllerSectionAddDevice = 1;
preferredStyle:UIAlertControllerStyleAlert];
UIAlertAction *retryAction =
[UIAlertAction actionWithTitle:NSLocalizedString(@"RETRY_BUTTON_TEXT", nil)
[UIAlertAction actionWithTitle:[CommonStrings retryButton]
style:UIAlertActionStyleDefault
handler:^(UIAlertAction *aaction) {
[self unlinkDevice:device success:successCallback];

15
Signal/src/network/GiphyAPI.swift
Unescape Escape View File

@ -9,6 +9,21 @@ enum GiphyFormat {
case gif, mp4, jpg
}
enum GiphyError: Error {
case assertionError(description: String)
case fetchFailure
}
extension GiphyError: LocalizedError {
public var errorDescription: String? {
switch self {
case .assertionError:
return NSLocalizedString("GIF_PICKER_ERROR_GENERIC", comment: "Generic error displayed when picking a gif")
case .fetchFailure:
return NSLocalizedString("GIF_PICKER_ERROR_FETCH_FAILURE", comment: "Error displayed when there is a failure fetching gifs from the remote service.")
}
}
}
// Represents a "rendition" of a GIF.
// Giphy offers a plethora of renditions for each image.
// They vary in content size (i.e. width, height),

11
Signal/translations/en.lproj/Localizable.strings
Unescape Escape View File

@ -613,6 +613,15 @@
/* A label for generic attachments. */
"GENERIC_ATTACHMENT_LABEL" = "Attachment";
/* Error displayed when there is a failure fetching gifs from the remote service. */
"GIF_PICKER_ERROR_FETCH_FAILURE" = "Failed to fetch the requested GIF. Please verify you are online.";
/* Generic error displayed when picking a gif */
"GIF_PICKER_ERROR_GENERIC" = "An unknown error occured.";
/* Shown when selected gif couldn't be fetched */
"GIF_PICKER_FAILURE_ALERT_TITLE" = "Unable to Choose GIF";
/* Alert message shown when user tries to search for GIFs without entering any search terms. */
"GIF_PICKER_VIEW_MISSING_QUERY" = "Please enter your search.";
@ -985,7 +994,7 @@
/* The title for the 'create group' button. */
"NEW_GROUP_CREATE_BUTTON" = "Create";
/* The navbar title for the 'new group' view. */
/* Used in place of the group name when a group has not yet been named. */
"NEW_GROUP_DEFAULT_TITLE" = "New Group";
/* An indicator that a user is a member of the new group. */

Write Preview
Loading…
Cancel
Save