From 0002daed48f661a0f13208d6670a239a7ad3fd2c Mon Sep 17 00:00:00 2001
From: Oliver Scott <olivercscott@gmail.com>
Date: Wed, 1 Jun 2022 12:11:32 +0200
Subject: [PATCH] Only modify network settings on system user

Captive portal, wi-fi and mobile data should not be modified for secondary users without user intervention

Issue: calyxos#1025
Change-Id: Ic24d18268d05b5a1535b3993bdd0a614055847f6
---
 src/org/lineageos/setupwizard/BaseSetupWizardActivity.java | 6 ++++--
 src/org/lineageos/setupwizard/NetworkSetupActivity.java    | 4 +++-
 src/org/lineageos/setupwizard/SetupWizardApp.java          | 4 +++-
 src/org/lineageos/setupwizard/SetupWizardExitActivity.java | 4 +++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java b/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
index 8a0e70d7..2039c0e3 100644
--- a/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
+++ b/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
@@ -312,8 +312,10 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
     }
 
     protected void onSetupStart() {
-        SetupWizardUtils.disableCaptivePortalDetection(getApplicationContext());
-        tryEnablingWifi();
+        if (SetupWizardUtils.isOwner()) {
+            SetupWizardUtils.disableCaptivePortalDetection(getApplicationContext());
+            tryEnablingWifi();
+        }
     }
 
     protected void exitIfSetupComplete() {
diff --git a/src/org/lineageos/setupwizard/NetworkSetupActivity.java b/src/org/lineageos/setupwizard/NetworkSetupActivity.java
index ddfd7f4c..808e406d 100644
--- a/src/org/lineageos/setupwizard/NetworkSetupActivity.java
+++ b/src/org/lineageos/setupwizard/NetworkSetupActivity.java
@@ -37,7 +37,9 @@ public class NetworkSetupActivity extends WrapperSubBaseActivity {
 
     @Override
     protected void onStartSubactivity() {
-        tryEnablingWifi();
+        if (SetupWizardUtils.isOwner()) {
+            tryEnablingWifi();
+        }
         Intent intent = new Intent(ACTION_SETUP_NETWORK);
         if (SetupWizardUtils.hasLeanback(this)) {
             intent.setComponent(SetupWizardUtils.sTvWifiSetupSettingsActivity);
diff --git a/src/org/lineageos/setupwizard/SetupWizardApp.java b/src/org/lineageos/setupwizard/SetupWizardApp.java
index dcfe3bc8..51d65aff 100644
--- a/src/org/lineageos/setupwizard/SetupWizardApp.java
+++ b/src/org/lineageos/setupwizard/SetupWizardApp.java
@@ -95,7 +95,9 @@ public class SetupWizardApp extends Application {
         NetworkMonitor.initInstance(this);
         PhoneMonitor.initInstance(this);
         SetupWizardUtils.disableComponentsForMissingFeatures(this);
-        SetupWizardUtils.setMobileDataEnabled(this, false);
+        if (SetupWizardUtils.isOwner()) {
+            SetupWizardUtils.setMobileDataEnabled(this, false);
+        }
         sStatusBarManager = SetupWizardUtils.disableStatusBar(this);
         mHandler.postDelayed(mRadioTimeoutRunnable, SetupWizardApp.RADIO_READY_TIMEOUT);
     }
diff --git a/src/org/lineageos/setupwizard/SetupWizardExitActivity.java b/src/org/lineageos/setupwizard/SetupWizardExitActivity.java
index 3ec65877..89ddabe5 100644
--- a/src/org/lineageos/setupwizard/SetupWizardExitActivity.java
+++ b/src/org/lineageos/setupwizard/SetupWizardExitActivity.java
@@ -40,7 +40,9 @@ public class SetupWizardExitActivity extends BaseSetupWizardActivity {
         if (LOGV) {
             Log.v(TAG, "onCreate savedInstanceState=" + savedInstanceState);
         }
-        SetupWizardUtils.enableCaptivePortalDetection(this);
+        if (SetupWizardUtils.isOwner()) {
+            SetupWizardUtils.enableCaptivePortalDetection(this);
+        }
         PhoneMonitor.onSetupFinished();
         if (!getSystemService(UserManager.class).isManagedProfile()) {
             launchHome();