Upgrading dependencies.

Podfile

@@ -9,8 +9,8 @@ pod 'libPhoneNumber-iOS',         '~> 0.8.2'
 pod 'AxolotlKit',                 '~> 0.6.2'
 pod 'PastelogKit',                '~> 1.2'
 pod 'TwistedOakCollapsingFutures','~> 1.0'
-pod 'AFNetworking',               '~> 2.5.1'
-pod 'Mantle',                     '~> 1.5'
+pod 'AFNetworking',               '~> 2.5.3'
+pod 'Mantle',                     '~> 2.0'
 pod 'FFCircularProgressView',     '>= 0.1'
 pod 'SCWaveformView',             '~> 1.0'
 pod 'YapDatabase/SQLCipher'

Podfile.lock

@@ -1,24 +1,24 @@
 PODS:
   - 25519 (1.8)
-  - AFNetworking (2.5.2):
-    - AFNetworking/NSURLConnection (= 2.5.2)
-    - AFNetworking/NSURLSession (= 2.5.2)
-    - AFNetworking/Reachability (= 2.5.2)
-    - AFNetworking/Security (= 2.5.2)
-    - AFNetworking/Serialization (= 2.5.2)
-    - AFNetworking/UIKit (= 2.5.2)
-  - AFNetworking/NSURLConnection (2.5.2):
+  - AFNetworking (2.5.3):
+    - AFNetworking/NSURLConnection (= 2.5.3)
+    - AFNetworking/NSURLSession (= 2.5.3)
+    - AFNetworking/Reachability (= 2.5.3)
+    - AFNetworking/Security (= 2.5.3)
+    - AFNetworking/Serialization (= 2.5.3)
+    - AFNetworking/UIKit (= 2.5.3)
+  - AFNetworking/NSURLConnection (2.5.3):
     - AFNetworking/Reachability
     - AFNetworking/Security
     - AFNetworking/Serialization
-  - AFNetworking/NSURLSession (2.5.2):
+  - AFNetworking/NSURLSession (2.5.3):
     - AFNetworking/Reachability
     - AFNetworking/Security
     - AFNetworking/Serialization
-  - AFNetworking/Reachability (2.5.2)
-  - AFNetworking/Security (2.5.2)
-  - AFNetworking/Serialization (2.5.2)
-  - AFNetworking/UIKit (2.5.2):
+  - AFNetworking/Reachability (2.5.3)
+  - AFNetworking/Security (2.5.3)
+  - AFNetworking/Serialization (2.5.3)
+  - AFNetworking/UIKit (2.5.3):
     - AFNetworking/NSURLConnection
     - AFNetworking/NSURLSession
   - APDropDownNavToolbar (1.1)
@@ -38,9 +38,9 @@ PODS:
     - JSQSystemSoundPlayer (~> 2.0.1)
   - JSQSystemSoundPlayer (2.0.1)
   - libPhoneNumber-iOS (0.8.4)
-  - Mantle (1.5.4):
-    - Mantle/extobjc (= 1.5.4)
-  - Mantle/extobjc (1.5.4)
+  - Mantle (2.0):
+    - Mantle/extobjc (= 2.0)
+  - Mantle/extobjc (2.0)
   - OpenSSL (1.0.201)
   - PastelogKit (1.2):
     - CocoaLumberjack (~> 1.9)
@@ -62,7 +62,7 @@ PODS:
     - YapDatabase/common
 
 DEPENDENCIES:
-  - AFNetworking (~> 2.5.1)
+  - AFNetworking (~> 2.5.3)
   - APDropDownNavToolbar (from `https://github.com/corbett/APDropDownNavToolbar.git`,
     branch `master`)
   - AxolotlKit (~> 0.6.2)
@@ -71,7 +71,7 @@ DEPENDENCIES:
   - JSQMessagesViewController (from `https://github.com/WhisperSystems/JSQMessagesViewController`,
     commit `9be8f6ed65eb55368a5ff767f055158cf585065f`)
   - libPhoneNumber-iOS (~> 0.8.2)
-  - Mantle (~> 1.5)
+  - Mantle (~> 2.0)
   - OpenSSL (~> 1.0.201)
   - PastelogKit (~> 1.2)
   - SCWaveformView (~> 1.0)
