kylefang/react-native-code-push
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native-code-push.git synced 2026-06-10 23:59:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix android install to overwrite pending

Browse Source
This commit is contained in:
Geoffrey Goh
2016-02-05 17:04:27 -08:00
parent e34f51445b
commit 2733af711e
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -481,7 +481,7 @@ public class CodePush {
@Override
protected Void doInBackground(Object... params) {
try {
codePushPackage.installPackage(updatePackage);
codePushPackage.installPackage(updatePackage, isPendingUpdate(null));
String pendingHash = CodePushUtils.tryGetString(updatePackage, codePushPackage.PACKAGE_HASH_KEY);
if (pendingHash == null) {

18
android/app/src/main/java/com/microsoft/codepush/react/CodePushPackage.java
View File

@@ -259,15 +259,23 @@ public class CodePushPackage {
CodePushUtils.writeReadableMapToFile(updatePackage, bundlePath);
}
public void installPackage(ReadableMap updatePackage) throws IOException {
public void installPackage(ReadableMap updatePackage, boolean removePendingUpdate) throws IOException {
String packageHash = CodePushUtils.tryGetString(updatePackage, PACKAGE_HASH_KEY);
WritableMap info = getCurrentPackageInfo();
String previousPackageHash = getPreviousPackageHash();
if (previousPackageHash != null && !previousPackageHash.equals(packageHash)) {
FileUtils.deleteDirectoryAtPath(getPackageFolderPath(previousPackageHash));
if (removePendingUpdate) {
String currentPackageFolderPath = getCurrentPackageFolderPath();
if (currentPackageFolderPath != null) {
FileUtils.deleteDirectoryAtPath(currentPackageFolderPath);
}
} else {
String previousPackageHash = getPreviousPackageHash();
if (previousPackageHash != null && !previousPackageHash.equals(packageHash)) {
FileUtils.deleteDirectoryAtPath(getPackageFolderPath(previousPackageHash));
}
info.putString(PREVIOUS_PACKAGE_KEY, CodePushUtils.tryGetString(info, CURRENT_PACKAGE_KEY));
}
info.putString(PREVIOUS_PACKAGE_KEY, CodePushUtils.tryGetString(info, CURRENT_PACKAGE_KEY));
info.putString(CURRENT_PACKAGE_KEY, packageHash);
updateCurrentPackageInfo(info);
}