From 282ac4bb29f5a52b72e6f02ddaba33d8d6119f20 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 1 Aug 2017 16:16:33 -0400 Subject: [PATCH] =?UTF-8?q?Add=20=E2=80=9Cshare=20profile=E2=80=9D=20row?= =?UTF-8?q?=20to=20conversation=20settings.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit // FREEBIE --- Signal.xcodeproj/project.pbxproj | 12 +- .../Contents.json | 23 ++++ .../table_ic_share_profile@1x.png | Bin 0 -> 1728 bytes .../table_ic_share_profile@2x.png | Bin 0 -> 2551 bytes .../table_ic_share_profile@3x.png | Bin 0 -> 3325 bytes .../ConversationView/MessagesViewController.m | 4 +- ...> OWSConversationSettingsViewController.h} | 2 +- ...> OWSConversationSettingsViewController.m} | 124 +++++++++++++++--- .../translations/en.lproj/Localizable.strings | 15 +++ 9 files changed, 156 insertions(+), 24 deletions(-) create mode 100644 Signal/Images.xcassets/table_ic_share_profile.imageset/Contents.json create mode 100644 Signal/Images.xcassets/table_ic_share_profile.imageset/table_ic_share_profile@1x.png create mode 100644 Signal/Images.xcassets/table_ic_share_profile.imageset/table_ic_share_profile@2x.png create mode 100644 Signal/Images.xcassets/table_ic_share_profile.imageset/table_ic_share_profile@3x.png rename Signal/src/ViewControllers/{OWSConversationSettingsTableViewController.h => OWSConversationSettingsViewController.h} (85%) rename Signal/src/ViewControllers/{OWSConversationSettingsTableViewController.m => OWSConversationSettingsViewController.m} (90%) diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 21e816027..4213a5b75 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -58,7 +58,7 @@ 34B3F8861E8DF1700035BE1A /* NotificationSettingsOptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F8571E8DF1700035BE1A /* NotificationSettingsOptionsViewController.m */; }; 34B3F8871E8DF1700035BE1A /* NotificationSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F8591E8DF1700035BE1A /* NotificationSettingsViewController.m */; }; 34B3F8881E8DF1700035BE1A /* OversizeTextMessageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F85A1E8DF1700035BE1A /* OversizeTextMessageViewController.swift */; }; - 34B3F8891E8DF1700035BE1A /* OWSConversationSettingsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F85C1E8DF1700035BE1A /* OWSConversationSettingsTableViewController.m */; }; + 34B3F8891E8DF1700035BE1A /* OWSConversationSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F85C1E8DF1700035BE1A /* OWSConversationSettingsViewController.m */; }; 34B3F88A1E8DF1700035BE1A /* OWSLinkDeviceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F85E1E8DF1700035BE1A /* OWSLinkDeviceViewController.m */; }; 34B3F88B1E8DF1700035BE1A /* OWSLinkedDevicesTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F8601E8DF1700035BE1A /* OWSLinkedDevicesTableViewController.m */; }; 34B3F88C1E8DF1700035BE1A /* OWSMessagesToolbarContentView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34B3F8611E8DF1700035BE1A /* OWSMessagesToolbarContentView.xib */; }; @@ -471,8 +471,8 @@ 34B3F8581E8DF1700035BE1A /* NotificationSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotificationSettingsViewController.h; sourceTree = ""; }; 34B3F8591E8DF1700035BE1A /* NotificationSettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NotificationSettingsViewController.m; sourceTree = ""; }; 34B3F85A1E8DF1700035BE1A /* OversizeTextMessageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OversizeTextMessageViewController.swift; sourceTree = ""; }; - 34B3F85B1E8DF1700035BE1A /* OWSConversationSettingsTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSConversationSettingsTableViewController.h; sourceTree = ""; }; - 34B3F85C1E8DF1700035BE1A /* OWSConversationSettingsTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSConversationSettingsTableViewController.m; sourceTree = ""; }; + 34B3F85B1E8DF1700035BE1A /* OWSConversationSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSConversationSettingsViewController.h; sourceTree = ""; }; + 34B3F85C1E8DF1700035BE1A /* OWSConversationSettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSConversationSettingsViewController.m; sourceTree = ""; }; 34B3F85D1E8DF1700035BE1A /* OWSLinkDeviceViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSLinkDeviceViewController.h; sourceTree = ""; }; 34B3F85E1E8DF1700035BE1A /* OWSLinkDeviceViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSLinkDeviceViewController.m; sourceTree = ""; }; 34B3F85F1E8DF1700035BE1A /* OWSLinkedDevicesTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSLinkedDevicesTableViewController.h; sourceTree = ""; }; @@ -1004,8 +1004,8 @@ 34CCAF3A1F0C2748004084F4 /* OWSAddToContactViewController.m */, 34533F161EA8D2070006114F /* OWSAudioAttachmentPlayer.h */, 34533F171EA8D2070006114F /* OWSAudioAttachmentPlayer.m */, - 34B3F85B1E8DF1700035BE1A /* OWSConversationSettingsTableViewController.h */, - 34B3F85C1E8DF1700035BE1A /* OWSConversationSettingsTableViewController.m */, + 34B3F85B1E8DF1700035BE1A /* OWSConversationSettingsViewController.h */, + 34B3F85C1E8DF1700035BE1A /* OWSConversationSettingsViewController.m */, 34D5CCAB1EAE7136005515DB /* OWSConversationSettingsViewDelegate.h */, 3497DBEA1ECE257500DB2605 /* OWSCountryMetadata.h */, 3497DBEB1ECE257500DB2605 /* OWSCountryMetadata.m */, @@ -2283,7 +2283,7 @@ 4574A5D61DD6704700C6B692 /* CallService.swift in Sources */, 34B3F8721E8DF1700035BE1A /* AdvancedSettingsTableViewController.m in Sources */, 45F170D61E315310003FC1F2 /* Weak.swift in Sources */, - 34B3F8891E8DF1700035BE1A /* OWSConversationSettingsTableViewController.m in Sources */, + 34B3F8891E8DF1700035BE1A /* OWSConversationSettingsViewController.m in Sources */, 34B3F87E1E8DF1700035BE1A /* InboxTableViewCell.m in Sources */, 34B3F8731E8DF1700035BE1A /* AttachmentApprovalViewController.swift in Sources */, B6B1013C196D213F007E3930 /* SignalKeyingStorage.m in Sources */, diff --git a/Signal/Images.xcassets/table_ic_share_profile.imageset/Contents.json b/Signal/Images.xcassets/table_ic_share_profile.imageset/Contents.json new file mode 100644 index 000000000..bc0302b0a --- /dev/null +++ b/Signal/Images.xcassets/table_ic_share_profile.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "table_ic_share_profile@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "table_ic_share_profile@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "table_ic_share_profile@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/table_ic_share_profile.imageset/table_ic_share_profile@1x.png b/Signal/Images.xcassets/table_ic_share_profile.imageset/table_ic_share_profile@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..768c27dfc5ef0e279287a13a16fd42d2053098c8 GIT binary patch literal 1728 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}oCO|{#S9GG z!XV7ZFl&wk0|SdvW=KRygs+cPa(=E}VoH8es$NBI0Z=sqgH44MkeQoWlBiITo0C^; zRbi_HR$&EXgM{^!6u?SKvTcwsYk*NEcCio^nlW#B-B_{|37a;u=! z;{2RaP!NRXWtP|(*?>KSE{q5fh%V>++=8Oi;$omSJ5#6@WHEI05eRGS%wcvQ3!-cA zFUkb^G!f)3J42`i$YSW~Be7Y4EQq856!caBnH8xy5iXg)00sNP80adj66hM8^K`Ye5o1R}Ho%5|=ed5=a_TlC6qMld@8iOORp<7-!(L@06IXk0flPk5#n| zFeO;|=BH$)Rk|dWq}mx77@F%ESm+uUh8UVz8CY1Eo7?E4sX=l9NXEG+HL)bWC?r2W z#}4d^To6~mSkDZi6ImXr)kYtbi;!{^B+G(DfqB-B3#b#8|LwSLy1h_jU|=%$ba4!c z;CwpW)*~!XrafQ&3$N}{$60MGmTid%7s3>p5(K8KzH%u*cP+1;-c}P!mkTSRFI>9v z{8CW2o>1nLkdQCF^KX29Q0W+dw)oxCJtAM4+pBH9fB!%C^S$bKdyg;raXKor@Q>On zKF9JE^#?xk?cu67fAgT_{DJHl+{atrZvGPbH*m@^)25@1?uqg_yf?O;FRqeW6c;4> z;11Wzd6yTPuMV4BCZ4Ch=@u&y)g2J_hm53WBDvS~hL<@r>-V7)od zyPB;1vz`g%E_}`q(^CFHh;6|nzu>2jOGWqGNqs7pBvW_ry%q2;!sZ5UI3LnOf4Fyy~Q7*rua2fGu2~I?r>K|NGwef4}!T=X;)$9lSjzS#b0H8-J^2ZREAet>hLm+4YO7<8H@+dGtbQF_|61bWx5GdKRJPeq_6cApd zt2t>)0L+WU0bvesd$^4`Mgsdl-`!?ohiP3 zPs$!ZDU1fbiAKx51k@H5jUKTNOW}bSgpI9}wT-j2jcu^4Bg)1Zy`4VOacbsP`=RZ-=fP9LSrfPm<6;avDVl-sT&-0JbxNL0kBLt$x z^uu}t3!oGE&V8j9Q+0q^=Mz(t6u!ppUzUxg^eo zT{@j?p8VnLLv=HiUIxB8yr5~FeddMC-%2ioydMI3lCqLcc61k>988}|3wz1Wn-UHo z-#_K{xaK0cmuC`wZ5dp7UW(rhPg}!A{BncXw{##}KjM^jiMLY=WOmWV;1;eb+kzB9 z+-rT&Flp0?8s1>JsKJ_G6_zwjldc=wMNBar*GbBhY#9sH88E0bn%UHL|9^fNapF6? z(|XNQzLJ%P`R`TV)h4zE_!UhV)n1IzN48qEOjfu#({ud9?*w_I5QKWmf zY8=+)Q9R@5?KsT5UD>`dmiY8PwRW_>e9r)7uPV!{RHToy3R6Wc!+&4?7iY}UWKLzq zF|}T!T(4tYYc?k)@A`vu=pl|ayfbGt zn{b{yMqQQ@M%5?w+%K#zqdlUvzu_D>dq{VC)(bMJW7*aC6_0`}9aZJW_oFt$ zS)tLI!9SPWI9Z7rYn)ae2ShrjYA##fjZR`}HdU+j-&?wBQ*_}I)9w8;JBmL_|C=vT zu}K>e;f|XYf0_tqS&FFn#B;F}!;?`llvSErVXT@Kd|Q4^3&xJS!cwKuF0Zy)fwt2&Xh zZRmk`^q9o34Wk!QaZ!-v;YLdU{Vj<6cxbs>%EKkvXRNzM^a}^}m4&k?PBZaA_67T2 zH|gScIUY8p6Q}*V7yEiFu3O<1$g@n3NI5vy1CRnaG0Om z#puL{JJ(mHyETuNi{pl?BG>EhoU^>7-o4Ld4Oe5^@LXtMpP~uiTeV`*IHe0w%dIgj#TtQYVne|KCKjk-}PT% z$EzyeL8l_0V_K$zL_Q1^6s|Z8`{3|0?c4F(RfIPMtqJ$f_p5hH&yD_3w_kHsGc%93 U?d=tv)$+eFKipPqjc0iBKYl9~9RL6T literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/table_ic_share_profile.imageset/table_ic_share_profile@3x.png b/Signal/Images.xcassets/table_ic_share_profile.imageset/table_ic_share_profile@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..697bde37bd0feb875efddd1db54454ade4d96835 GIT binary patch literal 3325 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 literal 0 HcmV?d00001 diff --git a/Signal/src/ViewControllers/ConversationView/MessagesViewController.m b/Signal/src/ViewControllers/ConversationView/MessagesViewController.m index 522c51a68..657049768 100644 --- a/Signal/src/ViewControllers/ConversationView/MessagesViewController.m +++ b/Signal/src/ViewControllers/ConversationView/MessagesViewController.m @@ -17,7 +17,7 @@ #import "OWSAudioAttachmentPlayer.h" #import "OWSCall.h" #import "OWSContactsManager.h" -#import "OWSConversationSettingsTableViewController.h" +#import "OWSConversationSettingsViewController.h" #import "OWSConversationSettingsViewDelegate.h" #import "OWSDisappearingMessagesJob.h" #import "OWSExpirableMessageView.h" @@ -1973,7 +1973,7 @@ typedef enum : NSUInteger { return; } - OWSConversationSettingsTableViewController *settingsVC = [OWSConversationSettingsTableViewController new]; + OWSConversationSettingsViewController *settingsVC = [OWSConversationSettingsViewController new]; settingsVC.conversationSettingsViewDelegate = self; [settingsVC configureWithThread:self.thread]; settingsVC.showVerificationOnAppear = showVerification; diff --git a/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.h b/Signal/src/ViewControllers/OWSConversationSettingsViewController.h similarity index 85% rename from Signal/src/ViewControllers/OWSConversationSettingsTableViewController.h rename to Signal/src/ViewControllers/OWSConversationSettingsViewController.h index 6ab122765..0ac0bb5fe 100644 --- a/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.h +++ b/Signal/src/ViewControllers/OWSConversationSettingsViewController.h @@ -10,7 +10,7 @@ NS_ASSUME_NONNULL_BEGIN @class TSThread; -@interface OWSConversationSettingsTableViewController : OWSTableViewController +@interface OWSConversationSettingsViewController : OWSTableViewController @property (nonatomic, weak) id conversationSettingsViewDelegate; diff --git a/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m b/Signal/src/ViewControllers/OWSConversationSettingsViewController.m similarity index 90% rename from Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m rename to Signal/src/ViewControllers/OWSConversationSettingsViewController.m index ecdf65166..72708639e 100644 --- a/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m +++ b/Signal/src/ViewControllers/OWSConversationSettingsViewController.m @@ -2,7 +2,7 @@ // Copyright (c) 2017 Open Whisper Systems. All rights reserved. // -#import "OWSConversationSettingsTableViewController.h" +#import "OWSConversationSettingsViewController.h" #import "BlockListUIUtils.h" #import "ContactsViewHelper.h" #import "Environment.h" @@ -24,6 +24,7 @@ #import #import #import +#import #import #import #import @@ -33,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface OWSConversationSettingsTableViewController () +@interface OWSConversationSettingsViewController () @property (nonatomic) TSThread *thread; @@ -52,7 +53,7 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - -@implementation OWSConversationSettingsTableViewController +@implementation OWSConversationSettingsViewController - (instancetype)init { @@ -78,14 +79,15 @@ NS_ASSUME_NONNULL_BEGIN return self; } -- (instancetype)initWithNibName:(nullable NSString *)nibNameOrNil bundle:(nullable NSBundle *)nibBundleOrNil { +- (instancetype)initWithNibName:(nullable NSString *)nibNameOrNil bundle:(nullable NSBundle *)nibBundleOrNil +{ self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; if (!self) { return self; } - + [self commonInit]; - + return self; } @@ -244,7 +246,7 @@ NS_ASSUME_NONNULL_BEGIN OWSTableContents *contents = [OWSTableContents new]; contents.title = NSLocalizedString(@"CONVERSATION_SETTINGS", @"title for conversation settings screen"); - __weak OWSConversationSettingsTableViewController *weakSelf = self; + __weak OWSConversationSettingsViewController *weakSelf = self; // Main section. @@ -271,7 +273,7 @@ NS_ASSUME_NONNULL_BEGIN iconName:@"table_ic_add_to_existing_contact"]; } actionBlock:^{ - OWSConversationSettingsTableViewController *strongSelf = weakSelf; + OWSConversationSettingsViewController *strongSelf = weakSelf; OWSCAssert(strongSelf); TSContactThread *contactThread = (TSContactThread *)strongSelf.thread; NSString *recipientId = contactThread.contactIdentifier; @@ -292,10 +294,50 @@ NS_ASSUME_NONNULL_BEGIN }]]; } + BOOL isOnProfileWhitelist = NO; + if (self.isGroupThread) { + TSGroupThread *groupThread = (TSGroupThread *)self.thread; + NSData *groupId = groupThread.groupModel.groupId; + isOnProfileWhitelist = [OWSProfilesManager.sharedManager isGroupIdInProfileWhitelist:groupId]; + } else { + NSString *recipientId = self.thread.contactIdentifier; + isOnProfileWhitelist = [OWSProfilesManager.sharedManager isUserInProfileWhitelist:recipientId]; + } + if (isOnProfileWhitelist) { + [mainSection addItem:[OWSTableItem itemWithCustomCellBlock:^{ + return [weakSelf + labelCellWithName:(self.isGroupThread + ? NSLocalizedString( + @"CONVERSATION_SETTINGS_VIEW_PROFILE_IS_SHARED_WITH_GROUP", + @"Indicates that user's profile has been shared with a group.") + : NSLocalizedString(@"CONVERSATION_SETTINGS_VIEW_PROFILE_IS_SHARED_WITH_USER", + @"Indicates that user's profile has been shared with a user."))iconName + :@"table_ic_share_profile"]; + } + actionBlock:^{ + [weakSelf showShareProfileAlert]; + }]]; + } else { + [mainSection addItem:[OWSTableItem itemWithCustomCellBlock:^{ + return + [weakSelf disclosureCellWithName:(self.isGroupThread + ? NSLocalizedString( + @"CONVERSATION_SETTINGS_VIEW_SHARE_PROFILE_WITH_GROUP", + @"Action that shares user profile with a group.") + : NSLocalizedString( + @"CONVERSATION_SETTINGS_VIEW_SHARE_PROFILE_WITH_USER", + @"Action that shares user profile with a user."))iconName + :@"table_ic_share_profile"]; + } + actionBlock:^{ + [weakSelf showShareProfileAlert]; + }]]; + } + [mainSection addItem:[OWSTableItem itemWithCustomCellBlock:^{ UITableViewCell *cell = [UITableViewCell new]; - OWSConversationSettingsTableViewController *strongSelf = weakSelf; + OWSConversationSettingsViewController *strongSelf = weakSelf; OWSCAssert(strongSelf); cell.preservesSuperviewLayoutMargins = YES; cell.contentView.preservesSuperviewLayoutMargins = YES; @@ -354,7 +396,7 @@ NS_ASSUME_NONNULL_BEGIN addItem:[OWSTableItem itemWithCustomCellBlock:^{ UITableViewCell *cell = [UITableViewCell new]; - OWSConversationSettingsTableViewController *strongSelf = weakSelf; + OWSConversationSettingsViewController *strongSelf = weakSelf; OWSCAssert(strongSelf); cell.preservesSuperviewLayoutMargins = YES; cell.contentView.preservesSuperviewLayoutMargins = YES; @@ -442,7 +484,7 @@ NS_ASSUME_NONNULL_BEGIN OWSTableSection *muteSection = [OWSTableSection new]; [muteSection addItem:[OWSTableItem itemWithCustomCellBlock:^{ UITableViewCell *cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:nil]; - OWSConversationSettingsTableViewController *strongSelf = weakSelf; + OWSConversationSettingsViewController *strongSelf = weakSelf; OWSCAssert(strongSelf); cell.preservesSuperviewLayoutMargins = YES; cell.contentView.preservesSuperviewLayoutMargins = YES; @@ -514,7 +556,7 @@ NS_ASSUME_NONNULL_BEGIN [weakSelf disclosureCellWithName:NSLocalizedString(@"CONVERSATION_SETTINGS_BLOCK_THIS_USER", @"table cell label in conversation settings") iconName:@"table_ic_block"]; - OWSConversationSettingsTableViewController *strongSelf = weakSelf; + OWSConversationSettingsViewController *strongSelf = weakSelf; OWSCAssert(strongSelf); cell.selectionStyle = UITableViewCellSelectionStyleNone; @@ -538,7 +580,7 @@ NS_ASSUME_NONNULL_BEGIN return 12.f; } -- (UITableViewCell *)disclosureCellWithName:(NSString *)name iconName:(NSString *)iconName +- (UITableViewCell *)cellWithName:(NSString *)name iconName:(NSString *)iconName { OWSAssert(name.length > 0); OWSAssert(iconName.length > 0); @@ -546,7 +588,6 @@ NS_ASSUME_NONNULL_BEGIN UITableViewCell *cell = [UITableViewCell new]; cell.preservesSuperviewLayoutMargins = YES; cell.contentView.preservesSuperviewLayoutMargins = YES; - cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; UIImageView *iconView = [self viewForIconWithName:iconName]; [cell.contentView addSubview:iconView]; @@ -566,6 +607,20 @@ NS_ASSUME_NONNULL_BEGIN return cell; } +- (UITableViewCell *)disclosureCellWithName:(NSString *)name iconName:(NSString *)iconName +{ + UITableViewCell *cell = [self cellWithName:name iconName:iconName]; + cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; + return cell; +} + +- (UITableViewCell *)labelCellWithName:(NSString *)name iconName:(NSString *)iconName +{ + UITableViewCell *cell = [self cellWithName:name iconName:iconName]; + cell.accessoryType = UITableViewCellAccessoryNone; + return cell; +} + - (UIView *)mainSectionHeader { UIView *mainSectionHeader = [UIView new]; @@ -728,6 +783,45 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - Actions +- (void)showShareProfileAlert +{ + UIAlertController *alertController = + [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet]; + + UIAlertAction *leaveAction = [UIAlertAction + actionWithTitle:NSLocalizedString(@"CONVERSATION_SETTINGS_VIEW_SHARE_PROFILE", + @"Button to confirm that user wants to share their profile with a user or group.") + style:UIAlertActionStyleDestructive + handler:^(UIAlertAction *_Nonnull action) { + [self shareProfile]; + }]; + [alertController addAction:leaveAction]; + + UIAlertAction *cancelAction = [UIAlertAction + actionWithTitle:NSLocalizedString(@"TXT_CANCEL_TITLE", nil) + style:UIAlertActionStyleCancel + handler:^(UIAlertAction *_Nonnull action) { + [self.tableView deselectRowAtIndexPath:[self.tableView indexPathForSelectedRow] animated:YES]; + }]; + [alertController addAction:cancelAction]; + + [self presentViewController:alertController animated:YES completion:nil]; +} + +- (void)shareProfile +{ + if (self.isGroupThread) { + TSGroupThread *groupThread = (TSGroupThread *)self.thread; + NSData *groupId = groupThread.groupModel.groupId; + [OWSProfilesManager.sharedManager addGroupIdToProfileWhitelist:groupId]; + } else { + NSString *recipientId = self.thread.contactIdentifier; + [OWSProfilesManager.sharedManager addUserToProfileWhitelist:recipientId]; + } + + [self updateTableContents]; +} + - (void)showVerificationView { NSString *recipientId = self.thread.contactIdentifier; @@ -949,7 +1043,7 @@ NS_ASSUME_NONNULL_BEGIN message:message preferredStyle:UIAlertControllerStyleActionSheet]; - __weak OWSConversationSettingsTableViewController *weakSelf = self; + __weak OWSConversationSettingsViewController *weakSelf = self; if (self.thread.isMuted) { UIAlertAction *action = [UIAlertAction actionWithTitle:NSLocalizedString(@"CONVERSATION_SETTINGS_UNMUTE_ACTION", @"Label for button to unmute a thread.") diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 7c0b42729..cd0c2b590 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -340,6 +340,21 @@ /* Label for button to unmute a thread. */ "CONVERSATION_SETTINGS_UNMUTE_ACTION" = "Unmute"; +/* Indicates that user's profile has been shared with a group. */ +"CONVERSATION_SETTINGS_VIEW_PROFILE_IS_SHARED_WITH_GROUP" = "Your profile is shared this group."; + +/* Indicates that user's profile has been shared with a user. */ +"CONVERSATION_SETTINGS_VIEW_PROFILE_IS_SHARED_WITH_USER" = "Your profile is shared this user."; + +/* Button to confirm that user wants to share their profile with a user or group. */ +"CONVERSATION_SETTINGS_VIEW_SHARE_PROFILE" = "Share Profile"; + +/* Action that shares user profile with a group. */ +"CONVERSATION_SETTINGS_VIEW_SHARE_PROFILE_WITH_GROUP" = "Share Your Profile"; + +/* Action that shares user profile with a user. */ +"CONVERSATION_SETTINGS_VIEW_SHARE_PROFILE_WITH_USER" = "Share Your Profile"; + /* ActionSheet title */ "CORRUPTED_SESSION_DESCRIPTION" = "Resetting your session will allow you to receive future messages from %@, but it will not recover any already corrupted messages.";