From 51125c9bf22fcdcf29684c527838d2dc6528fad4 Mon Sep 17 00:00:00 2001
From: DaVinci9196 <davinci9196@gmail.com>
Date: Tue, 8 Oct 2024 16:28:10 +0800
Subject: [PATCH] Fixed a crash when opening mg from the app info on the pad
 and clicking self check

---
 play-services-core/build.gradle                        |  3 +++
 .../main/kotlin/org/microg/gms/ui/SettingsFragment.kt  | 10 +++++++++-
 .../src/main/res/xml/preferences_start.xml             |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle
index 41b0b197c7..49fc113f4f 100644
--- a/play-services-core/build.gradle
+++ b/play-services-core/build.gradle
@@ -121,6 +121,7 @@ android {
         buildConfigField "String", "RECAPTCHA_ENTERPRISE_PROJECT_ID", "\"${localProperties.get("recaptchaEnterpreise.projectId", "")}\""
         buildConfigField "String", "RECAPTCHA_ENTERPRISE_SITE_KEY", "\"${localProperties.get("recaptchaEnterpreise.siteKey", "")}\""
         buildConfigField "String", "RECAPTCHA_ENTERPRISE_API_KEY", "\"${localProperties.get("recaptchaEnterpreise.apiKey", "")}\""
+        buildConfigField "Boolean", "PREFERERENCE_JUMP_NAVIGATION", "false"
 
         ndk {
             abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
@@ -156,12 +157,14 @@ android {
         "huawei" {
             dimension 'target'
             versionNameSuffix "-hw"
+            buildConfigField "Boolean", "PREFERERENCE_JUMP_NAVIGATION", "true"
         }
         "huaweilh" {
             dimension 'target'
             versionNameSuffix "-lh"
             versionCode appVersionCode - 1000
             matchingFallbacks = ['huawei']
+            buildConfigField "Boolean", "PREFERERENCE_JUMP_NAVIGATION", "true"
         }
         "user" {
             dimension 'target'
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/ui/SettingsFragment.kt b/play-services-core/src/main/kotlin/org/microg/gms/ui/SettingsFragment.kt
index 529e10371b..2ebe26a9f8 100644
--- a/play-services-core/src/main/kotlin/org/microg/gms/ui/SettingsFragment.kt
+++ b/play-services-core/src/main/kotlin/org/microg/gms/ui/SettingsFragment.kt
@@ -11,11 +11,11 @@ import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import androidx.preference.Preference
 import androidx.preference.PreferenceCategory
+import com.google.android.gms.BuildConfig
 import com.google.android.gms.R
 import org.microg.gms.checkin.CheckinPreferences
 import org.microg.gms.gcm.GcmDatabase
 import org.microg.gms.gcm.GcmPrefs
-import org.microg.gms.vending.VendingPreferences
 import org.microg.gms.safetynet.SafetyNetPreferences
 import org.microg.gms.ui.settings.SettingsProvider
 import org.microg.gms.ui.settings.getAllSettingsProviders
@@ -27,6 +27,13 @@ class SettingsFragment : ResourceSettingsFragment() {
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         super.onCreatePreferences(savedInstanceState, rootKey)
 
+        if(BuildConfig.PREFERERENCE_JUMP_NAVIGATION) {
+            findPreference<Preference>(PREF_SELF_CHECK)!!.onPreferenceClickListener = Preference.OnPreferenceClickListener {
+                findNavController().navigate(requireContext(), R.id.openSelfcheck)
+                true
+            }
+        }
+
         findPreference<Preference>(PREF_ACCOUNTS)!!.onPreferenceClickListener = Preference.OnPreferenceClickListener {
             findNavController().navigate(requireContext(), R.id.accountManagerFragment)
             true
@@ -135,6 +142,7 @@ class SettingsFragment : ResourceSettingsFragment() {
         const val PREF_CHECKIN = "pref_checkin"
         const val PREF_VENDING = "pref_vending"
         const val PREF_ACCOUNTS = "pref_accounts"
+        const val PREF_SELF_CHECK = "pref_self_check"
     }
 
     init {
diff --git a/play-services-core/src/main/res/xml/preferences_start.xml b/play-services-core/src/main/res/xml/preferences_start.xml
index 532d0c1459..5564ba60b4 100644
--- a/play-services-core/src/main/res/xml/preferences_start.xml
+++ b/play-services-core/src/main/res/xml/preferences_start.xml
@@ -19,6 +19,7 @@
     <PreferenceCategory android:layout="@layout/preference_category_no_label" android:key="prefcat_header">
         <Preference
             android:icon="@drawable/ic_check_list"
+            android:key="pref_self_check"
             android:summary="@string/self_check_desc"
             android:title="@string/self_check_title">
             <intent