Merge branch 'dev' of github.com:loki-project/loki-messenger-ios into dev

This commit is contained in:
Niels Andriesse 2019-11-18 13:46:20 +11:00
commit cb29b7d8f6

View file

@ -1022,8 +1022,7 @@ NS_ASSUME_NONNULL_BEGIN
NSArray<NSString *> *hexEncodedPublicKeys = [parser parseHexEncodedPublicKeys];
// Try to establish sessions
for (NSString *hexEncodedPublicKey in hexEncodedPublicKeys) {
TSContactThread *thread = [TSContactThread getThreadWithContactId:hexEncodedPublicKey transaction:transaction];
if (thread == nil) { return; }
TSContactThread *thread = [TSContactThread getOrCreateThreadWithContactId:hexEncodedPublicKey transaction:transaction];
LKThreadFriendRequestStatus friendRequestStatus = thread.friendRequestStatus;
switch (friendRequestStatus) {
case LKThreadFriendRequestStatusNone: {