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
4 changes: 2 additions & 2 deletions demo-app/src/main/kotlin/io/getstream/video/android/App.kt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import android.app.Application
import android.content.Context
import dagger.hilt.android.HiltAndroidApp
import io.getstream.video.android.datastore.delegate.StreamUserDataStore
import io.getstream.video.android.tooling.util.StreamFlavors
import io.getstream.video.android.tooling.util.StreamBuildFlavorUtil
import io.getstream.video.android.util.StreamVideoInitHelper
import kotlinx.coroutines.runBlocking

Expand Down Expand Up @@ -57,7 +57,7 @@ class App : Application() {

val Context.app get() = applicationContext as App

val defaultCallId get() = if (BuildConfig.FLAVOR == StreamFlavors.development) {
val defaultCallId get() = if (StreamBuildFlavorUtil.isDevelopment) {
"default:79cYh3J5JgGk"
} else {
""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import io.getstream.video.android.core.StreamVideo
import io.getstream.video.android.core.notifications.NotificationHandler
import io.getstream.video.android.datastore.delegate.StreamUserDataStore
import io.getstream.video.android.model.StreamCallId
import io.getstream.video.android.tooling.util.StreamFlavors
import io.getstream.video.android.tooling.util.StreamBuildFlavorUtil
import io.getstream.video.android.ui.AppNavHost
import io.getstream.video.android.ui.AppScreens
import io.getstream.video.android.ui.common.StreamCallActivity
Expand Down Expand Up @@ -66,7 +66,7 @@ class MainActivity : ComponentActivity() {
// Try to read the Google Play install referrer value. We use it to deliver
// the Call ID from the QR code link.
@Suppress("KotlinConstantConditions")
if (BuildConfig.FLAVOR == StreamFlavors.production) {
if (StreamBuildFlavorUtil.isProduction) {
InstallReferrer(this).extractInstallReferrer { callId: String ->
Log.d("MainActivity", "Call ID: $callId")
firebaseAnalytics.logEvent(FirebaseEvents.INSTALL_FROM_QR_CODE, null)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/*
* Copyright (c) 2014-2024 Stream.io Inc. All rights reserved.
*
* Licensed under the Stream License;
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://github.com/GetStream/stream-video-android/blob/main/LICENSE
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package io.getstream.video.android.data.datasource.local

import io.getstream.video.android.model.User

interface InMemoryStore {

fun saveUser(user: User)

fun getUser(): User?
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* Copyright (c) 2014-2024 Stream.io Inc. All rights reserved.
*
* Licensed under the Stream License;
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://github.com/GetStream/stream-video-android/blob/main/LICENSE
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package io.getstream.video.android.data.datasource.local

import io.getstream.video.android.model.User

/**
* Only used in E2E Testing builds
*/
class InMemoryStoreImpl : InMemoryStore {
private var temporaryUser: User? = null

override fun saveUser(user: User) {
temporaryUser = user
}

override fun getUser(): User? {
return temporaryUser
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/*
* Copyright (c) 2014-2024 Stream.io Inc. All rights reserved.
*
* Licensed under the Stream License;
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://github.com/GetStream/stream-video-android/blob/main/LICENSE
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package io.getstream.video.android.data.datasource.local

import io.getstream.video.android.model.User

class NoopMemoryStoreImpl : InMemoryStore {

override fun saveUser(user: User) {}

override fun getUser(): User? = null
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,13 @@ import dagger.hilt.InstallIn
import dagger.hilt.android.qualifiers.ApplicationContext
import dagger.hilt.components.SingletonComponent
import io.getstream.video.android.R
import io.getstream.video.android.data.datasource.local.InMemoryStore
import io.getstream.video.android.data.datasource.local.InMemoryStoreImpl
import io.getstream.video.android.data.datasource.local.NoopMemoryStoreImpl
import io.getstream.video.android.data.repositories.GoogleAccountRepository
import io.getstream.video.android.datastore.delegate.StreamUserDataStore
import io.getstream.video.android.tooling.util.StreamBuildFlavor
import io.getstream.video.android.tooling.util.StreamBuildFlavorUtil
import io.getstream.video.android.util.NetworkMonitor
import javax.inject.Singleton

Expand Down Expand Up @@ -62,4 +67,14 @@ object AppModule {
@Singleton
fun provideNetworkMonitor(@ApplicationContext context: Context) =
NetworkMonitor(context)

@Provides
@Singleton
fun provideInMemoryStore(): InMemoryStore {
val buildFlavour = StreamBuildFlavorUtil.current
return when (buildFlavour) {
StreamBuildFlavor.E2eTesting -> InMemoryStoreImpl()
else -> NoopMemoryStoreImpl()
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,35 @@

package io.getstream.video.android.tooling.util

import io.getstream.video.android.BuildConfig
import io.getstream.video.android.tooling.util.StreamBuildFlavor.Development
import io.getstream.video.android.tooling.util.StreamBuildFlavor.E2eTesting
import io.getstream.video.android.tooling.util.StreamBuildFlavor.Production

/**
* Defined flavors. Used in code logic.
*/
internal object StreamFlavors {
const val development = "development"
const val production = "production"

object StreamBuildFlavorUtil {
val current: StreamBuildFlavor
get() = StreamBuildFlavor.from(BuildConfig.FLAVOR)

val isDevelopment: Boolean get() = current == Development
val isProduction: Boolean get() = current == Production
val isE2eTesting: Boolean get() = current == E2eTesting
}

enum class StreamBuildFlavor(val type: String) {
Development("development"),
Production("production"),
E2eTesting("e2etesting"),
;

companion object {
fun from(type: String?): StreamBuildFlavor {
return entries.find { it.type == type } ?: Development
}
}
}

public object StreamEnvironments {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ import io.getstream.video.android.filters.video.VirtualBackgroundVideoFilter
import io.getstream.video.android.mock.StreamPreviewDataUtils
import io.getstream.video.android.mock.previewCall
import io.getstream.video.android.tooling.extensions.toPx
import io.getstream.video.android.tooling.util.StreamFlavors
import io.getstream.video.android.tooling.util.StreamBuildFlavorUtil
import io.getstream.video.android.ui.closedcaptions.ClosedCaptionUiState
import io.getstream.video.android.ui.closedcaptions.ClosedCaptionUiState.Available.toClosedCaptionUiState
import io.getstream.video.android.ui.closedcaptions.ClosedCaptionsContainer
Expand Down Expand Up @@ -287,7 +287,7 @@ fun CallScreen(
call = call,
layout = layout,
enableInPictureInPicture = true,
enableDiagnostics = BuildConfig.DEBUG || BuildConfig.FLAVOR == StreamFlavors.development,
enableDiagnostics = BuildConfig.DEBUG || StreamBuildFlavorUtil.isDevelopment,
onCallAction = {
when (it) {
ChooseLayout -> isShowingLayoutChooseMenu = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ import androidx.compose.ui.window.Popup
import androidx.compose.ui.window.PopupPositionProvider
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import io.getstream.video.android.BuildConfig
import io.getstream.video.android.R
import io.getstream.video.android.compose.theme.VideoTheme
import io.getstream.video.android.compose.ui.components.avatar.UserAvatar
Expand All @@ -101,7 +100,7 @@ import io.getstream.video.android.defaultCallId
import io.getstream.video.android.mock.StreamPreviewDataUtils
import io.getstream.video.android.mock.previewUsers
import io.getstream.video.android.model.User
import io.getstream.video.android.tooling.util.StreamFlavors
import io.getstream.video.android.tooling.util.StreamBuildFlavorUtil
import io.getstream.video.android.util.config.AppConfig
import io.getstream.video.android.util.config.types.StreamEnvironment

Expand Down Expand Up @@ -136,7 +135,7 @@ fun CallJoinScreen(
) {
CallJoinHeader(
user = user,
showDirectCall = BuildConfig.FLAVOR == StreamFlavors.development,
showDirectCall = StreamBuildFlavorUtil.isDevelopment || StreamBuildFlavorUtil.isE2eTesting,
onAvatarLongClick = { if (isNetworkAvailable) isSignOutDialogVisible = true },
onDirectCallClick = navigateToDirectCallJoin,
onSignOutClick = {
Expand Down Expand Up @@ -197,7 +196,7 @@ private fun HandleCallJoinUiState(
@Composable
private fun CallJoinHeader(
user: User?,
isProduction: Boolean = BuildConfig.FLAVOR == StreamFlavors.production,
isProduction: Boolean = StreamBuildFlavorUtil.isProduction,
showDirectCall: Boolean = user?.custom?.get("email")?.contains("getstreamio") == true,
onAvatarLongClick: () -> Unit,
onDirectCallClick: () -> Unit,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,13 @@ import io.getstream.android.push.PushProvider
import io.getstream.chat.android.client.ChatClient
import io.getstream.video.android.core.Call
import io.getstream.video.android.core.StreamVideo
import io.getstream.video.android.data.datasource.local.InMemoryStore
import io.getstream.video.android.datastore.delegate.StreamUserDataStore
import io.getstream.video.android.model.Device
import io.getstream.video.android.model.User
import io.getstream.video.android.model.mapper.isValidCallCid
import io.getstream.video.android.model.mapper.toTypeAndId
import io.getstream.video.android.tooling.util.StreamBuildFlavorUtil
import io.getstream.video.android.util.NetworkMonitor
import io.getstream.video.android.util.StreamVideoInitHelper
import io.getstream.video.android.util.fcmToken
Expand All @@ -37,6 +39,8 @@ import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.SharedFlow
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.flow.filterNotNull
import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.flow.shareIn
Expand All @@ -48,6 +52,7 @@ import javax.inject.Inject
class CallJoinViewModel @Inject constructor(
private val dataStore: StreamUserDataStore,
private val googleSignInClient: GoogleSignInClient,
private val inMemoryStore: InMemoryStore,
networkMonitor: NetworkMonitor,
) : ViewModel() {
val user: Flow<User?> = dataStore.user
Expand Down Expand Up @@ -84,6 +89,21 @@ class CallJoinViewModel @Inject constructor(
}
}
}

/**
* For E2E Testing Only
*/
if (StreamBuildFlavorUtil.isE2eTesting) {
viewModelScope.launch {
user
.filterNotNull()
.collectLatest { newUser ->
if (inMemoryStore.getUser() == null) {
inMemoryStore.saveUser(newUser)
}
}
}
}
}

fun handleUiEvent(event: CallJoinEvent) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ import io.getstream.video.android.compose.ui.components.base.styling.StreamDialo
import io.getstream.video.android.model.User
import io.getstream.video.android.models.builtInUsers
import io.getstream.video.android.tooling.extensions.toPx
import io.getstream.video.android.tooling.util.StreamFlavors
import io.getstream.video.android.tooling.util.StreamBuildFlavorUtil
import io.getstream.video.android.util.UserHelper
import io.getstream.video.android.util.config.AppConfig
import io.getstream.video.android.util.config.types.StreamEnvironment
Expand All @@ -127,7 +127,7 @@ fun LoginScreen(
}
val selectedEnv by AppConfig.currentEnvironment.collectAsStateWithLifecycle()
val availableEnvs by remember { mutableStateOf(AppConfig.availableEnvironments) }
val availableLogins = when (BuildConfig.FLAVOR == StreamFlavors.development) {
val availableLogins = when (StreamBuildFlavorUtil.isDevelopment) {
true -> listOf("built-in", "google", "email", "guest")
else -> listOf("google", "email", "guest")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,14 @@ package io.getstream.video.android.ui.outgoing
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import dagger.hilt.android.lifecycle.HiltViewModel
import io.getstream.video.android.BuildConfig
import io.getstream.video.android.data.datasource.local.InMemoryStore
import io.getstream.video.android.data.repositories.GoogleAccountRepository
import io.getstream.video.android.datastore.delegate.StreamUserDataStore
import io.getstream.video.android.model.User
import io.getstream.video.android.models.builtInUsers
import io.getstream.video.android.models.toUsers
import io.getstream.video.android.tooling.util.StreamFlavors
import io.getstream.video.android.tooling.util.StreamBuildFlavor
import io.getstream.video.android.tooling.util.StreamBuildFlavorUtil
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.firstOrNull
Expand All @@ -37,6 +38,7 @@ import javax.inject.Inject
class DirectCallJoinViewModel @Inject constructor(
private val userDataStore: StreamUserDataStore,
private val googleAccountRepository: GoogleAccountRepository,
private val inMemoryStore: InMemoryStore,
) : ViewModel() {
private val _uiState = MutableStateFlow(DirectCallUiState())
val uiState = _uiState.asStateFlow()
Expand All @@ -50,8 +52,15 @@ class DirectCallJoinViewModel @Inject constructor(
private suspend fun getCombinedUsers(): List<User> {
val currentUser = userDataStore.user.firstOrNull()
val googleUsers = suspend { googleAccountRepository.getAllAccounts().orEmpty().toUsers() }
return when (BuildConfig.FLAVOR == StreamFlavors.development) {
true -> User.builtInUsers().filterNot { it.id == currentUser?.id } + googleUsers()
val buildFlavour = StreamBuildFlavorUtil.current
return when (buildFlavour) {
StreamBuildFlavor.Development -> User.builtInUsers()
.filterNot { it.id == currentUser?.id } + googleUsers()

StreamBuildFlavor.E2eTesting -> {
inMemoryStore.getUser()?.let { arrayListOf(it) } ?: emptyList<User>()
}

else -> googleUsers()
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import com.squareup.moshi.adapter
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
import io.getstream.log.taggedLogger
import io.getstream.video.android.BuildConfig
import io.getstream.video.android.tooling.util.StreamFlavors
import io.getstream.video.android.tooling.util.StreamBuildFlavor
import io.getstream.video.android.util.config.types.StreamEnvironment
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.DelicateCoroutinesApi
Expand Down Expand Up @@ -136,7 +136,7 @@ object AppConfig {
}

private fun List<StreamEnvironment>.default(currentFlavor: String): StreamEnvironment {
return if (currentFlavor == StreamFlavors.development) {
return if (currentFlavor == StreamBuildFlavor.Development.type) {
first { it.env == "pronto" }
} else {
first { it.env == "demo" }
Expand Down