diff options
| author | Sean Leonard <meanderingcode@aetherislands.net> | 2013-07-12 11:39:40 -0600 |
|---|---|---|
| committer | Sean Leonard <meanderingcode@aetherislands.net> | 2013-07-12 11:39:40 -0600 |
| commit | 9d89c120aa1f01874b3b41169456efdfc5407b17 (patch) | |
| tree | 2a0e101acc60fd7836c88305c1a46d1d07e50f6d /src/se/leap/leapclient/Dashboard.java | |
| parent | 872bcd1e5044b3b0119ae8ff2eff5509c5ee3274 (diff) | |
| parent | dd9f4b8f26debbbea034d00db85fe123cab5619d (diff) | |
Merge branch 'feature/provider-details-fragment' into develop
Diffstat (limited to 'src/se/leap/leapclient/Dashboard.java')
| -rw-r--r-- | src/se/leap/leapclient/Dashboard.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/se/leap/leapclient/Dashboard.java b/src/se/leap/leapclient/Dashboard.java index 3c9df56c..96b982fc 100644 --- a/src/se/leap/leapclient/Dashboard.java +++ b/src/se/leap/leapclient/Dashboard.java @@ -88,6 +88,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf @Override protected void onResume() { super.onResume(); + if (provider != null) if (provider.hasEIP() && provider.getEIPType() == "OpenVPN") OpenVPN.addStateListener(this); @@ -98,6 +99,10 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf if ( requestCode == CONFIGURE_LEAP ) { if ( resultCode == RESULT_OK ){ buildDashboard(); + if(data != null && data.hasExtra(ConfigHelper.LOG_IN)) { + View view = ((ViewGroup)findViewById(android.R.id.content)).getChildAt(0); + logInDialog(view); + } } else configErrorDialog(); } |