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

Merge pull request #410 from Microsoft/restart

Browse Source 
Improve legacy restart logic
This commit is contained in:
Jonathan Carter
2016-07-01 15:45:49 -07:00
committed by GitHub
parent 09ffd38052 a05b064df0
commit dd3acd0ac3
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,24 +79,26 @@ public class CodePushNativeModule extends ReactContextBaseJavaModule {
return false;
}
private void loadBundleLegacy() {
Activity currentActivity = getCurrentActivity();
Intent intent = currentActivity.getIntent();
currentActivity.finish();
currentActivity.startActivity(intent);
private void loadBundleLegacy(final Activity currentActivity) {
mCodePush.invalidateCurrentInstance();
currentActivity.runOnUiThread(new Runnable() {
@Override
public void run() {
currentActivity.recreate();
}
});
}
private void loadBundle() {
mCodePush.clearDebugCacheIfNeeded();
Activity currentActivity = getCurrentActivity();
final Activity currentActivity = getCurrentActivity();
if (!ReactActivity.class.isInstance(currentActivity)) {
// Our preferred reload logic relies on the user's Activity inheriting
// from the core ReactActivity class, so if it doesn't, we fallback
// early to our legacy behavior.
loadBundleLegacy();
loadBundleLegacy(currentActivity);
} else {
try {
ReactActivity reactActivity = (ReactActivity)currentActivity;
@@ -144,14 +146,14 @@ public class CodePushNativeModule extends ReactContextBaseJavaModule {
catch (Exception e) {
// The recreation method threw an unknown exception
// so just simply fallback to restarting the Activity
loadBundleLegacy();
loadBundleLegacy(currentActivity);
}
}
});
} catch (Exception e) {
// Our reflection logic failed somewhere
// so fall back to restarting the Activity
loadBundleLegacy();
loadBundleLegacy(currentActivity);
}
}
}