Games: Added game account management

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

@@ -296,6 +296,20 @@ object SettingsContract {
         )
     }
 
+    object GameProfile {
+        const val ID = "gameprofile"
+        fun getContentUri(context: Context) = Uri.withAppendedPath(getCrossProfileSharedAuthorityUri(context), ID)
+        fun getContentType(context: Context) = "vnd.android.cursor.item/vnd.${getAuthority(context)}.$ID"
+
+        const val ALLOW_CREATE_PLAYER = "game_allow_create_player"
+        const val ALLOW_UPLOAD_GAME_PLAYED = "allow_upload_game_played"
+
+        val PROJECTION = arrayOf(
+            ALLOW_CREATE_PLAYER,
+            ALLOW_UPLOAD_GAME_PLAYED
+        )
+    }
+
     private fun <T> withoutCallingIdentity(f: () -> T): T {
         val identity = Binder.clearCallingIdentity()
         try {

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

@@ -21,6 +21,7 @@ import org.microg.gms.settings.SettingsContract.Auth
 import org.microg.gms.settings.SettingsContract.CheckIn
 import org.microg.gms.settings.SettingsContract.DroidGuard
 import org.microg.gms.settings.SettingsContract.Exposure
+import org.microg.gms.settings.SettingsContract.GameProfile
 import org.microg.gms.settings.SettingsContract.Gcm
 import org.microg.gms.settings.SettingsContract.Location
 import org.microg.gms.settings.SettingsContract.Profile
@@ -84,6 +85,7 @@ class SettingsProvider : ContentProvider() {
         Location.ID -> queryLocation(projection ?: Location.PROJECTION)
         Vending.ID -> queryVending(projection ?: Vending.PROJECTION)
         WorkProfile.ID -> queryWorkProfile(projection ?: WorkProfile.PROJECTION)
+        GameProfile.ID -> queryGameProfile(projection ?: GameProfile.PROJECTION)
         else -> null
     }
 
@@ -106,6 +108,7 @@ class SettingsProvider : ContentProvider() {
             Location.ID -> updateLocation(values)
             Vending.ID -> updateVending(values)
             WorkProfile.ID -> updateWorkProfile(values)
+            GameProfile.ID -> updateGameProfile(values)
             else -> return 0
         }
         return 1
@@ -401,6 +404,27 @@ class SettingsProvider : ContentProvider() {
         editor.apply()
     }
 
+    private fun queryGameProfile(p: Array<out String>): Cursor = MatrixCursor(p).addRow(p) { key ->
+        when (key) {
+            GameProfile.ALLOW_CREATE_PLAYER -> getSettingsBoolean(key, false)
+            GameProfile.ALLOW_UPLOAD_GAME_PLAYED -> getSettingsBoolean(key, false)
+            else -> throw IllegalArgumentException("Unknown key: $key")
+        }
+    }
+
+    private fun updateGameProfile(values: ContentValues) {
+        if (values.size() == 0) return
+        val editor = preferences.edit()
+        values.valueSet().forEach { (key, value) ->
+            when (key) {
+                GameProfile.ALLOW_CREATE_PLAYER -> editor.putBoolean(key, value as Boolean)
+                GameProfile.ALLOW_UPLOAD_GAME_PLAYED -> editor.putBoolean(key, value as Boolean)
+                else -> throw IllegalArgumentException("Unknown key: $key")
+            }
+        }
+        editor.apply()
+    }
+
     private fun MatrixCursor.addRow(
         p: Array<out String>,
         valueGetter: (String) -> Any?

play-services-base/core/src/main/res/values-zh-rCN/strings.xml

@@ -4,6 +4,7 @@
     <string name="foreground_service_notification_text"><xliff:g example="Exposure Notification">%1$s</xliff:g> 正在后台运行。</string>
     <string name="foreground_service_notification_big_text">对 <xliff:g example="microG Services">%1$s</xliff:g> 忽略电池优化，或者修改通知设置以隐藏此通知。</string>
     <string name="menu_advanced">高级</string>
+    <string name="menu_game_managed">管理游戏账号</string>
     <string name="list_no_item_none">无</string>
     <string name="list_item_see_all">全部显示</string>
     <string name="open_app">打开</string>

play-services-base/core/src/main/res/values/strings.xml

@@ -10,6 +10,7 @@
     <string name="foreground_service_notification_big_text">Exclude <xliff:g example="microG Services">%1$s</xliff:g> from battery optimizations or change notification settings to hide this notification.</string>
 
     <string name="menu_advanced">Advanced</string>
+    <string name="menu_game_managed">Game Accounts Managed</string>
 
     <string name="list_no_item_none">None</string>
     <string name="list_item_see_all">See all</string>

play-services-core-proto/src/main/proto/games.proto

@@ -0,0 +1,65 @@
+/*
+ * SPDX-FileCopyrightText: 2025 microG Project Team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package google.play.games.whitelisted.v1whitelisted;
+
+option java_outer_classname = "GamesPlayersProto";
+
+option java_package = "org.microg.gms.games";
+option java_multiple_files = true;
+
+service PlayersFirstParty {
+  rpc DeleteApplicationDataFirstParty (DeleteApplicationDataRequest) returns (DeleteApplicationDataResponse);
+  rpc DeletePlayerFirstParty (DeletePlayerRequest) returns (DeletePlayerResponse);
+}
+
+service ApplicationsFirstParty {
+  rpc ListApplicationsWithUserDataFirstParty (ListApplicationsWithUserDataRequest) returns (ListApplicationsWithUserDataResponse);
+}
+
+message ListApplicationsWithUserDataRequest {
+  optional string locale = 1;
+  optional string androidSdk = 2;
+}
+
+message ListApplicationsWithUserDataResponse {
+  optional string tag = 1;
+  optional int32 code = 2;
+  repeated FirstPartyApplication firstPartyApplication = 3;
+}
+
+message FirstPartyApplication {
+  optional string tag = 1;
+  optional Application application = 2;
+  optional int32 unlockAchievementsNum = 6;
+  optional int32 played = 9;
+}
+
+message Application {
+  optional string tag = 1;
+  optional string gameId = 2;
+  optional string gameName = 3;
+  optional ApplicationIcon gameIcon = 7;
+  optional int32 achievementsNum = 10;
+}
+
+message ApplicationIcon {
+  optional string type = 1;
+  optional int32 width = 2;
+  optional int32 height = 3;
+  optional string url = 4;
+  optional string tag = 5;
+}
+
+message DeletePlayerRequest {}
+
+message DeletePlayerResponse {}
+
+message DeleteApplicationDataRequest {
+  optional string gameId = 1;
+  optional int32 status = 2;
+}
+
+message DeleteApplicationDataResponse {}

play-services-core/src/huawei/AndroidManifest.xml

@@ -46,5 +46,11 @@
         <meta-data
             android:name="org.microg.gms.settings.vending_split_install"
             android:value="false" />
+        <meta-data
+            android:name="org.microg.gms.settings.game_allow_create_player"
+            android:value="true" />
+        <meta-data
+            android:name="org.microg.gms.settings.allow_upload_game_played"
+            android:value="true" />
     </application>
 </manifest>

play-services-core/src/main/AndroidManifest.xml

@@ -605,6 +605,12 @@
 
         <!-- Games -->
 
+        <activity
+            android:name="org.microg.gms.games.ui.GamePlayDataActivity"
+            android:process=":ui"
+            android:exported="false"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+
         <activity
             android:name="org.microg.gms.games.ui.InGameUiActivity"
             android:process=":ui"

play-services-core/src/main/kotlin/org/microg/gms/auth/consent/ConsentSignInActivity.kt

@@ -7,13 +7,15 @@ package org.microg.gms.auth.consent
 
 import android.annotation.SuppressLint
 import android.app.Activity
+import android.content.res.Configuration
 import android.graphics.Bitmap
 import android.os.Build.VERSION.SDK_INT
 import android.os.Bundle
 import android.os.Message
 import android.os.Messenger
 import android.util.Log
 import android.view.View
+import android.view.WindowManager
 import android.webkit.CookieManager
 import android.webkit.JavascriptInterface
 import android.webkit.WebView
@@ -58,11 +60,18 @@ class ConsentSignInActivity : Activity() {
             finish()
             return
         }
-
+        initLayout()
         initWebView()
         initCookieManager()
     }
 
+    private fun initLayout() {
+        val layoutParams = window.attributes as WindowManager.LayoutParams
+        layoutParams.width = (resources.displayMetrics.widthPixels * 0.8).toInt()
+        layoutParams.height = WindowManager.LayoutParams.WRAP_CONTENT
+        window.attributes = layoutParams
+    }
+
     private fun initWebView() {
         webView?.settings?.apply {
             userAgentString = generateWebViewUserAgentString(userAgentString)

play-services-core/src/main/kotlin/org/microg/gms/auth/signin/AuthSignInActivity.kt

@@ -62,10 +62,10 @@ class AuthSignInActivity : AppCompatActivity() {
         if (packageName == null || (packageName != callingActivity?.packageName && callingActivity?.packageName != this.packageName))
             return finishResult(CommonStatusCodes.DEVELOPER_ERROR, "package name mismatch")
 
-        initView()
+        initView(packageName)
     }
 
-    private fun initView() {
+    private fun initView(packageName: String) {
         val accountManager = getSystemService<AccountManager>() ?: return finishResult(CommonStatusCodes.INTERNAL_ERROR, "No account manager")
         val accounts = accountManager.getAccountsByType(DEFAULT_ACCOUNT_TYPE)
         if (accounts.isNotEmpty()) {
@@ -234,6 +234,6 @@ class AuthSignInActivity : AppCompatActivity() {
 
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
-        initView()
+        config?.packageName?.let { initView(it) }
     }
 }

play-services-core/src/main/kotlin/org/microg/gms/auth/signin/AuthSignInService.kt

@@ -31,6 +31,7 @@ import com.google.android.gms.auth.api.signin.GoogleSignInOptions
 import com.google.android.gms.auth.api.signin.internal.ISignInCallbacks
 import com.google.android.gms.auth.api.signin.internal.ISignInService
 import com.google.android.gms.common.Feature
+import com.google.android.gms.common.Scopes
 import com.google.android.gms.common.api.CommonStatusCodes
 import com.google.android.gms.common.api.Scope
 import com.google.android.gms.common.api.Status
@@ -42,6 +43,8 @@ import org.microg.gms.auth.AuthConstants
 import org.microg.gms.auth.AuthPrefs
 import org.microg.gms.common.GmsService
 import org.microg.gms.common.PackageUtils
+import org.microg.gms.games.GAMES_PACKAGE_NAME
+import org.microg.gms.games.GamesConfigurationService
 import org.microg.gms.utils.singleInstanceOf
 import org.microg.gms.utils.warnOnTransactionIssues
 import kotlin.coroutines.resume
@@ -79,10 +82,18 @@ class AuthSignInServiceImpl(
         }
         lifecycleScope.launchWhenStarted {
             try {
-                val account = account 
-                    ?: options?.account 
-                    ?: SignInConfigurationService.getDefaultAccount(context, packageName) 
-                    ?: AccountManager.get(context).getAccountsByType(AuthConstants.DEFAULT_ACCOUNT_TYPE).firstOrNull()
+                var currentAccount = account ?: options?.account
+                if (options?.scopes?.any { it.scopeUri.contains(Scopes.GAMES) } == true) {
+                    currentAccount = currentAccount ?: GamesConfigurationService.getDefaultAccount(context, packageName)
+                    if (currentAccount == null && GamesConfigurationService.loadPlayedGames(context)?.any { it == packageName } == false) {
+                        currentAccount = GamesConfigurationService.getDefaultAccount(context, GAMES_PACKAGE_NAME)
+                    }
+                    if (currentAccount == null) {
+                        sendResult(null, Status(CommonStatusCodes.SIGN_IN_REQUIRED))
+                        return@launchWhenStarted
+                    }
+                }
+                val account = currentAccount ?: SignInConfigurationService.getDefaultAccount(context, packageName)
                 Log.d(TAG, "silentSignIn: account -> ${account?.name}")
                 if (account != null && options?.isForceCodeForRefreshToken != true) {
                     if (getOAuthManager(context, packageName, options, account).isPermitted || AuthPrefs.isTrustGooglePermitted(context)) {
@@ -115,6 +126,9 @@ class AuthSignInServiceImpl(
                     Log.d(TAG, "$packageName:signOut defaultOptions:($defaultOptions)")
                     performSignOut(context, packageName, defaultOptions ?: options, account)
                 }
+                if (options?.scopes?.any { it.scopeUri.contains(Scopes.GAMES) } == true) {
+                    GamesConfigurationService.setDefaultAccount(context, packageName, null)
+                }
                 SignInConfigurationService.setDefaultSignInInfo(context, packageName, null, null)
                 runCatching { callbacks.onSignOut(Status.SUCCESS) }
             } catch (e: Exception) {

play-services-core/src/main/kotlin/org/microg/gms/auth/signin/extensions.kt

@@ -31,6 +31,7 @@ import org.microg.gms.auth.consent.CONSENT_MESSENGER
 import org.microg.gms.auth.consent.CONSENT_RESULT
 import org.microg.gms.auth.consent.CONSENT_URL
 import org.microg.gms.auth.consent.ConsentSignInActivity
+import org.microg.gms.games.GamesConfigurationService
 import org.microg.gms.people.DatabaseHelper
 import org.microg.gms.utils.toHexString
 import java.security.MessageDigest
@@ -58,6 +59,9 @@ val GoogleSignInOptions.includeProfile
 val GoogleSignInOptions.includeUnacceptableScope
     get() = scopeUris.any { it.scopeUri !in ACCEPTABLE_SCOPES }
 
+val GoogleSignInOptions.includeGame
+    get() = scopeUris.any { it.scopeUri.contains(Scopes.GAMES) }
+
 val consentRequestOptions: String?
     get() = runCatching {
         val sessionId = Base64.encodeToString(ByteArray(16).also { SecureRandom().nextBytes(it) }, Base64.NO_WRAP).trim()
@@ -153,6 +157,9 @@ suspend fun performSignIn(context: Context, packageName: String, options: Google
             databaseHelper.close()
         }
     } else listOf(null, null, null, null)
+    if (options?.includeGame == true) {
+        GamesConfigurationService.setDefaultAccount(context, packageName, account)
+    }
     SignInConfigurationService.setDefaultSignInInfo(context, packageName, account, options?.toJson())
     return GoogleSignInAccount(
         id,

play-services-core/src/main/kotlin/org/microg/gms/games/GameProfileSettings.kt

@@ -0,0 +1,36 @@
+/*
+ * SPDX-FileCopyrightText: 2025 e foundation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.microg.gms.games
+
+import android.content.ContentValues
+import android.content.Context
+import android.database.Cursor
+import org.microg.gms.settings.SettingsContract
+
+object GameProfileSettings {
+    private fun <T> getSettings(context: Context, vararg projection: String, f: (Cursor) -> T): T = SettingsContract.getSettings(
+        context, SettingsContract.GameProfile.getContentUri(context), projection, f
+    )
+
+    private fun setSettings(context: Context, v: ContentValues.() -> Unit) = SettingsContract.setSettings(context, SettingsContract.GameProfile.getContentUri(context), v)
+
+    @JvmStatic
+    fun setAllowCreatePlayer(context: Context, enabled: Boolean) {
+        setSettings(context) { put(SettingsContract.GameProfile.ALLOW_CREATE_PLAYER, enabled) }
+    }
+
+    @JvmStatic
+    fun setAllowUploadGamePlayed(context: Context, enabled: Boolean) {
+        setSettings(context) { put(SettingsContract.GameProfile.ALLOW_UPLOAD_GAME_PLAYED, enabled) }
+    }
+
+    @JvmStatic
+    fun getAllowCreatePlayer(context: Context): Boolean = getSettings(context, SettingsContract.GameProfile.ALLOW_CREATE_PLAYER) { c -> c.getInt(0) != 0 }
+
+    @JvmStatic
+    fun getAllowUploadGamePlayed(context: Context): Boolean = getSettings(context, SettingsContract.GameProfile.ALLOW_UPLOAD_GAME_PLAYED) { c -> c.getInt(0) != 0 }
+
+}