mirrors/oeffi
1
0
Fork 0
mirror of https://gitlab.com/oeffi/oeffi.git synced 2025-07-07 21:58:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

DirectionsActivity, DirectionsShortcutActivity: On SSLException, print message of root cause rather than the thrown exception.

Browse source
This commit is contained in:
Andreas Schildbach 2018-12-23 17:25:30 +01:00
parent 68f6908b40
commit 5bcb6a1ea6
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java
View file

@ -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();
}

5
oeffi/src/de/schildbach/oeffi/directions/DirectionsShortcutActivity.java
View file

@ -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) {