mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-03 16:10:00 +00:00
Create log messages from WebView just once (#6923)
We were creating the same message twice by mistake. Also, check the retrieved message for passwords before formatting the log line instead of after: this way we don't create a new formatted log line to just discard it
This commit is contained in:
committed by
GitHub
parent
81ed41d580
commit
80de3e4c5d
+6
-15
@@ -33,6 +33,11 @@ class DefaultConsoleMessageLogger : ConsoleMessageLogger {
|
|||||||
else -> Log.DEBUG
|
else -> Log.DEBUG
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Avoid logging any messages that contain "password" to prevent leaking sensitive information
|
||||||
|
if (consoleMessage.message().contains("password=")) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
val message = buildString {
|
val message = buildString {
|
||||||
append(consoleMessage.sourceId())
|
append(consoleMessage.sourceId())
|
||||||
append(":")
|
append(":")
|
||||||
@@ -41,20 +46,6 @@ class DefaultConsoleMessageLogger : ConsoleMessageLogger {
|
|||||||
append(consoleMessage.message())
|
append(consoleMessage.message())
|
||||||
}
|
}
|
||||||
|
|
||||||
// Avoid logging any messages that contain "password" to prevent leaking sensitive information
|
Timber.tag(tag).log(priority = priority, message = message)
|
||||||
if (message.contains("password=")) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
Timber.tag(tag).log(
|
|
||||||
priority = priority,
|
|
||||||
message = buildString {
|
|
||||||
append(consoleMessage.sourceId())
|
|
||||||
append(":")
|
|
||||||
append(consoleMessage.lineNumber())
|
|
||||||
append(" ")
|
|
||||||
append(consoleMessage.message())
|
|
||||||
},
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user