felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-02 22:26:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't disable the upload button in encrypted rooms

Browse Source 
Attachments will be sent encrypted with the corresponding
matrixkit / matrix-ios-sdk branches.
This commit is contained in:
David Baker
2016-11-11 17:31:44 +00:00
parent 7ad31254a8
commit b1107abb4c
1 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Vector/Views/RoomInputToolbar/RoomInputToolbarView.m
+8 -21
View File
@@ -151,9 +151,8 @@
[super growingTextViewDidChange:hpGrowingTextView];
if (self.isEncryptionEnabled)
if (self.rightInputToolbarButton.isEnabled && self.rightInputToolbarButton.isHidden)
{
// Disable the attachments and the call options which are not supported yet.
self.rightInputToolbarButton.hidden = NO;
self.attachMediaButton.hidden = YES;
self.voiceCallButton.hidden = YES;
@@ -161,26 +160,14 @@
self.messageComposerContainerTrailingConstraint.constant = self.frame.size.width - self.rightInputToolbarButton.frame.origin.x + 4;
}
else
else if (!self.rightInputToolbarButton.isEnabled && !self.rightInputToolbarButton.isHidden)
{
if (self.rightInputToolbarButton.isEnabled && self.rightInputToolbarButton.isHidden)
{
self.rightInputToolbarButton.hidden = NO;
self.attachMediaButton.hidden = YES;
self.voiceCallButton.hidden = YES;
self.hangupCallButton.hidden = YES;
self.messageComposerContainerTrailingConstraint.constant = self.frame.size.width - self.rightInputToolbarButton.frame.origin.x + 4;
}
else if (!self.rightInputToolbarButton.isEnabled && !self.rightInputToolbarButton.isHidden)
{
self.rightInputToolbarButton.hidden = YES;
self.attachMediaButton.hidden = NO;
self.voiceCallButton.hidden = _activeCall;
self.hangupCallButton.hidden = !_activeCall;
self.messageComposerContainerTrailingConstraint.constant = self.frame.size.width - self.attachMediaButton.frame.origin.x + 4;
}
self.rightInputToolbarButton.hidden = YES;
self.attachMediaButton.hidden = NO;
self.voiceCallButton.hidden = !self.isEncryptionEnabled && _activeCall;
self.hangupCallButton.hidden = !self.isEncryptionEnabled && !_activeCall;
self.messageComposerContainerTrailingConstraint.constant = self.frame.size.width - self.attachMediaButton.frame.origin.x + 4;
}
}