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 bug from merge conflict resolution

Browse Source
This commit is contained in:
Geoffrey Goh
2016-06-28 14:53:42 -07:00
parent c7fa9ace2d
commit 8624904cd4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -452,7 +452,7 @@ public class CodePushNativeModule extends ReactContextBaseJavaModule {
public void restartApp(boolean onlyIfUpdateIsPending, Promise promise) {
// If this is an unconditional restart request, or there
// is current pending update, then reload the app.
if (!onlyIfUpdateIsPending || CodePush.this.isPendingUpdate(null)) {
if (!onlyIfUpdateIsPending || mSettingsManager.isPendingUpdate(null)) {
loadBundle();
promise.resolve(true);
return;