Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,18 @@ class PlayAgeRangeDeclaration : HybridPlayAgeRangeDeclarationSpec() {
.addOnSuccessListener { r ->
val isoDateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.US)
val approvalDate = r.mostRecentApprovalDate()?.let { isoDateFormat.format(it) }
val userStatusString = r.userStatus()?.toString()
// userStatus will be empty if the user is not in a location where are legally required to show show the age verification prompt
// This is different from UNKNOWN where the user is not verified, but is in an applicable region
// https://developer.android.com/google/play/age-signals/use-age-signals-api#age-signals-responses
val isEligible = !userStatusString.isNullOrEmpty()
val userStatus = when (r.userStatus()) {
AgeSignalsVerificationStatus.VERIFIED -> PlayAgeRangeDeclarationUserStatusValues._0
AgeSignalsVerificationStatus.SUPERVISED -> PlayAgeRangeDeclarationUserStatusValues._1
AgeSignalsVerificationStatus.SUPERVISED_APPROVAL_PENDING -> PlayAgeRangeDeclarationUserStatusValues._2
AgeSignalsVerificationStatus.SUPERVISED_APPROVAL_DENIED -> PlayAgeRangeDeclarationUserStatusValues._3
AgeSignalsVerificationStatus.UNKNOWN -> PlayAgeRangeDeclarationUserStatusValues._4
else -> null
}
val isEligible = userStatus != null

cont.resume(
PlayAgeRangeDeclarationResult(
Expand All @@ -53,7 +60,7 @@ class PlayAgeRangeDeclaration : HybridPlayAgeRangeDeclarationSpec() {
ageLower = r.ageLower()?.toDouble(),
ageUpper = r.ageUpper()?.toDouble(),
mostRecentApprovalDate = approvalDate,
userStatus = userStatusString,
userStatus = userStatus,
error = null
)
)
Expand Down
13 changes: 6 additions & 7 deletions ios/PlayAgeRangeDeclaration.swift
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,19 @@ class PlayAgeRangeDeclaration: HybridPlayAgeRangeDeclarationSpec {

case .sharing(let declaration):

let statusString: String
let status: AppleAgeRangeDeclarationUserStatusValues

if let declarationStatus = declaration.ageRangeDeclaration {
statusString = String(describing: declarationStatus)

status = AppleAgeRangeDeclarationUserStatusValues(fromString: String(describing: declarationStatus)) ?? .unknown
} else {
statusString = "unknown"
status = .unknown
}

let controlsRawValue = try declaration.activeParentalControls.rawValue

return DeclaredAgeRangeResult(
isEligible: true,
status: statusString,
status: status,
parentControls: "\(controlsRawValue)",
lowerBound: declaration.lowerBound.map { Double($0) },
upperBound: declaration.upperBound.map { Double($0) }
Expand All @@ -69,7 +68,7 @@ class PlayAgeRangeDeclaration: HybridPlayAgeRangeDeclarationSpec {
case .declinedSharing:
return DeclaredAgeRangeResult(
isEligible: true,
status: "declined",
status: .declined,
parentControls: nil,
lowerBound: nil,
upperBound: nil
Expand All @@ -78,7 +77,7 @@ class PlayAgeRangeDeclaration: HybridPlayAgeRangeDeclarationSpec {
@unknown default:
return DeclaredAgeRangeResult(
isEligible: true,
status: "unknown",
status: .unknown,
parentControls: nil,
lowerBound: nil,
upperBound: nil
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 7 additions & 5 deletions nitrogen/generated/android/c++/JDeclaredAgeRangeResult.hpp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading