Fix pre key bundle handling bug

SignalServiceKit/src/Loki/Messaging/LKAddressMessage.m

@@ -34,7 +34,7 @@
     [addressMessageBuilder setPtpPort:portAsUInt32];
     NSError *error;
     SSKProtoLokiAddressMessage *addressMessage = [addressMessageBuilder buildAndReturnError:&error];
-    if (error || !addressMessage) {
+    if (error || addressMessage == nil) {
         OWSFailDebug(@"Failed to build Loki address message for: %@ due to error: %@.", recipient.recipientId, error);
         return nil;
     } else {

SignalServiceKit/src/Loki/Messaging/LKDeviceLinkMessage.m

@@ -33,22 +33,18 @@
 #pragma mark Building
 - (SSKProtoContentBuilder *)prepareCustomContentBuilder:(SignalRecipient *)recipient {
     SSKProtoContentBuilder *contentBuilder = SSKProtoContent.builder;
-    // If this is a request then we should attach a pre key bundle
+    NSError *error;
-    if (self.kind == LKDeviceLinkMessageKindRequest) {
+    // Build the pre key bundle message
-        PreKeyBundle *bundle = [OWSPrimaryStorage.sharedManager generatePreKeyBundleForContact:recipient.recipientId];
+    PreKeyBundle *preKeyBundle = [OWSPrimaryStorage.sharedManager generatePreKeyBundleForContact:recipient.recipientId];
-        SSKProtoPrekeyBundleMessageBuilder *preKeyBuilder = [SSKProtoPrekeyBundleMessage builderFromPreKeyBundle:bundle];
+    SSKProtoPrekeyBundleMessageBuilder *preKeyBundleMessageBuilder = [SSKProtoPrekeyBundleMessage builderFromPreKeyBundle:preKeyBundle];
-        // Build the pre key bundle message
+    SSKProtoPrekeyBundleMessage *preKeyBundleMessage = [preKeyBundleMessageBuilder buildAndReturnError:&error];
-        NSError *error;
+    if (error || preKeyBundleMessage == nil) {
-        SSKProtoPrekeyBundleMessage *message = [preKeyBuilder buildAndReturnError:&error];
+        OWSFailDebug(@"Failed to build pre key bundle message for: %@ due to error: %@.", recipient.recipientId, error);
-        if (error || !message) {
+        return nil;
-            OWSFailDebug(@"Failed to build pre key bundle for: %@ due to error: %@.", recipient.recipientId, error);
+    } else {
-            return nil;
+        [contentBuilder setPrekeyBundleMessage:preKeyBundleMessage];
-        } else {
-            [contentBuilder setPrekeyBundleMessage:message];
-        }
     }
     // Build the device link message
-    NSError *error;
     SSKProtoLokiDeviceLinkMessageBuilder *deviceLinkMessageBuilder = [SSKProtoLokiDeviceLinkMessage builder];
     [deviceLinkMessageBuilder setMasterHexEncodedPublicKey:self.masterHexEncodedPublicKey];
     [deviceLinkMessageBuilder setSlaveHexEncodedPublicKey:self.slaveHexEncodedPublicKey];

SignalServiceKit/src/Loki/Messaging/LKFriendRequestMessage.m

@@ -9,15 +9,15 @@
 #pragma mark Initialization
 - (SSKProtoContentBuilder *)prepareCustomContentBuilder:(SignalRecipient *)recipient {
     SSKProtoContentBuilder *contentBuilder = SSKProtoContent.builder;
-    PreKeyBundle *bundle = [OWSPrimaryStorage.sharedManager generatePreKeyBundleForContact:recipient.recipientId];
+    PreKeyBundle *preKeyBundle = [OWSPrimaryStorage.sharedManager generatePreKeyBundleForContact:recipient.recipientId];
-    SSKProtoPrekeyBundleMessageBuilder *preKeyBuilder = [SSKProtoPrekeyBundleMessage builderFromPreKeyBundle:bundle];
+    SSKProtoPrekeyBundleMessageBuilder *preKeyBundleMessageBuilder = [SSKProtoPrekeyBundleMessage builderFromPreKeyBundle:preKeyBundle];
     NSError *error;
-    SSKProtoPrekeyBundleMessage *_Nullable message = [preKeyBuilder buildAndReturnError:&error];
+    SSKProtoPrekeyBundleMessage *preKeyBundleMessage = [preKeyBundleMessageBuilder buildAndReturnError:&error];
-    if (error || !message) {
+    if (error || preKeyBundleMessage == nil) {
-        OWSFailDebug(@"Failed to build pre key bundle for: %@ due to error: %@.", recipient.recipientId, error);
+        OWSFailDebug(@"Failed to build pre key bundle message for: %@ due to error: %@.", recipient.recipientId, error);
         return nil;
     } else {
-         [contentBuilder setPrekeyBundleMessage:message];
+         [contentBuilder setPrekeyBundleMessage:preKeyBundleMessage];
     }
     return contentBuilder;
 }