Increment GDT's version and CHANGELOG (#3691)

* Increment GDT's version and CHANGELOG

* Wrap decoding targetToInflightPackages in a try/catch (#3689)

It's not apparent how a key could be stored with a nil object in the dictionary. Maybe it's possible that somehow a GDTUploadPackage fails to decode, but there aren't any indications that this is the case. This PR adds a check for contents of the dictionary, though encoding an empty dictionary should be fine. A try/catch is utilized to catch exceptions thrown in iOS's implementation of NSSecureCoding in NSMutableDictionary.

Author: mikehaney24

GoogleDataTransport.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'GoogleDataTransport'
-  s.version          = '1.1.2'
+  s.version          = '1.1.3'
   s.summary          = 'Google iOS SDK data transport.'
 
   s.description      = <<-DESC

GoogleDataTransport/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v1.1.3
+- Wrap decoding in GDTUploadCoordinator in a try catch. (#3676)
+
 # v1.1.2
 - Add initial support for iOS 13.
 - Add initial support for Catalyst.

GoogleDataTransport/GDTLibrary/GDTUploadCoordinator.m

@@ -163,16 +163,23 @@ + (BOOL)supportsSecureCoding {
 
 - (instancetype)initWithCoder:(NSCoder *)aDecoder {
   GDTUploadCoordinator *sharedCoordinator = [GDTUploadCoordinator sharedInstance];
-  sharedCoordinator->_targetToInFlightPackages =
-      [aDecoder decodeObjectOfClass:[NSMutableDictionary class]
-                             forKey:ktargetToInFlightPackagesKey];
+  @try {
+    sharedCoordinator->_targetToInFlightPackages =
+        [aDecoder decodeObjectOfClass:[NSMutableDictionary class]
+                               forKey:ktargetToInFlightPackagesKey];
+
+  } @catch (NSException *exception) {
+    sharedCoordinator->_targetToInFlightPackages = [NSMutableDictionary dictionary];
+  }
   return sharedCoordinator;
 }
 
 - (void)encodeWithCoder:(NSCoder *)aCoder {
   // All packages that have been given to uploaders need to be tracked so that their expiration
   // timers can be called.
-  [aCoder encodeObject:_targetToInFlightPackages forKey:ktargetToInFlightPackagesKey];
+  if (_targetToInFlightPackages.count > 0) {
+    [aCoder encodeObject:_targetToInFlightPackages forKey:ktargetToInFlightPackagesKey];
+  }
 }
 
 #pragma mark - GDTLifecycleProtocol

GoogleDataTransport/GDTTests/Unit/GDTUploadCoordinatorTest.m

@@ -146,4 +146,16 @@ - (void)testThatAFailedUploadResultsInAnEventualRetry {
   });
 }
 
+/** Tests that encoding and decoding works without crashing. */
+- (void)testNSSecureCoding {
+  GDTUploadPackage *package = [[GDTUploadPackage alloc] initWithTarget:kGDTTargetTest];
+  GDTUploadCoordinator *coordinator = [[GDTUploadCoordinator alloc] init];
+  coordinator.targetToInFlightPackages[@(kGDTTargetTest)] = package;
+  NSData *data = [NSKeyedArchiver archivedDataWithRootObject:coordinator];
+
+  // Unarchiving the coordinator always ends up altering the singleton instance.
+  GDTUploadCoordinator *unarchivedCoordinator = [NSKeyedUnarchiver unarchiveObjectWithData:data];
+  XCTAssertEqualObjects([GDTUploadCoordinator sharedInstance], unarchivedCoordinator);
+}
+
 @end