From a33defb154a02b5891442a30aca26ffdd1e5ebc3 Mon Sep 17 00:00:00 2001
From: DaVinci9196 <150454414+DaVinci9196@users.noreply.github.com>
Date: Sun, 15 Dec 2024 16:03:27 +0800
Subject: [PATCH] Google Maps location information sharing page settings button
 fix (#2634)

Co-authored-by: Marvin W <git@larma.de>
---
 play-services-core/src/main/AndroidManifest.xml              | 4 ++++
 .../kotlin/org/microg/gms/accountsettings/ui/MainActivity.kt | 5 ++---
 .../kotlin/org/microg/gms/accountsettings/ui/extensions.kt   | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
index b9d69cb41a..498980221e 100644
--- a/play-services-core/src/main/AndroidManifest.xml
+++ b/play-services-core/src/main/AndroidManifest.xml
@@ -770,6 +770,10 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="com.google.android.gms.location.settings.LOCATION_SHARING"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
         </activity>
 
         <activity
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/accountsettings/ui/MainActivity.kt b/play-services-core/src/main/kotlin/org/microg/gms/accountsettings/ui/MainActivity.kt
index 7040c9dbed..d8c97a9832 100644
--- a/play-services-core/src/main/kotlin/org/microg/gms/accountsettings/ui/MainActivity.kt
+++ b/play-services-core/src/main/kotlin/org/microg/gms/accountsettings/ui/MainActivity.kt
@@ -118,10 +118,9 @@ private val ALLOWED_WEB_PREFIXES = setOf(
 )
 
 private val ACTION_TO_SCREEN_ID = hashMapOf(
-    ACTION_MY_ACCOUNT to 1,
-    ACTION_ACCOUNT_PREFERENCES_SETTINGS to 1,
     ACTION_SECURITY_SETTINGS to 10006,
     ACTION_PRIVACY_SETTINGS to 10004,
+    ACTION_LOCATION_SHARING to 210,
 )
 
 class MainActivity : AppCompatActivity() {
@@ -134,7 +133,7 @@ class MainActivity : AppCompatActivity() {
         Log.d(TAG, "Invoked with ${intent.action} and extras $extras")
         super.onCreate(savedInstanceState)
 
-        val screenId = intent?.getIntExtra(EXTRA_SCREEN_ID, -1).takeIf { it != -1 } ?: ACTION_TO_SCREEN_ID[intent.action] ?: 1
+        val screenId = ACTION_TO_SCREEN_ID[intent.action] ?: intent?.getIntExtra(EXTRA_SCREEN_ID, -1)?.takeIf { it > 0 } ?: 1
         val product = intent?.getStringExtra(EXTRA_SCREEN_MY_ACTIVITY_PRODUCT)
         val kidOnboardingParams = intent?.getStringExtra(EXTRA_SCREEN_KID_ONBOARDING_PARAMS)
 
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/accountsettings/ui/extensions.kt b/play-services-core/src/main/kotlin/org/microg/gms/accountsettings/ui/extensions.kt
index 30a3b01be9..a142321579 100644
--- a/play-services-core/src/main/kotlin/org/microg/gms/accountsettings/ui/extensions.kt
+++ b/play-services-core/src/main/kotlin/org/microg/gms/accountsettings/ui/extensions.kt
@@ -10,6 +10,7 @@ const val ACTION_MY_ACCOUNT = "com.google.android.gms.accountsettings.MY_ACCOUNT
 const val ACTION_ACCOUNT_PREFERENCES_SETTINGS = "com.google.android.gms.accountsettings.ACCOUNT_PREFERENCES_SETTINGS"
 const val ACTION_PRIVACY_SETTINGS = "com.google.android.gms.accountsettings.PRIVACY_SETTINGS"
 const val ACTION_SECURITY_SETTINGS = "com.google.android.gms.accountsettings.SECURITY_SETTINGS"
+const val ACTION_LOCATION_SHARING = "com.google.android.gms.location.settings.LOCATION_SHARING"
 
 const val EXTRA_CALLING_PACKAGE_NAME = "extra.callingPackageName"
 const val EXTRA_IGNORE_ACCOUNT = "extra.ignoreAccount"