End-to-end encryption UI/UX

#723

- Let user send clear attachments in encrypted rooms
This commit is contained in:
giomfo
2016-11-09 10:58:11 +01:00
parent b70b1e9104
commit 77ec06b131
4 changed files with 19 additions and 14 deletions
@@ -104,9 +104,9 @@
}
}
- (void)setIsEncrypted:(BOOL)isEncrypted
- (void)setIsEncryptionEnabled:(BOOL)isEncryptionEnabled
{
if (isEncrypted)
if (isEncryptionEnabled)
{
self.encryptedRoomIcon.hidden = NO;
self.messageComposerContainerLeadingConstraint.constant = ROOM_INPUT_TOOLBAR_VIEW_ENCRYPTED_MESSAGE_COMPOSER_CONTAINER_LEADING;
@@ -117,7 +117,7 @@
self.messageComposerContainerLeadingConstraint.constant = ROOM_INPUT_TOOLBAR_VIEW_DEFAULT_MESSAGE_COMPOSER_CONTAINER_LEADING;
}
_isEncrypted = isEncrypted;
_isEncryptionEnabled = isEncryptionEnabled;
}
- (void)setActiveCall:(BOOL)activeCall
@@ -151,9 +151,9 @@
[super growingTextViewDidChange:hpGrowingTextView];
if (self.isEncrypted)
if (self.isEncryptionEnabled)
{
// Disable attachments and call options
// Disable the attachments and the call options which are not supported yet.
self.rightInputToolbarButton.hidden = NO;
self.attachMediaButton.hidden = YES;
self.voiceCallButton.hidden = YES;