diff --git a/Riot/AppDelegate.m b/Riot/AppDelegate.m index b0bb8f1cc..45f05303b 100644 --- a/Riot/AppDelegate.m +++ b/Riot/AppDelegate.m @@ -2919,7 +2919,7 @@ NSString *const kAppDelegateNetworkStatusDidChangeNotification = @"kAppDelegateN preferredStyle:UIAlertControllerStyleAlert]; [self.mxInAppNotification addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] - style:UIAlertActionStyleDefault + style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) { if (weakSelf) @@ -3002,7 +3002,7 @@ NSString *const kAppDelegateNetworkStatusDidChangeNotification = @"kAppDelegateN } [accountPicker addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] - style:UIAlertActionStyleDefault + style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) { if (weakSelf) diff --git a/Riot/ViewController/RecentsViewController.m b/Riot/ViewController/RecentsViewController.m index 3be4fb67d..60e64e640 100644 --- a/Riot/ViewController/RecentsViewController.m +++ b/Riot/ViewController/RecentsViewController.m @@ -1599,7 +1599,7 @@ }]]; [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] - style:UIAlertActionStyleDefault + style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) { if (weakSelf) @@ -1709,7 +1709,7 @@ }]; [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] - style:UIAlertActionStyleDefault + style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) { if (weakSelf) diff --git a/Riot/ViewController/RoomParticipantsViewController.m b/Riot/ViewController/RoomParticipantsViewController.m index 77092d4b9..4b83342aa 100644 --- a/Riot/ViewController/RoomParticipantsViewController.m +++ b/Riot/ViewController/RoomParticipantsViewController.m @@ -1358,7 +1358,7 @@ preferredStyle:UIAlertControllerStyleAlert]; [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] - style:UIAlertActionStyleDefault + style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) { if (weakSelf) @@ -1445,7 +1445,7 @@ preferredStyle:UIAlertControllerStyleAlert]; [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] - style:UIAlertActionStyleDefault + style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) { if (weakSelf) @@ -1497,7 +1497,7 @@ preferredStyle:UIAlertControllerStyleAlert]; [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] - style:UIAlertActionStyleDefault + style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) { if (weakSelf) @@ -1535,7 +1535,7 @@ preferredStyle:UIAlertControllerStyleAlert]; [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] - style:UIAlertActionStyleDefault + style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) { if (weakSelf) diff --git a/Riot/ViewController/RoomSettingsViewController.m b/Riot/ViewController/RoomSettingsViewController.m index a62b2c5c9..2aa5e8840 100644 --- a/Riot/ViewController/RoomSettingsViewController.m +++ b/Riot/ViewController/RoomSettingsViewController.m @@ -673,7 +673,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti }]]; [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] - style:UIAlertActionStyleDefault + style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) { if (weakSelf) @@ -805,7 +805,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti } [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] - style:UIAlertActionStyleDefault + style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) { if (weakSelf) @@ -1135,7 +1135,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti currentAlert = [UIAlertController alertControllerWithTitle:nil message:message preferredStyle:UIAlertControllerStyleAlert]; [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] - style:UIAlertActionStyleDefault + style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) { if (weakSelf) @@ -3143,7 +3143,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti currentAlert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"room_details_history_section_prompt_title", @"Vector", nil) message:NSLocalizedStringFromTable(@"room_details_history_section_prompt_msg", @"Vector", nil) preferredStyle:UIAlertControllerStyleAlert]; [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] - style:UIAlertActionStyleDefault + style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) { if (weakSelf) @@ -3211,7 +3211,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti currentAlert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"room_details_addresses_disable_main_address_prompt_title", @"Vector", nil) message:NSLocalizedStringFromTable(@"room_details_addresses_disable_main_address_prompt_msg", @"Vector", nil) preferredStyle:UIAlertControllerStyleAlert]; [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] - style:UIAlertActionStyleDefault + style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) { if (weakSelf) @@ -3315,7 +3315,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti preferredStyle:UIAlertControllerStyleAlert]; [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] - style:UIAlertActionStyleDefault + style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) { if (weakSelf) @@ -3410,7 +3410,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti preferredStyle:UIAlertControllerStyleAlert]; [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] - style:UIAlertActionStyleDefault + style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) { if (weakSelf) diff --git a/Riot/ViewController/RoomViewController.m b/Riot/ViewController/RoomViewController.m index a7df3799b..d8bdd27c6 100644 --- a/Riot/ViewController/RoomViewController.m +++ b/Riot/ViewController/RoomViewController.m @@ -2411,7 +2411,7 @@ }]]; - [self->currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) { + [self->currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) { if (weakSelf) { @@ -2466,7 +2466,7 @@ } [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"cancel", @"Vector", nil) - style:UIAlertActionStyleDefault + style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) { if (weakSelf) @@ -3918,7 +3918,7 @@ }]]; [currentAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedStringFromTable(@"cancel", @"Vector", nil) - style:UIAlertActionStyleDefault + style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) { if (weakSelf) @@ -4282,7 +4282,7 @@ preferredStyle:UIAlertControllerStyleAlert]; [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] - style:UIAlertActionStyleDefault + style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) { if (weakSelf) diff --git a/Riot/ViewController/SettingsViewController.m b/Riot/ViewController/SettingsViewController.m index e21f7c1f9..a854dae9a 100644 --- a/Riot/ViewController/SettingsViewController.m +++ b/Riot/ViewController/SettingsViewController.m @@ -2638,7 +2638,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)(); }]]; [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] - style:UIAlertActionStyleDefault + style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) { if (weakSelf) @@ -2705,7 +2705,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)(); currentAlert = [UIAlertController alertControllerWithTitle:NSLocalizedStringFromTable(@"settings_remove_prompt_title", @"Vector", nil) message:promptMsg preferredStyle:UIAlertControllerStyleAlert]; [currentAlert addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] - style:UIAlertActionStyleDefault + style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) { if (weakSelf) @@ -3732,7 +3732,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)(); // Cancel button [themePicker addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] - style:UIAlertActionStyleDefault + style:UIAlertActionStyleCancel handler:nil]]; UIView *fromCell = [self.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:USER_INTERFACE_THEME_INDEX inSection:SETTINGS_SECTION_USER_INTERFACE_INDEX]]; @@ -3964,7 +3964,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)(); // check if the textfields have the right value savePasswordAction.enabled = NO; - UIAlertAction* cancel = [UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) { + UIAlertAction* cancel = [UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) { if (weakSelf) { diff --git a/Riot/Views/RoomInputToolbar/RoomInputToolbarView.m b/Riot/Views/RoomInputToolbar/RoomInputToolbarView.m index eb25e3fd2..cd30b6802 100644 --- a/Riot/Views/RoomInputToolbar/RoomInputToolbarView.m +++ b/Riot/Views/RoomInputToolbar/RoomInputToolbarView.m @@ -289,7 +289,7 @@ }]]; [callActionSheet addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] - style:UIAlertActionStyleDefault + style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) { if (weakSelf) diff --git a/RiotShareExtension/Model/ShareExtensionManager.m b/RiotShareExtension/Model/ShareExtensionManager.m index be1602354..515f15842 100644 --- a/RiotShareExtension/Model/ShareExtensionManager.m +++ b/RiotShareExtension/Model/ShareExtensionManager.m @@ -442,7 +442,7 @@ typedef NS_ENUM(NSInteger, ImageCompressionMode) } [compressionPrompt addAction:[UIAlertAction actionWithTitle:[NSBundle mxk_localizedStringForKey:@"cancel"] - style:UIAlertActionStyleDefault + style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) { if (weakSelf)