Skip to content

Phenotype: Adjust data to be non-empty #3139

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Phenotype: Adjust data to be non-empty #3139

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
29 changes: 8 additions & 21 deletions play-services-core/src/main/kotlin/org/microg/gms/phenotype/PhenotypeService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,30 +118,19 @@ class PhenotypeServiceImpl(val packageName: String?) : IPhenotypeService.Stub()

override fun getCommitedConfiguration(callbacks: IPhenotypeCallbacks, packageName: String?) {
Log.d(TAG, "getCommitedConfiguration($packageName)")
callbacks.onCommittedConfiguration(Status.SUCCESS, Configurations().apply {
field4 = emptyArray()
})
callbacks.onCommittedConfiguration(Status.SUCCESS, configurationsResult())
}

override fun getConfigurationSnapshotWithToken(callbacks: IPhenotypeCallbacks, packageName: String?, user: String?, p3: String?) {
Log.d(TAG, "getConfigurationSnapshotWithToken($packageName, $user, $p3)")
if (packageName in CONFIGURATION_OPTIONS.keys) {
callbacks.onConfiguration(Status.SUCCESS, Configurations().apply {
serverToken = "unknown"
snapshotToken = "unknown"
version = System.currentTimeMillis() / 1000
field4 = arrayOf(Configuration().apply {
id = 0
flags = CONFIGURATION_OPTIONS[packageName]
removeNames = emptyArray()
})
field5 = false
field6 = byteArrayOf()
})
callbacks.onConfiguration(Status.SUCCESS, configurationsResult(arrayOf(Configuration().apply {
id = 0
flags = CONFIGURATION_OPTIONS[packageName]
removeNames = emptyArray()
})))
} else {
callbacks.onConfiguration(Status.SUCCESS, Configurations().apply {
field4 = emptyArray()
})
callbacks.onConfiguration(Status.SUCCESS, configurationsResult())
}
}

Expand All @@ -152,9 +141,7 @@ class PhenotypeServiceImpl(val packageName: String?) : IPhenotypeService.Stub()

override fun registerSync(callbacks: IPhenotypeCallbacks, packageName: String?, version: Int, p3: Array<out String>?, p4: ByteArray?, p5: String?, p6: String?) {
Log.d(TAG, "registerSync($packageName, $version, $p3, $p4, $p5, $p6)")
callbacks.onConfiguration(Status.SUCCESS, Configurations().apply {
field4 = emptyArray()
})
callbacks.onConfiguration(Status.SUCCESS, configurationsResult())
}

override fun setFlagOverrides(callbacks: IPhenotypeCallbacks, packageName: String?, user: String?, flagName: String?, flagType: Int, flagDataType: Int, flagValue: String?) {
Expand Down
12 changes: 12 additions & 0 deletions play-services-core/src/main/kotlin/org/microg/gms/phenotype/extensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@

package org.microg.gms.phenotype

import com.google.android.gms.phenotype.Configuration
import com.google.android.gms.phenotype.Configurations

private val supportedLanguages = listOf(
"bs", "pt", "ja", "ko", "fr", "it", "de", "zh", "nl",
"iw", "he", "tr", "cs", "id", "in", "sv", "da", "no",
Expand All @@ -16,4 +19,13 @@ fun encodeSupportedLanguageList(): ByteArray {
return supportedLanguages.flatMap { lang ->
listOf(0x0A.toByte(), 0x02.toByte()) + lang.toByteArray(Charsets.UTF_8).toList()
}.toByteArray()
}

fun configurationsResult(configurations: Array<Configuration> = emptyArray()) = Configurations().apply {
serverToken = "unknown"
snapshotToken = "unknown"
version = System.currentTimeMillis() / 1000
field4 = configurations
field5 = false
field6 = byteArrayOf()
}