SetupWizardActivity: use a separate action for finalizing provision
This commit is contained in:
parent
7e34b75443
commit
657f729fac
|
@ -238,7 +238,7 @@ public class DummyActivity extends Activity {
|
||||||
.setBoolean(LocalStorageManager.PREF_HAS_SETUP, true);
|
.setBoolean(LocalStorageManager.PREF_HAS_SETUP, true);
|
||||||
LocalStorageManager.getInstance()
|
LocalStorageManager.getInstance()
|
||||||
.setBoolean(LocalStorageManager.PREF_IS_SETTING_UP, false);
|
.setBoolean(LocalStorageManager.PREF_IS_SETTING_UP, false);
|
||||||
Intent intent = new Intent(Intent.ACTION_MAIN);
|
Intent intent = new Intent(SetupWizardActivity.ACTION_PROFILE_PROVISIONED);
|
||||||
intent.setComponent(new ComponentName(this, SetupWizardActivity.class));
|
intent.setComponent(new ComponentName(this, SetupWizardActivity.class));
|
||||||
startActivity(intent);
|
startActivity(intent);
|
||||||
Toast.makeText(this, getString(R.string.provision_finished), Toast.LENGTH_LONG).show();
|
Toast.makeText(this, getString(R.string.provision_finished), Toast.LENGTH_LONG).show();
|
||||||
|
|
|
@ -33,6 +33,7 @@ public class SetupWizardActivity extends AppCompatActivity {
|
||||||
// finished by the system, but the Shelter inside the profile has never been brought up
|
// finished by the system, but the Shelter inside the profile has never been brought up
|
||||||
// due to the user having not clicked on the notification yet.
|
// due to the user having not clicked on the notification yet.
|
||||||
public static final String ACTION_RESUME_SETUP = "net.typeblog.shelter.RESUME_SETUP";
|
public static final String ACTION_RESUME_SETUP = "net.typeblog.shelter.RESUME_SETUP";
|
||||||
|
public static final String ACTION_PROFILE_PROVISIONED = "net.typeblog.shelter.PROFILE_PROVISIONED";
|
||||||
|
|
||||||
private DevicePolicyManager mPolicyManager = null;
|
private DevicePolicyManager mPolicyManager = null;
|
||||||
private LocalStorageManager mStorage = null;
|
private LocalStorageManager mStorage = null;
|
||||||
|
@ -43,6 +44,16 @@ public class SetupWizardActivity extends AppCompatActivity {
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
// The user could click on the "finish provisioning" notification while having removed
|
||||||
|
// this activity from the recents stack, in which case the notification will start a new
|
||||||
|
// instance of activity
|
||||||
|
if (ACTION_PROFILE_PROVISIONED.equals(getIntent().getAction()) && Utility.isWorkProfileAvailable(this)) {
|
||||||
|
// ...in which case we should finish immediately and go back to MainActivity
|
||||||
|
startActivity(new Intent(this, MainActivity.class));
|
||||||
|
finish();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
setContentView(R.layout.activity_setup_wizard);
|
setContentView(R.layout.activity_setup_wizard);
|
||||||
mPolicyManager = getSystemService(DevicePolicyManager.class);
|
mPolicyManager = getSystemService(DevicePolicyManager.class);
|
||||||
mStorage = LocalStorageManager.getInstance();
|
mStorage = LocalStorageManager.getInstance();
|
||||||
|
@ -62,7 +73,7 @@ public class SetupWizardActivity extends AppCompatActivity {
|
||||||
super.onNewIntent(intent);
|
super.onNewIntent(intent);
|
||||||
// DummyActivity will start this activity with an empty intent
|
// DummyActivity will start this activity with an empty intent
|
||||||
// once the provision is finalized
|
// once the provision is finalized
|
||||||
if (Utility.isWorkProfileAvailable(this))
|
if (ACTION_PROFILE_PROVISIONED.equals(intent.getAction()) && Utility.isWorkProfileAvailable(this))
|
||||||
finishWithResult(true);
|
finishWithResult(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue