diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-05-16 17:30:59 +0200 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-05-16 17:36:25 +0200 |
commit | 694577b9b45f3a3042f65a0e50e278b13dc20a39 (patch) | |
tree | e5a2a0e41fa136ec668dc26b8cb74e515a8a93ee /app/src/main/java/com/wireguard/android/util/ExceptionLoggers.java | |
parent | android: Directly use views for snackbars (diff) | |
download | wireguard-android-694577b9b45f3a3042f65a0e50e278b13dc20a39.tar.xz wireguard-android-694577b9b45f3a3042f65a0e50e278b13dc20a39.zip |
ExceptionLoggers: never have a null message
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to '')
-rw-r--r-- | app/src/main/java/com/wireguard/android/util/ExceptionLoggers.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/app/src/main/java/com/wireguard/android/util/ExceptionLoggers.java b/app/src/main/java/com/wireguard/android/util/ExceptionLoggers.java index dbc41ff1..cc7cf17e 100644 --- a/app/src/main/java/com/wireguard/android/util/ExceptionLoggers.java +++ b/app/src/main/java/com/wireguard/android/util/ExceptionLoggers.java @@ -6,8 +6,8 @@ package com.wireguard.android.util; +import android.support.annotation.NonNull; import android.util.Log; - import java9.util.concurrent.CompletionException; import java9.util.function.BiConsumer; @@ -29,11 +29,20 @@ public enum ExceptionLoggers implements BiConsumer<Object, Throwable> { } public static Throwable unwrap(final Throwable throwable) { - if (throwable instanceof CompletionException) + if (throwable instanceof CompletionException && throwable.getCause() != null) return throwable.getCause(); return throwable; } + @NonNull + public static String unwrapMessage(Throwable throwable) { + throwable = unwrap(throwable); + final String message = throwable.getMessage(); + if (message != null) + return message; + return throwable.getClass().getSimpleName(); + } + @Override public void accept(final Object result, final Throwable throwable) { if (throwable != null) |