Show log if an error is reported in last 5 log messages.

3 files changed, 3 insertions, 2 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
index ed507de4..8b532e24 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
@@ -296,6 +296,7 @@ public class EipFragment extends Fragment implements Observer {
                 && !status_message.getText().toString().equalsIgnoreCase(dashboard.getString(R.string.eip_state_not_connected))){
             dashboard.showLog();
         }
+        status_message.setText(dashboard.getString(R.string.eip_state_not_connected));
     }
 
     private void adjustSwitch() {
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/EipStatus.java b/app/src/main/java/se/leap/bitmaskclient/eip/EipStatus.java
index f9ddc0d2..17e290b8 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/EipStatus.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/EipStatus.java
@@ -142,7 +142,7 @@ public class EipStatus extends Observable implements VpnStatus.StateListener {
 
         VpnStatus.LogItem[] log = VpnStatus.getlogbuffer();
         String message = "";
-        for (int i = 0; i < lines; i++) {
+        for (int i = 1; i <= lines && log.length > i; i++) {
             message = log[log.length-i].getString(context);
             for(int j = 0; j < error_keywords.length; j++)
                 if(message.contains(error_keywords[j]))
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java b/app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java
index 25c85585..5af8b8f1 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java
@@ -148,6 +148,6 @@ public class VpnConfigGenerator {
                         + new_line
                         + "persist-tun"
                         + new_line
-                        + "auth-retry nointeract remove";
+                        + "auth-retry nointeract"
     }
 }