1 files changed, 28 insertions, 5 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/StartActivity.java b/app/src/main/java/se/leap/bitmaskclient/StartActivity.java
index bb01ddc0..f5991538 100644
--- a/app/src/main/java/se/leap/bitmaskclient/StartActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/StartActivity.java
@@ -55,7 +55,7 @@ public class StartActivity extends Activity {
             case FIRST:
                 storeAppVersion();
                 // TODO start ProfileCreation & replace below code
-                // (new Intent(getActivity(), ConfigurationWizard.class), Constants.REQUEST_CODE_SWITCH_PROVIDER);
+                // (new Intent(getActivity(), ProviderListActivity.class), Constants.REQUEST_CODE_SWITCH_PROVIDER);
                 break;
 
             case UPGRADE:
@@ -153,9 +153,7 @@ public class StartActivity extends Activity {
 
                 //buildDashboard(getIntent().getBooleanExtra(EIP_RESTART_ON_BOOT, false));
 //                user_status_fragment.restoreSessionStatus(savedInstanceState);
-                Intent intent = new Intent(this, MainActivity.class);
-                intent.setAction(MainActivity.ACTION_SHOW_VPN_FRAGMENT);
-                startActivity(intent);
+                showMainActivity();
             }
         } else {
             configureLeapProvider();
@@ -166,7 +164,32 @@ public class StartActivity extends Activity {
         if (getIntent().hasExtra(APP_ACTION_CONFIGURE_ALWAYS_ON_PROFILE)) {
             getIntent().removeExtra(APP_ACTION_CONFIGURE_ALWAYS_ON_PROFILE);
         }
-        startActivityForResult(new Intent(this, ConfigurationWizard.class), REQUEST_CODE_CONFIGURE_LEAP);
+        startActivityForResult(new Intent(this, ProviderListActivity.class), REQUEST_CODE_CONFIGURE_LEAP);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (data == null) {
+            return;
+        }
+
+        if (requestCode == REQUEST_CODE_CONFIGURE_LEAP) {
+            if (resultCode == RESULT_OK && data.hasExtra(Provider.KEY)) {
+                Provider provider = data.getParcelableExtra(Provider.KEY);
+                ConfigHelper.storeProviderInPreferences(preferences, provider);
+
+                showMainActivity();
+            } else if (resultCode == RESULT_CANCELED) {
+                finish();
+            }
+        }
+    }
+
+    private void showMainActivity() {
+        Intent intent = new Intent(this, MainActivity.class);
+        intent.setAction(MainActivity.ACTION_SHOW_VPN_FRAGMENT);
+        startActivity(intent);
+        finish();
     }
 
 }