react-native-ota-hot-update 2.1.7 → 2.1.8

package/README.md

@@ -143,7 +143,7 @@ Open `MainApplication.kt` and add these codes bellow:
 import com.otahotupdate.OtaHotUpdate
 ...
 override fun getJSBundleFile(): String? {
-    return OtaHotUpdate.bundleJS
+    return OtaHotUpdate.bundleJS(this@MainApplication)
 }
 
 ```
@@ -153,11 +153,11 @@ MainApplication.java:
 		@Nullable
 		@Override
 		protected String getJSBundleFile() {
-			return OtaHotUpdate.getBundleJS();
+			return OtaHotUpdate.getBundleJS(this);
 		}
 ```
 
-For jave it maybe can be like: `OtaHotUpdate.Companion.getBundleJS()` depend on kotlin / jdk version on your project, you can use android studio to get the correct format coding.
+For java it maybe can be like: `OtaHotUpdate.Companion.getBundleJS(this)` depend on kotlin / jdk version on your project, you can use android studio to get the correct format coding.
 
 Open `AndroidManifest.xml` :
 

package/android/src/main/java/com/otahotupdate/OtaHotUpdate.kt

@@ -4,7 +4,7 @@ import android.content.Context
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.os.Build
-import com.facebook.react.TurboReactPackage
+import com.facebook.react.BaseReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.module.model.ReactModuleInfo
@@ -16,10 +16,7 @@ import com.rnhotupdate.Common.VERSION
 import com.rnhotupdate.SharedPrefs
 
 
-class OtaHotUpdate(context: Context?) : TurboReactPackage() {
-  init {
-    mContext = context
-  }
+class OtaHotUpdate : BaseReactPackage() {
   override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
     return if (name == OtaHotUpdateModule.NAME) {
       OtaHotUpdateModule(reactContext)
@@ -37,7 +34,6 @@ class OtaHotUpdate(context: Context?) : TurboReactPackage() {
         OtaHotUpdateModule.NAME,
         false,  // canOverrideExistingModule
         false,  // needsEagerInit
-        true,  // hasConstants
         false,  // isCxxModule
         isTurboModule // isTurboModule
       )
@@ -53,24 +49,19 @@ class OtaHotUpdate(context: Context?) : TurboReactPackage() {
         packageManager.getPackageInfo(packageName, 0)
       }
     }
-    private var mContext: Context? = null
-    val bundleJS: String
-      get() {
-        if (mContext == null) {
-          return DEFAULT_BUNDLE
-        }
-        val sharedPrefs = SharedPrefs(mContext!!)
-        val pathBundle = sharedPrefs.getString(PATH)
-        val version = sharedPrefs.getString(VERSION)
-        val currentVersionName = sharedPrefs.getString(CURRENT_VERSION_NAME)
-        if (pathBundle == "" || (currentVersionName != mContext?.getPackageInfo()?.versionName)) {
-          if (version != "") {
-            // reset version number because bundle is wrong version, need download from new version
-            sharedPrefs.putString(VERSION, "")
-          }
-          return DEFAULT_BUNDLE
+    fun bundleJS(context: Context): String {
+      val sharedPrefs = SharedPrefs(context)
+      val pathBundle = sharedPrefs.getString(PATH)
+      val version = sharedPrefs.getString(VERSION)
+      val currentVersionName = sharedPrefs.getString(CURRENT_VERSION_NAME)
+      if (pathBundle == "" || (currentVersionName != context.getPackageInfo().versionName)) {
+        if (version != "") {
+          // reset version number because bundle is wrong version, need download from new version
+          sharedPrefs.putString(VERSION, "")
         }
-        return pathBundle!!
+        return DEFAULT_BUNDLE
       }
+      return pathBundle!!
+    }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-ota-hot-update",
-  "version": "2.1.7",
+  "version": "2.1.8",
   "description": "Hot update for react native",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",

package/plugin/src/index.ts

@@ -6,7 +6,7 @@ const withAndroidAction: any = (config: any) => {
       `
           override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
 
-          override fun getJSBundleFile(): String = OtaHotUpdate.bundleJS`
+          override fun getJSBundleFile(): String = OtaHotUpdate.bundleJS(this@MainApplication)`
     );
     config.modResults.contents = config.modResults.contents.replace(
       /import expo.modules.ReactNativeHostWrapper/g,

package/react-native.config.js

@@ -6,7 +6,7 @@ module.exports = {
     platforms: {
       android: {
         cmakeListsPath: 'generated/jni/CMakeLists.txt',
-        packageInstance: 'new OtaHotUpdate(getApplicationContext())',
+        packageInstance: 'new OtaHotUpdate()',
       },
     },
   },