Fix LiveUpdate isFeatureEnabled check and push listener (#1333)

Author: jyaganeh

urbanairship-live-update/src/main/java/com/urbanairship/liveupdate/LiveUpdateManager.kt

@@ -16,7 +16,6 @@ import com.urbanairship.config.AirshipRuntimeConfig
 import com.urbanairship.json.JsonMap
 import com.urbanairship.liveupdate.data.LiveUpdateDatabase
 import com.urbanairship.liveupdate.notification.LiveUpdatePayload
-import com.urbanairship.push.PushListener
 import com.urbanairship.push.PushManager
 
 /**
@@ -38,13 +37,7 @@ internal constructor(
 ) : AirshipComponent(context, dataStore) {
 
     private val isFeatureEnabled: Boolean
-        get() = privacyManager.isEnabled(FEATURE_PUSH) && channel.id != null
-
-    private val pushListener = PushListener { message, _ ->
-        message.liveUpdatePayload
-            ?.let { LiveUpdatePayload.fromJson(it) }
-            ?.let { registrar.onLiveUpdatePushReceived(message, it) }
-    }
+        get() = privacyManager.isEnabled(FEATURE_PUSH)
 
     public constructor(
         context: Context,
@@ -158,7 +151,15 @@ internal constructor(
     public override fun init() {
         super.init()
 
+        channel.addChannelListener { updateLiveActivityEnablement() }
         privacyManager.addListener { updateLiveActivityEnablement() }
+
+        pushManager.addPushListener { message, _ ->
+            message.liveUpdatePayload
+                ?.let { LiveUpdatePayload.fromJson(it) }
+                ?.let { registrar.onLiveUpdatePushReceived(message, it) }
+        }
+
         updateLiveActivityEnablement()
     }
 
@@ -169,16 +170,13 @@ internal constructor(
 
     private fun updateLiveActivityEnablement() {
         if (isFeatureEnabled) {
-            pushManager.addPushListener(pushListener)
-
             // Check for any active live Updates that have had their notifications cleared.
             // This makes sure we'll end the live update if the notification is dropped due
             // to an app upgrade or other cases where we don't get notified of the dismiss.
             registrar.stopLiveUpdatesForClearedNotifications()
         } else {
             // Clear all live updates.
             registrar.clearAll()
-            pushManager.removePushListener(pushListener)
         }
     }
 

urbanairship-live-update/src/test/java/com/urbanairship/liveupdate/LiveUpdateManagerTest.kt

@@ -13,6 +13,7 @@ import com.urbanairship.liveupdate.data.LiveUpdateDatabase
 import com.urbanairship.push.PushManager
 import io.mockk.every
 import io.mockk.mockk
+import io.mockk.verify
 import junit.framework.TestCase.assertTrue
 import org.junit.Before
 import org.junit.Test
@@ -26,10 +27,8 @@ public class LiveUpdateManagerTest {
         every { platform } returns ANDROID_PLATFORM
         every { requestSession } returns TestRequestSession()
     }
-    private val pushManager: PushManager = mockk(relaxed = true)
-    private val channel: AirshipChannel = mockk {
-        every { id } returns "channelId"
-    }
+    private val pushManager: PushManager = mockk(relaxUnitFun = true)
+    private val channel: AirshipChannel = mockk(relaxed = true)
     private val dao: LiveUpdateDao = mockk()
     private val database: LiveUpdateDatabase = mockk {
         every { liveUpdateDao() } returns dao
@@ -62,5 +61,8 @@ public class LiveUpdateManagerTest {
     public fun testInit() {
         liveUpdateManager.init()
         assertTrue(liveUpdateManager.isComponentEnabled)
+
+        verify { pushManager.addPushListener(any()) }
+        verify { channel.addChannelListener(any()) }
     }
 }