Skip to content

Commit e6efa55

Browse files
BBigTree黄世城
andauthored
fix: check module activity null pointer. (#457)
Co-authored-by: 黄世城 <[email protected]>
1 parent d6b1205 commit e6efa55

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

android/src/main/java/cn/reactnative/modules/update/UpdateModuleImpl.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package cn.reactnative.modules.update;
22

33
import android.app.Activity;
4-
import android.app.Application;
4+
import android.content.Context;
55
import android.util.Log;
66
import com.facebook.react.ReactApplication;
77
import com.facebook.react.ReactInstanceManager;
@@ -117,7 +117,7 @@ public static void reloadUpdate(UpdateContext updateContext, ReactApplicationCon
117117
public void run() {
118118
try {
119119
updateContext.switchVersion(hash);
120-
final Application application = (Application) getReactApplicationContext().getApplicationContext();
120+
final Context application = mContext.getApplicationContext();
121121
ReactInstanceManager instanceManager = updateContext.getCustomReactInstanceManager();
122122

123123
if (instanceManager == null) {
@@ -141,6 +141,7 @@ public void run() {
141141
promise.resolve(true);
142142
} catch (Throwable err) {
143143
promise.reject("pushy:"+err.getMessage());
144+
final Activity activity = mContext.getCurrentActivity();
144145
if (activity != null) {
145146
activity.recreate();
146147
}

android/src/oldarch/cn/reactnative/modules/update/UpdateModule.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package cn.reactnative.modules.update;
22

33
import android.app.Activity;
4-
import android.app.Application;
4+
import android.content.Context;
55
import android.content.Intent;
66
import android.net.Uri;
77
import android.os.Build;
@@ -176,7 +176,7 @@ public void reloadUpdate(ReadableMap options, final Promise promise) {
176176
public void run() {
177177
try {
178178
updateContext.switchVersion(hash);
179-
final Application application = (Application) getReactApplicationContext().getApplicationContext();
179+
final Context application = getReactApplicationContext().getApplicationContext();
180180
ReactInstanceManager instanceManager = updateContext.getCustomReactInstanceManager();
181181

182182
if (instanceManager == null) {
@@ -199,6 +199,7 @@ public void run() {
199199
instanceManager.recreateReactContextInBackground();
200200
promise.resolve(null);
201201
} catch (Throwable err) {
202+
final Activity activity = getCurrentActivity();
202203
if (activity != null) {
203204
activity.recreate();
204205
}

0 commit comments

Comments
 (0)