From 935244843efa08e9f56afe3ac672ca24e9edde38 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 12 Jun 2017 15:50:54 -0400 Subject: [PATCH] Tweak verification UI. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add “tap for options” to verification banner copy. * Add close button to banners. * Always use shield icon for verification row in conversation settings view. * Add action sheet to verification banner. // FREEBIE --- .../banner_close.imageset/Contents.json | 23 ++++ .../banner_close.imageset/banner_close@1x.png | Bin 0 -> 1190 bytes .../banner_close.imageset/banner_close@2x.png | Bin 0 -> 1353 bytes .../banner_close.imageset/banner_close@3x.png | Bin 0 -> 1555 bytes .../ConversationView/MessagesViewController.m | 108 +++++++++++++++--- ...SConversationSettingsTableViewController.m | 6 +- .../translations/en.lproj/Localizable.strings | 6 +- 7 files changed, 116 insertions(+), 27 deletions(-) create mode 100644 Signal/Images.xcassets/banner_close.imageset/Contents.json create mode 100644 Signal/Images.xcassets/banner_close.imageset/banner_close@1x.png create mode 100644 Signal/Images.xcassets/banner_close.imageset/banner_close@2x.png create mode 100644 Signal/Images.xcassets/banner_close.imageset/banner_close@3x.png diff --git a/Signal/Images.xcassets/banner_close.imageset/Contents.json b/Signal/Images.xcassets/banner_close.imageset/Contents.json new file mode 100644 index 000000000..88969df15 --- /dev/null +++ b/Signal/Images.xcassets/banner_close.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "banner_close@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "banner_close@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "banner_close@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/banner_close.imageset/banner_close@1x.png b/Signal/Images.xcassets/banner_close.imageset/banner_close@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..68625ef18204ed0336405cdd99ce6ba7d4bae9ad GIT binary patch literal 1190 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4F%}28J29*~C-V}>;VkfoEM{QP zQwCwiilz2t3=GUGGD9LtB7A+UlJj%*5>xV%QuQiw3xKK_7;Gx6fXv*~l0=1y+?>2( zs|s5sunH?68zii+qySb@l5MLL;TxdfoL`ixV5(=LXP{)qrJ$f-Q<_24+^q zrZ)O$Y7jmI>vk?mO)SYT3dzsUu?xtoNX^LwaTSd9%pf|E<&m_4d|~BZl$i<)UQi&~ z8QSP$h@q=@&d)6KQE)+Gaw;gqz*>-m z&{c!2iNs|Mk_1$vjXo$XBc*Lf#sP~0bB-MsFiv5)(2nc+d9~NTj5*!Y#W6%evUS2i z-evqRlB(`mL@Ya(SopOI#U(Go+_h$2dM&`UvYpS#+ QZwD0~p00i_>zopr00~2XhX4Qo literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/banner_close.imageset/banner_close@2x.png b/Signal/Images.xcassets/banner_close.imageset/banner_close@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..b9127307ff64756d2c21ad0d3d7c0681e3ea746c GIT binary patch literal 1353 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1G~&H|6fVg?31 zWe{epSZZI!z`(pBGbExU!q>+tIX_n~F(p4KRj(qq0H~UQ!KT6r$jnVGNmQuF&B-ga zs<2f8tFQvHLBje<3ScEA*|tg%z5xo(`9-M;rg|oN21<5Z3JMA~MJZ`kK`w4k?LeNb zQbtKhft9{~d3m{Bxv^e;QM$gNrKP35fswwEkuFe$ZgFK^Nn(X=Ua>O75STeGsl~}f znFS@8`FRQ;a}$&DOG|8(lt3220o0wj1#pY5^EIYG-6%Xs&BurfX;vVrXh*U}j}% zW}}a$2H``nZs(%Z#FG4?ko^1{yMWA!)SO%pSHV~hsuNirNh`<~R{lkqslea`1)`my zjXs7Lx_amQ+=8Oi;$o0`Q>c1mF?97osm1v@r6A)&^D;~9jG$W3gwb_HBINCi4Gf@~ zkVVmTL}1l{EQ+K96cJY7kcx20%uUS$`^E@p4OR(sjn4Tw`9;A6iOH#;5CdyL5<*uE zwk8snHAoUrjW+tAw2YLtAsGiO3d}inT)@--%Y}AaVkcH505i3fr;B5Vh2YjHXA2KG z@U#{_NXuvmGunB{aR!6k64opQ^Dd8Bo`y3O4euMTuGl;AfXt$q=C^9Asy@BTHDF&{Vl7R?3N$T*wtV5rno1*t@o+f zu~|14clZXHC{!KZZa4dw-m23QYuC-lJW=dq67a_>?b~vlNcVb&;LxjqNwbzz7H@g< zw2-sKO6JXy#G9?l_RTo9$s!78eFiQ_K9z fY?ifWx;?Yqoa@@R7cZO*D&IU^{an^LB{Ts5;M3F{ literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/banner_close.imageset/banner_close@3x.png b/Signal/Images.xcassets/banner_close.imageset/banner_close@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..d75cfda3271084776e826a677555f2d1c73e3b8d GIT binary patch literal 1555 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3jKx9jP7LeL$-D$|I14-?iy0X7 zltGxWVyS%@0|WDl%#etZ2wxwolpi<;HsXMd|v6mX?o9TAa1k)hNzWqeoAIqrAuN-s-2O6p}DSsnXaKxh@q*Kfti)D ziH$y*8iWtQx}A$s6HD@oLh|!->;f_?Qgd=aTm@r2Gl))Pc_ghMUs(AUWu^jy7Ziwg zhBo>bV(99f^K%P|Qj3d0>P?~Qk;Tx}2c;J0=ahns56#Ogu`_~dK@&#T6^W3yGd3`Q zYC;x8*AanL2eK%V4p2l`fkP_7B{MfQ59}Lbpfy+}&^0>e=j0a!7bGU9f2Jb0wyQuo6H+=U+-giH<9DU1e|PM*-edNWk1o$W|2+1X|3UT&pGi+{PY*X^+wb{CMy4tKM}F$g)rB6l z2CQl3Cf~w2C$<$eTBNPI%71AJL)x(uKca617CvQox@+02xW8^rA;6=%DwWxevF!Y!7=iO{R18W%cUVU0(aePc6C? zI;*xfzGvy*8PVB+OPJr?S?T)A%4J`($Rf|hlV?jZ-`ezBAp7u)to3pi*Bv?Sn#(pz zbj9ws3(p4V{`c~|@<;6G>h8S2J^M1;_8findR|QKZVTPjk3U!MJ9uWszPNk(5o*V; z|Iy9=$iDIAYf<}?@21>b=Igrk?xt6dR9?sXwB*jrdisB@jrQGbD}49G#B65bpZ1eI zZtG|5>kKP)?@hLFl0Cg%=Gg|m*)e;UpA{*+|9PR@#@hb=yU%4`_;>KWdDi(u;p|?X zf=vszilxNX?sGV^W!Is--pLD2om#qa->(cSo+EnIae>iZtRH8Z=-5B!{L&y4v$|w^ z+mfm2@2`Zpn^s#IZePsuA(Q8igvhq*Pb1@ZYO-%PxT@7rWzV1@7x;q3=ip>n6>YiC nA4)UMA7HF#{4e+Tjm|%2=C>uS(~Wm81(npEu6{1-oD!M *)noLongerVerifiedRecipientIds +{ + NSMutableArray *result = [NSMutableArray new]; + for (NSString *recipientId in self.thread.recipientIdentifiers) { + if ([[OWSIdentityManager sharedManager] verificationStateForRecipientId:recipientId] + == OWSVerificationStateNoLongerVerified) { + [result addObject:recipientId]; + } + } + return result; +} + - (void)ensureBannerState { // This method should be called rarely, so it's simplest to discard and @@ -686,14 +699,8 @@ typedef enum : NSUInteger { return; } - // A collection of the group members who are "no longer verified". - NSMutableArray *noLongerVerifiedRecipientIds = [NSMutableArray new]; - for (NSString *recipientId in self.thread.recipientIdentifiers) { - if ([[OWSIdentityManager sharedManager] verificationStateForRecipientId:recipientId] - == OWSVerificationStateNoLongerVerified) { - [noLongerVerifiedRecipientIds addObject:recipientId]; - } - } + NSArray *noLongerVerifiedRecipientIds = [self noLongerVerifiedRecipientIds]; + if (noLongerVerifiedRecipientIds.count > 0) { NSString *message; if (noLongerVerifiedRecipientIds.count > 1) { @@ -748,14 +755,6 @@ typedef enum : NSUInteger { OWSAssert(title.length > 0); OWSAssert(bannerColor); - UILabel *label = [UILabel new]; - label.font = [UIFont ows_mediumFontWithSize:14.f]; - label.text = title; - label.textColor = [UIColor whiteColor]; - label.numberOfLines = 0; - label.lineBreakMode = NSLineBreakByWordWrapping; - label.textAlignment = NSTextAlignmentCenter; - UIView *bannerView = [UIView new]; bannerView.backgroundColor = bannerColor; bannerView.layer.cornerRadius = 2.5f; @@ -766,12 +765,30 @@ typedef enum : NSUInteger { bannerView.layer.shadowRadius = 2.f; bannerView.layer.shadowOpacity = 0.35f; + UILabel *label = [UILabel new]; + label.font = [UIFont ows_mediumFontWithSize:14.f]; + label.text = title; + label.textColor = [UIColor whiteColor]; + label.numberOfLines = 0; + label.lineBreakMode = NSLineBreakByWordWrapping; + label.textAlignment = NSTextAlignmentCenter; + + UIImage *closeIcon = [UIImage imageNamed:@"banner_close"]; + UIImageView *closeButton = [[UIImageView alloc] initWithImage:closeIcon]; + [bannerView addSubview:closeButton]; + const CGFloat kBannerCloseButtonPadding = 8.f; + [closeButton autoPinEdgeToSuperviewEdge:ALEdgeTop withInset:kBannerCloseButtonPadding]; + [closeButton autoPinEdgeToSuperviewEdge:ALEdgeRight withInset:kBannerCloseButtonPadding]; + [closeButton autoSetDimension:ALDimensionWidth toSize:closeIcon.size.width]; + [closeButton autoSetDimension:ALDimensionHeight toSize:closeIcon.size.height]; + [bannerView addSubview:label]; [label autoPinEdgeToSuperviewEdge:ALEdgeTop withInset:5]; [label autoPinEdgeToSuperviewEdge:ALEdgeBottom withInset:5]; const CGFloat kBannerHPadding = 15.f; [label autoPinEdgeToSuperviewEdge:ALEdgeLeft withInset:kBannerHPadding]; - [label autoPinEdgeToSuperviewEdge:ALEdgeRight withInset:kBannerHPadding]; + const CGFloat kBannerHSpacing = 10.f; + [label autoPinEdge:ALEdgeRight toEdge:ALEdgeLeft ofView:closeButton withOffset:-kBannerHSpacing]; [bannerView addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:tapSelector]]; @@ -780,7 +797,8 @@ typedef enum : NSUInteger { [bannerView autoHCenterInSuperview]; CGFloat labelDesiredWidth = [label sizeThatFits:CGSizeZero].width; - CGFloat bannerDesiredWidth = labelDesiredWidth + kBannerHPadding * 2.f; + CGFloat bannerDesiredWidth + = (labelDesiredWidth + kBannerHPadding + kBannerHSpacing + closeIcon.size.width + kBannerCloseButtonPadding); const CGFloat kMinBannerHMargin = 20.f; if (bannerDesiredWidth + kMinBannerHMargin * 2.f >= self.view.width) { [bannerView autoPinWidthToSuperviewWithMargin:kMinBannerHMargin]; @@ -814,7 +832,59 @@ typedef enum : NSUInteger { - (void)noLongerVerifiedBannerViewWasTapped:(UIGestureRecognizer *)sender { if (sender.state == UIGestureRecognizerStateRecognized) { - [self showConversationSettingsAndShowVerification:YES]; + UIAlertController *actionSheetController = + [UIAlertController alertControllerWithTitle:nil + message:nil + preferredStyle:UIAlertControllerStyleActionSheet]; + + __weak MessagesViewController *weakSelf = self; + UIAlertAction *unblockAction = [UIAlertAction + actionWithTitle: + NSLocalizedString(@"VERIFY_PRIVACY", + @"Label for button or row which allows users to verify the safety number of another user.") + style:UIAlertActionStyleDefault + handler:^(UIAlertAction *_Nonnull action) { + [weakSelf showConversationSettingsAndShowVerification:YES]; + }]; + [actionSheetController addAction:unblockAction]; + + UIAlertAction *dismissAction = + [UIAlertAction actionWithTitle:NSLocalizedString(@"DISMISS_BUTTON_TEXT", + @"Generic short text for button to dismiss a dialog") + style:UIAlertActionStyleCancel + handler:^(UIAlertAction *_Nonnull action) { + [weakSelf resetVerificationStateToDefault]; + }]; + [actionSheetController addAction:dismissAction]; + + [self presentViewController:actionSheetController animated:YES completion:nil]; + } +} + +- (void)resetVerificationStateToDefault +{ + OWSAssert([NSThread isMainThread]); + + NSArray *noLongerVerifiedRecipientIds = [self noLongerVerifiedRecipientIds]; + for (NSString *recipientId in noLongerVerifiedRecipientIds) { + OWSAssert(recipientId.length > 0); + + OWSRecipientIdentity *_Nullable recipientIdentity = + [[OWSIdentityManager sharedManager] recipientIdentityForRecipientId:recipientId]; + OWSAssert(recipientIdentity); + + // By capturing the identity key when we enter these views, we prevent the edge case + // where the user verifies a key that we learned about while this view was open. + NSData *identityKey = recipientIdentity.identityKey; + OWSAssert(identityKey.length > 0); + if (identityKey.length < 1) { + continue; + } + + [OWSIdentityManager.sharedManager setVerificationState:OWSVerificationStateDefault + identityKey:identityKey + recipientId:recipientId + sendSyncMessage:YES]; } } diff --git a/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m b/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m index 6d42b372d..24fac89c0 100644 --- a/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m +++ b/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m @@ -240,16 +240,12 @@ NS_ASSUME_NONNULL_BEGIN firstSection.customHeaderHeight = @(100.f); if (!self.isGroupThread && self.thread.hasSafetyNumbers) { - NSString *recipientId = self.thread.contactIdentifier; - BOOL isVerified = [[OWSIdentityManager sharedManager] verificationStateForRecipientId:recipientId] - == OWSVerificationStateVerified; - [firstSection addItem:[OWSTableItem itemWithCustomCellBlock:^{ return [weakSelf disclosureCellWithName: NSLocalizedString(@"VERIFY_PRIVACY", @"Label for button or row which allows users to verify the safety number of another user.") - iconName:(isVerified ? @"table_ic_verify" : @"table_ic_not_verified")]; + iconName:@"table_ic_not_verified"]; } actionBlock:^{ [weakSelf showVerificationView]; diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 7b33cf752..5a77ba966 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -722,13 +722,13 @@ "MESSAGE_STATUS_UPLOADING" = "Uploading…"; /* Indicates that one member of this group conversation is no longer verified. Embeds {{user's name or phone number}}. */ -"MESSAGES_VIEW_1_MEMBER_NO_LONGER_VERIFIED_FORMAT" = "%@ is no longer verified."; +"MESSAGES_VIEW_1_MEMBER_NO_LONGER_VERIFIED_FORMAT" = "%@ is no longer verified. Tap for options."; /* Indicates that this 1:1 conversation has been blocked. */ "MESSAGES_VIEW_CONTACT_BLOCKED" = "You Blocked this User"; /* Indicates that this 1:1 conversation is no longer verified. Embeds {{user's name or phone number}}. */ -"MESSAGES_VIEW_CONTACT_NO_LONGER_VERIFIED_FORMAT" = "%@ is no longer verified."; +"MESSAGES_VIEW_CONTACT_NO_LONGER_VERIFIED_FORMAT" = "%@ is no longer verified. Tap for options."; /* Action sheet title after tapping on failed download. */ "MESSAGES_VIEW_FAILED_DOWNLOAD_ACTIONSHEET_TITLE" = "Download Failed."; @@ -743,7 +743,7 @@ "MESSAGES_VIEW_GROUP_N_MEMBERS_BLOCKED_FORMAT" = "You Blocked %d Members of this Group"; /* Indicates that more than one member of this group conversation is no longer verified. */ -"MESSAGES_VIEW_N_MEMBERS_NO_LONGER_VERIFIED" = "More than one member of this group is no longer verified."; +"MESSAGES_VIEW_N_MEMBERS_NO_LONGER_VERIFIED" = "More than one member of this group is no longer verified. Tap for options."; /* The subtitle for the messages view title indicates that the title can be tapped to access settings for this conversation. */ "MESSAGES_VIEW_TITLE_SUBTITLE" = "Tap here for settings";