summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcyBerta <richy@cyborgsociety.org>2013-12-04 02:39:51 +0100
committercyBerta <richy@cyborgsociety.org>2013-12-04 02:39:51 +0100
commit853d2aac3a1b5f532695d8daa0cba2c4787d8aa7 (patch)
treea5520ee8356cf2cafad36311bfd7e917836ca8d9
parenta4a2ed01e4f74abe30382ae737a9e145c8a41807 (diff)
parentdc417fbfc67d8edaad58effde3a6a73fbeeab1da (diff)
Merge branch 'develop' of ssh://leap.se:22/bitmask_android into develop
-rw-r--r--src/se/leap/bitmaskclient/Dashboard.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/se/leap/bitmaskclient/Dashboard.java b/src/se/leap/bitmaskclient/Dashboard.java
index 103310bb..ca619e9f 100644
--- a/src/se/leap/bitmaskclient/Dashboard.java
+++ b/src/se/leap/bitmaskclient/Dashboard.java
@@ -115,7 +115,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data){
- if ( requestCode == CONFIGURE_LEAP ) {
+ if ( requestCode == CONFIGURE_LEAP || requestCode == SWITCH_PROVIDER) {
if ( resultCode == RESULT_OK ){
ConfigHelper.saveSharedPref(EIP.AUTHED_EIP, authed_eip);
startService( new Intent(EIP.ACTION_UPDATE_EIP_SERVICE) );
@@ -301,7 +301,9 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
//if(mProgressDialog != null) mProgressDialog.dismiss();
//mProgressDialog = ProgressDialog.show(this, getResources().getString(R.string.logout_title), getResources().getString(R.string.logout_message), true);
+ if(mProgressBar == null) mProgressBar = (ProgressBar) findViewById(R.id.eipProgress);
mProgressBar.setVisibility(ProgressBar.VISIBLE);
+ if(eipStatus == null) eipStatus = (TextView) findViewById(R.id.eipStatus);
eipStatus.setText("Starting to logout");
//mProgressBar.setMax(1);
startService(provider_API_command);