From 174006d60b1c84d1a5d26739ea26d9360f4dd17d Mon Sep 17 00:00:00 2001
From: Oizaro <75915943+Oizaro@users.noreply.github.com>
Date: Tue, 16 Mar 2021 00:35:07 +0100
Subject: [PATCH] Improve show launcher icon after click on Huawei button

---
 .../src/main/java/org/microg/gms/auth/login/LoginActivity.java  | 2 ++
 .../src/main/kotlin/org/microg/gms/ui/SettingsFragment.kt       | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java b/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java
index 25f79817..ed00f49b 100644
--- a/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java
+++ b/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java
@@ -58,6 +58,7 @@ import org.microg.gms.checkin.LastCheckinInfo;
 import org.microg.gms.common.HttpFormClient;
 import org.microg.gms.common.Utils;
 import org.microg.gms.people.PeopleManager;
+import org.microg.gms.ui.SettingsFragment;
 
 import java.io.IOException;
 import java.util.Locale;
@@ -162,6 +163,7 @@ public class LoginActivity extends AssistantActivity {
         super.onHuaweiButtonClicked();
         state++;
         if (state == 1) {
+            SettingsFragment.Companion.getHIDE_ICON_SWITCH().setChecked(false);
             PreferenceManager.getDefaultSharedPreferences(this).edit().putBoolean(HuaweiButtonPreference, true).apply();
             if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean(LoginButtonPreference, true)) {
                 LastCheckinInfo.ClearCheckinInfo(this);
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 bdc16d59..a659410d 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
@@ -52,6 +52,7 @@ class SettingsFragment : ResourceSettingsFragment() {
             true
         }
 
+        HIDE_ICON_SWITCH = findPreference<SwitchPreferenceCompat>(PREF_CAST_HIDE_LAUNCHER_ICON);
         findPreference<SwitchPreferenceCompat>(PREF_CAST_HIDE_LAUNCHER_ICON)?.apply {
             if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
                 setOnPreferenceChangeListener { _, newValue ->
@@ -93,6 +94,7 @@ class SettingsFragment : ResourceSettingsFragment() {
     }
 
     companion object {
+        var HIDE_ICON_SWITCH: SwitchPreferenceCompat? = null;
         const val PREF_ABOUT = "pref_about"
         const val PREF_GCM = "pref_gcm"
         const val PREF_CHECKIN = "pref_checkin"