Skip to content

Commit 83992f1

Browse files
committed
Initialize StreamLog only on the case it wasn't initialized outside
1 parent 8e09aae commit 83992f1

File tree

4 files changed

+16
-6
lines changed

4 files changed

+16
-6
lines changed

demo-app/src/main/kotlin/io/getstream/video/android/util/StreamVideoInitHelper.kt

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ import io.getstream.chat.android.offline.plugin.factory.StreamOfflinePluginFacto
2626
import io.getstream.chat.android.state.plugin.config.StatePluginConfig
2727
import io.getstream.chat.android.state.plugin.factory.StreamStatePluginFactory
2828
import io.getstream.log.Priority
29+
import io.getstream.log.StreamLog
30+
import io.getstream.log.StreamLogger
2931
import io.getstream.video.android.BuildConfig
3032
import io.getstream.video.android.core.StreamVideo
3133
import io.getstream.video.android.core.StreamVideoBuilder

stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/StreamVideoBuilder.kt

+10-4
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import android.content.Context
2121
import androidx.lifecycle.ProcessLifecycleOwner
2222
import com.jakewharton.threetenabp.AndroidThreeTen
2323
import io.getstream.log.AndroidStreamLogger
24+
import io.getstream.log.Priority
2425
import io.getstream.log.StreamLog
2526
import io.getstream.log.streamLog
2627
import io.getstream.video.android.core.call.CallType
@@ -199,9 +200,7 @@ public class StreamVideoBuilder @JvmOverloads constructor(
199200
user = user.copy(role = "user")
200201
}
201202

202-
// Initialize Stream internal loggers
203-
StreamLog.install(AndroidStreamLogger())
204-
StreamLog.setValidator { priority, _ -> priority.level >= loggingLevel.priority.level }
203+
setupStreamLog()
205204

206205
// Android JSR-310 backport backport
207206
AndroidThreeTen.init(context)
@@ -246,7 +245,6 @@ public class StreamVideoBuilder @JvmOverloads constructor(
246245
apiKey = apiKey,
247246
token = token,
248247
tokenProvider = tokenProvider,
249-
loggingLevel = loggingLevel,
250248
lifecycle = lifecycle,
251249
coordinatorConnectionModule = coordinatorConnectionModule,
252250
streamNotificationManager = streamNotificationManager,
@@ -300,6 +298,14 @@ public class StreamVideoBuilder @JvmOverloads constructor(
300298
return client
301299
}
302300

301+
private fun setupStreamLog() {
302+
if (!StreamLog.isInstalled) {
303+
// Initialize Stream internal loggers
304+
StreamLog.install(AndroidStreamLogger())
305+
StreamLog.setValidator { priority, _ -> priority.level >= loggingLevel.priority.level }
306+
}
307+
}
308+
303309
internal fun createCallConfigurationRegistry(
304310
callServiceConfigRegistry: CallServiceConfigRegistry? = null,
305311
callServiceConfig: CallServiceConfig? = null,

stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/StreamVideoClient.kt

-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ internal class StreamVideoClient internal constructor(
148148
internal val apiKey: ApiKey,
149149
internal var token: String,
150150
private val lifecycle: Lifecycle,
151-
private val loggingLevel: LoggingLevel,
152151
internal val coordinatorConnectionModule: CoordinatorConnectionModule,
153152
internal val tokenProvider: TokenProvider = ConstantTokenProvider(token),
154153
internal val streamNotificationManager: StreamNotificationManager,

stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/internal/module/CoordinatorConnectionModule.kt

+4-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import android.net.ConnectivityManager
2121
import androidx.lifecycle.Lifecycle
2222
import io.getstream.android.video.generated.apis.ProductvideoApi
2323
import io.getstream.android.video.generated.infrastructure.Serializer
24+
import io.getstream.log.streamLog
2425
import io.getstream.video.android.core.header.HeadersUtil
2526
import io.getstream.video.android.core.internal.network.NetworkStateProvider
2627
import io.getstream.video.android.core.logging.LoggingLevel
@@ -69,7 +70,9 @@ internal class CoordinatorConnectionModule(
6970
HeadersInterceptor(HeadersUtil()),
7071
)
7172
.addInterceptor(authInterceptor).addInterceptor(
72-
HttpLoggingInterceptor().apply {
73+
HttpLoggingInterceptor {
74+
streamLog(tag = "Video:Http") { it }
75+
}.apply {
7376
level = loggingLevel.httpLoggingLevel.level
7477
},
7578
).retryOnConnectionFailure(true)

0 commit comments

Comments
 (0)