From f12501076d288ffb6c4c3f65a4af026e9c2dff29 Mon Sep 17 00:00:00 2001
From: Oizaro <Oizaro@users.noreply.github.com>
Date: Wed, 30 Sep 2020 00:33:58 +0200
Subject: [PATCH] Move spoof detection to main method

---
 .../java/org/microg/gms/auth/login/LoginActivity.java     | 8 +++++---
 .../main/java/org/microg/gms/checkin/CheckinClient.java   | 1 +
 play-services-core/src/main/res/values-in/strings.xml     | 2 --
 play-services-core/src/main/res/values-it/strings.xml     | 2 --
 4 files changed, 6 insertions(+), 7 deletions(-)

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 41c06620..00bf3a63 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
@@ -94,11 +94,13 @@ public class LoginActivity extends AssistantActivity {
     private InputMethodManager inputMethodManager;
     private ViewGroup authContent;
     private int state = 0;
+    private Bundle initialSavedInstanceState;
 
     @SuppressLint("AddJavascriptInterface")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        initialSavedInstanceState = savedInstanceState;
         accountType = AuthConstants.DEFAULT_ACCOUNT_TYPE;
         accountManager = AccountManager.get(LoginActivity.this);
         inputMethodManager = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
@@ -147,7 +149,6 @@ public class LoginActivity extends AssistantActivity {
         } else {
             setMessage(R.string.auth_before_connect);
             setBackButtonText(android.R.string.cancel);
-            CheckinClient.brandSpoof = false;
             setNextButtonText(R.string.auth_sign_in);
         }
     }
@@ -156,8 +157,8 @@ public class LoginActivity extends AssistantActivity {
     protected void onSpoofButtonClicked() {
         super.onSpoofButtonClicked();
         CheckinClient.brandSpoof = true;
-        state = 1;
-        init();
+        state = 0;
+        onCreate(initialSavedInstanceState);
     }
 
     @Override
@@ -353,6 +354,7 @@ public class LoginActivity extends AssistantActivity {
                             accountManager.setUserData(account, "GoogleUserId", accountId);
                         checkin(true);
                         finish();
+                        CheckinClient.brandSpoof = false;
                     }
                     @Override
                     public void onException(Exception exception) {
diff --git a/play-services-core/src/main/java/org/microg/gms/checkin/CheckinClient.java b/play-services-core/src/main/java/org/microg/gms/checkin/CheckinClient.java
index cd60ce05..ddc6d099 100755
--- a/play-services-core/src/main/java/org/microg/gms/checkin/CheckinClient.java
+++ b/play-services-core/src/main/java/org/microg/gms/checkin/CheckinClient.java
@@ -80,6 +80,7 @@ public class CheckinClient {
                                              DeviceIdentifier deviceIdent, PhoneInfo phoneInfo,
                                              LastCheckinInfo checkinInfo, Locale locale,
                                              List<Account> accounts) {
+        Log.e("sono io sono io", ""+brandSpoof);
         CheckinRequest.Builder builder = new CheckinRequest.Builder()
                 .accountCookie(new ArrayList<String>())
                 .androidId(checkinInfo.androidId)
diff --git a/play-services-core/src/main/res/values-in/strings.xml b/play-services-core/src/main/res/values-in/strings.xml
index e8357e1e..5492bbc1 100644
--- a/play-services-core/src/main/res/values-in/strings.xml
+++ b/play-services-core/src/main/res/values-in/strings.xml
@@ -90,8 +90,6 @@ Ini bisa berlangsung beberapa menit."</string>
     <string name="pref_about_title">Tentang Vanced microG</string>
     <string name="pref_cast_double_fix">Perbaikan Cast terduplikasi</string>
 
-    <string name="brand_spoof_button">Spoof</string>
-
     <string name="pref_switcher_title">Registrasi perangkat</string>
     <string name="pref_checkin_enable_summary">Registrasi perangkat anda ke layanan Google dan buat pengenal perangkat unik. Vanced microG strips mengenal bits selain dari akun Google anda dari data registrasi.</string>
     <string name="pref_device_registration_android_id">Android ID</string>
diff --git a/play-services-core/src/main/res/values-it/strings.xml b/play-services-core/src/main/res/values-it/strings.xml
index a52acfcd..08ac5cf4 100755
--- a/play-services-core/src/main/res/values-it/strings.xml
+++ b/play-services-core/src/main/res/values-it/strings.xml
@@ -90,8 +90,6 @@ Questo potrà richiedere un paio di minuti"</string>
     <string name="pref_about_title">Informazioni su Vanced microG</string>
     <string name="pref_cast_double_fix">Correzione cast duplicato</string>
 
-    <string name="brand_spoof_button">Spoof</string>
-
     <string name="pref_switcher_title">Registra dispositivo</string>
     <string name="pref_checkin_enable_summary">Registra il tuo dispositivo sui servizi Google e crea un identificatore univoco del dispositivo. Verranno rimossi dai Servizi Vanced microG alcuni bit utili per identificare i dati di registrazione, oltre al nome dell\'account Google.</string>
     <string name="pref_device_registration_android_id">ID Android</string>