summaryrefslogtreecommitdiff
path: root/app/src/main/java
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-01-28 20:06:23 +0100
committerParménides GV <parmegv@sdf.org>2014-04-21 17:36:59 +0200
commit61292176b4fe0543b0f4f4d5c339f2ebf0f6e1ee (patch)
treeb720f5d5abd0cbb07a6ac7ed9ff9f58ceee3dff7 /app/src/main/java
parent365a517ab7571bce056812253cdbb410f3aa8e35 (diff)
Rebooting with no network again a again works.
Diffstat (limited to 'app/src/main/java')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/Dashboard.java4
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java3
2 files changed, 3 insertions, 4 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
index b95f319f..62a68d2d 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
@@ -104,10 +104,6 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
protected void onPause() {
super.onPause();
- Log.d("Dashboard", "eip_service_fragment.saveEipStatus()");
- EipServiceFragment eip_service_fragment = (EipServiceFragment) getFragmentManager().findFragmentByTag(TAG_EIP_FRAGMENT);
- if(eip_service_fragment != null)
- eip_service_fragment.saveEipStatus();
}
@Override
diff --git a/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java b/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java
index 4cc6be4f..15cc5b4d 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java
@@ -172,6 +172,7 @@ public class EipServiceFragment extends Fragment implements StateListener, OnChe
eipStatus.setText(R.string.state_noprocess);
}
eipAutoSwitched = true;
+ saveEipStatus();
}
@@ -179,6 +180,8 @@ public class EipServiceFragment extends Fragment implements StateListener, OnChe
mEipStartPending = true;
eipFragment.findViewById(R.id.eipProgress).setVisibility(View.VISIBLE);
((TextView) eipFragment.findViewById(R.id.eipStatus)).setText(R.string.eip_status_start_pending);
+ eipSwitch.setChecked(true);
+ saveEipStatus();
eipCommand(EIP.ACTION_START_EIP);
}