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

Merge pull request #416 from Microsoft/getConfig

Browse Source 
[Android] Guarding against NPEs in getConfiguration
This commit is contained in:
Jonathan Carter
2016-07-05 21:41:59 -07:00
committed by GitHub
parent 59f6a25ce6 d26188fb12
commit b665afdeb5
2 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,22 +32,30 @@ import java.util.HashMap;
import java.util.Map;
public class CodePushNativeModule extends ReactContextBaseJavaModule {
private String mBinaryContentsHash = null;
private String mClientUniqueId = null;
private LifecycleEventListener mLifecycleEventListener = null;
private int mMinimumBackgroundDuration = 0;
private CodePush mCodePush;
private CodePushUpdateManager mUpdateManager;
private CodePushTelemetryManager mTelemetryManager;
private SettingsManager mSettingsManager;
private CodePushTelemetryManager mTelemetryManager;
private CodePushUpdateManager mUpdateManager;
private static final String REACT_APPLICATION_CLASS_NAME = "com.facebook.react.ReactApplication";
private static final String REACT_NATIVE_HOST_CLASS_NAME = "com.facebook.react.ReactNativeHost";
public CodePushNativeModule(ReactApplicationContext reactContext, CodePush codePush, CodePushUpdateManager codePushUpdateManager, CodePushTelemetryManager codePushTelemetryManager, SettingsManager settingsManager) {
super(reactContext);
mCodePush = codePush;
mUpdateManager = codePushUpdateManager;
mTelemetryManager = codePushTelemetryManager;
mSettingsManager = settingsManager;
mTelemetryManager = codePushTelemetryManager;
mUpdateManager = codePushUpdateManager;
// Initialize module state while we have a reference to the current context.
mBinaryContentsHash = CodePushUpdateUtils.getHashForBinaryContents(reactContext, mCodePush.isDebugMode());
mClientUniqueId = Settings.Secure.getString(reactContext.getContentResolver(), Settings.Secure.ANDROID_ID);
}
@Override
@@ -240,19 +248,15 @@ 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("clientUniqueId", mClientUniqueId);
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);
// The binary hash may be null in debug builds
if (mBinaryContentsHash != null) {
configMap.putString(CodePushConstants.PACKAGE_HASH_KEY, mBinaryContentsHash);
}
promise.resolve(configMap);

8
android/app/src/main/java/com/microsoft/codepush/react/CodePushUpdateUtils.java
View File

@@ -1,6 +1,6 @@
package com.microsoft.codepush.react;
import android.app.Activity;
import android.content.Context;
import com.facebook.react.bridge.ReadableArray;
import com.facebook.react.bridge.WritableMap;
@@ -98,9 +98,9 @@ public class CodePushUpdateUtils {
return null;
}
public static String getHashForBinaryContents(Activity mainActivity, boolean isDebugMode) {
public static String getHashForBinaryContents(Context context, boolean isDebugMode) {
try {
return CodePushUtils.getStringFromInputStream(mainActivity.getAssets().open(CodePushConstants.CODE_PUSH_HASH_FILE_NAME));
return CodePushUtils.getStringFromInputStream(context.getAssets().open(CodePushConstants.CODE_PUSH_HASH_FILE_NAME));
} catch (IOException e) {
if (!isDebugMode) {
// Only print this message in "Release" mode. In "Debug", we may not have the
@@ -128,4 +128,4 @@ public class CodePushUpdateUtils {
throw new CodePushInvalidUpdateException("The update contents failed the data integrity check.");
}
}
}
}