summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2013-06-27 21:52:54 +0200
committerSean Leonard <meanderingcode@aetherislands.net>2013-07-12 11:38:44 -0600
commit73a18a778abdfd8010c8b7609c99b825cc1554d0 (patch)
tree87c06c26b072a2e2187efc5a356b4bfea4d4f2a4
parent36b3b30960bb7c07d3ca4c3a748334627ecb8003 (diff)
Login button from ProviderDetailFragment works.
I return an intent with ConfigHelper.LOG_IN extra present. Dashboard looks for it, and if found, starts LogInDialog.
-rw-r--r--src/se/leap/leapclient/ConfigurationWizard.java5
-rw-r--r--src/se/leap/leapclient/Dashboard.java5
2 files changed, 9 insertions, 1 deletions
diff --git a/src/se/leap/leapclient/ConfigurationWizard.java b/src/se/leap/leapclient/ConfigurationWizard.java
index 7f29a408..7cf989a4 100644
--- a/src/se/leap/leapclient/ConfigurationWizard.java
+++ b/src/se/leap/leapclient/ConfigurationWizard.java
@@ -332,7 +332,10 @@ implements ProviderListFragment.Callbacks, NewProviderDialog.NewProviderDialogIn
@Override
public void login() {
- //TODO Start dashboard and show login dialog
+ Intent ask_login = new Intent();
+ ask_login.putExtra(ConfigHelper.LOG_IN, ConfigHelper.LOG_IN);
+ setResult(RESULT_OK, ask_login);
+ finish();
}
@Override
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();
}