Display the deeper cause for connection failure

5 files changed, 7 insertions, 5 deletions

diff --git a/app/src/main/java/se/lublin/mumla/app/MumlaActivity.java b/app/src/main/java/se/lublin/mumla/app/MumlaActivity.java
index 1f6170d..48525a4 100644
--- a/app/src/main/java/se/lublin/mumla/app/MumlaActivity.java
+++ b/app/src/main/java/se/lublin/mumla/app/MumlaActivity.java
@@ -724,7 +724,9 @@ public class MumlaActivity extends AppCompatActivity implements ListView.OnItemC
                     AlertDialog.Builder ab = new AlertDialog.Builder(MumlaActivity.this);
                     ab.setTitle(getString(R.string.connectionRefused) + (mSettings.isTorEnabled() ? " (Tor)" : ""));
                     if (mService.isReconnecting()) {
-                        ab.setMessage(getString(R.string.attempting_reconnect, error.getMessage()));
+                        ab.setMessage(error.getMessage() + "\n\n"
+                                + getString(R.string.attempting_reconnect,
+                                error.getCause() != null ? error.getCause().getMessage() : "unknown"));
                         ab.setPositiveButton(R.string.cancel_reconnect, new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index b106541..ca0d0e5 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -219,6 +219,6 @@
   <string name="invalid_port_range">Ungültiger Port (1-65535)</string>
   <string name="invalid_username">Ungültiger Benutzername</string>
   <string name="cancel_reconnect">Neuverbinden abbrechen</string>
-  <string name="attempting_reconnect">Fehler: %s.\n\n Versuche erneut zu verbinden.</string>
+  <string name="attempting_reconnect">Fehler: %s.\n\n Versuche erneut zu verbinden…</string>
   <string name="default_">Standard</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index a5d82ff..5fd0d68 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -219,6 +219,6 @@
   <string name="invalid_port_range">Puerto inválido (1-65535)</string>
   <string name="invalid_username">Nombre de usuario inválido</string>
   <string name="cancel_reconnect">Cancelar reconexión</string>
-  <string name="attempting_reconnect">Error: %s.\n\nIntentando reconectar.</string>
+  <string name="attempting_reconnect">Error: %s.\n\nIntentando reconectar…</string>
   <string name="default_">Predeterminado</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index a149c47..64152bb 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -219,6 +219,6 @@
   <string name="invalid_port_range">Port invalide (1-65535)</string>
   <string name="invalid_username">Nom d\'utilisateur invalide</string>
   <string name="cancel_reconnect">Annuler la reconnexion</string>
-  <string name="attempting_reconnect">Erreur: %s.\n\nTentative de reconnexion.</string>
+  <string name="attempting_reconnect">Erreur: %s.\n\nTentative de reconnexion…</string>
   <string name="default_">Défaut</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 360be42..7b9416a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -245,7 +245,7 @@
     <string name="invalid_port_range">Invalid port (1-65535)</string>
     <string name="invalid_username">Invalid username</string>
     <string name="cancel_reconnect">Cancel reconnect</string>
-    <string name="attempting_reconnect">%s. Reconnecting…</string>
+    <string name="attempting_reconnect">Error: %s.\n\nReconnecting…</string>
     <string name="change_requires_reconnect">Reconnect for change to take effect.</string>
     <string name="no_certificate">No Certificate</string>
     <string name="certificates">Certificates</string>