Skip to content

Fix null package name in AndroidLog after proguard #6094

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yschimke merged 1 commit into from
May 28, 2020
Merged

Fix null package name in AndroidLog after proguard #6094

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 deletions okhttp/src/main/kotlin/okhttp3/internal/platform/android/AndroidLog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,16 @@ object AndroidLog {
private val configuredLoggers = CopyOnWriteArraySet<Logger>()

private val knownLoggers = LinkedHashMap<String, String>().apply {
this[OkHttpClient::class.java.`package`.name] = "OkHttp"
this[OkHttpClient::class.java.name] = "okhttp.OkHttpClient"
this[Http2::class.java.name] = "okhttp.Http2"
this[TaskRunner::class.java.name] = "okhttp.TaskRunner"
}.toMap()
val packageName = OkHttpClient::class.java.`package`?.name

if (packageName != null) {
this[packageName] = "OkHttp"
}

this[OkHttpClient::class.java.name] = "okhttp.OkHttpClient"
this[Http2::class.java.name] = "okhttp.Http2"
this[TaskRunner::class.java.name] = "okhttp.TaskRunner"
}.toMap()

internal fun androidLog(loggerName: String, logLevel: Int, message: String, t: Throwable?) {
val tag = loggerTag(loggerName)
Expand Down