Bugfix for CCPackage and persistency.

There was a wrong key used to determine enabledOnDownload.
InstallURL property was mandatory causing some issues.
EnabledOnDownload is mandatory now, InstallURL is not.

Author: NickyWeber

UnitTests/CCPackageTests.m

@@ -74,6 +74,31 @@ - (void)testInitWithDictionary
     XCTAssertTrue(package.enableOnDownload);
 }
 
+- (void)testInitWithDictionaryMinimumValuesSet
+{
+    NSDictionary *dictionary = @{
+        @"name" : @"DLC",
+        @"resolution" : @"tablethd",
+        @"os" : @"iOS",
+        @"remoteURL" : @"http://foo.fake",
+        @"status" : @(CCPackageStatusInitial),
+        @"enableOnDownload" : @(NO)
+    };
+
+    CCPackage *package = [[CCPackage alloc] initWithDictionary:dictionary];
+
+    CCAssertEqualStrings(package.name, @"DLC");
+    CCAssertEqualStrings(package.resolution, @"tablethd");
+    CCAssertEqualStrings(package.os, @"iOS");
+    XCTAssertEqualObjects(package.remoteURL, [NSURL URLWithString:@"http://foo.fake"]);
+    XCTAssertNil(package.installURL);
+    XCTAssertEqual(package.status, CCPackageStatusInitial);
+    XCTAssertNil(package.localDownloadURL);
+    XCTAssertNil(package.unzipURL);
+    XCTAssertNil(package.folderName);
+    XCTAssertFalse(package.enableOnDownload);
+}
+
 - (void)testToDictionary
 {
     CCPackage *package = [[CCPackage alloc] initWithName:@"DLC"

cocos2d/CCPackage.m

@@ -34,6 +34,7 @@ - (instancetype)initWithName:(NSString *)name resolution:(NSString *)resolution
         self.os = os;
         self.remoteURL = remoteURL;
         self.status = CCPackageStatusInitial;
+        self.enableOnDownload = NO;
     }
 
     return self;
@@ -62,8 +63,13 @@ - (instancetype)initWithDictionary:(NSDictionary *)dictionary
                                                       os:dictionary[PACKAGE_SERIALIZATION_KEY_OS]
                                                remoteURL:[NSURL URLWithString:dictionary[PACKAGE_SERIALIZATION_KEY_REMOTE_URL]]];
 
-    package.installURL = [NSURL fileURLWithPath:dictionary[PACKAGE_SERIALIZATION_KEY_INSTALL_URL]];
     package.status = (CCPackageStatus) [dictionary[PACKAGE_SERIALIZATION_KEY_STATUS] unsignedIntegerValue];
+    package.enableOnDownload = [dictionary[PACKAGE_SERIALIZATION_KEY_ENABLE_ON_DOWNLOAD] boolValue];
+
+    if (dictionary[PACKAGE_SERIALIZATION_KEY_INSTALL_URL])
+    {
+        package.installURL = [NSURL fileURLWithPath:dictionary[PACKAGE_SERIALIZATION_KEY_INSTALL_URL]];
+    }
 
     if (dictionary[PACKAGE_SERIALIZATION_KEY_LOCAL_DOWNLOAD_URL])
     {
@@ -80,11 +86,6 @@ - (instancetype)initWithDictionary:(NSDictionary *)dictionary
         package.folderName = dictionary[PACKAGE_SERIALIZATION_KEY_FOLDER_NAME];
     }
 
-    if (dictionary[PACKAGE_SERIALIZATION_KEY_FOLDER_NAME])
-    {
-        package.enableOnDownload = [dictionary[PACKAGE_SERIALIZATION_KEY_ENABLE_ON_DOWNLOAD] boolValue];
-    }
-
     return package;
 }
 
@@ -103,6 +104,8 @@ - (NSDictionary *)toDictionary
     dictionary[PACKAGE_SERIALIZATION_KEY_OS] = _os;
     dictionary[PACKAGE_SERIALIZATION_KEY_REMOTE_URL] = [_remoteURL absoluteString];
     dictionary[PACKAGE_SERIALIZATION_KEY_VERSION] = @(PACKAGE_SERIALIZATION_VERSION);
+    dictionary[PACKAGE_SERIALIZATION_KEY_ENABLE_ON_DOWNLOAD] = @(_enableOnDownload);
+
     if (_installURL)
     {
         dictionary[PACKAGE_SERIALIZATION_KEY_INSTALL_URL] = [_installURL path];
@@ -123,8 +126,6 @@ - (NSDictionary *)toDictionary
         dictionary[PACKAGE_SERIALIZATION_KEY_FOLDER_NAME] = _folderName;
     }
 
-    dictionary[PACKAGE_SERIALIZATION_KEY_ENABLE_ON_DOWNLOAD] = @(_enableOnDownload);
-
     return dictionary;
 }