Merge branch 'mkirk/archive-not-delete'

Podfile.lock

@@ -130,13 +130,13 @@ EXTERNAL SOURCES:
 
 CHECKOUT OPTIONS:
   AxolotlKit:
-    :commit: 9179d4e326df58185f35af45831e7a5d7250ab85
+    :commit: f8f44d143bffd38e8470fdca0db7adf73a844956
     :git: https://github.com/WhisperSystems/SignalProtocolKit.git
   JSQMessagesViewController:
     :commit: 7054e4b13ee5bcd6d524adb6dc9a726e8c466308
     :git: https://github.com/WhisperSystems/JSQMessagesViewController.git
   SignalServiceKit:
-    :commit: f2f654af194c9b232ccf2b3d382f8a096bffcd00
+    :commit: 8bd02812541bc3e93065420cd1dc9d5e5249fec7
     :git: https://github.com/WhisperSystems/SignalServiceKit.git
   SocketRocket:
     :commit: 877ac7438be3ad0b45ef5ca3969574e4b97112bf

Signal/src/ProfileFetcherJob.swift

@@ -68,8 +68,8 @@ class ProfileFetcherJob: NSObject {
             }
 
             if OWSIdentityManager.shared().saveRemoteIdentity(latestIdentityKey, recipientId: recipientId) {
-                Logger.info("\(self.TAG) updated identity key in fetched profile for recipient: \(recipientId)")
+                Logger.info("\(self.TAG) updated identity key with fetched profile for recipient: \(recipientId)")
-                self.storageManager.deleteAllSessions(forContact: recipientId)
+                self.storageManager.archiveAllSessions(forContact: recipientId)
             } else {
                 // no change in identity.
             }

Signal/src/ViewControllers/DebugUI/DebugUISessionState.m

@@ -49,13 +49,20 @@ NS_ASSUME_NONNULL_BEGIN
                                        actionBlock:^{
                                            [self presentVerificationStatePickerForContactThread:contactThread];
                                        }],
-                       [OWSTableItem itemWithTitle:@"Delete session"
+                       [OWSTableItem itemWithTitle:@"Delete all sessions"
                                        actionBlock:^{
                                            dispatch_async([OWSDispatch sessionStoreQueue], ^{
                                                [[TSStorageManager sharedManager]
                                                    deleteAllSessionsForContact:contactThread.contactIdentifier];
                                            });
                                        }],
+                       [OWSTableItem itemWithTitle:@"Archive all sessions"
+                                       actionBlock:^{
+                                           dispatch_async([OWSDispatch sessionStoreQueue], ^{
+                                               [[TSStorageManager sharedManager]
+                                                   archiveAllSessionsForContact:contactThread.contactIdentifier];
+                                           });
+                                       }],
                        [OWSTableItem itemWithTitle:@"Send session reset"
                                        actionBlock:^{
                                            [OWSSessionResetJob