Merge pull request #184 from Microsoft/fix-invalid-jsbundle-issue

Prevent crashes after downloading zip updates containing no valid jsbundle extension

Author: geof90

CodePush.h

@@ -80,7 +80,7 @@ failCallback:(void (^)(NSError *err))failCallback;
                        error:(NSError **)error;
 
 + (NSString *)getPackageFolderPath:(NSString *)packageHash;
-
++ (BOOL)isCodePushError:(NSError *)err;
 
 + (void)downloadPackage:(NSDictionary *)updatePackage
        progressCallback:(void (^)(long long, long long))progressCallback

CodePush.m

@@ -391,6 +391,10 @@ - (void)savePendingUpdate:(NSString *)packageHash
             }
             // The download failed
             failCallback:^(NSError *err) {
+                if ([CodePushPackage isCodePushError:err]) {
+                    [self saveFailedUpdate:updatePackage];
+                }
+                
                 reject([NSString stringWithFormat: @"%lu", (long)err.code], err.localizedDescription, err);
             }];
     });

CodePushPackage.m

@@ -193,6 +193,11 @@ + (NSString *)getPackageFolderPath:(NSString *)packageHash
     return [[self getCodePushPath] stringByAppendingPathComponent:packageHash];
 }
 
++ (BOOL)isCodePushError:(NSError *)err
+{
+    return err != nil && [CodePushErrorDomain isEqualToString:err.domain];
+}
+
 + (void)downloadPackage:(NSDictionary *)updatePackage
        progressCallback:(void (^)(long long, long long))progressCallback
            doneCallback:(void (^)())doneCallback

android/app/src/main/java/com/microsoft/codepush/react/CodePush.java

@@ -298,7 +298,7 @@ private void rollbackPackage() {
         removePendingUpdate();
     }
 
-    private void saveFailedUpdate(WritableMap failedPackage) {
+    private void saveFailedUpdate(ReadableMap failedPackage) {
         SharedPreferences settings = applicationContext.getSharedPreferences(CODE_PUSH_PREFERENCES, 0);
         String failedUpdatesString = settings.getString(FAILED_UPDATES_KEY, null);
         JSONArray failedUpdates;
@@ -379,6 +379,10 @@ public void call(DownloadProgress downloadProgress) {
                     } catch (IOException e) {
                         e.printStackTrace();
                         promise.reject(e.getMessage());
+                    } catch (CodePushInvalidUpdateException e) {
+                        e.printStackTrace();
+                        saveFailedUpdate(updatePackage);
+                        promise.reject(e.getMessage());
                     }
 
                     return null;