aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2018-05-16 17:30:59 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2018-05-16 17:36:25 +0200
commit4330e5e072d1221946942600b273cc7f643ab9fa (patch)
treee5a2a0e41fa136ec668dc26b8cb74e515a8a93ee
parentandroid: Directly use views for snackbars (diff)
downloadwireguard-android-4330e5e072d1221946942600b273cc7f643ab9fa.tar.xz
wireguard-android-4330e5e072d1221946942600b273cc7f643ab9fa.zip
ExceptionLoggers: never have a null message
-rw-r--r--app/src/main/java/com/wireguard/android/QuickTileService.java2
-rw-r--r--app/src/main/java/com/wireguard/android/fragment/TunnelController.java2
-rw-r--r--app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java8
-rw-r--r--app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java4
-rw-r--r--app/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java2
-rw-r--r--app/src/main/java/com/wireguard/android/util/ExceptionLoggers.java13
6 files changed, 20 insertions, 11 deletions
diff --git a/app/src/main/java/com/wireguard/android/QuickTileService.java b/app/src/main/java/com/wireguard/android/QuickTileService.java
index 3bf4d90..8480b65 100644
--- a/app/src/main/java/com/wireguard/android/QuickTileService.java
+++ b/app/src/main/java/com/wireguard/android/QuickTileService.java
@@ -76,7 +76,7 @@ public class QuickTileService extends TileService {
final Throwable throwable) {
if (throwable == null)
return;
- final String error = ExceptionLoggers.unwrap(throwable).getMessage();
+ final String error = ExceptionLoggers.unwrapMessage(throwable);
final String message = getString(R.string.toggle_error, error);
Log.e(TAG, message, throwable);
Toast.makeText(this, message, Toast.LENGTH_LONG).show();
diff --git a/app/src/main/java/com/wireguard/android/fragment/TunnelController.java b/app/src/main/java/com/wireguard/android/fragment/TunnelController.java
index 86cf7fa..aeac686 100644
--- a/app/src/main/java/com/wireguard/android/fragment/TunnelController.java
+++ b/app/src/main/java/com/wireguard/android/fragment/TunnelController.java
@@ -48,7 +48,7 @@ public final class TunnelController {
if (throwable == null)
return;
final Context context = view.getContext();
- final String error = ExceptionLoggers.unwrap(throwable).getMessage();
+ final String error = ExceptionLoggers.unwrapMessage(throwable);
final int messageResId = checked ? R.string.error_up : R.string.error_down;
final String message = context.getString(messageResId, error);
Snackbar.make(view, message, Snackbar.LENGTH_LONG).show();
diff --git a/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java b/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java
index b7ce882..1dc3f90 100644
--- a/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java
+++ b/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java
@@ -54,7 +54,7 @@ public class TunnelEditorFragment extends BaseFragment {
Toast.makeText(getContext(), message, Toast.LENGTH_SHORT).show();
onFinished();
} else {
- final String error = ExceptionLoggers.unwrap(throwable).getMessage();
+ final String error = ExceptionLoggers.unwrapMessage(throwable);
message = getString(R.string.config_save_error, savedTunnel.getName(), error);
Log.e(TAG, message, throwable);
if (binding != null) {
@@ -119,7 +119,7 @@ public class TunnelEditorFragment extends BaseFragment {
try {
binding.getConfig().commitData(newConfig);
} catch (final Exception e) {
- final String error = ExceptionLoggers.unwrap(e).getMessage();
+ final String error = ExceptionLoggers.unwrapMessage(e);
final String tunnelName = tunnel == null ? binding.getConfig().getName() : tunnel.getName();
final String message = getString(R.string.config_save_error, tunnelName, error);
Log.e(TAG, message, e);
@@ -171,7 +171,7 @@ public class TunnelEditorFragment extends BaseFragment {
Log.d(TAG, message);
onFinished();
} else {
- final String error = ExceptionLoggers.unwrap(throwable).getMessage();
+ final String error = ExceptionLoggers.unwrapMessage(throwable);
message = getString(R.string.tunnel_create_error, error);
Log.e(TAG, message, throwable);
if (binding != null) {
@@ -190,7 +190,7 @@ public class TunnelEditorFragment extends BaseFragment {
Log.d(TAG, "Attempting to save config of renamed tunnel " + tunnel.getName());
renamedTunnel.setConfig(newConfig).whenComplete((a, b) -> onConfigSaved(renamedTunnel, b));
} else {
- final String error = ExceptionLoggers.unwrap(throwable).getMessage();
+ final String error = ExceptionLoggers.unwrapMessage(throwable);
message = getString(R.string.tunnel_rename_error, error);
Log.e(TAG, message, throwable);
if (binding != null) {
diff --git a/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java b/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java
index aae12c5..1138796 100644
--- a/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java
+++ b/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java
@@ -239,7 +239,7 @@ public class TunnelListFragment extends BaseFragment {
if (throwable == null) {
message = getResources().getQuantityString(R.plurals.delete_success, count, count);
} else {
- final String error = ExceptionLoggers.unwrap(throwable).getMessage();
+ final String error = ExceptionLoggers.unwrapMessage(throwable);
message = getResources().getQuantityString(R.plurals.delete_error, count, count, error);
Log.e(TAG, message, throwable);
}
@@ -252,7 +252,7 @@ public class TunnelListFragment extends BaseFragment {
String message = null;
for (final Throwable throwable : throwables) {
- final String error = ExceptionLoggers.unwrap(throwable).getMessage();
+ final String error = ExceptionLoggers.unwrapMessage(throwable);
message = getString(R.string.import_error, error);
Log.e(TAG, message, throwable);
}
diff --git a/app/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java b/app/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java
index 3c065d6..8013279 100644
--- a/app/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java
+++ b/app/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java
@@ -102,7 +102,7 @@ public class ZipExporterPreference extends Preference {
private void exportZipComplete(final String filePath, final Throwable throwable) {
if (throwable != null) {
- final String error = ExceptionLoggers.unwrap(throwable).getMessage();
+ final String error = ExceptionLoggers.unwrapMessage(throwable);
final String message = getContext().getString(R.string.export_error, error);
Log.e(TAG, message, throwable);
Snackbar.make(
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 dbc41ff..cc7cf17 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)