Skip to content

Commit 3051231

Browse files
Merge pull request #361 from jukov/logging_fix
Wrap log method tracing in null check.
2 parents a16303b + c1bc8ec commit 3051231

File tree

1 file changed

+18
-12
lines changed

1 file changed

+18
-12
lines changed

biometric/src/main/java/dev/skomlach/biometric/compat/utils/logging/BiometricLoggerImpl.kt

+18-12
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,13 @@ object BiometricLoggerImpl {
3535

3636

3737
fun e(vararg msgs: Any?) {
38-
val m = mutableListOf(*msgs).also {
39-
it.add(0, "BiometricLogging")
40-
it.add(1, method)
38+
externalLogger?.let { logger ->
39+
val m = mutableListOf(*msgs).also {
40+
it.add(0, "BiometricLogging")
41+
it.add(1, method)
42+
}
43+
logger.logError(*m.toTypedArray())
4144
}
42-
externalLogger?.logError(*m.toTypedArray())
4345
if (DEBUG) Log.e("BiometricLogging", listOf(*msgs).toString())
4446
}
4547

@@ -49,21 +51,25 @@ object BiometricLoggerImpl {
4951

5052

5153
fun e(e: Throwable?, vararg msgs: Any?) {
52-
val m = mutableListOf(*msgs).also {
53-
it.add(0, "BiometricLogging")
54-
it.add(1, method)
54+
externalLogger?.let { logger ->
55+
val m = mutableListOf(*msgs).also {
56+
it.add(0, "BiometricLogging")
57+
it.add(1, method)
58+
}
59+
logger.logException(e, *m.toTypedArray())
5560
}
56-
externalLogger?.logException(e, *m.toTypedArray())
5761
if (DEBUG) Log.e("BiometricLogging", listOf(*msgs).toString(), e)
5862
}
5963

6064

6165
fun d(vararg msgs: Any?) {
62-
val m = mutableListOf(*msgs).also {
63-
it.add(0, "BiometricLogging")
64-
it.add(1, method)
66+
externalLogger?.let { logger ->
67+
val m = mutableListOf(*msgs).also {
68+
it.add(0, "BiometricLogging")
69+
it.add(1, method)
70+
}
71+
logger.log(*m.toTypedArray())
6572
}
66-
externalLogger?.log(*m.toTypedArray())
6773
if (DEBUG) Log.d("BiometricLogging", listOf(*msgs).toString())
6874
}
6975

0 commit comments

Comments
 (0)