Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import io.getstream.android.core.api.StreamClient
import io.getstream.android.core.api.log.StreamLogger
import io.getstream.android.core.api.model.connection.StreamConnectedUser
import io.getstream.android.core.api.model.connection.StreamConnectionState
import io.getstream.android.core.api.model.event.StreamClientWsEvent
import io.getstream.android.core.api.model.exceptions.StreamClientException
import io.getstream.android.core.api.model.value.StreamApiKey
import io.getstream.android.core.api.processing.StreamAggregatedEvent
Expand Down Expand Up @@ -190,6 +191,10 @@ internal class FeedsClientImpl(
listener.onEvent(stateEvent)
}
}
} else if (event is StreamClientWsEvent) {
// Core forwards its own lifecycle events (e.g. connection.ok) to listeners.
// Connection state is exposed separately, so there is nothing to do here.
logger.v { "[onEvent] Ignoring core event: $event" }
} else {
logger.e { "[onEvent] Received non-WSEvent: $event" }
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import io.getstream.android.core.api.StreamClient
import io.getstream.android.core.api.log.StreamLogger
import io.getstream.android.core.api.model.connection.StreamConnectedUser
import io.getstream.android.core.api.model.connection.StreamConnectionState
import io.getstream.android.core.api.model.event.StreamClientWsEvent
import io.getstream.android.core.api.model.exceptions.StreamClientException
import io.getstream.android.core.api.model.value.StreamApiKey
import io.getstream.android.core.api.processing.StreamAggregatedEvent
Expand Down Expand Up @@ -475,6 +476,26 @@ internal class FeedsClientImplTest {
verify(exactly = 1) { feedsEventsSubscriptionManager.forEach(any()) }
}

@Test
fun `on core event, then ignore it without logging an error`() = runTest {
val listener = captureClientListener()

listener.onEvent(object : StreamClientWsEvent {})

verify(exactly = 0) { feedsEventsSubscriptionManager.forEach(any()) }
verify(exactly = 0) { logger.e(any<() -> String>()) }
}

@Test
fun `on unknown event, then log an error`() = runTest {
val listener = captureClientListener()

listener.onEvent("not-an-event")

verify(exactly = 0) { feedsEventsSubscriptionManager.forEach(any()) }
verify(exactly = 1) { logger.e(any<() -> String>()) }
}

private suspend fun captureClientListener(): StreamClientListener {
val listener = slot<StreamClientListener>()
every { coreClient.subscribe(capture(listener)) } returns Result.success(mockk())
Expand Down
Loading