From 97e234f78514573da55d33a956430412a1e4c153 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Wed, 31 Oct 2018 14:24:13 -0400
Subject: [PATCH] Fix "413 on prekey fetch" errors.

---
 .../src/Contacts/SignalRecipient.m            | 31 ++++++++++---------
 .../src/Messages/OWSMessageSender.m           |  4 ++-
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/SignalServiceKit/src/Contacts/SignalRecipient.m b/SignalServiceKit/src/Contacts/SignalRecipient.m
index 3ce3bebb3..1fcfc22c6 100644
--- a/SignalServiceKit/src/Contacts/SignalRecipient.m
+++ b/SignalServiceKit/src/Contacts/SignalRecipient.m
@@ -172,12 +172,7 @@ NS_ASSUME_NONNULL_BEGIN
     OWSLogDebug(@"removing devices: %@, from registered recipient: %@", devices, self);
     [self reloadWithTransaction:transaction];
     [self removeDevices:devices];
-
-    if (self.devices.count > 0) {
-        [self saveWithTransaction_internal:transaction];
-    } else {
-        [SignalRecipient removeUnregisteredRecipient:self.recipientId transaction:transaction];
-    }
+    [self saveWithTransaction_internal:transaction];
 }
 
 - (NSString *)recipientId
@@ -190,6 +185,13 @@ NS_ASSUME_NONNULL_BEGIN
     return [self.recipientId compare:other.recipientId];
 }
 
+- (void)removeWithTransaction:(YapDatabaseReadWriteTransaction *)transaction
+{
+    OWSFailDebug(@"Don't call removeWithTransaction.");
+    
+    [super removeWithTransaction:transaction];
+}
+
 - (void)saveWithTransaction:(YapDatabaseReadWriteTransaction *)transaction
 {
     // We only want to mutate the persisted SignalRecipients in the database
@@ -199,7 +201,7 @@ NS_ASSUME_NONNULL_BEGIN
     // reflect "last known registration status".  Forcing our codebase to
     // use those methods helps ensure that we update the cache deliberately.
     OWSFailDebug(@"Don't call saveWithTransaction from outside this class.");
-
+    
     [self saveWithTransaction_internal:transaction];
 }
 
@@ -207,13 +209,13 @@ NS_ASSUME_NONNULL_BEGIN
 {
     [super saveWithTransaction:transaction];
 
-    OWSLogVerbose(@"saved signal recipient: %@", self.recipientId);
+    OWSLogVerbose(@"saved signal recipient: %@ (%lu)", self.recipientId, (unsigned long) self.devices.count);
 }
 
 + (BOOL)isRegisteredRecipient:(NSString *)recipientId transaction:(YapDatabaseReadTransaction *)transaction
 {
     SignalRecipient *_Nullable instance = [self registeredRecipientForRecipientId:recipientId transaction:transaction];
-    return instance != nil;
+    return instance.devices.count > 0;
 }
 
 + (SignalRecipient *)markRecipientAsRegisteredAndGet:(NSString *)recipientId
@@ -254,12 +256,11 @@ NS_ASSUME_NONNULL_BEGIN
     OWSAssertDebug(transaction);
     OWSAssertDebug(recipientId.length > 0);
 
-    SignalRecipient *_Nullable instance = [self registeredRecipientForRecipientId:recipientId transaction:transaction];
-    if (!instance) {
-        return;
-    }
-    OWSLogDebug(@"removing recipient: %@", recipientId);
-    [instance removeWithTransaction:transaction];
+    SignalRecipient *instance = [self getOrBuildUnsavedRecipientForRecipientId:recipientId
+                                                                   transaction:transaction];
+    OWSLogDebug(@"Marking recipient as not registered: %@", recipientId);
+    [instance removeDevices:instance.devices.set];
+    [instance saveWithTransaction_internal:transaction];
 }
 
 @end
diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m
index c65d29bc0..5c6c6d97d 100644
--- a/SignalServiceKit/src/Messages/OWSMessageSender.m
+++ b/SignalServiceKit/src/Messages/OWSMessageSender.m
@@ -1056,7 +1056,9 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
             OWSFailDebug(@"sync message has device messages for unknown secondary devices.");
         }
     } else {
-        OWSAssertDebug(deviceMessages.count > 0);
+        // This can happen for users who have unregistered.
+        // We still want to try sending to them in case they have re-registered.
+        OWSLogWarn(deviceMessages.count > 0);
     }
 
     if (deviceMessages.count == 0) {