mirror/react-native-update
1
0
Fork 0
mirror of https://gitcode.com/gh_mirrors/re/react-native-pushy.git synced 2025-10-31 21:33:12 +08:00
Code Issues Packages Projects Releases Wiki Activity GitHub Gitee

fix: check module activity null pointer. (#457)

Browse Source 
Co-authored-by: 黄世城 <huangshicheng@xgd.com>
This commit is contained in:
CrazyBigTree
2024-12-10 20:42:34 +08:00
committed by GitHub
parent d6b1205fb9
commit e6efa55bd5
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android/src/main/java/cn/reactnative/modules/update/UpdateModuleImpl.java
View File

@@ -1,7 +1,7 @@
package cn.reactnative.modules.update; package cn.reactnative.modules.update;
import android.app.Activity; import android.app.Activity;
import android.app.Application; import android.content.Context;
import android.util.Log; import android.util.Log;
import com.facebook.react.ReactApplication; import com.facebook.react.ReactApplication;
import com.facebook.react.ReactInstanceManager; import com.facebook.react.ReactInstanceManager;
@@ -117,7 +117,7 @@ public class UpdateModuleImpl {
public void run() { public void run() {
try { try {
updateContext.switchVersion(hash); updateContext.switchVersion(hash);
final Application application = (Application) getReactApplicationContext().getApplicationContext(); final Context application = mContext.getApplicationContext();
ReactInstanceManager instanceManager = updateContext.getCustomReactInstanceManager(); ReactInstanceManager instanceManager = updateContext.getCustomReactInstanceManager();
if (instanceManager == null) { if (instanceManager == null) {
@@ -141,6 +141,7 @@ public class UpdateModuleImpl {
promise.resolve(true); promise.resolve(true);
} catch (Throwable err) { } catch (Throwable err) {
promise.reject("pushy:"+err.getMessage()); promise.reject("pushy:"+err.getMessage());
final Activity activity = mContext.getCurrentActivity();
if (activity != null) { if (activity != null) {
activity.recreate(); activity.recreate();
} }

5
android/src/oldarch/cn/reactnative/modules/update/UpdateModule.java
View File

@@ -1,7 +1,7 @@
package cn.reactnative.modules.update; package cn.reactnative.modules.update;
import android.app.Activity; import android.app.Activity;
import android.app.Application; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
@@ -176,7 +176,7 @@ public class UpdateModule extends ReactContextBaseJavaModule {
public void run() { public void run() {
try { try {
updateContext.switchVersion(hash); updateContext.switchVersion(hash);
final Application application = (Application) getReactApplicationContext().getApplicationContext(); final Context application = getReactApplicationContext().getApplicationContext();
ReactInstanceManager instanceManager = updateContext.getCustomReactInstanceManager(); ReactInstanceManager instanceManager = updateContext.getCustomReactInstanceManager();
if (instanceManager == null) { if (instanceManager == null) {
@@ -199,6 +199,7 @@ public class UpdateModule extends ReactContextBaseJavaModule {
instanceManager.recreateReactContextInBackground(); instanceManager.recreateReactContextInBackground();
promise.resolve(null); promise.resolve(null);
} catch (Throwable err) { } catch (Throwable err) {
final Activity activity = getCurrentActivity();
if (activity != null) { if (activity != null) {
activity.recreate(); activity.recreate();
} }