Merge branch 'master' into MBL-19970-fix-breaking-e2e-tests

Author: kdeakinstructure

apps/parent/src/main/java/com/instructure/parentapp/di/feature/CookieConsentModule.kt

@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.instructure.parentapp.di.feature
+
+import com.instructure.canvasapi2.apis.UserAPI
+import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.canvasapi2.utils.ConsentPrefs
+import com.instructure.pandautils.features.cookieconsent.AnalyticsConsentHandler
+import com.instructure.pandautils.features.cookieconsent.CookieConsentNamespace
+import com.instructure.pandautils.utils.FeatureFlagProvider
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+class CookieConsentModule {
+
+    @Provides
+    fun provideCookieConsentNamespace(): CookieConsentNamespace {
+        return CookieConsentNamespace.PARENT
+    }
+
+    @Provides
+    fun provideAnalyticsConsentHandler(
+        userApi: UserAPI.UsersInterface,
+        featureFlagProvider: FeatureFlagProvider,
+        consentPrefs: ConsentPrefs,
+        apiPrefs: ApiPrefs
+    ): AnalyticsConsentHandler {
+        return object : AnalyticsConsentHandler(userApi, featureFlagProvider, consentPrefs, apiPrefs) {}
+    }
+}

apps/parent/src/main/java/com/instructure/parentapp/di/feature/LoginModule.kt

@@ -26,9 +26,11 @@ import com.instructure.canvasapi2.utils.Analytics
 import com.instructure.canvasapi2.utils.ApiPrefs
 import com.instructure.loginapi.login.LoginNavigation
 import com.instructure.loginapi.login.features.acceptableusepolicy.AcceptableUsePolicyRouter
+import com.instructure.loginapi.login.features.cookieconsent.CookieConsentRouter
 import com.instructure.loginapi.login.util.LoginPrefs
 import com.instructure.pandautils.features.reminder.AlarmScheduler
 import com.instructure.parentapp.features.login.ParentAcceptableUsePolicyRouter
+import com.instructure.parentapp.features.login.ParentCookieConsentRouter
 import com.instructure.parentapp.features.login.ParentLoginNavigation
 import com.instructure.parentapp.features.login.SignInActivity
 import dagger.Module
@@ -59,6 +61,11 @@ class LoginModule {
     ): LoginNavigation {
         return ParentLoginNavigation(activity, alarmScheduler)
     }
+
+    @Provides
+    fun provideCookieConsentRouter(activity: FragmentActivity): CookieConsentRouter {
+        return ParentCookieConsentRouter(activity)
+    }
 }
 
 @Module

apps/parent/src/main/java/com/instructure/parentapp/features/login/ParentAcceptableUsePolicyRouter.kt

@@ -22,10 +22,10 @@ import androidx.fragment.app.FragmentActivity
 import com.instructure.canvasapi2.utils.Analytics
 import com.instructure.canvasapi2.utils.AnalyticsEventConstants
 import com.instructure.loginapi.login.features.acceptableusepolicy.AcceptableUsePolicyRouter
+import com.instructure.loginapi.login.features.cookieconsent.CookieConsentActivity
 import com.instructure.loginapi.login.tasks.LogoutTask
 import com.instructure.pandautils.features.reminder.AlarmScheduler
 import com.instructure.parentapp.R
-import com.instructure.parentapp.features.main.MainActivity
 import com.instructure.parentapp.features.webview.HtmlContentActivity
 import com.instructure.parentapp.util.ParentLogoutTask
 
@@ -42,8 +42,9 @@ class ParentAcceptableUsePolicyRouter(
     override fun startApp() {
         CookieManager.getInstance().flush()
 
-        val intent = Intent(activity, MainActivity::class.java)
+        val intent = Intent(activity, CookieConsentActivity::class.java)
         activity.intent?.extras?.let { intent.putExtras(it) }
+        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
         activity.startActivity(intent)
     }
 

apps/parent/src/main/java/com/instructure/parentapp/features/login/ParentCookieConsentRouter.kt

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.instructure.parentapp.features.login
+
+import android.content.Intent
+import androidx.fragment.app.FragmentActivity
+import com.instructure.loginapi.login.features.cookieconsent.CookieConsentRouter
+import com.instructure.parentapp.features.main.MainActivity
+
+class ParentCookieConsentRouter(
+    private val activity: FragmentActivity
+) : CookieConsentRouter {
+
+    override fun startApp() {
+        val intent = Intent(activity, MainActivity::class.java)
+        activity.intent?.extras?.let { intent.putExtras(it) }
+        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+        activity.startActivity(intent)
+    }
+}

apps/parent/src/main/java/com/instructure/parentapp/features/login/routevalidator/RouteValidatorAction.kt

@@ -29,4 +29,5 @@ sealed class RouteValidatorAction {
     data class ShowToast(val message: String) : RouteValidatorAction()
     data class StartSignInActivity(val accountDomain: AccountDomain) : RouteValidatorAction()
     data object StartLoginActivity : RouteValidatorAction()
+    data object StartCookieConsent : RouteValidatorAction()
 }

apps/parent/src/main/java/com/instructure/parentapp/features/login/routevalidator/RouteValidatorActivity.kt

@@ -30,6 +30,7 @@ import com.instructure.pandautils.binding.viewBinding
 import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.collectOneOffEvents
 import com.instructure.parentapp.databinding.ActivityRouteValidatorBinding
+import com.instructure.loginapi.login.features.cookieconsent.CookieConsentActivity
 import com.instructure.parentapp.features.login.LoginActivity
 import com.instructure.parentapp.features.login.SignInActivity
 import com.instructure.parentapp.features.main.MainActivity
@@ -60,6 +61,7 @@ class RouteValidatorActivity : BaseCanvasActivity() {
             is RouteValidatorAction.ShowToast -> Toast.makeText(this, action.message, Toast.LENGTH_LONG).show()
             is RouteValidatorAction.StartSignInActivity -> startSignInActivity(action.accountDomain)
             is RouteValidatorAction.StartLoginActivity -> startLoginActivity()
+            is RouteValidatorAction.StartCookieConsent -> startCookieConsent()
         }
     }
 
