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 3ecd415b84
commit ddd8c9ff5f
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File

28
Signal/src/ViewControllers/ProfileViewController.m
Unescape Escape View File

@ -225,27 +225,37 @@ NS_ASSUME_NONNULL_BEGIN
__weak ProfileViewController *weakSelf = self; __weak ProfileViewController *weakSelf = self;
// Show an activity indicator to block the UI during the profile upload. // Show an activity indicator to block the UI during the profile upload.
UIAlertController *alertController = UIAlertController *alertController = [UIAlertController
[UIAlertController alertControllerWithTitle:NSLocalizedString(@"PROFILE_VIEW_SAVING", alertControllerWithTitle:NSLocalizedString(@"PROFILE_VIEW_SAVING",
@"Indicates that the user's profile view is being saved.") @"Alert title that indicates the user's profile view is being saved.")
message:nil message:nil
preferredStyle:UIAlertControllerStyleAlert]; preferredStyle:UIAlertControllerStyleAlert];
[self presentViewController:alertController [self presentViewController:alertController
animated:YES animated:YES
completion:^{ completion:^{
[alertController dismissViewControllerAnimated:NO completion:nil];
[OWSProfileManager.sharedManager updateLocalProfileName:[self normalizedProfileName] [OWSProfileManager.sharedManager updateLocalProfileName:[self normalizedProfileName]
avatarImage:self.avatar avatarImage:self.avatar
success:^{ success:^{
[weakSelf.navigationController popViewControllerAnimated:YES]; [alertController dismissViewControllerAnimated:NO
completion:^{
[weakSelf.navigationController
popViewControllerAnimated:YES];
}];
} }
failure:^{ failure:^{
[alertController
dismissViewControllerAnimated:NO
completion:^{
[OWSAlerts [OWSAlerts
showAlertWithTitle:NSLocalizedString(@"ALERT_ERROR_TITLE", @"") showAlertWithTitle:NSLocalizedString(
message:NSLocalizedString(@"PROFILE_VIEW_ERROR_UPDATE_FAILED", @"ALERT_ERROR_TITLE", @"")
@"Error message shown when a profile update fails.")]; message:
NSLocalizedString(
@"PROFILE_VIEW_ERROR_UPDATE_FAILED",
@"Error message shown when a "
@"profile update fails.")];
}];
}]; }];
}]; }];
} }

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

@ -1081,7 +1081,7 @@
/* Label for the profile name field of the profile view. */ /* Label for the profile name field of the profile view. */
"PROFILE_VIEW_NAME_SECTION_HEADER" = "Profile Name"; "PROFILE_VIEW_NAME_SECTION_HEADER" = "Profile Name";
/* Indicates that the user's profile view is being saved. */ /* Alert title that indicates the user's profile view is being saved. */
"PROFILE_VIEW_SAVING" = "Saving..."; "PROFILE_VIEW_SAVING" = "Saving...";
/* Title for the profile view. */ /* Title for the profile view. */

Write Preview
Loading…
Cancel
Save