jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Voip log: clean after Benoit review

This commit is contained in:
ganfra 2021-07-23 09:50:09 +02:00
parent e3464f58fa
commit 45a51d138e
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/logger/LoggerTag.kt
View File

@ -22,16 +22,13 @@ package org.matrix.android.sdk.api.logger
* val loggerTag = LoggerTag("MyTag", LoggerTag.VOIP) * val loggerTag = LoggerTag("MyTag", LoggerTag.VOIP)
* Timber.tag(loggerTag.value).v("My log message") * 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) object VOIP : LoggerTag("VOIP", null)
val value: String val value: String = if (parentTag == null) {
get() { _value
return if (parentTag == null) { } else {
_value "${parentTag.value}/$_value"
} else { }
"${parentTag.value}/$_value"
}
}
} }

3
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallSignalingHandler.kt
View File

@ -38,6 +38,7 @@ import timber.log.Timber
import javax.inject.Inject import javax.inject.Inject
private val loggerTag = LoggerTag("CallSignalingHandler", LoggerTag.VOIP) private val loggerTag = LoggerTag("CallSignalingHandler", LoggerTag.VOIP)
private const val MAX_AGE_TO_RING = 40_000
@SessionScope @SessionScope
internal class CallSignalingHandler @Inject constructor(private val activeCallHandler: ActiveCallHandler, 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 now = System.currentTimeMillis()
val age = now - (event.ageLocalTs ?: now) 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.") Timber.tag(loggerTag.value).w("Call invite is too old to ring.")
return return
} }