From a0e94d30fbd2b5c3b756050f058dd0c38d3a4efb Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Mon, 21 Oct 2019 16:09:46 +1100 Subject: [PATCH] Disable attachments for non-friends --- .../ConversationView/ConversationInputToolbar.h | 1 + .../ConversationView/ConversationInputToolbar.m | 5 +++++ .../ConversationView/ConversationViewController.m | 2 ++ 3 files changed, 8 insertions(+) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.h b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.h index fb0acd36b..15494abad 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.h +++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.h @@ -59,6 +59,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)setPlaceholderText:(NSString *)placeholderText; - (void)clearTextMessageAnimated:(BOOL)isAnimated; - (void)toggleDefaultKeyboard; +- (void)setAttachmentButtonHidden:(BOOL)isHidden; - (void)updateFontSizes; diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m index 6dadb5a00..fe7796873 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m @@ -362,6 +362,11 @@ const CGFloat kMaxTextViewHeight = 98; [self.inputTextView reloadInputViews]; } +- (void)setAttachmentButtonHidden:(BOOL)isHidden +{ + [self.attachmentButton setHidden:isHidden]; +} + - (void)setQuotedReply:(nullable OWSQuotedReplyModel *)quotedReply { if (quotedReply == _quotedReply) { diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index 3c498e08b..72ab4f151 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -1646,6 +1646,8 @@ typedef enum : NSUInteger { [self.inputToolbar setUserInteractionEnabled:!hasPendingFriendRequest]; NSString *placeholderText = hasPendingFriendRequest ? NSLocalizedString(@"Pending Friend Request...", "") : NSLocalizedString(@"New Message", ""); [self.inputToolbar setPlaceholderText:placeholderText]; + BOOL isContactFriend = self.thread.isContactFriend; + [self.inputToolbar setAttachmentButtonHidden:!isContactFriend]; } #pragma mark - Identity