Merge branch 'feature/Detect-more-errors-in-the-VPN-bootstrap-#6802' into develop

1 files changed, 1 insertions, 3 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
index 5e5b76b2..8b532e24 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
@@ -53,7 +53,6 @@ public class EipFragment extends Fragment implements Observer {
     private boolean is_starting_to_connect;
     private boolean wants_to_connect;
 
-    @Override
     public void onAttach(Activity activity) {
         super.onAttach(activity);
 
@@ -293,8 +292,7 @@ public class EipFragment extends Fragment implements Observer {
     private void setDisconnectedUI(){
         hideProgressBar();
         adjustSwitch();
-        String last_log_message = eip_status.getLastLogMessage(dashboard.getApplicationContext());
-        if((last_log_message.contains("error") || last_log_message.contains("ERROR"))
+        if(eip_status.errorInLast(5, dashboard.getApplicationContext())
                 && !status_message.getText().toString().equalsIgnoreCase(dashboard.getString(R.string.eip_state_not_connected))){
             dashboard.showLog();
         }