From d6e884924804880094481170d22108d300bfa5db Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 27 Sep 2017 16:57:02 -0400 Subject: [PATCH] Rework "send read receipts" setting. // FREEBIE --- .../PrivacySettingsTableViewController.m | 20 +++++++++---------- .../translations/en.lproj/Localizable.strings | 2 +- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Signal/src/ViewControllers/PrivacySettingsTableViewController.m b/Signal/src/ViewControllers/PrivacySettingsTableViewController.m index 8f7e0d61d..8ebba2a91 100644 --- a/Signal/src/ViewControllers/PrivacySettingsTableViewController.m +++ b/Signal/src/ViewControllers/PrivacySettingsTableViewController.m @@ -46,18 +46,7 @@ NS_ASSUME_NONNULL_BEGIN }], ]]]; - OWSTableSection *screenSecuritySection = [OWSTableSection new]; - screenSecuritySection.headerTitle = NSLocalizedString(@"SETTINGS_SECURITY_TITLE", @"Section header"); - screenSecuritySection.footerTitle = NSLocalizedString(@"SETTINGS_SCREEN_SECURITY_DETAIL", nil); - [screenSecuritySection addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_SCREEN_SECURITY", @"") - isOn:[Environment.preferences screenSecurityIsEnabled] - target:weakSelf - selector:@selector(didToggleScreenSecuritySwitch:)]]; - [contents addSection:screenSecuritySection]; - OWSTableSection *readReceiptsSection = [OWSTableSection new]; - readReceiptsSection.headerTitle - = NSLocalizedString(@"SETTINGS_READ_RECEIPTS_SECTION_TITLE", @"Title of the 'read receipts' settings section."); readReceiptsSection.footerTitle = NSLocalizedString( @"SETTINGS_READ_RECEIPTS_SECTION_FOOTER", @"An explanation of the 'read receipts' setting."); [readReceiptsSection @@ -68,6 +57,15 @@ NS_ASSUME_NONNULL_BEGIN selector:@selector(didToggleReadReceiptsSwitch:)]]; [contents addSection:readReceiptsSection]; + OWSTableSection *screenSecuritySection = [OWSTableSection new]; + screenSecuritySection.headerTitle = NSLocalizedString(@"SETTINGS_SECURITY_TITLE", @"Section header"); + screenSecuritySection.footerTitle = NSLocalizedString(@"SETTINGS_SCREEN_SECURITY_DETAIL", nil); + [screenSecuritySection addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_SCREEN_SECURITY", @"") + isOn:[Environment.preferences screenSecurityIsEnabled] + target:weakSelf + selector:@selector(didToggleScreenSecuritySwitch:)]]; + [contents addSection:screenSecuritySection]; + // Allow calls to connect directly vs. using TURN exclusively OWSTableSection *callingSection = [OWSTableSection new]; callingSection.headerTitle diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index f05cb7016..ad7a00a46 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -1437,7 +1437,7 @@ "SETTINGS_PRIVACY_TITLE" = "Privacy"; /* Label for the 'read receipts' setting. */ -"SETTINGS_READ_RECEIPT" = "Send Read Receipts"; +"SETTINGS_READ_RECEIPT" = "Read Receipts"; /* An explanation of the 'read receipts' setting. */ "SETTINGS_READ_RECEIPTS_SECTION_FOOTER" = "Read receipts let you see when others have read your message - and let them see when you have read their messages.";