Fix BG push when isHeadlessJSTaskEnabledOnStart is disabled (#668)

Author: rlepinski

android/src/main/java/com/urbanairship/reactnative/AirshipModule.kt

@@ -4,11 +4,8 @@ import android.annotation.SuppressLint
 import android.os.Build
 import com.facebook.react.bridge.*
 import com.facebook.react.modules.core.RCTNativeAppEventEmitter
-import com.urbanairship.PendingResult
 import com.urbanairship.actions.ActionResult
-import com.urbanairship.actions.ActionValue
 import com.urbanairship.android.framework.proxy.EventType
-import com.urbanairship.android.framework.proxy.NotificationConfig
 import com.urbanairship.android.framework.proxy.ProxyLogger
 import com.urbanairship.android.framework.proxy.events.EventEmitter
 import com.urbanairship.android.framework.proxy.proxies.AirshipProxy
@@ -19,6 +16,7 @@ import com.urbanairship.android.framework.proxy.proxies.SuspendingPredicate
 import com.urbanairship.json.JsonMap
 import com.urbanairship.json.JsonSerializable
 import com.urbanairship.json.JsonValue
+import com.urbanairship.reactnative.ManifestUtils.isHeadlessJSTaskEnabledOnStart
 import kotlin.time.Duration.Companion.milliseconds
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.filter
@@ -61,6 +59,16 @@ class AirshipModule internal constructor(val context: ReactApplicationContext) :
     override fun initialize() {
         super.initialize()
 
+        if (!context.isHeadlessJSTaskEnabledOnStart()) {
+          scope.launch {
+            EventEmitter.shared().pendingEventListener
+              .filter { !it.type.isForeground() }
+              .collect {
+                AirshipHeadlessEventService.startService(context)
+              }
+          }
+        }
+
         scope.launch {
             // Background events will create a headless JS task in ReactAutopilot since
             // initialized wont be called until we have a JS task.
@@ -196,7 +204,7 @@ class AirshipModule internal constructor(val context: ReactApplicationContext) :
             proxy.channel.getChannelId()
         }
     }
-    
+
     @ReactMethod
     override fun channelWaitForChannelId(promise: Promise) {
         promise.resolve(scope) {

android/src/main/java/com/urbanairship/reactnative/ManifestUtils.kt

@@ -0,0 +1,30 @@
+package com.urbanairship.reactnative
+
+import android.content.Context
+import android.content.pm.PackageManager
+
+object ManifestUtils {
+
+  private const val HEADLESS_JS_TASK_ON_START_MANIFEST_KEY =  "com.urbanairship.reactnative.ALLOW_HEADLESS_JS_TASK_BEFORE_MODULE"
+  private const val EXTENDER_MANIFEST_KEY = "com.urbanairship.reactnative.AIRSHIP_EXTENDER"
+
+  fun Context.extenderClassName(): String? {
+    return try {
+      this.packageManager.getApplicationInfo(this.packageName, PackageManager.GET_META_DATA)
+        .metaData.getString(EXTENDER_MANIFEST_KEY)
+    } catch (e: PackageManager.NameNotFoundException) {
+      null
+    }
+  }
+
+  fun Context.isHeadlessJSTaskEnabledOnStart(): Boolean {
+    return try {
+      this.packageManager.getApplicationInfo(this.packageName, PackageManager.GET_META_DATA)
+        .metaData.getBoolean(HEADLESS_JS_TASK_ON_START_MANIFEST_KEY, true)
+    } catch (e: PackageManager.NameNotFoundException) {
+      true
+    }
+  }
+}
+
+

android/src/main/java/com/urbanairship/reactnative/ReactAutopilot.kt

@@ -3,8 +3,6 @@
 package com.urbanairship.reactnative
 
 import android.content.Context
-import android.content.pm.ApplicationInfo
-import android.content.pm.PackageManager
 import com.urbanairship.UAirship
 import com.urbanairship.analytics.Extension
 import com.urbanairship.android.framework.proxy.BaseAutopilot
@@ -17,6 +15,8 @@ import com.urbanairship.embedded.AirshipEmbeddedInfo
 import com.urbanairship.embedded.AirshipEmbeddedObserver
 import com.urbanairship.json.JsonMap
 import com.urbanairship.json.jsonMapOf
+import com.urbanairship.reactnative.ManifestUtils.extenderClassName
+import com.urbanairship.reactnative.ManifestUtils.isHeadlessJSTaskEnabledOnStart
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
@@ -33,7 +33,7 @@ class ReactAutopilot : BaseAutopilot() {
     override fun onReady(context: Context, airship: UAirship) {
         ProxyLogger.info("Airship React Native version: %s, SDK version: %s", BuildConfig.AIRSHIP_MODULE_VERSION, UAirship.getVersion())
 
-        val allowHeadlessJsTaskBeforeModule = isHeadlessJSTaskEnabledOnStart(context)
+        val allowHeadlessJsTaskBeforeModule = context.isHeadlessJSTaskEnabledOnStart()
         ProxyLogger.debug("ALLOW_HEADLESS_JS_TASK_BEFORE_MODULE: $allowHeadlessJsTaskBeforeModule")
 
         if (allowHeadlessJsTaskBeforeModule) {
@@ -69,48 +69,15 @@ class ReactAutopilot : BaseAutopilot() {
 
     @Suppress("deprecation")
     private fun createExtender(context: Context): AirshipExtender? {
-        val ai: ApplicationInfo
+        val className = context.extenderClassName() ?: return null
         try {
-            ai = context.packageManager.getApplicationInfo(context.packageName, PackageManager.GET_META_DATA)
-
-            if (ai.metaData == null) {
-                return null
-            }
-        } catch (e: PackageManager.NameNotFoundException) {
-            return null
-        }
-
-        val classname = ai.metaData.getString(EXTENDER_MANIFEST_KEY) ?: return null
-
-        try {
-            val extenderClass = Class.forName(classname)
+            val extenderClass = Class.forName(className)
             return extenderClass.getDeclaredConstructor().newInstance() as AirshipExtender
         } catch (e: Exception) {
-            ProxyLogger.error(e, "Unable to create extender: $classname")
+            ProxyLogger.error(e, "Unable to create extender: $className")
         }
         return null
     }
-
-    private fun isHeadlessJSTaskEnabledOnStart(context: Context): Boolean {
-        val ai: ApplicationInfo
-        try {
-            ai = context.packageManager.getApplicationInfo(context.packageName, PackageManager.GET_META_DATA)
-
-            if (ai.metaData == null) {
-                return true
-            }
-        } catch (e: PackageManager.NameNotFoundException) {
-            return true
-        }
-
-        return ai.metaData.getBoolean(HEADLESS_JS_TASK_ON_START_MANIFEST_KEY, true)
-    }
-
-
-    companion object {
-        const val HEADLESS_JS_TASK_ON_START_MANIFEST_KEY = "com.urbanairship.reactnative.ALLOW_HEADLESS_JS_TASK_BEFORE_MODULE"
-        const val EXTENDER_MANIFEST_KEY = "com.urbanairship.reactnative.AIRSHIP_EXTENDER"
-    }
 }
 
 internal class PendingEmbeddedUpdated(pending: List<AirshipEmbeddedInfo>) : Event {