summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2013-12-04 17:13:12 +0100
committerParménides GV <parmegv@sdf.org>2013-12-04 17:13:12 +0100
commitd004c5535c75540600d6670e86300872651fc7bf (patch)
treeee30a40be65e993a9f886b47fd57d41717bf4222
parent9f0e175d9c4da5ffc914d4c42001e5195fa20557 (diff)
Rebased and working fine.
I've restored use_anonymously() and login() methods from ConfigurationWizard, now everything works ok.
-rw-r--r--src/se/leap/bitmaskclient/ConfigurationWizard.java9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/se/leap/bitmaskclient/ConfigurationWizard.java b/src/se/leap/bitmaskclient/ConfigurationWizard.java
index 7ecc1652..4a3bb12b 100644
--- a/src/se/leap/bitmaskclient/ConfigurationWizard.java
+++ b/src/se/leap/bitmaskclient/ConfigurationWizard.java
@@ -547,18 +547,15 @@ implements ProviderListFragment.Callbacks, NewProviderDialog.NewProviderDialogIn
@Override
public void login() {
-
-
- Intent ask_login = new Intent(this, Dashboard.class);
+ Intent ask_login = new Intent();
ask_login.putExtra(LogInDialog.VERB, LogInDialog.VERB);
- startActivityForResult(ask_login, Dashboard.CONFIGURE_LEAP);
+ setResult(RESULT_OK, ask_login);
finish();
}
@Override
public void use_anonymously() {
- Intent intent = new Intent(this, Dashboard.class);
- startActivityForResult(intent, Dashboard.CONFIGURE_LEAP);
+ setResult(RESULT_OK);
finish();
}
}