From 5bcb6a1ea609ea4091f1410b7fb7a84ba8b973ed Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Sun, 23 Dec 2018 17:25:30 +0100
Subject: [PATCH] DirectionsActivity, DirectionsShortcutActivity: On
 SSLException, print message of root cause rather than the thrown exception.

---
 .../de/schildbach/oeffi/directions/DirectionsActivity.java   | 5 ++++-
 .../oeffi/directions/DirectionsShortcutActivity.java         | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java b/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java
index 7762bcc..3a26821 100644
--- a/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java
+++ b/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java
@@ -40,6 +40,8 @@ import org.osmdroid.views.overlay.Overlay;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.base.Throwables;
+
 import de.schildbach.oeffi.Constants;
 import de.schildbach.oeffi.FromViaToAware;
 import de.schildbach.oeffi.MyActionBar;
@@ -1103,7 +1105,8 @@ public class DirectionsActivity extends OeffiMainActivity implements ActivityCom
             protected void onSSLException(final SSLException x) {
                 final DialogBuilder builder = DialogBuilder.warn(DirectionsActivity.this,
                         R.string.directions_alert_ssl_exception_title);
-                builder.setMessage(getString(R.string.directions_alert_ssl_exception_message, x.toString()));
+                builder.setMessage(getString(R.string.directions_alert_ssl_exception_message,
+                        Throwables.getRootCause(x).toString()));
                 builder.setNeutralButton(R.string.directions_alert_ssl_exception_button_dismiss, null);
                 builder.show();
             }
diff --git a/oeffi/src/de/schildbach/oeffi/directions/DirectionsShortcutActivity.java b/oeffi/src/de/schildbach/oeffi/directions/DirectionsShortcutActivity.java
index 44b9701..e219a22 100644
--- a/oeffi/src/de/schildbach/oeffi/directions/DirectionsShortcutActivity.java
+++ b/oeffi/src/de/schildbach/oeffi/directions/DirectionsShortcutActivity.java
@@ -24,6 +24,8 @@ import javax.net.ssl.SSLException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.base.Throwables;
+
 import de.schildbach.oeffi.Constants;
 import de.schildbach.oeffi.OeffiActivity;
 import de.schildbach.oeffi.R;
@@ -323,7 +325,8 @@ public class DirectionsShortcutActivity extends OeffiActivity
             protected void onSSLException(final SSLException x) {
                 final DialogBuilder builder = DialogBuilder.warn(DirectionsShortcutActivity.this,
                         R.string.directions_alert_ssl_exception_title);
-                builder.setMessage(getString(R.string.directions_alert_ssl_exception_message, x.toString()));
+                builder.setMessage(getString(R.string.directions_alert_ssl_exception_message,
+                        Throwables.getRootCause(x).toString()));
                 builder.setNeutralButton(R.string.directions_alert_ssl_exception_button_dismiss,
                         new DialogInterface.OnClickListener() {
                             public void onClick(final DialogInterface dialog, final int which) {