From b00532ffec18eec74218456ae22c65f26b8efabc Mon Sep 17 00:00:00 2001 From: Jonathan Carter Date: Sat, 7 Nov 2015 07:33:40 -0800 Subject: [PATCH] Fixing appstoreversion regression --- CodePush.ios.js | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/CodePush.ios.js b/CodePush.ios.js index 4def417..f20ad56 100644 --- a/CodePush.ios.js +++ b/CodePush.ios.js @@ -94,22 +94,24 @@ function checkForUpdate() { return new Promise((resolve, reject) => { sdk.queryUpdateWithCurrentPackage(queryPackage, (err, update) => { if (err) { - reject(err); + return reject(err); } - if (update) { - update = extend(update, packageMixins.remote); - - NativeCodePush.isFailedUpdate(update.packageHash) - .then((isFailedHash) => { - update.failedApply = isFailedHash; - resolve(update); - }) - .catch(reject) - .done(); - } else { - resolve(update); + // Ignore updates that require a newer app version, + // since the end-user couldn't reliably apply it + if (!update || update.updateAppVersion) { + return resolve(null); } + + update = extend(update, packageMixins.remote); + + NativeCodePush.isFailedUpdate(update.packageHash) + .then((isFailedHash) => { + update.failedApply = isFailedHash; + resolve(update); + }) + .catch(reject) + .done(); }) }); });