Added Device Sync request (#2621)

microg · Dec 18, 2024 · 76f1aba · 76f1aba
1 parent f8df8f6
commit 76f1aba
Show file tree

Hide file tree

Showing 18 changed files with 923 additions and 1 deletion.
diff --git a/play-services-base/core/src/main/kotlin/org/microg/gms/settings/SettingsContract.kt b/play-services-base/core/src/main/kotlin/org/microg/gms/settings/SettingsContract.kt
@@ -199,12 +199,14 @@ object SettingsContract {
         const val LICENSING_PURCHASE_FREE_APPS = "vending_licensing_purchase_free_apps"
         const val BILLING = "vending_billing"
         const val ASSET_DELIVERY = "vending_asset_delivery"
+        const val ASSET_DEVICE_SYNC = "vending_device_sync"
 
         val PROJECTION = arrayOf(
             LICENSING,
             LICENSING_PURCHASE_FREE_APPS,
             BILLING,
             ASSET_DELIVERY,
+            ASSET_DEVICE_SYNC,
         )
     }
 

diff --git a/play-services-base/core/src/main/kotlin/org/microg/gms/settings/SettingsProvider.kt b/play-services-base/core/src/main/kotlin/org/microg/gms/settings/SettingsProvider.kt
@@ -356,6 +356,7 @@ class SettingsProvider : ContentProvider() {
             Vending.LICENSING_PURCHASE_FREE_APPS -> getSettingsBoolean(key, false)
             Vending.BILLING -> getSettingsBoolean(key, false)
             Vending.ASSET_DELIVERY -> getSettingsBoolean(key, false)
+            Vending.ASSET_DEVICE_SYNC -> getSettingsBoolean(key, false)
             else -> throw IllegalArgumentException("Unknown key: $key")
         }
     }
@@ -369,6 +370,7 @@ class SettingsProvider : ContentProvider() {
                 Vending.LICENSING_PURCHASE_FREE_APPS -> editor.putBoolean(key, value as Boolean)
                 Vending.BILLING -> editor.putBoolean(key, value as Boolean)
                 Vending.ASSET_DELIVERY -> editor.putBoolean(key, value as Boolean)
+                Vending.ASSET_DEVICE_SYNC -> editor.putBoolean(key, value as Boolean)
                 else -> throw IllegalArgumentException("Unknown key: $key")
             }
         }

diff --git a/play-services-basement/src/main/java/org/microg/gms/common/Constants.java b/play-services-basement/src/main/java/org/microg/gms/common/Constants.java
@@ -28,4 +28,5 @@ public class Constants {
     public static final String MICROG_PACKAGE_SIGNATURE_SHA1 = "10321bd893f69af97f7573aafe9de1dc0901f3a1";
     @Deprecated
     public static final int MAX_REFERENCE_VERSION = GMS_VERSION_CODE;
+    public static final String VENDING_PACKAGE_NAME = "com.android.vending";
 }
diff --git a/play-services-core/src/huawei/AndroidManifest.xml b/play-services-core/src/huawei/AndroidManifest.xml
@@ -40,5 +40,8 @@
         <meta-data
             android:name="org.microg.gms.settings.vending_asset_delivery"
             android:value="true" />
+        <meta-data
+            android:name="org.microg.gms.settings.vending_device_sync"
+            android:value="true" />
     </application>
 </manifest>
diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
@@ -127,6 +127,11 @@
         android:permissionGroup="com.google.android.gms.permission.CAR_INFORMATION"
         android:protectionLevel="dangerous" />
 
+    <permission
+        android:name="com.google.android.gms.auth.permission.GOOGLE_ACCOUNT_CHANGE"
+        android:protectionLevel="signature"/>
+    <uses-permission android:name="com.google.android.gms.auth.permission.GOOGLE_ACCOUNT_CHANGE" />
+
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

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
@@ -22,6 +22,7 @@
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.Color;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
@@ -77,6 +78,7 @@
 import static org.microg.gms.auth.AuthPrefs.isAuthVisible;
 import static org.microg.gms.common.Constants.GMS_PACKAGE_NAME;
 import static org.microg.gms.common.Constants.GMS_VERSION_CODE;
