diff options
author | Fup Duck <fupduck@sacknagel.com> | 2018-01-21 19:17:36 +0100 |
---|---|---|
committer | Fup Duck <fupduck@sacknagel.com> | 2018-01-21 19:17:36 +0100 |
commit | 042e10b53b95d48ffbcce45213ebec5f0794fb01 (patch) | |
tree | 1474c13c8a487e38f81528396da8fb0a19cc8583 /app/src/main/java/se/leap/bitmaskclient/BaseConfigurationWizard.java | |
parent | 6e45a5bcb4de152543b5dd5d9bd2027fb62f7375 (diff) |
handle startActivityForResult
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/BaseConfigurationWizard.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/BaseConfigurationWizard.java | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/BaseConfigurationWizard.java b/app/src/main/java/se/leap/bitmaskclient/BaseConfigurationWizard.java index 1025a64e..0726a785 100644 --- a/app/src/main/java/se/leap/bitmaskclient/BaseConfigurationWizard.java +++ b/app/src/main/java/se/leap/bitmaskclient/BaseConfigurationWizard.java @@ -49,6 +49,7 @@ import static android.view.View.GONE; import static se.leap.bitmaskclient.Constants.APP_ACTION_QUIT; 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.ProviderAPI.CORRECTLY_DOWNLOADED_CERTIFICATE; import static se.leap.bitmaskclient.ProviderAPI.ERRORS; import static se.leap.bitmaskclient.ProviderAPI.INCORRECTLY_DOWNLOADED_CERTIFICATE; @@ -198,6 +199,16 @@ public abstract class BaseConfigurationWizard extends ConfigWizardBaseActivity providerAPIResultReceiver = null; } + @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 void setUpProviderAPIResultReceiver() { providerAPIResultReceiver = new ProviderAPIResultReceiver(new Handler(), this); providerAPIBroadcastReceiver = new ProviderAPIBroadcastReceiver(); @@ -391,7 +402,7 @@ public abstract class BaseConfigurationWizard extends ConfigWizardBaseActivity Intent intent = new Intent(this, ProviderDetailActivity.class); intent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION); intent.putExtra(PROVIDER_KEY, provider); - startActivity(intent); + startActivityForResult(intent, REQUEST_CODE_CONFIGURE_LEAP); } } |