diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-01-22 20:50:53 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-04-21 17:36:59 +0200 |
| commit | b9a190335150e458099d81b70c16462fbe9e3cdd (patch) | |
| tree | 6c22baaf605992cc294f3776cbc072366e2571bb /app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java | |
| parent | f85ff9f79376ca56c62c17e3f9c5968113b44565 (diff) | |
Always restore last eip status on boot.
Next step: don't restore off status!
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java')
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java b/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java index b4cb541a..ff204efc 100644 --- a/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java +++ b/app/src/main/java/se/leap/bitmaskclient/EipServiceFragment.java @@ -27,6 +27,7 @@ import android.widget.TextView; public class EipServiceFragment extends Fragment implements StateListener, OnCheckedChangeListener { protected static final String IS_EIP_PENDING = "is_eip_pending"; + public static final String START_ON_BOOT = "start on boot"; private View eipFragment; private static Switch eipSwitch; @@ -73,6 +74,8 @@ public class EipServiceFragment extends Fragment implements StateListener, OnChe }); eipSwitch.setOnCheckedChangeListener(this); + if(getArguments() != null && getArguments().containsKey(START_ON_BOOT) && getArguments().getBoolean(START_ON_BOOT)) + startEipFromScratch(); return eipFragment; } @@ -122,10 +125,7 @@ public class EipServiceFragment extends Fragment implements StateListener, OnChe String certificate = getActivity().getSharedPreferences(Dashboard.SHARED_PREFERENCES, Activity.MODE_PRIVATE).getString(EIP.CERTIFICATE, ""); if(allowed_anon || !certificate.isEmpty()) { if (isChecked){ - mEipStartPending = true; - eipFragment.findViewById(R.id.eipProgress).setVisibility(View.VISIBLE); - ((TextView) eipFragment.findViewById(R.id.eipStatus)).setText(R.string.eip_status_start_pending); - eipCommand(EIP.ACTION_START_EIP); + startEipFromScratch(); } else { if (mEipStartPending){ AlertDialog.Builder alertBuilder = new AlertDialog.Builder(getActivity()); @@ -168,6 +168,12 @@ public class EipServiceFragment extends Fragment implements StateListener, OnChe } + public void startEipFromScratch() { + mEipStartPending = true; + eipFragment.findViewById(R.id.eipProgress).setVisibility(View.VISIBLE); + ((TextView) eipFragment.findViewById(R.id.eipStatus)).setText(R.string.eip_status_start_pending); + eipCommand(EIP.ACTION_START_EIP); + } /** * Send a command to EIP |