chore: further linter fixes

fix: addressed regression with the navbar
chore: updated Google Age Signals API and handling

Author: ace42588

app/src/main/java/com/advice/schedule/presentation/viewmodel/FeedbackViewModel.kt

@@ -45,30 +45,34 @@ class FeedbackViewModel :
         val state = _state.value as? FeedbackState.Content ?: return
 
         val items =
-            state.feedback.items.map {
-                if (it.id == item.id) {
-                    when (val type = it.type) {
-                        FeedbackType.DisplayOnly -> it
+            state.feedback.items.map { feedbackItem ->
+                if (feedbackItem.id == item.id) {
+                    when (val type = feedbackItem.type) {
+                        FeedbackType.DisplayOnly -> feedbackItem
                         is FeedbackType.MultiSelect -> {
                             val selections =
                                 if (value.toLong() in type.selections) {
                                     type.selections.filter { it != value.toLong() }
                                 } else {
                                     type.selections + value.toLong()
                                 }
-                            it.copy(type = FeedbackType.MultiSelect(type.options, selections))
+                            feedbackItem.copy(
+                                type = FeedbackType.MultiSelect(type.options, selections),
+                            )
                         }
 
                         is FeedbackType.SelectOne -> {
-                            it.copy(type = FeedbackType.SelectOne(type.options, value.toLong()))
+                            feedbackItem.copy(
+                                type = FeedbackType.SelectOne(type.options, value.toLong()),
+                            )
                         }
 
                         is FeedbackType.TextBox -> {
-                            it.copy(type = FeedbackType.TextBox(value))
+                            feedbackItem.copy(type = FeedbackType.TextBox(value))
                         }
                     }
                 } else {
-                    it
+                    feedbackItem
                 }
             }
 

app/src/main/java/com/advice/schedule/ui/viewmodels/MainViewModel.kt

@@ -1,6 +1,6 @@
 package com.advice.schedule.ui.viewmodels
 
-import android.content.Context
+import android.app.Activity
 import android.os.Bundle
 import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
@@ -109,19 +109,22 @@ class MainViewModel :
     private var hasStarted = false
 
     fun onAppStart(
-        context: Context,
+        activity: Activity,
         appUpdateLauncher: ActivityResultLauncher<IntentSenderRequest>,
     ) {
         if (hasStarted) return
         hasStarted = true
 
+        // Play Age Signals 0.0.4 requires an Activity for the sharing-access prompt.
+        userSession.resolveAudienceContext(activity)
+
         // Only showing the prompt once per version.
         if (storage.updateVersion != BuildConfig.VERSION_CODE) {
             appManager.checkForUpdate(appUpdateLauncher)
         }
         val format =
             if (android.text.format.DateFormat
-                    .is24HourFormat(context)
+                    .is24HourFormat(activity)
             ) {
                 "24h"
             } else {
@@ -132,7 +135,7 @@ class MainViewModel :
         viewModelScope.launch {
             toastManager.messages.collect {
                 if (it != null) {
-                    Toast.makeText(context, it.text, it.duration).show()
+                    Toast.makeText(activity, it.text, it.duration).show()
                     toastManager.clear()
                 }
             }

core/src/main/java/com/advice/core/audience/AudienceStatus.kt

@@ -1,17 +1,16 @@
 package com.advice.core.audience
 
-enum class AudienceStatus(
-    val value: Int,
-) {
-    Verified(0),
-    Supervised(1),
-    Declared(5),
-    Pending(2),
-    Denied(3),
-    Unknown(4),
-    ;
-
-    companion object {
-        fun getByValue(value: Int?) = entries.firstOrNull { it.value == value }
-    }
+/**
+ * Domain mapping of Play Age Signals response fields.
+ *
+ * [Declared]/[Supervised]/[Verified] come from `ageRangeSource` (TIER_A–D).
+ * [Pending]/[Denied] come from `significantChangeStatus` when present.
+ */
+enum class AudienceStatus {
+    Declared,
+    Supervised,
+    Verified,
+    Pending,
+    Denied,
+    Unknown,
 }

data/src/main/java/com/advice/data/session/UserSession.kt

@@ -1,5 +1,6 @@
 package com.advice.data.session
 
+import android.app.Activity
 import com.advice.core.audience.AudienceContext
 import com.advice.core.local.Conference
 import com.advice.core.local.FlowResult
@@ -20,4 +21,10 @@ interface UserSession {
     fun getConferenceFlow(): Flow<FlowResult<Conference>>
 
     fun setConference(conference: Conference)
+
+    /**
+     * Resolves Play Age Signals using [activity] so Play can show the sharing prompt when required.
+     * Safe to call multiple times; only the first successful resolve replaces [AudienceContext.Unresolved].
+     */
+    fun resolveAudienceContext(activity: Activity)
 }

feature-firebase/src/main/java/com/advice/firebase/data/sources/FirebaseFAQDataSource.kt

@@ -34,7 +34,7 @@ class FirebaseFAQDataSource(
                     .snapshotFlow()
                     .closeOnConferenceChange(userSession.getConference())
                     .mapSnapshot {
-                        it.toObjectsOrEmpty(FirebaseFAQ::class.java).map { it.toFAQ() }
+                        it.toObjectsOrEmpty(FirebaseFAQ::class.java).map { faq -> faq.toFAQ() }
                     }.onStart { emit(FlowResult.Loading) }
             }.shareIn(
                 applicationScope,

feature-firebase/src/main/java/com/advice/firebase/session/FirebaseUserSession.kt

@@ -1,5 +1,6 @@
 package com.advice.firebase.session
 
+import android.app.Activity
 import com.advice.core.audience.AudienceContext
 import com.advice.core.local.Conference
 import com.advice.core.local.FlowResult
@@ -9,6 +10,7 @@ import com.advice.data.sources.ConferencesDataSource
 import com.advice.play.AgeSignalsRepository
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.crashlytics.FirebaseCrashlytics
+import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -33,6 +35,9 @@ class FirebaseUserSession(
     private val _conferenceFlow: MutableStateFlow<FlowResult<Conference>> =
         MutableStateFlow(FlowResult.Loading)
 
+    /** Completes true once anonymous auth succeeds; false if auth failed. */
+    private val authReady = CompletableDeferred<Boolean>()
+
     override var isDeveloper: Boolean = false
 
     init {
@@ -73,19 +78,31 @@ class FirebaseUserSession(
                 val user = it.user
                 if (user != null) {
                     Timber.d("User uid: ${user.uid}")
-                    _audienceContext.value = ageSignals.get()
+                    authReady.complete(true)
                 } else {
                     crashlytics.log("user cannot be signed in")
                     Timber.e("User could not be signed in")
                     _audienceContext.value = AudienceContext.Unavailable
+                    authReady.complete(false)
                 }
             } catch (ex: Exception) {
                 Timber.e(ex, "Could not sign in anonymously")
                 _audienceContext.value = AudienceContext.Unavailable
+                authReady.complete(false)
             }
         }
     }
 
+    override fun resolveAudienceContext(activity: Activity) {
+        if (_audienceContext.value !is AudienceContext.Unresolved) return
+
+        applicationScope.launch {
+            if (!authReady.await()) return@launch
+            if (_audienceContext.value !is AudienceContext.Unresolved) return@launch
+            _audienceContext.value = ageSignals.get(activity)
+        }
+    }
+
     private fun getActiveConference(
         previous: Conference?,
         conferences: List<Conference>,

feature-play/src/debug/java/com/advice/play/DebugAgeSignalsManager.kt

@@ -1,25 +1,36 @@
 package com.advice.play
 
 import android.content.Context
+import com.google.android.play.agesignals.AgeSignalsAccessResult
 import com.google.android.play.agesignals.AgeSignalsManager
 import com.google.android.play.agesignals.AgeSignalsResult
-import com.google.android.play.agesignals.model.AgeSignalsVerificationStatus
+import com.google.android.play.agesignals.model.AgeRangeSource
+import com.google.android.play.agesignals.model.AgeSignalsStatus
 import com.google.android.play.agesignals.testing.FakeAgeSignalsManager
 
 /**
  * Supervised 13–17 persona for on-device DEBUG testing.
- * Change [debugPersona] to try a different Age Signals response.
+ * Change [debugPersona] / [debugAccessStatus] to try a different Age Signals response.
  */
+private val debugAccessStatus: Int = AgeSignalsStatus.SHARED
+
 private val debugPersona: AgeSignalsResult =
-    AgeSignalsResult.builder()
-        .setUserStatus(AgeSignalsVerificationStatus.SUPERVISED)
+    AgeSignalsResult
+        .builder()
+        .setAgeRangeSource(AgeRangeSource.TIER_B)
         .setAgeLower(13)
         .setAgeUpper(17)
         .setInstallId("fake_install_id")
         .build()
 
 fun createAgeSignalsManager(context: Context): AgeSignalsManager {
     return FakeAgeSignalsManager().apply {
+        setNextAgeSignalsAccessResult(
+            AgeSignalsAccessResult
+                .builder()
+                .setAgeSignalsStatus(debugAccessStatus)
+                .build(),
+        )
         setNextAgeSignalsResult(debugPersona)
     }
 }