PeterCxy/Shelter
3
4
Fork 1
Code Issues Projects Releases Activity

SetupWizardActivity: use a separate action for finalizing provision

Browse source
This commit is contained in:
Peter Cai 2021-03-17 16:33:21 +08:00
parent 7e34b75443
commit 657f729fac
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/net/typeblog/shelter/ui/DummyActivity.java
View file

@ -238,7 +238,7 @@ public class DummyActivity extends Activity {
.setBoolean(LocalStorageManager.PREF_HAS_SETUP, true);
LocalStorageManager.getInstance()
.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));
startActivity(intent);
Toast.makeText(this, getString(R.string.provision_finished), Toast.LENGTH_LONG).show();

13
app/src/main/java/net/typeblog/shelter/ui/SetupWizardActivity.java
View file

@ -33,6 +33,7 @@ public class SetupWizardActivity extends AppCompatActivity {
// 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.
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 LocalStorageManager mStorage = null;
@ -43,6 +44,16 @@ public class SetupWizardActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle 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);
mPolicyManager = getSystemService(DevicePolicyManager.class);
mStorage = LocalStorageManager.getInstance();
@ -62,7 +73,7 @@ public class SetupWizardActivity extends AppCompatActivity {
super.onNewIntent(intent);
// DummyActivity will start this activity with an empty intent
// once the provision is finalized
if (Utility.isWorkProfileAvailable(this))
if (ACTION_PROFILE_PROVISIONED.equals(intent.getAction()) && Utility.isWorkProfileAvailable(this))
finishWithResult(true);
}