Merge branch 'feature/Look-for-a-better-solution-to-the-VPN-slider-#6863' into develop

1 files changed, 18 insertions, 6 deletions

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 b7f95277..4bfef1cb 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/EipStatus.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/EipStatus.java
@@ -31,7 +31,7 @@ public class EipStatus extends Observable implements VpnStatus.StateListener {
             wants_to_disconnect = false,
             is_connecting = false;
 
-
+    int last_error_line = 0;
     private String state, log_message;
     private int localized_res_id;
 
@@ -137,18 +137,30 @@ public class EipStatus extends Observable implements VpnStatus.StateListener {
     }
 
     public boolean errorInLast(int lines, Context context) {
-        boolean result = false;
+        return !lastError(lines, context).isEmpty();
+    }
+
+    public String lastError(int lines, Context context) {
+        String error = "";
+
         String[] error_keywords = {"error", "ERROR", "fatal", "FATAL"};
 
         VpnStatus.LogItem[] log = VpnStatus.getlogbuffer();
+        if(log.length < last_error_line)
+            last_error_line = 0;
         String message = "";
         for (int i = 1; i <= lines && log.length > i; i++) {
-            message = log[log.length - i].getString(context);
+            int line = log.length - i;
+            VpnStatus.LogItem log_item = log[line];
+            message = log_item.getString(context);
             for (int j = 0; j < error_keywords.length; j++)
-                if (message.contains(error_keywords[j]))
-                    result = true;
+                if (message.contains(error_keywords[j]) && line > last_error_line) {
+                    error = message;
+                    last_error_line = line;
+                }
         }
-        return result;
+
+        return error;
     }
 
     @Override