SetupWizardActivity: better documentation again

app/src/main/java/net/typeblog/shelter/ui/SetupWizardActivity.java

@@ -31,7 +31,8 @@ import net.typeblog.shelter.util.Utility;
 public class SetupWizardActivity extends AppCompatActivity {
     // RESUME_SETUP should be used when MainActivity detects the provisioning has been
     // 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 (on Android 7 or lower).
+    // TODO: When we remove support for Android 7, get rid of all of these nonsense :)
     public static final String ACTION_RESUME_SETUP = "net.typeblog.shelter.RESUME_SETUP";
     public static final String ACTION_PROFILE_PROVISIONED = "net.typeblog.shelter.PROFILE_PROVISIONED";
 
@@ -115,9 +116,11 @@ public class SetupWizardActivity extends AppCompatActivity {
     private void setupProfileCb(Boolean result) {
         if (result) {
             if (Utility.isWorkProfileAvailable(this)) {
-                // The setup could be already finalized at this point
+                // On Oreo and later versions, since we make use of the activity intent
-                // (post-Oreo, since there is the activity intent ACTION_PROVISIONING_SUCCESSFUL,
+                // ACTION_PROVISIONING_SUCCESSFUL, the provisioning UI will not finish
-                //  the work profile provisioning UI will not finish until that activity finishes.)
+                // until that activity returns. In this case, there is really no need for us
+                // to do anything else here (and this callback may not even be called because
+                // the activity will likely be already finished by this point).
                 // There is no need for more action
                 finishWithResult(true);
                 return;

app/src/main/res/values/strings.xml

@@ -15,7 +15,7 @@
     <string name="setup_wizard_compatibility">Compatibility</string>
     <string name="setup_wizard_compatibility_text">Shelter is developed and tested on AOSP-like Android derivatives. This includes AOSP (Android Open Source Project), Google Android (on Pixels), and <b>most AOSP-based open-source custom ROMs</b> such as LineageOS. If your phone is running one of the Android derivatives listed above, then congratulations! Shelter is probably going to work correctly on your device.\n\nSome device vendors introduce very invasive customizations into the Android code base, resulting in conflicts, incompatibility and unexpected behavior. Some custom ROMs can also introduce compatibility-breaking changes, but generally these are rarer occurrences compared to phone vendor-introduced incompatibilities.\n\nShelter is merely an interface into the Work Profile feature provided by the system. If the feature provided by the system is broken or non-standard, <b>Shelter could not magically resolve the issue on its own</b>. If you are currently using a vendor-modified Android version that is known to break Work Profiles, <b>you have been warned</b>. You may proceed anyway, but there is no guarantee that Shelter would behave correctly under these circumstances.</string>
     <string name="setup_wizard_ready">Ready?</string>
-    <string name="setup_wizard_ready_text">We are now ready to set up Shelter for you. Please first ensure that your device is <b>not</b> in Do Not Disturb mode, because you will need to <b>click on a notification</b> later to finalize the setup process.\n\nWhen you are ready, click on \"Next\" to begin the setup process.</string>
+    <string name="setup_wizard_ready_text">We are now ready to set up Shelter for you. If your device is running Android 7 or lower, please first ensure that your device is <b>not</b> in Do Not Disturb mode, because you will need to <b>click on a notification</b> later to finalize the setup process.\n\nWhen you are ready, click on \"Next\" to begin the setup process.</string>
     <string name="setup_wizard_please_wait">Please wait…</string>
     <string name="setup_wizard_please_wait_text">We are trying to initialize Work Profile and set up Shelter on your device.</string>
     <string name="setup_wizard_failed">Setup failed</string>