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 34a7f9cba5
commit b47337c0ba
8 changed files with 72 additions and 87 deletions
Show Stats Download Patch File Download Diff File

63
Signal/src/AppDelegate.m
Unescape Escape View File

@ -270,25 +270,23 @@ static NSString *const kURLHostVerifyPrefix = @"verify";
NSString *filename = url.lastPathComponent; NSString *filename = url.lastPathComponent;
if ([filename stringByDeletingPathExtension].length < 1) { if ([filename stringByDeletingPathExtension].length < 1) {
DDLogError(@"Application opened with URL invalid filename: %@", url); DDLogError(@"Application opened with URL invalid filename: %@", url);
[ViewControllerUtils [OWSAlerts showAlertWithTitle:
showAlertWithTitle: NSLocalizedString(@"EXPORT_WITH_SIGNAL_ERROR_TITLE",
NSLocalizedString(@"EXPORT_WITH_SIGNAL_ERROR_TITLE", @"Title for the alert indicating the 'export with signal' attachment had an error.")
@"Title for the alert indicating the 'export with signal' attachment had an error.") message:NSLocalizedString(@"EXPORT_WITH_SIGNAL_ERROR_MESSAGE_INVALID_FILENAME",
message:NSLocalizedString(@"EXPORT_WITH_SIGNAL_ERROR_MESSAGE_INVALID_FILENAME", @"Message for the alert indicating the 'export with signal' file had an "
@"Message for the alert indicating the 'export with signal' file had an " @"invalid filename.")];
@"invalid filename.")];
return NO; return NO;
} }
NSString *fileExtension = [filename pathExtension]; NSString *fileExtension = [filename pathExtension];
if (fileExtension.length < 1) { if (fileExtension.length < 1) {
DDLogError(@"Application opened with URL missing file extension: %@", url); DDLogError(@"Application opened with URL missing file extension: %@", url);
[ViewControllerUtils [OWSAlerts showAlertWithTitle:
showAlertWithTitle: NSLocalizedString(@"EXPORT_WITH_SIGNAL_ERROR_TITLE",
NSLocalizedString(@"EXPORT_WITH_SIGNAL_ERROR_TITLE", @"Title for the alert indicating the 'export with signal' attachment had an error.")
@"Title for the alert indicating the 'export with signal' attachment had an error.") message:NSLocalizedString(@"EXPORT_WITH_SIGNAL_ERROR_MESSAGE_UNKNOWN_TYPE",
message:NSLocalizedString(@"EXPORT_WITH_SIGNAL_ERROR_MESSAGE_UNKNOWN_TYPE", @"Message for the alert indicating the 'export with signal' file had "
@"Message for the alert indicating the 'export with signal' file had " @"unknown type.")];
@"unknown type.")];
return NO; return NO;
} }
@ -320,7 +318,7 @@ static NSString *const kURLHostVerifyPrefix = @"verify";
} else if ([isDirectory boolValue]) { } else if ([isDirectory boolValue]) {
DDLogInfo(@"%@ User picked directory at url: %@", self.tag, url); DDLogInfo(@"%@ User picked directory at url: %@", self.tag, url);
DDLogError(@"Application opened with URL of unknown UTI type: %@", url); DDLogError(@"Application opened with URL of unknown UTI type: %@", url);
[ViewControllerUtils [OWSAlerts
showAlertWithTitle: showAlertWithTitle:
NSLocalizedString(@"ATTACHMENT_PICKER_DOCUMENTS_PICKED_DIRECTORY_FAILED_ALERT_TITLE", NSLocalizedString(@"ATTACHMENT_PICKER_DOCUMENTS_PICKED_DIRECTORY_FAILED_ALERT_TITLE",
@"Alert title when picking a document fails because user picked a directory/bundle") @"Alert title when picking a document fails because user picked a directory/bundle")
@ -333,34 +331,31 @@ static NSString *const kURLHostVerifyPrefix = @"verify";
NSData *data = [NSData dataWithContentsOfURL:url]; NSData *data = [NSData dataWithContentsOfURL:url];
if (!data) { if (!data) {
DDLogError(@"Application opened with URL with unloadable content: %@", url); DDLogError(@"Application opened with URL with unloadable content: %@", url);
[ViewControllerUtils [OWSAlerts showAlertWithTitle:
showAlertWithTitle: NSLocalizedString(@"EXPORT_WITH_SIGNAL_ERROR_TITLE",
NSLocalizedString(@"EXPORT_WITH_SIGNAL_ERROR_TITLE", @"Title for the alert indicating the 'export with signal' attachment had an error.")
@"Title for the alert indicating the 'export with signal' attachment had an error.") message:NSLocalizedString(@"EXPORT_WITH_SIGNAL_ERROR_MESSAGE_MISSING_DATA",
message:NSLocalizedString(@"EXPORT_WITH_SIGNAL_ERROR_MESSAGE_MISSING_DATA", @"Message for the alert indicating the 'export with signal' data "
@"Message for the alert indicating the 'export with signal' data " @"couldn't be loaded.")];
@"couldn't be loaded.")];
return NO; return NO;
} }
SignalAttachment *attachment = [SignalAttachment attachmentWithData:data dataUTI:utiType filename:filename]; SignalAttachment *attachment = [SignalAttachment attachmentWithData:data dataUTI:utiType filename:filename];
if (!attachment) { if (!attachment) {
DDLogError(@"Application opened with URL with invalid content: %@", url); DDLogError(@"Application opened with URL with invalid content: %@", url);
[ViewControllerUtils [OWSAlerts showAlertWithTitle:
showAlertWithTitle: NSLocalizedString(@"EXPORT_WITH_SIGNAL_ERROR_TITLE",
NSLocalizedString(@"EXPORT_WITH_SIGNAL_ERROR_TITLE", @"Title for the alert indicating the 'export with signal' attachment had an error.")
@"Title for the alert indicating the 'export with signal' attachment had an error.") message:NSLocalizedString(@"EXPORT_WITH_SIGNAL_ERROR_MESSAGE_MISSING_ATTACHMENT",
message:NSLocalizedString(@"EXPORT_WITH_SIGNAL_ERROR_MESSAGE_MISSING_ATTACHMENT", @"Message for the alert indicating the 'export with signal' attachment "
@"Message for the alert indicating the 'export with signal' attachment " @"couldn't be loaded.")];
@"couldn't be loaded.")];
return NO; return NO;
} }
if ([attachment hasError]) { if ([attachment hasError]) {
DDLogError(@"Application opened with URL with content error: %@ %@", url, [attachment errorName]); DDLogError(@"Application opened with URL with content error: %@ %@", url, [attachment errorName]);
[ViewControllerUtils [OWSAlerts showAlertWithTitle:
showAlertWithTitle: NSLocalizedString(@"EXPORT_WITH_SIGNAL_ERROR_TITLE",
NSLocalizedString(@"EXPORT_WITH_SIGNAL_ERROR_TITLE", @"Title for the alert indicating the 'export with signal' attachment had an error.")
@"Title for the alert indicating the 'export with signal' attachment had an error.") message:[attachment errorName]];
message:[attachment errorName]];
return NO; return NO;
} }
DDLogInfo(@"Application opened with URL: %@", url); DDLogInfo(@"Application opened with URL: %@", url);

31
Signal/src/ViewControllers/MessagesViewController.m
Unescape Escape View File

@ -207,7 +207,7 @@ typedef enum : NSUInteger {
forState:UIControlStateNormal]; forState:UIControlStateNormal];
button.imageView.tintColor = [UIColor ows_materialBlueColor]; button.imageView.tintColor = [UIColor ows_materialBlueColor];
// We want to be permissive about the voice memo gesture, so we: // We want to be permissive about the voice message gesture, so we:
// //
// * Add the gesture recognizer to the button's superview instead of the button. // * Add the gesture recognizer to the button's superview instead of the button.
// * Filter the touches that the gesture recognizer receives by serving as its // * Filter the touches that the gesture recognizer receives by serving as its
@ -269,18 +269,18 @@ typedef enum : NSUInteger {
case UIGestureRecognizerStateCancelled: case UIGestureRecognizerStateCancelled:
case UIGestureRecognizerStateFailed: case UIGestureRecognizerStateFailed:
if (self.isRecordingVoiceMemo) { if (self.isRecordingVoiceMemo) {
// Cancel voice memo if necessary. // Cancel voice message if necessary.
self.isRecordingVoiceMemo = NO; self.isRecordingVoiceMemo = NO;
[self.delegate voiceMemoGestureDidCancel]; [self.delegate voiceMemoGestureDidCancel];
} }
break; break;
case UIGestureRecognizerStateBegan: case UIGestureRecognizerStateBegan:
if (self.isRecordingVoiceMemo) { if (self.isRecordingVoiceMemo) {
// Cancel voice memo if necessary. // Cancel voice message if necessary.
self.isRecordingVoiceMemo = NO; self.isRecordingVoiceMemo = NO;
[self.delegate voiceMemoGestureDidCancel]; [self.delegate voiceMemoGestureDidCancel];
} }
// Start voice memo. // Start voice message.
[self.textView resignFirstResponder]; [self.textView resignFirstResponder];
self.isRecordingVoiceMemo = YES; self.isRecordingVoiceMemo = YES;
self.voiceMemoGestureStartLocation = [sender locationInView:self]; self.voiceMemoGestureStartLocation = [sender locationInView:self];
@ -306,7 +306,7 @@ typedef enum : NSUInteger {
break; break;
case UIGestureRecognizerStateEnded: case UIGestureRecognizerStateEnded:
if (self.isRecordingVoiceMemo) { if (self.isRecordingVoiceMemo) {
// End voice memo. // End voice message.
self.isRecordingVoiceMemo = NO; self.isRecordingVoiceMemo = NO;
[self.delegate voiceMemoGestureDidEnd]; [self.delegate voiceMemoGestureDidEnd];
} }
@ -325,7 +325,7 @@ typedef enum : NSUInteger {
- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch
{ {
// We want to be permissive about the voice memo gesture, so we accept // We want to be permissive about the voice message gesture, so we accept
// gesture that begin within N points of the // gesture that begin within N points of the
CGFloat kVoiceMemoGestureTolerancePoints = 10; CGFloat kVoiceMemoGestureTolerancePoints = 10;
CGPoint location = [touch locationInView:self.voiceMemoButton]; CGPoint location = [touch locationInView:self.voiceMemoButton];
@ -399,7 +399,8 @@ typedef enum : NSUInteger {
UILabel *cancelLabel = [UILabel new]; UILabel *cancelLabel = [UILabel new];
cancelLabel.textColor = [UIColor ows_destructiveRedColor]; cancelLabel.textColor = [UIColor ows_destructiveRedColor];
cancelLabel.font = [UIFont ows_mediumFontWithSize:14.f]; cancelLabel.font = [UIFont ows_mediumFontWithSize:14.f];
cancelLabel.text = NSLocalizedString(@"VOICE_MEMO_CANCEL_INSTRUCTIONS", @"Indicates how to cancel a voice memo."); cancelLabel.text
= NSLocalizedString(@"VOICE_MESSAGE_CANCEL_INSTRUCTIONS", @"Indicates how to cancel a voice message.");
[self.voiceMemoUI addSubview:cancelLabel]; [self.voiceMemoUI addSubview:cancelLabel];
[imageView autoVCenterInSuperview]; [imageView autoVCenterInSuperview];
@ -484,7 +485,7 @@ typedef enum : NSUInteger {
{ {
OWSAssert([NSThread isMainThread]); OWSAssert([NSThread isMainThread]);
// Fade out the voice memo views as the cancel gesture // Fade out the voice message views as the cancel gesture
// proceeds as feedback. // proceeds as feedback.
for (UIView *subview in self.voiceMemoUI.subviews) { for (UIView *subview in self.voiceMemoUI.subviews) {
subview.layer.opacity = MAX(0.f, MIN(1.f, 1.f - (float)cancelAlpha)); subview.layer.opacity = MAX(0.f, MIN(1.f, 1.f - (float)cancelAlpha));
@ -3132,8 +3133,16 @@ typedef enum : NSUInteger {
const NSTimeInterval kMinimumRecordingTimeSeconds = 1.f; const NSTimeInterval kMinimumRecordingTimeSeconds = 1.f;
if (currentTime < kMinimumRecordingTimeSeconds) { if (currentTime < kMinimumRecordingTimeSeconds) {
DDLogInfo(@"Discarding voice memo; too short."); DDLogInfo(@"Discarding voice message; too short.");
self.audioRecorder = nil; self.audioRecorder = nil;
[OWSAlerts
showAlertWithTitle:
NSLocalizedString(@"VOICE_MESSAGE_TOO_SHORT_ALERT_TITLE",
@"Title for the alert indicating the 'voice message' needs to be held to be held down to record.")
message:NSLocalizedString(@"VOICE_MESSAGE_TOO_SHORT_ALERT_MESSAGE",
@"Message for the alert indicating the 'voice message' needs to be held to be held "
@"down to record.")];
return; return;
} }
@ -3148,7 +3157,7 @@ typedef enum : NSUInteger {
self.audioRecorder = nil; self.audioRecorder = nil;
NSString *filename = [NSLocalizedString(@"VOICE_MEMO_FILE_NAME", @"Filename for voice memos.") NSString *filename = [NSLocalizedString(@"VOICE_MESSAGE_FILE_NAME", @"Filename for voice messages.")
stringByAppendingPathExtension:[MIMETypeUtil fileExtensionForUTIType:(NSString *)kUTTypeMPEG4Audio]]; stringByAppendingPathExtension:[MIMETypeUtil fileExtensionForUTIType:(NSString *)kUTTypeMPEG4Audio]];
SignalAttachment *attachment = SignalAttachment *attachment =
@ -3524,7 +3533,7 @@ typedef enum : NSUInteger {
{ {
// Override. // Override.
// //
// We want to show the "voice memo" button if the text input is empty // We want to show the "voice message" button if the text input is empty
// and the "send" button if it isn't. // and the "send" button if it isn't.
[((OWSMessagesToolbarContentView *)self.inputToolbar.contentView)ensureEnabling]; [((OWSMessagesToolbarContentView *)self.inputToolbar.contentView)ensureEnabling];
} }

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

@ -310,7 +310,7 @@ NSString *const kSelectRecipientViewControllerCellIdentifier = @"kSelectRecipien
} }
[activityAlert dismissViewControllerAnimated:NO [activityAlert dismissViewControllerAnimated:NO
completion:^{ completion:^{
[ViewControllerUtils [OWSAlerts
showAlertWithTitle:NSLocalizedString(@"ALERT_ERROR_TITLE", showAlertWithTitle:NSLocalizedString(@"ALERT_ERROR_TITLE",
@"Title for a generic error alert.") @"Title for a generic error alert.")
message:error.localizedDescription]; message:error.localizedDescription];

3
Signal/src/ViewControllers/UpdateGroupViewController.m
Unescape Escape View File

@ -12,6 +12,7 @@
#import "OWSContactsManager.h" #import "OWSContactsManager.h"
#import "OWSTableViewController.h" #import "OWSTableViewController.h"
#import "SecurityUtils.h" #import "SecurityUtils.h"
#import "Signal-Swift.h"
#import "SignalKeyingStorage.h" #import "SignalKeyingStorage.h"
#import "TSOutgoingMessage.h" #import "TSOutgoingMessage.h"
#import "UIUtil.h" #import "UIUtil.h"
@ -307,7 +308,7 @@ NS_ASSUME_NONNULL_BEGIN
[weakSelf showUnblockAlertForRecipientId:recipientId]; [weakSelf showUnblockAlertForRecipientId:recipientId];
} }
} else { } else {
[ViewControllerUtils [OWSAlerts
showAlertWithTitle: showAlertWithTitle:
NSLocalizedString(@"UPDATE_GROUP_CANT_REMOVE_MEMBERS_ALERT_TITLE", NSLocalizedString(@"UPDATE_GROUP_CANT_REMOVE_MEMBERS_ALERT_TITLE",
@"Title for alert indicating that group members can't be removed.") @"Title for alert indicating that group members can't be removed.")

8
Signal/src/ViewControllers/ViewControllerUtils.h
Unescape Escape View File

@ -22,12 +22,4 @@
+ (NSString *)formatDurationSeconds:(long)timeSeconds; + (NSString *)formatDurationSeconds:(long)timeSeconds;
#pragma mark - Alerts
+ (UIAlertController *)showAlertWithTitle:(NSString *)title message:(NSString *)message;
+ (UIAlertController *)showAlertWithTitle:(NSString *)title
message:(NSString *)message
buttonLabel:(NSString *)buttonLabel;
@end @end

24
Signal/src/ViewControllers/ViewControllerUtils.m
Unescape Escape View File

@ -115,30 +115,6 @@ NS_ASSUME_NONNULL_BEGIN
} }
} }
#pragma mark - Alerts
+ (UIAlertController *)showAlertWithTitle:(NSString *)title message:(NSString *)message
{
return [self showAlertWithTitle:title message:message buttonLabel:NSLocalizedString(@"OK", nil)];
}
+ (UIAlertController *)showAlertWithTitle:(NSString *)title
message:(NSString *)message
buttonLabel:(NSString *)buttonLabel
{
OWSAssert(title.length > 0);
OWSAssert(message.length > 0);
UIAlertController *alert =
[UIAlertController alertControllerWithTitle:title message:message preferredStyle:UIAlertControllerStyleAlert];
[alert addAction:[UIAlertAction actionWithTitle:buttonLabel style:UIAlertActionStyleDefault handler:nil]];
[[UIApplication sharedApplication].frontmostViewController presentViewController:alert animated:YES completion:nil];
return alert;
}
#pragma mark - Logging #pragma mark - Logging
+ (NSString *)tag + (NSString *)tag

12
Signal/src/views/OWSAlerts.swift
Unescape Escape View File

@ -22,4 +22,16 @@ import Foundation
alertController.addAction(settingsAction) alertController.addAction(settingsAction)
UIApplication.shared.frontmostViewController?.present(alertController, animated: true, completion: nil) UIApplication.shared.frontmostViewController?.present(alertController, animated: true, completion: nil)
} }
public class func showAlert(withTitle title: String, message: String) {
self.showAlert(withTitle: title, message: message, buttonLabel: NSLocalizedString("OK", comment: ""))
}
public class func showAlert(withTitle title: String, message: String, buttonLabel: String) {
assert(title.characters.count > 0)
assert(message.characters.count > 0)
let alert = UIAlertController(title: title, message: message, preferredStyle: .alert)
alert.addAction(UIAlertAction(title: buttonLabel, style: .default, handler: nil))
UIApplication.shared.frontmostViewController?.present(alert, animated: true, completion: nil)
}
} }

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

@ -1277,17 +1277,17 @@
/* table cell label in conversation settings */ /* table cell label in conversation settings */
"VERIFY_PRIVACY" = "Verify Safety Number"; "VERIFY_PRIVACY" = "Verify Safety Number";
/* Indicates how to cancel a voice memo. */ /* Indicates how to cancel a voice message. */
"VOICE_MEMO_CANCEL_INSTRUCTIONS" = "Slide to Cancel"; "VOICE_MESSAGE_CANCEL_INSTRUCTIONS" = "Slide to Cancel";
/* Filename for voice memos. */ /* Filename for voice messages. */
"VOICE_MEMO_FILE_NAME" = "Voice Memo"; "VOICE_MESSAGE_FILE_NAME" = "Voice Message";
/* Message of the 'voice memo needs recording permission' alert. */ /* Message for the alert indicating the 'voice message' needs to be held to be held down to record. */
"VOICE_MEMO_NEEDS_RECORDING_PERMISSION_ALERT_MESSAGE" = "You can grant Signal access to your microphone in the Settings App >> Privacy >> Microphone >> Signal."; "VOICE_MESSAGE_TOO_SHORT_ALERT_MESSAGE" = "Tap and hold to record a voice message.";
/* Title of the 'voice memo needs recording permission' alert. */ /* Title for the alert indicating the 'voice message' needs to be held to be held down to record. */
"VOICE_MEMO_NEEDS_RECORDING_PERMISSION_ALERT_TITLE" = "Can't Record"; "VOICE_MESSAGE_TOO_SHORT_ALERT_TITLE" = "Voice Message";
/* Activity indicator title, shown upon returning to the device manager, until you complete the provisioning process on desktop */ /* Activity indicator title, shown upon returning to the device manager, until you complete the provisioning process on desktop */
"WAITING_TO_COMPLETE_DEVICE_LINK_TEXT" = "Complete setup on Signal Desktop."; "WAITING_TO_COMPLETE_DEVICE_LINK_TEXT" = "Complete setup on Signal Desktop.";

Write Preview
Loading…
Cancel
Save