@@ -92,6 +94,13 @@ class RouteValidatorActivity : BaseCanvasActivity() {
         finish()
     }
 
+    private fun startCookieConsent() {
+        val intent = Intent(this, CookieConsentActivity::class.java)
+        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+        startActivity(intent)
+        finish()
+    }
+
     companion object {
         fun createIntent(context: Context, uri: Uri): Intent {
             val intent = Intent(context, RouteValidatorActivity::class.java)

apps/parent/src/main/java/com/instructure/parentapp/features/login/routevalidator/RouteValidatorViewModel.kt

@@ -108,7 +108,7 @@ class RouteValidatorViewModel @Inject constructor(
                     } else {
                         // Log the analytics - only for real logins, not masquerading
                         logQREvent(apiPrefs.domain, true)
-                        postActionWithDelay(RouteValidatorAction.StartMainActivity())
+                        postActionWithDelay(RouteValidatorAction.StartCookieConsent)
                     }
                     return@tryLaunch
                 } catch (e: Throwable) {

apps/parent/src/main/java/com/instructure/parentapp/features/settings/ParentSettingsBehaviour.kt

@@ -26,7 +26,7 @@ class ParentSettingsBehaviour(private val selectedStudentHolder: SelectedStudent
         get() = mapOf(
             R.string.preferences to listOf(SettingsItem.APP_THEME),
             R.string.inboxSettingsTitle to listOf(SettingsItem.INBOX_SIGNATURE),
-            R.string.legal to listOf(SettingsItem.ABOUT, SettingsItem.LEGAL)
+            R.string.legal to listOf(SettingsItem.ABOUT, SettingsItem.LEGAL, SettingsItem.PRIVACY)
         )
 
     override suspend fun applyAppSpecificColorSettings() {

apps/parent/src/main/java/com/instructure/parentapp/features/settings/ParentSettingsRouter.kt

@@ -24,4 +24,8 @@ class ParentSettingsRouter(private val navigation: Navigation, private val activ
     override fun navigateToInboxSignature() {
         navigation.navigate(activity, navigation.inboxSignatureSettings)
     }
+
+    override fun navigateToPrivacySettings() {
+        navigation.navigate(activity, navigation.privacySettings)
+    }
 }

apps/parent/src/main/java/com/instructure/parentapp/features/splash/SplashViewModel.kt

@@ -23,6 +23,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.instructure.canvasapi2.models.User
 import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.canvasapi2.utils.ConsentPrefs
 import com.instructure.canvasapi2.utils.weave.catch
 import com.instructure.canvasapi2.utils.weave.tryLaunch
 import com.instructure.pandautils.utils.ColorKeeper
@@ -43,6 +44,7 @@ class SplashViewModel @Inject constructor(
     @ApplicationContext private val context: Context,
     private val repository: SplashRepository,
     private val apiPrefs: ApiPrefs,
+    private val consentPrefs: ConsentPrefs,
     private val colorKeeper: ColorKeeper,
     private val featureFlagProvider: FeatureFlagProvider,
     savedStateHandle: SavedStateHandle
@@ -83,18 +85,20 @@ class SplashViewModel @Inject constructor(
                 }
             }
 
-            val sendUsageMetrics = repository.getSendUsageMetrics()
-            if (sendUsageMetrics) {
-                val userWithIds = repository.getSelfWithUuid()
-                val visitorData = mapOf(
-                    "locale" to apiPrefs.effectiveLocale,
-                )
-                val accountData = mapOf(
-                    "surveyOptOut" to featureFlagProvider.checkAccountSurveyNotificationsFlag()
-                )
-                Pendo.startSession(userWithIds?.uuid?.SHA256().orEmpty(), userWithIds?.accountUuid.orEmpty(), visitorData, accountData)
-            } else {
-                Pendo.endSession()
+            if (consentPrefs.currentUserConsent == true) {
+                val sendUsageMetrics = repository.getSendUsageMetrics()
+                if (sendUsageMetrics) {
+                    val userWithIds = repository.getSelfWithUuid()
+                    val visitorData = mapOf(
+                        "locale" to apiPrefs.effectiveLocale,
+                    )
+                    val accountData = mapOf(
+                        "surveyOptOut" to featureFlagProvider.checkAccountSurveyNotificationsFlag()
+                    )
+                    Pendo.startSession(userWithIds?.uuid?.SHA256().orEmpty(), userWithIds?.accountUuid.orEmpty(), visitorData, accountData)
+                } else {
+                    Pendo.endSession()
+                }
             }
 
             val students = repository.getStudents()