summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Leonard <meanderingcode@aetherislands.net>2013-07-26 15:04:29 -0600
committerSean Leonard <meanderingcode@aetherislands.net>2013-07-26 15:04:29 -0600
commit1fb7b037923b8fc78aef743bfe8ee08caf2c6d1a (patch)
treec00e8a4ef4af19bfa56b28af69201944f777e9e8
parent972bcbf3c848093410732e3d9b41951984da0338 (diff)
parent011906a4062c4169e343fbdf72ad75491caa1767 (diff)
Merge branch 'hotfix/dismiss-login-progress-dialog' into develop
-rw-r--r--src/se/leap/leapclient/Dashboard.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/se/leap/leapclient/Dashboard.java b/src/se/leap/leapclient/Dashboard.java
index 4c9c28dd..67a73c44 100644
--- a/src/se/leap/leapclient/Dashboard.java
+++ b/src/se/leap/leapclient/Dashboard.java
@@ -299,6 +299,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
Cookie session_id = new BasicClientCookie(session_id_cookie_key, session_id_string);
downloadAuthedUserCertificate(session_id);
} else if(resultCode == ConfigHelper.SRP_AUTHENTICATION_FAILED) {
+ mProgressDialog.dismiss();
logInDialog(getCurrentFocus(), resultData.getString(getResources().getString(R.string.user_message)));
} else if(resultCode == ConfigHelper.LOGOUT_SUCCESSFUL) {
authed = false;
@@ -310,10 +311,12 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
mProgressDialog.dismiss();
Toast.makeText(getApplicationContext(), R.string.log_out_failed_message, Toast.LENGTH_LONG).show();
} else if(resultCode == ConfigHelper.CORRECTLY_DOWNLOADED_CERTIFICATE) {
- setResult(RESULT_CANCELED);
+ setResult(RESULT_OK);
+ mProgressDialog.dismiss();
Toast.makeText(getApplicationContext(), R.string.successful_authed_cert_downloaded_message, Toast.LENGTH_LONG).show();
} else if(resultCode == ConfigHelper.INCORRECTLY_DOWNLOADED_CERTIFICATE) {
setResult(RESULT_CANCELED);
+ mProgressDialog.dismiss();
Toast.makeText(getApplicationContext(), R.string.authed_cert_download_failed_message, Toast.LENGTH_LONG).show();
}
}