+import static org.microg.gms.common.Constants.VENDING_PACKAGE_NAME;
 
 public class LoginActivity extends AssistantActivity {
     public static final String TMPL_NEW_ACCOUNT = "new_account";
@@ -91,6 +93,8 @@ public class LoginActivity extends AssistantActivity {
     private static final String GOOGLE_SUITE_URL = "https://accounts.google.com/signin/continue";
     private static final String MAGIC_USER_AGENT = " MinuteMaid";
     private static final String COOKIE_OAUTH_TOKEN = "oauth_token";
+    private static final String ACTION_UPDATE_ACCOUNT = "com.google.android.gms.auth.GOOGLE_ACCOUNT_CHANGE";
+    private static final String PERMISSION_UPDATE_ACCOUNT = "com.google.android.gms.auth.permission.GOOGLE_ACCOUNT_CHANGE";
 
     private final FidoHandler fidoHandler = new FidoHandler(this);
     private final DroidGuardHandler dgHandler = new DroidGuardHandler(this);
@@ -358,6 +362,10 @@ private void returnSuccessResponse(Account account){
             bd.putString(AccountManager.KEY_ACCOUNT_TYPE,accountType);
             response.onResult(bd);
         }
+        Intent intent = new Intent(ACTION_UPDATE_ACCOUNT);
+        intent.setPackage(VENDING_PACKAGE_NAME);
+        intent.putExtra(AccountManager.KEY_ACCOUNT_NAME, account.name);
+        sendBroadcast(intent, PERMISSION_UPDATE_ACCOUNT);
     }
     private void retrieveGmsToken(final Account account) {
         final AuthManager authManager = new AuthManager(this, account.name, GMS_PACKAGE_NAME, "ac2dm");

diff --git a/play-services-core/src/main/java/org/microg/tools/selfcheck/InstalledPackagesChecks.java b/play-services-core/src/main/java/org/microg/tools/selfcheck/InstalledPackagesChecks.java
@@ -42,7 +42,7 @@ public String getGroupName(Context context) {
     @Override
     public void doChecks(Context context, ResultCollector collector) {
         addPackageInstalledAndSignedResult(context, collector, context.getString(R.string.self_check_pkg_gms), Constants.GMS_PACKAGE_NAME, Constants.GMS_PACKAGE_SIGNATURE_SHA1);
-        addPackageInstalledAndSignedResult(context, collector, context.getString(R.string.self_check_pkg_vending), "com.android.vending", Constants.GMS_PACKAGE_SIGNATURE_SHA1);
+        addPackageInstalledAndSignedResult(context, collector, context.getString(R.string.self_check_pkg_vending), Constants.VENDING_PACKAGE_NAME, Constants.GMS_PACKAGE_SIGNATURE_SHA1);
         addPackageInstalledResult(context, collector, context.getString(R.string.self_check_pkg_gsf), Constants.GSF_PACKAGE_NAME);
     }
 

diff --git a/play-services-core/src/main/kotlin/org/microg/gms/ui/VendingFragment.kt b/play-services-core/src/main/kotlin/org/microg/gms/ui/VendingFragment.kt
@@ -19,6 +19,7 @@ class VendingFragment : PreferenceFragmentCompat() {
     private lateinit var licensingPurchaseFreeAppsEnabled: TwoStatePreference
     private lateinit var iapEnable: TwoStatePreference
     private lateinit var assetDeliveryEnabled: TwoStatePreference
+    private lateinit var deviceSyncEnabled: TwoStatePreference
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         addPreferencesFromResource(R.xml.preferences_vending)
@@ -73,6 +74,18 @@ class VendingFragment : PreferenceFragmentCompat() {
             }
             true
         }
+
+        deviceSyncEnabled = preferenceScreen.findPreference(PREF_DEVICE_SYNC_ENABLED) ?: deviceSyncEnabled
+        deviceSyncEnabled.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+            val appContext = requireContext().applicationContext
+            lifecycleScope.launchWhenResumed {
+                if (newValue is Boolean) {
+                    VendingPreferences.setDeviceSyncEnabled(appContext, newValue)
+                }
+                updateContent()
+            }
+            true
+        }
     }
 
     override fun onResume() {
@@ -87,6 +100,7 @@ class VendingFragment : PreferenceFragmentCompat() {
             licensingPurchaseFreeAppsEnabled.isChecked = VendingPreferences.isLicensingPurchaseFreeAppsEnabled(appContext)
             iapEnable.isChecked = VendingPreferences.isBillingEnabled(appContext)
             assetDeliveryEnabled.isChecked = VendingPreferences.isAssetDeliveryEnabled(appContext)
+            deviceSyncEnabled.isChecked = VendingPreferences.isDeviceSyncEnabled(appContext)
         }
     }
 
@@ -95,5 +109,6 @@ class VendingFragment : PreferenceFragmentCompat() {
         const val PREF_LICENSING_PURCHASE_FREE_APPS_ENABLED = "vending_licensing_purchase_free_apps"
         const val PREF_IAP_ENABLED = "vending_iap"
         const val PREF_ASSET_DELIVERY_ENABLED = "vending_asset_delivery"
+        const val PREF_DEVICE_SYNC_ENABLED = "vending_device_sync"
     }
 }
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/vending/VendingPreferences.kt b/play-services-core/src/main/kotlin/org/microg/gms/vending/VendingPreferences.kt
@@ -69,4 +69,19 @@ object VendingPreferences {
             put(SettingsContract.Vending.ASSET_DELIVERY, enabled)
         }
     }
