diff options
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/AbstractProviderDetailActivity.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/AbstractProviderDetailActivity.java | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/AbstractProviderDetailActivity.java b/app/src/main/java/se/leap/bitmaskclient/AbstractProviderDetailActivity.java index a596cc7f..bd8ae228 100644 --- a/app/src/main/java/se/leap/bitmaskclient/AbstractProviderDetailActivity.java +++ b/app/src/main/java/se/leap/bitmaskclient/AbstractProviderDetailActivity.java @@ -21,6 +21,7 @@ import butterknife.InjectView; import static se.leap.bitmaskclient.Constants.PROVIDER_ALLOW_ANONYMOUS; import static se.leap.bitmaskclient.Constants.PROVIDER_KEY; +import static se.leap.bitmaskclient.Constants.REQUEST_CODE_CONFIGURE_LEAP; import static se.leap.bitmaskclient.Constants.SHARED_PREFERENCES; import static se.leap.bitmaskclient.MainActivity.ACTION_SHOW_VPN_FRAGMENT; @@ -73,12 +74,13 @@ public abstract class AbstractProviderDetailActivity extends ConfigWizardBaseAct intent = new Intent(getApplicationContext(), SignupActivity.class); } else { Log.d(TAG, "use anonymously selected"); - intent = new Intent(getApplicationContext(), MainActivity.class); - intent.setAction(ACTION_SHOW_VPN_FRAGMENT); + setResult(RESULT_OK); + finish(); + return; } intent.putExtra(PROVIDER_KEY, provider); intent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION); - startActivity(intent); + startActivityForResult(intent, REQUEST_CODE_CONFIGURE_LEAP); } }); } catch (JSONException e) { @@ -92,6 +94,16 @@ public abstract class AbstractProviderDetailActivity extends ConfigWizardBaseAct provider = intent.getParcelableExtra(PROVIDER_KEY); } + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + if (requestCode == REQUEST_CODE_CONFIGURE_LEAP) { + if (resultCode == RESULT_OK) { + setResult(resultCode, data); + finish(); + } + } + } + private boolean anonAllowed(JSONObject providerJson) { try { JSONObject serviceDescription = providerJson.getJSONObject(Provider.SERVICE); |