expo-updates 0.11.3 → 0.11.4

package/CHANGELOG.md

@@ -10,6 +10,13 @@
 
 ### 💡 Others
 
+## 0.11.4 — 2022-01-13
+
+### 🐛 Bug fixes
+
+- Fix `IllegalThreadStateException` that occurred when creating an event to send to React Native early in the app lifecycle. ([#15880](https://github.com/expo/expo/pull/15880) by [@esamelson](https://github.com/esamelson))
+- Ensure we return early when updates are disabled on Android. ([#15882](https://github.com/expo/expo/pull/15882) by [@esamelson](https://github.com/esamelson))
+
 ## 0.11.3 — 2021-12-22
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'maven'
 
 group = 'host.exp.exponent'
-version = '0.11.3'
+version = '0.11.4'
 
 apply from: "../scripts/create-manifest-android.gradle"
 
@@ -64,7 +64,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 30)
     versionCode 31
-    versionName '0.11.3'
+    versionName '0.11.4'
     consumerProguardFiles("proguard-rules.pro")
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     // uncomment below to export the database schema when making changes

package/android/src/main/java/expo/modules/updates/UpdatesController.kt

@@ -56,10 +56,13 @@ class UpdatesController private constructor(
   private val databaseHandlerThread = HandlerThread("expo-updates-database")
   private lateinit var databaseHandler: Handler
   private fun initializeDatabaseHandler() {
-    databaseHandlerThread.start()
-    databaseHandler = Handler(databaseHandlerThread.looper)
+    if (!::databaseHandler.isInitialized) {
+      databaseHandlerThread.start()
+      databaseHandler = Handler(databaseHandlerThread.looper)
+    }
   }
 
+  private var isStarted = false
   private var loaderTask: LoaderTask? = null
   private var remoteLoadStatus = ErrorRecoveryDelegate.RemoteLoadStatus.IDLE
 
@@ -81,7 +84,7 @@ class UpdatesController private constructor(
     private set
 
   fun onDidCreateReactInstanceManager(reactInstanceManager: ReactInstanceManager) {
-    if (isEmergencyLaunch) {
+    if (isEmergencyLaunch || !updatesConfiguration.isEnabled) {
       return
     }
     errorRecovery.startMonitoring(reactInstanceManager)
@@ -191,8 +194,15 @@ class UpdatesController private constructor(
    */
   @Synchronized
   fun start(context: Context) {
+    if (isStarted) {
+      return
+    }
+    isStarted = true
+
     if (!updatesConfiguration.isEnabled) {
       launcher = NoDatabaseLauncher(context, updatesConfiguration)
+      notifyController()
+      return
     }
     if (updatesConfiguration.updateUrl == null || updatesConfiguration.scopeKey == null) {
       throw AssertionError("expo-updates is enabled, but no valid URL is configured in AndroidManifest.xml. If you are making a release build for the first time, make sure you have run `expo publish` at least once.")
@@ -200,6 +210,8 @@ class UpdatesController private constructor(
     if (updatesDirectory == null) {
       launcher = NoDatabaseLauncher(context, updatesConfiguration, updatesDirectoryException)
       isEmergencyLaunch = true
+      notifyController()
+      return
     }
 
     initializeDatabaseHandler()
@@ -280,6 +292,9 @@ class UpdatesController private constructor(
 
   @Synchronized
   private fun notifyController() {
+    if (launcher == null) {
+      throw AssertionError("UpdatesController.notifyController was called with a null launcher, which is an error. This method should only be called when an update is ready to launch.")
+    }
     isLoaderTaskFinished = true
     (this as java.lang.Object).notify()
   }
@@ -444,8 +459,10 @@ class UpdatesController private constructor(
      * @param context the base context of the application, ideally a [ReactApplication]
      */
     @JvmStatic fun initialize(context: Context) {
-      initializeWithoutStarting(context)
-      singletonInstance!!.start(context)
+      if (singletonInstance == null) {
+        initializeWithoutStarting(context)
+        singletonInstance!!.start(context)
+      }
     }
 
     /**

package/android/src/main/java/expo/modules/updates/UpdatesUtils.kt

@@ -136,16 +136,20 @@ object UpdatesUtils {
   ) {
     val host = reactNativeHost?.get()
     if (host != null) {
-      val instanceManager = host.reactInstanceManager
       AsyncTask.execute {
         try {
           var reactContext: ReactContext? = null
           // in case we're trying to send an event before the reactContext has been initialized
           // continue to retry for 5000ms
           for (i in 0..4) {
-            reactContext = instanceManager.currentReactContext
-            if (reactContext != null) {
-              break
+            // Calling host.reactInstanceManager has a side effect of creating a new
+            // reactInstanceManager if there isn't already one. We want to avoid this so we check
+            // if it has an instance first.
+            if (host.hasInstance()) {
+              reactContext = host.reactInstanceManager.currentReactContext
+              if (reactContext != null) {
+                break
+              }
             }
             Thread.sleep(1000)
           }

package/android/src/main/java/expo/modules/updates/errorrecovery/ErrorRecovery.kt

@@ -19,8 +19,10 @@ class ErrorRecovery {
   private var previousExceptionHandler: DefaultNativeModuleCallExceptionHandler? = null
 
   fun initialize(delegate: ErrorRecoveryDelegate) {
-    handlerThread.start()
-    handler = ErrorRecoveryHandler(handlerThread.looper, delegate)
+    if (!::handler.isInitialized) {
+      handlerThread.start()
+      handler = ErrorRecoveryHandler(handlerThread.looper, delegate)
+    }
   }
 
   fun startMonitoring(reactInstanceManager: ReactInstanceManager) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-updates",
-  "version": "0.11.3",
+  "version": "0.11.4",
   "description": "Fetches and manages remotely-hosted assets and updates to your app's JS bundle.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -52,5 +52,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "5145f283481b62ea2a12cc98c308ca9b9aef3899"
+  "gitHead": "b4c5971e76728660c1b851da17ec049a343deb40"
 }