From fb6285a35e4b28220314deda04b7f86bcb3ac3e7 Mon Sep 17 00:00:00 2001
From: Oliver Scott <olivercscott@gmail.com>
Date: Mon, 5 Dec 2022 15:24:54 +0100
Subject: [PATCH] Add API to query managed profiles

Replace mIsPrimaryUser and UserManager calls with API

Change-Id: I4c9661c6daf3dcb714db01d5229bf4cee37648c2
---
 src/org/lineageos/setupwizard/BaseSetupWizardActivity.java | 6 ------
 src/org/lineageos/setupwizard/SetupWizardActivity.java     | 5 ++---
 src/org/lineageos/setupwizard/SetupWizardExitActivity.java | 3 +--
 src/org/lineageos/setupwizard/util/SetupWizardUtils.java   | 5 +++++
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java b/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
index 2039c0e3..2ec668c7 100644
--- a/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
+++ b/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
@@ -88,7 +88,6 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
     protected boolean mIsExiting = false;
     private final boolean mIsFirstRun = true;
     protected boolean mIsGoingBack = false;
-    private boolean mIsPrimaryUser;
     protected int mResultCode = 0;
     private Intent mResultData;
 
@@ -112,7 +111,6 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
         }
         super.onCreate(savedInstanceState);
         registerReceiver(finishReceiver, new IntentFilter(ACTION_SETUP_COMPLETE));
-        mIsPrimaryUser = UserHandle.myUserId() == 0;
         initLayout();
         mNavigationBar = getNavigationBar();
         if (mNavigationBar != null) {
@@ -520,10 +518,6 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
         return mIsFirstRun;
     }
 
-    protected boolean isPrimaryUser() {
-        return mIsPrimaryUser;
-    }
-
     public boolean hasMultipleUsers() {
         return ((UserManager) getSystemService(USER_SERVICE)).getUsers().size() > 1;
     }
diff --git a/src/org/lineageos/setupwizard/SetupWizardActivity.java b/src/org/lineageos/setupwizard/SetupWizardActivity.java
index 876b63d5..dfb5e19c 100644
--- a/src/org/lineageos/setupwizard/SetupWizardActivity.java
+++ b/src/org/lineageos/setupwizard/SetupWizardActivity.java
@@ -26,7 +26,6 @@ import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
 import android.annotation.Nullable;
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.UserManager;
 import android.util.Log;
 
 import com.google.android.setupcompat.util.WizardManagerHelper;
@@ -53,9 +52,9 @@ public class SetupWizardActivity extends BaseSetupWizardActivity {
             onSetupStart();
             SetupWizardUtils.enableComponent(this, WizardManager.class);
             Intent intent = new Intent(ACTION_LOAD);
-            if (isPrimaryUser()) {
+            if (SetupWizardUtils.isOwner()) {
                 intent.putExtra(EXTRA_SCRIPT_URI, getString(R.string.lineage_wizard_script_uri));
-            } else if (getSystemService(UserManager.class).isManagedProfile()) {
+            } else if (SetupWizardUtils.isManagedProfile(this)) {
                 intent.putExtra(EXTRA_SCRIPT_URI, getString(
                         R.string.lineage_wizard_script_managed_profile_uri));
             } else {
diff --git a/src/org/lineageos/setupwizard/SetupWizardExitActivity.java b/src/org/lineageos/setupwizard/SetupWizardExitActivity.java
index 89ddabe5..e1305353 100644
--- a/src/org/lineageos/setupwizard/SetupWizardExitActivity.java
+++ b/src/org/lineageos/setupwizard/SetupWizardExitActivity.java
@@ -24,7 +24,6 @@ import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
 import android.annotation.Nullable;
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.UserManager;
 import android.util.Log;
 
 import org.lineageos.setupwizard.util.PhoneMonitor;
@@ -44,7 +43,7 @@ public class SetupWizardExitActivity extends BaseSetupWizardActivity {
             SetupWizardUtils.enableCaptivePortalDetection(this);
         }
         PhoneMonitor.onSetupFinished();
-        if (!getSystemService(UserManager.class).isManagedProfile()) {
+        if (!SetupWizardUtils.isManagedProfile(this)) {
             launchHome();
         }
         finish();
diff --git a/src/org/lineageos/setupwizard/util/SetupWizardUtils.java b/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
index 48369844..19120ec4 100644
--- a/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
+++ b/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
@@ -46,6 +46,7 @@ import android.net.ConnectivityManager;
 import android.os.Binder;
 import android.os.SystemProperties;
 import android.os.UserHandle;
+import android.os.UserManager;
 import android.provider.Settings;
 import android.telephony.ServiceState;
 import android.telephony.SubscriptionManager;
@@ -143,6 +144,10 @@ public class SetupWizardUtils {
         return UserHandle.myUserId() == 0;
     }
 
+    public static boolean isManagedProfile(Context context) {
+        return context.getSystemService(UserManager.class).isManagedProfile();
+    }
+
     public static void disableCaptivePortalDetection(Context context) {
         Settings.Global.putInt(context.getContentResolver(), KEY_DETECT_CAPTIVE_PORTAL, 0);
     }