+
+    @JvmStatic
+    fun isDeviceSyncEnabled(context: Context): Boolean {
+        val projection = arrayOf(SettingsContract.Vending.ASSET_DEVICE_SYNC)
+        return SettingsContract.getSettings(context, SettingsContract.Vending.getContentUri(context), projection) { c ->
+            c.getInt(0) != 0
+        }
+    }
+
+    @JvmStatic
+    fun setDeviceSyncEnabled(context: Context, enabled: Boolean) {
+        SettingsContract.setSettings(context, SettingsContract.Vending.getContentUri(context)) {
+            put(SettingsContract.Vending.ASSET_DEVICE_SYNC, enabled)
+        }
+    }
 }
diff --git a/play-services-core/src/main/res/values-zh-rCN/strings.xml b/play-services-core/src/main/res/values-zh-rCN/strings.xml
@@ -264,4 +264,6 @@ microG GmsCore 内置一套自由的 SafetyNet 实现，但是官方服务器要
     <string name="pref_vending_asset_delivery_summary">当使用 Play 资产传递的应用请求时下载额外的资产</string>
     <string name="pref_vending_asset_delivery_category">Google Play 资产传递</string>
     <string name="pref_vending_asset_delivery_switch">启用按需资产传递</string>
+    <string name="pref_vending_asset_device_sync_summary">使用 Play 资产传递的应用请求时将会根据当前使用设备信息下载更多的资产</string>
+    <string name="pref_vending_asset_device_sync_switch">启用设备信息同步</string>
 </resources>
diff --git a/play-services-core/src/main/res/values/strings.xml b/play-services-core/src/main/res/values/strings.xml
@@ -297,6 +297,8 @@ Please set up a password, PIN, or pattern lock screen."</string>
     <string name="pref_vending_asset_delivery_category">Google Play Asset Delivery</string>
     <string name="pref_vending_asset_delivery_switch">Enable on-demand asset delivery</string>
     <string name="pref_vending_asset_delivery_summary">Download additional assets when requested by apps that use Play Asset Delivery</string>
+    <string name="pref_vending_asset_device_sync_summary">Applications using Play Asset Delivery will download additional assets based on the information of the device currently in use.</string>
+    <string name="pref_vending_asset_device_sync_switch">Enable device information sync</string>
 
     <string name="credentials_assisted_cancel">Cancel</string>
     <string name="credentials_assisted_continue">Continue</string>

diff --git a/play-services-core/src/main/res/xml/preferences_vending.xml b/play-services-core/src/main/res/xml/preferences_vending.xml
@@ -61,5 +61,11 @@
             android:key="vending_asset_delivery"
             android:persistent="false"
             app:iconSpaceReserved="false" />
+        <SwitchPreferenceCompat
+            android:title="@string/pref_vending_asset_device_sync_switch"
+            android:summary="@string/pref_vending_asset_device_sync_summary"
+            android:key="vending_device_sync"
+            android:persistent="false"
+            app:iconSpaceReserved="false" />
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/vending-app/src/main/AndroidManifest.xml b/vending-app/src/main/AndroidManifest.xml
@@ -19,6 +19,7 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="com.google.android.gms.permission.READ_SETTINGS" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="com.google.android.gms.auth.permission.GOOGLE_ACCOUNT_CHANGE"/>
 
     <uses-permission
         android:name="android.permission.USE_CREDENTIALS"
@@ -190,6 +191,15 @@
                 <action android:name="com.google.android.play.core.expressintegrityservice.BIND_EXPRESS_INTEGRITY_SERVICE"/>
             </intent-filter>
         </service>
+
+        <receiver
+            android:name="com.google.android.finsky.accounts.impl.AccountsChangedReceiver"
+            android:permission="com.google.android.gms.auth.permission.GOOGLE_ACCOUNT_CHANGE"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.google.android.gms.auth.GOOGLE_ACCOUNT_CHANGE"/>
+            </intent-filter>
+        </receiver>
 
     </application>
 </manifest>
diff --git a/vending-app/src/main/java/com/android/vending/VendingPreferences.kt b/vending-app/src/main/java/com/android/vending/VendingPreferences.kt
@@ -41,4 +41,12 @@ object VendingPreferences {
             c.getInt(0) != 0
         }
     }
+
+    @JvmStatic
+    fun isDeviceSyncEnabled(context: Context): Boolean {
+        val projection = arrayOf(SettingsContract.Vending.ASSET_DEVICE_SYNC)
+        return SettingsContract.getSettings(context, SettingsContract.Vending.getContentUri(context), projection) { c ->
+            c.getInt(0) != 0
+        }
+    }
 }
diff --git a/vending-app/src/main/java/org/microg/vending/billing/core/GooglePlayApi.kt b/vending-app/src/main/java/org/microg/vending/billing/core/GooglePlayApi.kt
@@ -12,5 +12,6 @@ class GooglePlayApi {
         const val URL_AUTH_PROOF_TOKENS = "https://www.googleapis.com/reauth/v1beta/users/me/reauthProofTokens"
         const val URL_DETAILS = "$URL_FDFE/details"
         const val URL_PURCHASE = "$URL_FDFE/purchase"
+        const val URL_SYNC = "$URL_FDFE/sync"
     }
 }