6.4.18-rc3 (#1567)

- Fixed crash on broken OMEMO bundles again

Author: tmolitor-stud-tu

Monal/Classes/MLOMEMO.m

@@ -686,7 +686,7 @@ -(void) queryOMEMOBundleFrom:(NSString*) jid andDevice:(NSNumber*) deviceid
             [self processOMEMOKeys:receivedKeys forJid:jid andRid:rid];
 
             NSData* newIdentity = [self.monalSignalStore getIdentityForAddress:address];
-            if(oldIdentity == nil || (newIdentity != nil && ![oldIdentity isEqual:newIdentity]))
+            if(newIdentity != nil && (oldIdentity == nil || ![oldIdentity isEqual:newIdentity]))
             {
                 NSString* trustLevel = trustLevels2Text[[self.monalSignalStore getTrustLevel:address identityKey:newIdentity]];
                 [self postOMEMOMessageForUser:jid withMessage:[NSString stringWithFormat:NSLocalizedString(@"OMEMO: Detected new %@ device with id: %@", @"OMEMO warning shown inside chat view"), trustLevel, rid]];
@@ -698,7 +698,7 @@ -(void) queryOMEMOBundleFrom:(NSString*) jid andDevice:(NSNumber*) deviceid
             {
                 //only show warning, if we don't already know this deviceid
                 //(e.g. a really new device, not a devicelist removal followed by adding it back)
-                if((oldIdentity == nil || (newIdentity != nil && ![oldIdentity isEqual:newIdentity])) && [rid unsignedIntValue] != self.monalSignalStore.deviceid)
+                if(newIdentity != nil && ((oldIdentity == nil || ![oldIdentity isEqual:newIdentity]) && [rid unsignedIntValue] != self.monalSignalStore.deviceid))
                 {
                     NSString* trustLevel = trustLevels2Text[[self.monalSignalStore getTrustLevel:address identityKey:newIdentity]];
                     DDLogWarn(@"Got new %@ deviceid %@ for own account %@", trustLevel, rid, jid);