summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-10-14 18:39:03 +0200
committerParménides GV <parmegv@sdf.org>2014-10-14 19:13:22 +0200
commit11528c3f7124090ef44675cf613a949ed07ad9bb (patch)
treef9d69a886e16b36ccb2a47b0a6e31cb4e1a718f3
parent8bc58f450262ba2cf64e92772746b62018f80e59 (diff)
Start EIP after downloading an authed certificate.
Always. Previously we didn't do so if EIP hadn't been started before. Fix a small bug introduced during latest refactoring, authentication did not work because the final result variable wasn't assigned.
-rw-r--r--app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java2
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/Dashboard.java6
-rw-r--r--app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java2
3 files changed, 4 insertions, 6 deletions
diff --git a/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
index b83f33a1..f51099a3 100644
--- a/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
+++ b/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
@@ -260,7 +260,7 @@ public class ProviderAPI extends IntentService {
if(validUserLoginData(username, password)) {
String server = (String) task.get(Provider.API_URL);
- authenticate(username, password, server);
+ result = authenticate(username, password, server);
broadcast_progress(progress++);
} else {
if(!wellFormedPassword(password)) {
diff --git a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
index 761afc0a..16e4cf03 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
@@ -65,6 +65,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
public static final String START_ON_BOOT = "dashboard start on boot";
final public static String ON_BOOT = "dashboard on boot";
public static final String APP_VERSION = "bitmask version";
+ final public static String TAG = Dashboard.class.getSimpleName();
private EipServiceFragment eipFragment;
@@ -498,10 +499,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
changeStatusMessage(resultCode);
if(mProgressBar != null)
mProgressBar.setVisibility(ProgressBar.GONE);
- if(EipServiceFragment.isEipSwitchChecked())
- eipStart();
- else
- eipStatus.setText(R.string.eip_state_not_connected);
+ eipStart();
} else if(resultCode == ProviderAPI.INCORRECTLY_DOWNLOADED_CERTIFICATE) {
setResult(RESULT_CANCELED);
changeStatusMessage(resultCode);
diff --git a/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
index 3c8ec607..549eee0d 100644
--- a/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
+++ b/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
@@ -255,7 +255,7 @@ public class ProviderAPI extends IntentService {
String server = (String) task.get(Provider.API_URL);
- authenticate(username, password, server);
+ result = authenticate(username, password, server);
broadcast_progress(progress++);
} else {
if(!wellFormedPassword(password)) {