From 45a51d138e88070360faa5d76f7c6a2b526e8563 Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 23 Jul 2021 09:50:09 +0200 Subject: [PATCH] Voip log: clean after Benoit review --- .../matrix/android/sdk/api/logger/LoggerTag.kt | 15 ++++++--------- .../internal/session/call/CallSignalingHandler.kt | 3 ++- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/logger/LoggerTag.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/logger/LoggerTag.kt index 9978ae32aa..9e7ee297f1 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/logger/LoggerTag.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/logger/LoggerTag.kt @@ -22,16 +22,13 @@ package org.matrix.android.sdk.api.logger * val loggerTag = LoggerTag("MyTag", LoggerTag.VOIP) * Timber.tag(loggerTag.value).v("My log message") */ -open class LoggerTag(private val _value: String, private val parentTag: LoggerTag? = null) { +open class LoggerTag(_value: String, parentTag: LoggerTag? = null) { object VOIP : LoggerTag("VOIP", null) - val value: String - get() { - return if (parentTag == null) { - _value - } else { - "${parentTag.value}/$_value" - } - } + val value: String = if (parentTag == null) { + _value + } else { + "${parentTag.value}/$_value" + } } diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallSignalingHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallSignalingHandler.kt index a71fdeae03..59058bf976 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallSignalingHandler.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallSignalingHandler.kt @@ -38,6 +38,7 @@ import timber.log.Timber import javax.inject.Inject private val loggerTag = LoggerTag("CallSignalingHandler", LoggerTag.VOIP) +private const val MAX_AGE_TO_RING = 40_000 @SessionScope internal class CallSignalingHandler @Inject constructor(private val activeCallHandler: ActiveCallHandler, @@ -185,7 +186,7 @@ internal class CallSignalingHandler @Inject constructor(private val activeCallHa } val now = System.currentTimeMillis() val age = now - (event.ageLocalTs ?: now) - if (age > 40_000 && event.getClearType() == EventType.CALL_INVITE) { + if (age > MAX_AGE_TO_RING) { Timber.tag(loggerTag.value).w("Call invite is too old to ring.") return }