react-native-update 10.17.1 → 10.19.0

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

@@ -117,8 +117,7 @@ public class UpdateModuleImpl {
             public void run() {
                 try {
                     updateContext.switchVersion(hash);
-                    Activity activity = mContext.getCurrentActivity();
-                    Application application = activity.getApplication();
+                    final Application application = (Application) getReactApplicationContext().getApplicationContext();
                     ReactInstanceManager instanceManager = updateContext.getCustomReactInstanceManager();
 
                     if (instanceManager == null) {
@@ -142,7 +141,9 @@ public class UpdateModuleImpl {
                         promise.resolve(true);
                     } catch (Throwable err) {
                         promise.reject("pushy:"+err.getMessage());
-                        activity.recreate();
+                        if (activity != null) {
+                            activity.recreate();
+                        }
                     }
 
                 } catch (Throwable err) {

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

@@ -176,8 +176,7 @@ public class UpdateModule extends ReactContextBaseJavaModule {
             public void run() {
                 try {
                     updateContext.switchVersion(hash);
-                    Activity activity = getCurrentActivity();
-                    Application application = activity.getApplication();
+                    final Application application = (Application) getReactApplicationContext().getApplicationContext();
                     ReactInstanceManager instanceManager = updateContext.getCustomReactInstanceManager();
 
                     if (instanceManager == null) {
@@ -200,7 +199,9 @@ public class UpdateModule extends ReactContextBaseJavaModule {
                         instanceManager.recreateReactContextInBackground();
                         promise.resolve(null);
                     } catch (Throwable err) {
-                        activity.recreate();
+                        if (activity != null) {
+                            activity.recreate();
+                        }
                         promise.reject(err);
                     }
 

package/ios/RCTPushy/RCTPushy.mm

@@ -1,6 +1,10 @@
 #import "RCTPushy.h"
 #import "RCTPushyDownloader.h"
 #import "RCTPushyManager.h"
+
+#if __has_include("RCTReloadCommand.h")
+#import "RCTReloadCommand.h"
+#endif
 // Thanks to this guard, we won't import this header when we build for the old architecture.
 #ifdef RCT_NEW_ARCH_ENABLED
 #import "RCTPushySpec.h"
@@ -311,14 +315,17 @@ RCT_EXPORT_METHOD(reloadUpdate:(NSDictionary *)options
         if (hash.length) {
             [self setNeedUpdate:options resolver:resolve rejecter:reject];
             
-            // reload 0.62+
-            // RCTReloadCommandSetBundleURL([[self class] bundleURL]);
-            // RCTTriggerReloadCommandListeners(@"pushy reload");
-            
-           dispatch_async(dispatch_get_main_queue(), ^{
-               [self.bridge setValue:[[self class] bundleURL] forKey:@"bundleURL"];
-               [self.bridge reload];
-           });
+            #if __has_include("RCTReloadCommand.h")
+                // reload 0.62+
+                RCTReloadCommandSetBundleURL([[self class] bundleURL]);
+                RCTTriggerReloadCommandListeners(@"pushy reload");
+            #else
+                // reload in earlier version
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    [self.bridge setValue:[[self class] bundleURL] forKey:@"bundleURL"];
+                    [self.bridge reload];
+                });
+            #endif
             resolve(@true);
         }else{
             reject(@"执行报错", nil, nil);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "10.17.1",
+  "version": "10.19.0",
   "description": "react-native hot update",
   "main": "src/index",
   "scripts": {