Skip to content

Add support for loading snapshots and update IGamesCallbacks and IGam… #3795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NepMods wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for loading snapshots and update IGamesCallbacks and IGam… #3795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@ allprojects {
ext.appVersionCode = ourGmsVersionCode
ext.isReleaseVersion = false
}
ext {
GRADLE_MICROG_VERSION_WITHOUT_GIT = 1
}

subprojects {
repositories {
Expand Down
57 changes: 55 additions & 2 deletions play-services-core/src/main/kotlin/org/microg/gms/games/GamesService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ package org.microg.gms.games
import android.accounts.Account
import android.accounts.AccountManager
import android.app.PendingIntent
import android.content.ContentValues
import android.content.Context
import android.content.Intent
import android.net.Uri
Expand Down Expand Up @@ -617,6 +618,42 @@ class GamesServiceImpl(val context: Context, override val lifecycle: Lifecycle,

override fun loadSnapshots(callbacks: IGamesCallbacks?, forceReload: Boolean) {
Log.d(TAG, "Method loadSnapshots(forceReload:$forceReload) called")
lifecycleScope.launchWhenStarted {
runCatching {
val authResponse = withContext(Dispatchers.IO) {
AuthManager(context, account.name, packageName, "$SERVICE_GAMES_LITE ${Scopes.DRIVE_APPFOLDER}").apply { isPermitted = true }.requestAuth(true)
}
var oauthToken: String? = null
if (authResponse.auth?.let { oauthToken = it } == null) {
throw RuntimeException("oauthToken is null")
}
val snapshots = SnapshotsDataClient.get(context).loadSnapshotData(oauthToken!!)
val columns = PlayerColumns.CURRENT_PLAYER_COLUMNS.toTypedArray() +
GameColumns.CURRENT_GAME_COLUMNS.toTypedArray() +
SnapshotColumns.CURRENT_GAME_COLUMNS.toTypedArray()
val builder = DataHolder.builder(columns)
val playerValues = (player as? PlayerEntity)?.toContentValues()
snapshots.forEach { snapshot ->
val row = playerValues?.let { ContentValues(it) } ?: ContentValues()
snapshot.id?.let { row.put(SnapshotColumns.EXTERNAL_SNAPSHOT_ID, it) }
snapshot.coverImage?.url?.let { row.put(SnapshotColumns.COVER_ICON_IMAGE_URL, it) }
snapshot.coverImage?.width?.let { row.put(SnapshotColumns.COVER_ICON_IMAGE_WIDTH, it) }
snapshot.coverImage?.height?.let { row.put(SnapshotColumns.COVER_ICON_IMAGE_HEIGHT, it) }
snapshot.uniqueName?.let { row.put(SnapshotColumns.UNIQUE_NAME, it) }
snapshot.title?.let { row.put(SnapshotColumns.TITLE, it) }
snapshot.description?.let { row.put(SnapshotColumns.DESCRIPTION, it) }
snapshot.lastModifiedMillis?.toLongOrNull()?.let { row.put(SnapshotColumns.LAST_MODIFIED_TIMESTAMP, it) }
snapshot.durationMillis?.toLongOrNull()?.let { row.put(SnapshotColumns.DURATION, it) }
snapshot.progressValue?.toLongOrNull()?.let { row.put(SnapshotColumns.PROGRESS_VALUE, it) }
row.put(SnapshotColumns.PENDING_CHANGE_COUNT, 0)
builder.withRow(row)
}
callbacks?.onSnapshotsLoaded(builder.build(GamesStatusCodes.OK.code))
}.onFailure {
Log.w(TAG, "loadSnapshots: error", it)
callbacks?.onSnapshotsLoaded(DataHolder.empty(GamesStatusCodes.SNAPSHOT_COMMIT_FAILED.code))
}
}
}

override fun commitSnapshot(
Expand Down Expand Up @@ -662,6 +699,7 @@ class GamesServiceImpl(val context: Context, override val lifecycle: Lifecycle,

override fun discardAndCloseSnapshot(contents: Contents?) {
Log.d(TAG, "discardAndCloseSnapshot: $contents")
runCatching { contents?.parcelFileDescriptor?.close() }
}

override fun loadEventsById(callbacks: IGamesCallbacks?, forceReload: Boolean, eventsIds: Array<out String>?) {
Expand Down Expand Up @@ -712,12 +750,27 @@ class GamesServiceImpl(val context: Context, override val lifecycle: Lifecycle,
val fileOutputStream = FileOutputStream(file)
fileOutputStream.write(contentByteArray)
}
val snapshotProto = resolveSnapshotHeadResponse?.snapshotMetadata?.snapshot
val columns = PlayerColumns.CURRENT_PLAYER_COLUMNS.toTypedArray() +
GameColumns.CURRENT_GAME_COLUMNS.toTypedArray() +
SnapshotColumns.CURRENT_GAME_COLUMNS.toTypedArray()
val dataHolder = if (player is PlayerEntity) {
DataHolder.builder(columns)
.withRow(player.toContentValues()).build(CommonStatusCodes.SUCCESS)
val row = player.toContentValues()
snapshotProto?.snapshotId?.let { row.put(SnapshotColumns.EXTERNAL_SNAPSHOT_ID, it) }
saveName?.let { row.put(SnapshotColumns.UNIQUE_NAME, it) }
snapshotProto?.content?.description?.let {
row.put(SnapshotColumns.TITLE, it)
row.put(SnapshotColumns.DESCRIPTION, it)
} ?: saveName?.let { row.put(SnapshotColumns.TITLE, it) }
snapshotProto?.content?.snapshotTimeInfo?.timestamp?.let { row.put(SnapshotColumns.LAST_MODIFIED_TIMESTAMP, it) }
snapshotProto?.content?.duration?.let { row.put(SnapshotColumns.DURATION, it) }
snapshotProto?.content?.progressValue?.let { row.put(SnapshotColumns.PROGRESS_VALUE, it) }
snapshotProto?.content?.deviceName?.let { row.put(SnapshotColumns.DEVICE_NAME, it) }
snapshotProto?.coverImage?.imageUrl?.let { row.put(SnapshotColumns.COVER_ICON_IMAGE_URL, it) }
snapshotProto?.coverImage?.width?.let { row.put(SnapshotColumns.COVER_ICON_IMAGE_WIDTH, it) }
snapshotProto?.coverImage?.height?.let { row.put(SnapshotColumns.COVER_ICON_IMAGE_HEIGHT, it) }
row.put(SnapshotColumns.PENDING_CHANGE_COUNT, 0)
DataHolder.builder(columns).withRow(row).build(CommonStatusCodes.SUCCESS)
} else {
DataHolder.builder(columns).build(CommonStatusCodes.SIGN_IN_REQUIRED)
}
Expand Down
5 changes: 3 additions & 2 deletions play-services-games/src/main/aidl/com/google/android/gms/games/internal/IGamesCallbacks.aidl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ interface IGamesCallbacks {
/* @deprecated */ void onGameMuteStatusLoaded(in DataHolder data) = 5037;
/* @deprecated */ void onContactSettingsLoaded(in DataHolder data) = 5038;
/* @deprecated */ void onContactSettingsUpdated(int statusCode) = 5039;
void onResolveSnapshotHead(in DataHolder data, in Contents contents) = 12003;
void commitSnapshotResult(in DataHolder data) = 12004;
void onSnapshotsLoaded(in DataHolder data) = 12001;
void onResolveSnapshotHead(in DataHolder data, in Contents contents) = 12004;
void commitSnapshotResult(in DataHolder data) = 12005;
void onServerAuthCode(in Status status, String serverAuthCode) = 25002;
void onServerAuthCodeWithScopes(in Status status, String serverAuthCode, in List<String> grantedScopes) = 25006;
}
10 changes: 5 additions & 5 deletions play-services-games/src/main/aidl/com/google/android/gms/games/internal/IGamesService.aidl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,17 +92,17 @@ interface IGamesService {
Intent getAllLeaderboardsIntent() = 9002;
Intent getAchievementsIntent() = 9004;
Intent getPlayerSearchIntent() = 9009;
Intent getSelectSnapshotIntent(String title, boolean allowAddButton, boolean allowDelete, int maxSnapshots) = 12000;
void loadSnapshots(IGamesCallbacks callbacks, boolean forceReload) = 12001;
void commitSnapshot(IGamesCallbacks callbacks, String str, in SnapshotMetadataChangeEntity change, in Contents contents) = 12006;
Intent getSelectSnapshotIntent(String title, boolean allowAddButton, boolean allowDelete, int maxSnapshots) = 12001;
void loadSnapshots(IGamesCallbacks callbacks, boolean forceReload) = 12002;
void commitSnapshot(IGamesCallbacks callbacks, String str, in SnapshotMetadataChangeEntity change, in Contents contents) = 12007;
void loadEvents(IGamesCallbacks callbacks, boolean forceReload) = 12015;
void incrementEvent(String eventId, int incrementAmount) = 12016;
void discardAndCloseSnapshot(in Contents contents) = 12018;
void discardAndCloseSnapshot(in Contents contents) = 12019;
void loadEventsById(IGamesCallbacks callbacks, boolean forceReload, in String[] eventsIds) = 12030;
// void resolveSnapshotConflict(IGamesCallbacks callbacks, String conflictId, String snapshotId, in SnapshotMetadataChangeEntity metadata, in Contents contents) = 12032;
int getMaxDataSize() = 12034;
int getMaxCoverImageSize() = 12035;
void resolveSnapshotHead(IGamesCallbacks callbacks, String saveName, int i) = 15000;
void resolveSnapshotHead(IGamesCallbacks callbacks, String saveName, int i) = 15001;
void registerEventClient(IGamesClient callback, long l) = 15500;
Intent getCompareProfileIntentForPlayer(in PlayerEntity player) = 15502;

Expand Down