Skip to content

Fix automatic RCS consent request semantics #3

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

Merged
naormeit merged 2 commits into from
Sep 11, 2026
Merged

Fix automatic RCS consent request semantics #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
516c1eb
fix(constellation): align automatic RCS consent request
keeltrace Sep 10, 2026
d8dfdff
test(constellation): cover automatic RCS consent semantics
keeltrace Sep 10, 2026
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
28 changes: 25 additions & 3 deletions ...constellation/core/src/main/kotlin/org/microg/gms/constellation/core/VerifyPhoneNumber.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import org.microg.gms.constellation.core.proto.GetConsentResponse
import org.microg.gms.constellation.core.proto.Param
import org.microg.gms.constellation.core.proto.RcsConsent
import org.microg.gms.constellation.core.proto.RequestHeader
import org.microg.gms.constellation.core.proto.RequestTrigger
import org.microg.gms.constellation.core.proto.SetConsentRequest
import org.microg.gms.constellation.core.proto.SyncRequest
import org.microg.gms.constellation.core.proto.Verification
Expand All @@ -50,6 +51,20 @@ private enum class ReadCallbackMode {
TYPED
}

internal data class RcsAutoConsentRequestSemantics(
val rcsConsentVersion: ConsentVersion,
val requestConsentVersion: ConsentVersion,
val triggerType: RequestTrigger.Type
)

internal fun resolveRcsAutoConsentRequestSemantics(
consentType: ConsentVersion
): RcsAutoConsentRequestSemantics = RcsAutoConsentRequestSemantics(
rcsConsentVersion = ConsentVersion.RCS_CONSENT,
requestConsentVersion = consentType,
triggerType = RequestTrigger.Type.CONSENT_API_TRIGGER
)

@Suppress("DEPRECATION")
suspend fun handleVerifyPhoneNumberV1(
context: Context,
Expand Down Expand Up @@ -301,14 +316,21 @@ private suspend fun runVerificationFlow(
if (!consented) {
Log.e(TAG, "Consent has not been set. Auto-setting consent.")
val consentType = parseConsentVersion(request.extras)
val semantics = resolveRcsAutoConsentRequestSemantics(consentType)
val setRequest = SetConsentRequest(
header_ = RequestHeader(context, sessionId, buildContext, "setConsent"),
header_ = RequestHeader(
context,
sessionId,
buildContext,
"setConsent",
semantics.triggerType
),
asterism_client = asterismClient,
rcs_consent = RcsConsent(
consent = Consent.CONSENTED,
consent_version = consentType
consent_version = semantics.rcsConsentVersion
),
consent_version = consentType,
consent_version = semantics.requestConsentVersion,
api_params = Param.getList(request.extras)
)
try {
Expand Down
33 changes: 33 additions & 0 deletions ...e/src/test/kotlin/org/microg/gms/constellation/core/RcsAutoConsentRequestSemanticsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package org.microg.gms.constellation.core

import org.junit.Assert.assertEquals
import org.junit.Test
import org.microg.gms.constellation.core.proto.ConsentVersion
import org.microg.gms.constellation.core.proto.RequestTrigger

class RcsAutoConsentRequestSemanticsTest {
@Test
fun preservesRequestedConsentVersionButUsesRcsConsentRecordVersion() {
val semantics = resolveRcsAutoConsentRequestSemantics(
ConsentVersion.RCS_DEFAULT_ON_LEGAL_FYI
)

assertEquals(ConsentVersion.RCS_CONSENT, semantics.rcsConsentVersion)
assertEquals(
ConsentVersion.RCS_DEFAULT_ON_LEGAL_FYI,
semantics.requestConsentVersion
)
}

@Test
fun usesConsentApiTrigger() {
val semantics = resolveRcsAutoConsentRequestSemantics(
ConsentVersion.RCS_DEFAULT_ON_OUT_OF_BOX
)

assertEquals(
RequestTrigger.Type.CONSENT_API_TRIGGER,
semantics.triggerType
)
}
}