Skip to content
This repository was archived by the owner on May 20, 2025. It is now read-only.

Commit 142859e

Browse files
committed
fix invalid jsbundle issue
1 parent 40944c9 commit 142859e

File tree

4 files changed

+15
-2
lines changed

4 files changed

+15
-2
lines changed

CodePush.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ failCallback:(void (^)(NSError *err))failCallback;
8080
error:(NSError **)error;
8181

8282
+ (NSString *)getPackageFolderPath:(NSString *)packageHash;
83-
83+
+ (BOOL)isCodePushError:(NSError *)err;
8484

8585
+ (void)downloadPackage:(NSDictionary *)updatePackage
8686
progressCallback:(void (^)(long long, long long))progressCallback

CodePush.m

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,10 @@ - (void)savePendingUpdate:(NSString *)packageHash
391391
}
392392
// The download failed
393393
failCallback:^(NSError *err) {
394+
if ([CodePushPackage isCodePushError:err]) {
395+
[self saveFailedUpdate:updatePackage];
396+
}
397+
394398
reject([NSString stringWithFormat: @"%lu", (long)err.code], err.localizedDescription, err);
395399
}];
396400
});

CodePushPackage.m

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,11 @@ + (NSString *)getPackageFolderPath:(NSString *)packageHash
193193
return [[self getCodePushPath] stringByAppendingPathComponent:packageHash];
194194
}
195195

196+
+ (BOOL)isCodePushError:(NSError *)err
197+
{
198+
return err != nil && [CodePushErrorDomain isEqualToString:err.domain];
199+
}
200+
196201
+ (void)downloadPackage:(NSDictionary *)updatePackage
197202
progressCallback:(void (^)(long long, long long))progressCallback
198203
doneCallback:(void (^)())doneCallback

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ private void rollbackPackage() {
298298
removePendingUpdate();
299299
}
300300

301-
private void saveFailedUpdate(WritableMap failedPackage) {
301+
private void saveFailedUpdate(ReadableMap failedPackage) {
302302
SharedPreferences settings = applicationContext.getSharedPreferences(CODE_PUSH_PREFERENCES, 0);
303303
String failedUpdatesString = settings.getString(FAILED_UPDATES_KEY, null);
304304
JSONArray failedUpdates;
@@ -379,6 +379,10 @@ public void call(DownloadProgress downloadProgress) {
379379
} catch (IOException e) {
380380
e.printStackTrace();
381381
promise.reject(e.getMessage());
382+
} catch (CodePushInvalidUpdateException e) {
383+
e.printStackTrace();
384+
saveFailedUpdate(updatePackage);
385+
promise.reject(e.getMessage());
382386
}
383387

384388
return null;

0 commit comments

Comments
 (0)