@@ -108,7 +108,7 @@ CHECKOUT OPTIONS:
 
 SPEC CHECKSUMS:
   '25519': f4e131763c4e3551951d27ff1af258a93cd94f3e
-  AFNetworking: fefbce9660acb17f48ae0011292d4da0f457bf36
+  AFNetworking: e1d86c2a96bb5d2e7408da36149806706ee122fe
   APDropDownNavToolbar: 5d0c3f363208543d20e86ddb4630927c28cdfd4b
   AxolotlKit: 630fd578a69223b29579b300bdfd88f90d83218a
   CocoaLumberjack: 628fca2e88ef06f7cf6817309aa405f325d9a6fa
@@ -118,7 +118,7 @@ SPEC CHECKSUMS:
   JSQMessagesViewController: 9fd7e9ac96e9fc91f2deca86928e2cc916aeebaa
   JSQSystemSoundPlayer: c5850e77a4363ffd374cd851154b9af93264ed8d
   libPhoneNumber-iOS: dbfc7b4128510a4955df3e5a6f125393fc9ebc2f
-  Mantle: 60acd0cd363e27d945bda0a6b8e90577112d28f3
+  Mantle: 17de73ef929db2234d76fde2aacfb89ab11c61e8
   OpenSSL: 4e990d04b14015c49c800c400b86ae44a4818a5c
   PastelogKit: c73795b8c0bbf33ea45d3b6a5eabb373be3d5955
   ProtocolBuffers: 9a4a171c0c7cc8f21dd29aeca4f9ac775d84a880

Pods

@@ -1 +1 @@
-Subproject commit 65dbb739ff3b58566bf20105d06b0c0a53a0be1c
+Subproject commit 733706c8f65bd25bd3b1ba33b1a61076dcca6a9b

Signal/src/environment/VersionMigrations.m

@@ -57,7 +57,6 @@
     if ([self isVersion:previousVersion atLeast:@"2.0.0" andLessThan:@"2.0.21"] || needsToRegisterPush) {
         [self clearVideoCache];
         [self blockingPushRegistration];
-        
     }
 }
 
@@ -227,6 +226,7 @@
 
 + (void)blockingPushRegistration{
     [UIApplication.sharedApplication setNetworkActivityIndicatorVisible:YES];
+    [[NSUserDefaults standardUserDefaults] setObject:@YES forKey:NEEDS_TO_REGISTER_PUSH_KEY];
     
     UIAlertController *waitingController = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Upgrading Signal ...", nil)
                                                                                message:nil
@@ -236,7 +236,7 @@
                                                                                  animated:YES
                                                                                completion:nil];
     
-    failedPushRegistrationBlock failure = ^(NSError *error) {
+    __block failedPushRegistrationBlock failure = ^(NSError *error) {
         [self refreshPushLock:waitingController];
     };
     

Signal/src/textsecure/Messages/TSMessagesManager+sendMessages.m

@@ -249,8 +249,15 @@ dispatch_queue_t sendingQueue() {
                                                                       body:serializedMessage
                                                             registrationId:cipher.remoteRegistrationId];
     
+    NSError *error;
+    NSDictionary *jsonDict = [MTLJSONAdapter JSONDictionaryFromModel:serverMessage error:&error];
     
-    return [MTLJSONAdapter JSONDictionaryFromModel:serverMessage];
+    if (error) {
+        DDLogError(@"Error while making JSON dictionary of message: %@", error.debugDescription);
+        return nil;
+    }
+    
+    return jsonDict;
 }
 
 - (TSWhisperMessageType)messageTypeForCipherMessage:(id<CipherMessage>)cipherMessage{

Signal/src/textsecure/Messages/TSServerMessage.m

@@ -10,6 +10,7 @@
 #import "TSServerMessage.h"
 
 #import "NSData+Base64.h"
+#import <Mantle/NSDictionary+MTLMappingAdditions.h>
 
 @interface TSServerMessage ()
 
@@ -24,7 +25,7 @@
 @implementation TSServerMessage
 
 + (NSDictionary *)JSONKeyPathsByPropertyKey{
-    return @{};
+    return [NSDictionary mtl_identityPropertyMapWithModel:[TSServerMessage class]];
 }
 
 - (instancetype)initWithType:(TSWhisperMessageType)type