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 | 4330e5e072d1221946942600b273cc7f643ab9fa (patch) | |
tree | e5a2a0e41fa136ec668dc26b8cb74e515a8a93ee /app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java | |
parent | android: Directly use views for snackbars (diff) | |
download | wireguard-android-4330e5e072d1221946942600b273cc7f643ab9fa.tar.xz wireguard-android-4330e5e072d1221946942600b273cc7f643ab9fa.zip |
ExceptionLoggers: never have a null message
Diffstat (limited to 'app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java')
-rw-r--r-- | app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java | 8 |
1 files changed, 4 insertions, 4 deletions
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 b7ce8820..1dc3f907 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) { |