Rebased and working fine.

I've restored use_anonymously() and login() methods from ConfigurationWizard, now everything works ok.

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();

 	}

 }