fix(location): option for Find My Device, call settingsPages.cmd

Atlas-OS · Jul 16, 2024 · 3ce9f08 · 3ce9f08
1 parent d492b6c
commit 3ce9f08
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 21 deletions.
diff --git a/src/playbook/Configuration/tweaks.yml b/src/playbook/Configuration/tweaks.yml
@@ -84,7 +84,6 @@ actions:
   - !task: {path: 'tweaks\privacy\disable-activity-feed.yml'}
   - !task: {path: 'tweaks\privacy\disable-app-launch-tracking.yml'}
   - !task: {path: 'tweaks\privacy\disable-experimentation.yml'}
-  - !task: {path: 'tweaks\privacy\disable-location-tracking.yml'}
   - !task: {path: 'tweaks\privacy\disable-lockscreen-camera.yml'}
   - !task: {path: 'tweaks\privacy\disable-online-speech-recognition.yml'}
   - !task: {path: 'tweaks\privacy\disable-pca.yml'}

diff --git a/src/playbook/Configuration/tweaks/privacy/disable-location-tracking.yml b/src/playbook/Configuration/tweaks/privacy/disable-location-tracking.yml
diff --git a/src/playbook/Configuration/tweaks/qol/set-hidden-settings-pages.yml b/src/playbook/Configuration/tweaks/qol/set-hidden-settings-pages.yml
@@ -8,14 +8,14 @@ actions:
   - !registryValue:
     path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer'
     value: 'SettingsPageVisibility'
-    data: 'hide:recovery;maps;maps-downloadmaps;findmydevice;privacy;privacy-speechtyping;privacy-speech;privacy-feedback;privacy-activityhistory;search-permissions;privacy-general;sync;cortana-windowssearch;mobile-devices;mobile-devices-addphone;workplace;backup'
+    data: 'hide:recovery;maps;maps-downloadmaps;privacy;privacy-speechtyping;privacy-speech;privacy-feedback;privacy-activityhistory;search-permissions;privacy-general;sync;cortana-windowssearch;mobile-devices;mobile-devices-addphone;workplace;backup'
     type: REG_SZ
     builds: [ '<22000' ]
 
     # Windows 11
   - !registryValue:
     path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer'
     value: 'SettingsPageVisibility'
-    data: 'hide:recovery;maps;maps-downloadmaps;findmydevice;privacy;privacy-feedback;privacy-activityhistory;search-permissions;privacy-general;sync;cortana-windowssearch;mobile-devices;mobile-devices-addphone;workplace;family-group;deviceusage;home'
+    data: 'hide:recovery;maps;maps-downloadmaps;privacy;privacy-feedback;privacy-activityhistory;search-permissions;privacy-general;sync;cortana-windowssearch;mobile-devices;mobile-devices-addphone;workplace;family-group;deviceusage;home'
     type: REG_SZ
     builds: [ '>=22000' ]
diff --git a/...Executables/AtlasDesktop/3. General Configuration/Location/Disable Location (default).cmd b/...Executables/AtlasDesktop/3. General Configuration/Location/Disable Location (default).cmd
@@ -18,6 +18,8 @@ fltmc > nul 2>&1 || (
 	sc config lfsvc start=disabled
 	sc config MapsBroker start=disabled
 	reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\Windows Search" /v AllowSearchToUseLocation /t REG_DWORD /d 0 /f
+	reg add "HKLM\SOFTWARE\Policies\Microsoft\FindMyDevice" /v AllowFindMyDevice /t REG_DWORD /d 0 /f
+	reg add "HKLM\SOFTWARE\Policies\Microsoft\FindMyDevice" /v LocationSyncEnabled /t REG_DWORD /d 0 /f
 ) > nul
 
 (
@@ -26,10 +28,15 @@ fltmc > nul 2>&1 || (
 	taskkill /f /im SystemSettings.exe
 ) > nul 2>&1
 
-"%windir%\AtlasModules\Scripts\settingsPages.cmd" /hide privacy-location
+for %%a in (
+	"privacy-location"
+	"findmydevice"
+) do (
+	call "%windir%\AtlasModules\Scripts\settingsPages.cmd" /hide %%~a /silent
+)
 
 if "%~1"=="/silent" exit /b
 
-echo Finished, please reboot your device for changes to apply.
+echo Finished.
 pause
 exit /b
diff --git a/src/playbook/Executables/AtlasDesktop/3. General Configuration/Location/Enable Location.cmd b/src/playbook/Executables/AtlasDesktop/3. General Configuration/Location/Enable Location.cmd
@@ -25,7 +25,7 @@ fltmc > nul 2>&1 || (
 	taskkill /f /im SystemSettings.exe
 ) > nul 2>&1
 
-"%windir%\AtlasModules\Scripts\settingsPages.cmd" /unhide privacy-location
+call "%windir%\AtlasModules\Scripts\settingsPages.cmd" /unhide privacy-location
 
 if "%~1"=="/silent" exit /b
 
@@ -34,6 +34,19 @@ choice /c:yn /n /m "Would you like to allow Windows Search to use your location?
 if %errorlevel%==1 reg delete %key% /f > nul
 if %errorlevel%==2 reg add %key% /t REG_DWORD /d 0 /f > nul
 
-echo Finished, please reboot your device for changes to apply.
+set key1="HKLM\SOFTWARE\Policies\Microsoft\FindMyDevice"
+choice /c:yn /n /m "Would you like to unlock Find My Device functionality? [Y/N] "
+if %errorlevel%==1 (
+	reg delete %key1% /f > nul
+	call "%windir%\AtlasModules\Scripts\settingsPages.cmd" /unhide findmydevice /silent
+)
+if %errorlevel%==2 (
+	reg add %key1% /v AllowFindMyDevice /t REG_DWORD /d 0 /f > nul
+	reg add %key1% /v LocationSyncEnabled /t REG_DWORD /d 0 /f > nul
+)
+
+echo]
+echo Finished.
+start ms-settings:privacy-location
 pause
 exit /b