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

Guarding against NPEs

Browse Source
This commit is contained in:
Jonathan Carter
2016-07-05 17:50:39 -07:00
parent c4db3d8f7e
commit 8ad33ebc2d
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,6 +80,8 @@ public class CodePushNativeModule extends ReactContextBaseJavaModule {
}
private void loadBundleLegacy(final Activity currentActivity) {
CodePushUtils.log("Legacy restart logic being used");
mCodePush.invalidateCurrentInstance();
currentActivity.runOnUiThread(new Runnable() {
@@ -240,19 +242,23 @@ public class CodePushNativeModule extends ReactContextBaseJavaModule {
@ReactMethod
public void getConfiguration(Promise promise) {
Activity currentActivity = getCurrentActivity();
WritableNativeMap configMap = new WritableNativeMap();
configMap.putString("appVersion", mCodePush.getAppVersion());
configMap.putString("deploymentKey", mCodePush.getDeploymentKey());
configMap.putString("serverUrl", mCodePush.getServerUrl());
configMap.putString("clientUniqueId",
Settings.Secure.getString(currentActivity.getContentResolver(),
android.provider.Settings.Secure.ANDROID_ID));
String binaryHash = CodePushUpdateUtils.getHashForBinaryContents(currentActivity, mCodePush.isDebugMode());
if (binaryHash != null) {
// binaryHash will be null if the React Native assets were not bundled into the APK
// (e.g. in Debug builds)
configMap.putString(CodePushConstants.PACKAGE_HASH_KEY, binaryHash);
Activity currentActivity = getCurrentActivity();
if (currentActivity != null) {
configMap.putString("clientUniqueId",
Settings.Secure.getString(currentActivity.getContentResolver(),
android.provider.Settings.Secure.ANDROID_ID));
String binaryHash = CodePushUpdateUtils.getHashForBinaryContents(currentActivity, mCodePush.isDebugMode());
if (binaryHash != null) {
// binaryHash will be null if the React Native assets were not bundled into the APK
// (e.g. in Debug builds)
configMap.putString(CodePushConstants.PACKAGE_HASH_KEY, binaryHash);
}
}
promise.resolve(configMap);