Fix groups breaking without avatar (#1336)

- Group updates were appearing as "unsupported attachment"
- Couldn't message in a new group unless it had attachment.

// FREEBIE
pull/1/head
Michael Kirk 8 years ago committed by GitHub
parent 720b167b3b
commit 5372173c4a

@ -130,7 +130,7 @@ EXTERNAL SOURCES:
CHECKOUT OPTIONS: CHECKOUT OPTIONS:
SignalServiceKit: SignalServiceKit:
:commit: a0df56a68e5db7729a209b069bcdfd56e6d7e92a :commit: 1824af5335d8faa9f30eed40f0e1dc8198650ceb
:git: https://github.com/WhisperSystems/SignalServiceKit.git :git: https://github.com/WhisperSystems/SignalServiceKit.git
SocketRocket: SocketRocket:
:commit: 8096fef47d582bff8ae3758c9ae7af1d55ea53d6 :commit: 8096fef47d582bff8ae3758c9ae7af1d55ea53d6

@ -38,7 +38,7 @@
</dict> </dict>
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>2.5.0.16</string> <string>2.5.0.17</string>
<key>ITSAppUsesNonExemptEncryption</key> <key>ITSAppUsesNonExemptEncryption</key>
<false/> <false/>
<key>LOGS_EMAIL</key> <key>LOGS_EMAIL</key>

@ -158,12 +158,13 @@ typedef enum : NSUInteger {
return; return;
} }
if ([_thread isKindOfClass:[TSGroupThread class]] && if ([_thread isKindOfClass:[TSGroupThread class]]) {
![((TSGroupThread *)_thread).groupModel.groupMemberIds containsObject:[TSAccountManager localNumber]]) { TSGroupThread *groupThread = (TSGroupThread *)self.thread;
if (![groupThread.groupModel.groupMemberIds containsObject:[TSAccountManager localNumber]]) {
[self inputToolbar].hidden = YES; // user has requested they leave the group. further sends disallowed [self inputToolbar].hidden = YES; // user has requested they leave the group. further sends disallowed
[self.inputToolbar endEditing:TRUE]; [self.inputToolbar endEditing:TRUE];
self.navigationItem.rightBarButtonItem = nil; // further group action disallowed self.navigationItem.rightBarButtonItem = nil; // further group action disallowed
}
} else { } else {
[self inputToolbar].hidden = NO; [self inputToolbar].hidden = NO;
[self loadDraftInCompose]; [self loadDraftInCompose];

Loading…
Cancel
Save