Skip to content

Commit 0382cfa

Browse files
author
sunny.luo
committed
check activity
1 parent 6ee34eb commit 0382cfa

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,7 @@ public static void reloadUpdate(UpdateContext updateContext, ReactApplicationCon
117117
public void run() {
118118
try {
119119
updateContext.switchVersion(hash);
120-
Activity activity = mContext.getCurrentActivity();
121-
Application application = activity.getApplication();
120+
final Application application = (Application) getReactApplicationContext().getApplicationContext();
122121
ReactInstanceManager instanceManager = updateContext.getCustomReactInstanceManager();
123122

124123
if (instanceManager == null) {
@@ -142,7 +141,9 @@ public void run() {
142141
promise.resolve(true);
143142
} catch (Throwable err) {
144143
promise.reject("pushy:"+err.getMessage());
145-
activity.recreate();
144+
if (activity != null) {
145+
activity.recreate();
146+
}
146147
}
147148

148149
} catch (Throwable err) {

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,7 @@ public void reloadUpdate(ReadableMap options, final Promise promise) {
176176
public void run() {
177177
try {
178178
updateContext.switchVersion(hash);
179-
Activity activity = getCurrentActivity();
180-
Application application = activity.getApplication();
179+
final Application application = (Application) getReactApplicationContext().getApplicationContext();
181180
ReactInstanceManager instanceManager = updateContext.getCustomReactInstanceManager();
182181

183182
if (instanceManager == null) {
@@ -200,7 +199,9 @@ public void run() {
200199
instanceManager.recreateReactContextInBackground();
201200
promise.resolve(null);
202201
} catch (Throwable err) {
203-
activity.recreate();
202+
if (activity != null) {
203+
activity.recreate();
204+
}
204205
promise.reject(err);
205206
}
206207

0 commit comments

Comments
 (0)