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

Fixed issue with [Android] restartApp() throwing exception w/ release build #861

Merged
sergey-akhalkov merged 5 commits into from
Jun 1, 2017
Merged

Fixed issue with [Android] restartApp() throwing exception w/ release build #861

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
23808ca
Fixed issue with error on parsing plist path
May 17, 2017
dec9398
Merge branch 'master' of https://github.com/Microsoft/react-native-co…
May 26, 2017
1034c6c
Fixed issue with [Android] restartApp() throwing exception w/ release…
May 26, 2017
e122824
Changed return value to null for getUpdateMetadata instead of empty s…
May 29, 2017
2f1afd6
Code refactoring: moved variable assignment out of loop
May 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions android/app/src/main/java/com/microsoft/codepush/react/CodePushNativeModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,12 @@ private void setJSBundle(ReactInstanceManager instanceManager, String latestJSBu
Field bundleLoaderField = instanceManager.getClass().getDeclaredField("mBundleLoader");
Class<?> jsBundleLoaderClass = Class.forName("com.facebook.react.cxxbridge.JSBundleLoader");
Method createFileLoaderMethod = null;
String createFileLoaderMethodName = latestJSBundleFile.toLowerCase().startsWith("assets://")
? "createAssetLoader" : "createFileLoader";

Method[] methods = jsBundleLoaderClass.getDeclaredMethods();
for (Method method : methods) {
if (method.getName().equals("createFileLoader")) {
for (Method method : methods) {
if (method.getName().equals(createFileLoaderMethodName)) {
createFileLoaderMethod = method;
break;
}
Expand All @@ -125,7 +127,7 @@ private void setJSBundle(ReactInstanceManager instanceManager, String latestJSBu
// RN >= v0.34
latestJSBundleLoader = createFileLoaderMethod.invoke(jsBundleLoaderClass, latestJSBundleFile);
} else if (numParameters == 2) {
// RN >= v0.31 && RN < v0.34
// RN >= v0.31 && RN < v0.34 or AssetLoader instance
latestJSBundleLoader = createFileLoaderMethod.invoke(jsBundleLoaderClass, getReactApplicationContext(), latestJSBundleFile);
} else {
throw new NoSuchMethodException("Could not find a recognized 'createFileLoader' method");
Expand Down