login: Switch to SettingsProvider for "Alt Sign in"

* This was using PreferenceManager which we aren't using after
3651: Refactor settings access to use a SettingsProvider | https://review.calyxos.org/c/CalyxOS/platform_external_microg_GmsCore/+/3651
* This is still the known working approach for now so let's switch
  it over.

Change-Id: I76939af2a39eaf16c20d05e8c10ef0cc213611ae

Author: chirayudesai

play-services-basement/src/main/kotlin/org/microg/gms/settings/SettingsContract.kt

@@ -23,6 +23,8 @@ object SettingsContract {
         const val VERSION_INFO = "versionInfo"
         const val DEVICE_DATA_VERSION_INFO = "deviceDataVersionInfo"
 
+        const val BRAND_SPOOF = "brandSpoof"
+
         val PROJECTION = arrayOf(
             ENABLED,
             ANDROID_ID,
@@ -31,6 +33,7 @@ object SettingsContract {
             SECURITY_TOKEN,
             VERSION_INFO,
             DEVICE_DATA_VERSION_INFO,
+            BRAND_SPOOF,
         )
         const val PREFERENCES_NAME = "checkin"
         const val INITIAL_DIGEST = "1-929a0dca0eee55513280171a8585da7dcd3700f8"

play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java

@@ -73,6 +73,8 @@
 import static android.view.View.VISIBLE;
 import static android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT;
 import static org.microg.gms.auth.AuthPrefs.isAuthVisible;
+import static org.microg.gms.checkin.CheckinPrefs.isSpoofingEnabled;
+import static org.microg.gms.checkin.CheckinPrefs.setSpoofingEnabled;
 import static org.microg.gms.common.Constants.GMS_PACKAGE_NAME;
 import static org.microg.gms.common.Constants.GMS_VERSION_CODE;
 
@@ -162,13 +164,14 @@ protected void onSpoofButtonClicked() {
         super.onSpoofButtonClicked();
         state++;
         if (state == 1) {
-            PreferenceManager.getDefaultSharedPreferences(this).edit().putBoolean(SpoofButtonPreference, true).apply();
-            if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean(LoginButtonPreference, true)) {
-                LastCheckinInfo.ClearCheckinInfo(this);
-                CheckinClient.brandSpoof = true;
-                PreferenceManager.getDefaultSharedPreferences(this).edit().putBoolean(LoginButtonPreference, true).apply();
+            if (!isSpoofingEnabled(this)) {
+                LastCheckinInfo.clear(this);
+                setSpoofingEnabled(this, true);
             }
             init();
+        } else if (state == -1) {
+            setResult(RESULT_CANCELED);
+            finish();
         }
     }
 
@@ -177,11 +180,9 @@ protected void onNextButtonClicked() {
         super.onNextButtonClicked();
         state++;
         if (state == 1) {
-            PreferenceManager.getDefaultSharedPreferences(this).edit().putBoolean(LoginButtonPreference, true).apply();
-            if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean(SpoofButtonPreference, true)) {
-                LastCheckinInfo.ClearCheckinInfo(this);
-                CheckinClient.brandSpoof = false;
-                PreferenceManager.getDefaultSharedPreferences(this).edit().putBoolean(SpoofButtonPreference, true).apply();
+            if (isSpoofingEnabled(this)) {
+                LastCheckinInfo.clear(this);
+                setSpoofingEnabled(this, false);
             }
             init();
         } else if (state == -1) {

play-services-core/src/main/java/org/microg/gms/checkin/CheckinClient.java

@@ -46,7 +46,6 @@ public class CheckinClient {
     private static final List<String> TODO_LIST_STRING = new ArrayList<>(); // TODO
     private static final List<CheckinRequest.Checkin.Statistic> TODO_LIST_CHECKIN = new ArrayList<>(); // TODO
     private static final String SERVICE_URL = "https://android.clients.google.com/checkin";
-    public static boolean brandSpoof = false;
 
     public static CheckinResponse request(CheckinRequest request) throws IOException {
         HttpURLConnection connection = (HttpURLConnection) new URL(SERVICE_URL).openConnection();
@@ -80,7 +79,7 @@ public static CheckinResponse request(CheckinRequest request) throws IOException
     public static CheckinRequest makeRequest(Build build, DeviceConfiguration deviceConfiguration,
                                              DeviceIdentifier deviceIdent, PhoneInfo phoneInfo,
                                              LastCheckinInfo checkinInfo, Locale locale,
-                                             List<Account> accounts) {
+                                             List<Account> accounts, Boolean brandSpoof) {
         CheckinRequest.Builder builder = new CheckinRequest.Builder()
                 .accountCookie(new ArrayList<>())
                 .androidId(checkinInfo.getAndroidId())

play-services-core/src/main/java/org/microg/gms/checkin/CheckinManager.java

@@ -33,6 +33,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.microg.gms.checkin.CheckinPrefs.isSpoofingEnabled;
+
 public class CheckinManager {
     private static final long MIN_CHECKIN_INTERVAL = 3 * 60 * 60 * 1000; // 3 hours
 
@@ -58,7 +60,8 @@ public static synchronized LastCheckinInfo checkin(Context context, boolean forc
         }
         CheckinRequest request = CheckinClient.makeRequest(Utils.getBuild(context),
                 new DeviceConfiguration(context), Utils.getDeviceIdentifier(context),
-                Utils.getPhoneInfo(context), info, Utils.getLocale(context), accounts);
+                Utils.getPhoneInfo(context), info, Utils.getLocale(context), accounts,
+                isSpoofingEnabled(context));
         return handleResponse(context, CheckinClient.request(request));
     }
 

play-services-core/src/main/kotlin/org/microg/gms/checkin/CheckinPrefs.kt

@@ -7,6 +7,7 @@ package org.microg.gms.checkin
 import android.content.Context
 import org.microg.gms.settings.SettingsContract
 import org.microg.gms.settings.SettingsContract.CheckIn
+import org.microg.gms.settings.SettingsContract.setSettings
 
 object CheckinPrefs {
 
@@ -18,4 +19,19 @@ object CheckinPrefs {
         }
     }
 
+    @JvmStatic
+    fun isSpoofingEnabled(context: Context): Boolean {
+        val projection = arrayOf(CheckIn.BRAND_SPOOF)
+        return SettingsContract.getSettings(context, CheckIn.CONTENT_URI, projection) { c ->
+            c.getInt(0) != 0
+        }
+    }
+
+    @JvmStatic
+    fun setSpoofingEnabled(context: Context, enabled: Boolean) {
+        setSettings(context, CheckIn.CONTENT_URI) {
+            put(CheckIn.BRAND_SPOOF, enabled)
+        }
+    }
+
 }

play-services-core/src/main/kotlin/org/microg/gms/settings/SettingsProvider.kt

@@ -88,6 +88,7 @@ class SettingsProvider : ContentProvider() {
             CheckIn.SECURITY_TOKEN -> checkInPrefs.getLong(key, 0)
             CheckIn.VERSION_INFO -> checkInPrefs.getString(key, "") ?: ""
             CheckIn.DEVICE_DATA_VERSION_INFO -> checkInPrefs.getString(key, "") ?: ""
+            CheckIn.BRAND_SPOOF -> getSettingsBoolean(key, false)
             else -> throw IllegalArgumentException()
         }
     }
@@ -107,6 +108,10 @@ class SettingsProvider : ContentProvider() {
                 // special case: not saved in checkInPrefs
                 updateCheckInEnabled(value as Boolean)
             }
+            if (key == CheckIn.BRAND_SPOOF) {
+                // special case: not saved in checkInPrefs
+                updateSpoofingEnabled(value as Boolean)
+            }
             when (key) {
                 CheckIn.ANDROID_ID -> editor.putLong(key, value as Long)
                 CheckIn.DIGEST -> editor.putString(key, value as String?)
@@ -125,6 +130,12 @@ class SettingsProvider : ContentProvider() {
             .apply()
     }
 
+    private fun updateSpoofingEnabled(enabled: Boolean) {
+        preferences.edit()
+            .putBoolean(CheckIn.BRAND_SPOOF, enabled)
+            .apply()
+    }
+
     private fun queryGcm(p: Array<out String>): Cursor = MatrixCursor(p).addRow(p) { key ->
         when (key) {
             Gcm.ENABLE_GCM -> getSettingsBoolean(key, false)