From c26ba8d28bc4070c1945b228221d3e6b2158c485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Tue, 19 Nov 2013 19:27:23 +0100 Subject: Rebased onto 0.2.2 --- src/se/leap/bitmaskclient/Dashboard.java | 5 +++-- src/se/leap/bitmaskclient/ProviderAPI.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/se/leap/bitmaskclient/Dashboard.java b/src/se/leap/bitmaskclient/Dashboard.java index ecac500e..1307a232 100644 --- a/src/se/leap/bitmaskclient/Dashboard.java +++ b/src/se/leap/bitmaskclient/Dashboard.java @@ -112,6 +112,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf if ( resultCode == RESULT_OK ){ ConfigHelper.saveSharedPref(EIP.PARSED_SERIAL, 0); ConfigHelper.saveSharedPref(EIP.AUTHED_EIP, authed_eip); + startService( new Intent(EIP.ACTION_UPDATE_EIP_SERVICE) ); buildDashboard(); @@ -357,7 +358,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf setResult(RESULT_OK); authed_eip = true; - ConfigHelper.saveSharedPref(EIP.AUTHED_EIP, authed_eip); + ConfigHelper.saveSharedPref(EIP.AUTHED, authed_eip); invalidateOptionsMenu(); mProgressBar.setVisibility(ProgressBar.GONE); @@ -370,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_EIP, authed_eip); + ConfigHelper.saveSharedPref(EIP.AUTHED, authed_eip); changeStatusMessage(resultCode); mProgressBar.setVisibility(ProgressBar.GONE); diff --git a/src/se/leap/bitmaskclient/ProviderAPI.java b/src/se/leap/bitmaskclient/ProviderAPI.java index 39dd978a..62a51c32 100644 --- a/src/se/leap/bitmaskclient/ProviderAPI.java +++ b/src/se/leap/bitmaskclient/ProviderAPI.java @@ -486,7 +486,7 @@ public class ProviderAPI extends IntentService { private boolean validCertificate(String cert_string) { boolean result = false; - if(!ConfigHelper.checkErrorenousDownload(cert_string)) { + if(!ConfigHelper.checkErroneousDownload(cert_string)) { X509Certificate certCert = ConfigHelper.parseX509CertificateFromString(cert_string); try { Base64.encodeToString( certCert.getEncoded(), Base64.DEFAULT); -- cgit v1.2.3