diff options
author | Parménides GV <parmegv@sdf.org> | 2013-12-10 18:49:44 +0100 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2013-12-10 18:49:44 +0100 |
commit | 16ac5c300e21ce4c8b380013735f2c17d2e34768 (patch) | |
tree | 15438ac49ef44d015a7c1134685ca1d670af0d35 | |
parent | c26ba8d28bc4070c1945b228221d3e6b2158c485 (diff) |
Rebased onto 0.2.3.
-rw-r--r-- | src/se/leap/bitmaskclient/Dashboard.java | 13 | ||||
-rw-r--r-- | src/se/leap/bitmaskclient/EIP.java | 2 |
2 files changed, 3 insertions, 12 deletions
diff --git a/src/se/leap/bitmaskclient/Dashboard.java b/src/se/leap/bitmaskclient/Dashboard.java index 1307a232..7880880c 100644 --- a/src/se/leap/bitmaskclient/Dashboard.java +++ b/src/se/leap/bitmaskclient/Dashboard.java @@ -358,7 +358,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf setResult(RESULT_OK); authed_eip = true; - ConfigHelper.saveSharedPref(EIP.AUTHED, authed_eip); + ConfigHelper.saveSharedPref(EIP.AUTHED_EIP, authed_eip); invalidateOptionsMenu(); mProgressBar.setVisibility(ProgressBar.GONE); @@ -371,7 +371,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf mProgressBar.setVisibility(ProgressBar.GONE); } else if(resultCode == ProviderAPI.LOGOUT_SUCCESSFUL) { authed_eip = false; - ConfigHelper.saveSharedPref(EIP.AUTHED, authed_eip); + ConfigHelper.saveSharedPref(EIP.AUTHED_EIP, authed_eip); changeStatusMessage(resultCode); mProgressBar.setVisibility(ProgressBar.GONE); @@ -469,13 +469,4 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf startService(eip_intent); } - - public class ProviderAPIBroadcastReceiver_Update extends BroadcastReceiver { - - @Override - public void onReceive(Context context, Intent intent) { - int update = intent.getIntExtra(ProviderAPI.UPDATE_DATA, 0); - //mProgressBar.setProgress(update); - } - } } diff --git a/src/se/leap/bitmaskclient/EIP.java b/src/se/leap/bitmaskclient/EIP.java index 6717aeae..561f71af 100644 --- a/src/se/leap/bitmaskclient/EIP.java +++ b/src/se/leap/bitmaskclient/EIP.java @@ -58,7 +58,7 @@ import android.util.Log; */ public final class EIP extends IntentService { - public final static String AUTHED = "authed eip"; + public final static String AUTHED_EIP = "authed eip"; public final static String ACTION_START_EIP = "se.leap.bitmaskclient.START_EIP"; public final static String ACTION_STOP_EIP = "se.leap.bitmaskclient.STOP_EIP"; public final static String ACTION_UPDATE_EIP_SERVICE = "se.leap.bitmaskclient.UPDATE_EIP_SERVICE"; |