summaryrefslogtreecommitdiff
path: root/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2015-04-20 19:55:00 +0200
committerParménides GV <parmegv@sdf.org>2015-04-22 12:36:39 +0200
commit0a7cb34e42fc3b8bf8623bda45cd4d76079a96c4 (patch)
tree8547d79bf71a99ff091272ca56631b856a197651 /app/src/main/java/se/leap/bitmaskclient/EipFragment.java
parentd486768d6b0664d9032605897c8f1847ef4e3a39 (diff)
Always show the log if an error happens.
I've removed the "reason" management in LogWindowWrapper, letting EipStatus display the error log message only if it's a new one (based on the log buffer position).
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/EipFragment.java')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/EipFragment.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
index c92ae3cd..a13cab09 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EipFragment.java
@@ -103,7 +103,6 @@ public class EipFragment extends Fragment implements Observer {
@OnClick(R.id.vpn_Status_Image)
void handleIcon() {
- LogWindowWrapper.getInstance(dashboard.getApplicationContext()).clearReason();
if (eip_status.isConnected() || eip_status.isConnecting())
handleSwitchOff();
else
@@ -243,11 +242,9 @@ public class EipFragment extends Fragment implements Observer {
private void handleNewState(EipStatus eip_status) {
Context context = dashboard.getApplicationContext();
String error = eip_status.lastError(5, context);
- LogWindowWrapper log_window = LogWindowWrapper.getInstance(context);
- if (!error.isEmpty() && log_window != null && !log_window.reason().equalsIgnoreCase(error)) {
- log_window.showLog();
- log_window.showedBecauseOf(error);
+ if (!error.isEmpty()) {
+ dashboard.showLog();
VoidVpnService.stop();
}
adjustSwitch();