Do not terminate default lifecycle

Tinder · Jan 17, 2019 · abf165a · abf165a
1 parent 7e3ab5d
commit abf165a
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 50 deletions.
diff --git a/demo/src/main/java/com/tinder/app/websocket/echo/view/EchoBotFragment.kt b/demo/src/main/java/com/tinder/app/websocket/echo/view/EchoBotFragment.kt
@@ -75,6 +75,8 @@ class EchoBotFragment : Fragment() {
                 val numberOfMessages = chatView.getMessageView().messageList.size
                 if (numberOfMessages == 0) {
                     setMessages(chatMessages)
+                } else if (chatMessages.isEmpty()) {
+                    chatView.getMessageView().removeAll()
                 } else {
                     for (i in numberOfMessages until chatMessages.size) {
                         addMessage(chatMessages[i])

diff --git a/...android/src/main/java/com/tinder/scarlet/lifecycle/android/ApplicationResumedLifecycle.kt b/...android/src/main/java/com/tinder/scarlet/lifecycle/android/ApplicationResumedLifecycle.kt
diff --git a/...apter-gson/src/test/java/com/tinder/scarlet/messageadapter/gson/GsonMessageAdapterTest.kt b/...apter-gson/src/test/java/com/tinder/scarlet/messageadapter/gson/GsonMessageAdapterTest.kt
@@ -184,9 +184,6 @@ internal class GsonMessageAdapterTest {
             @Receive
             fun observeEvents(): Stream<WebSocketEvent>
 
-            @Receive
-            fun observeStateTransition(): Stream<StateTransition>
-
             @Send
             fun sendString(message: String): Boolean
 

diff --git a/scarlet/src/main/java/com/tinder/scarlet/lifecycle/DefaultLifecycle.kt b/scarlet/src/main/java/com/tinder/scarlet/lifecycle/DefaultLifecycle.kt
@@ -6,8 +6,12 @@ package com.tinder.scarlet.lifecycle
 
 import com.tinder.scarlet.Lifecycle
 import com.tinder.scarlet.LifecycleState
-import io.reactivex.Flowable
 
-internal class DefaultLifecycle() : Lifecycle by FlowableLifecycle(
-    Flowable.just(LifecycleState.Started)
-)
+internal class DefaultLifecycle(
+    private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry()
+) : Lifecycle by lifecycleRegistry {
+    init {
+        lifecycleRegistry.onNext(LifecycleState.Started)
+    }
+}
+
diff --git a/scarlet/src/test/java/com/tinder/scarlet/lifecycle/DefaultLifecycleTest.kt b/scarlet/src/test/java/com/tinder/scarlet/lifecycle/DefaultLifecycleTest.kt
@@ -20,4 +20,14 @@ internal class DefaultLifecycleTest {
         // Then
         testSubscriber.assertValues(LifecycleState.Started)
     }
+
+    @Test
+    fun observeState_shouldNotTerminate() {
+        // When
+        val testSubscriber = Flowable.fromPublisher(defaultLifecycle).test()
+
+        // Then
+        testSubscriber.assertNotTerminated()
+    }
+
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -184,9 +184,6 @@ internal class GsonMessageAdapterTest { @@
                 @Receive
                 fun observeEvents(): Stream<WebSocketEvent>
-                @Receive
-                fun observeStateTransition(): Stream<StateTransition>
                 @Send
                 fun sendString(message: String): Boolean
@@ Expand Down @@