Add duck.ai categories to feedback

cmonfortep · cmonfortep · commit 9b5b25444aae · 2025-07-07T13:45:20.000+02:00
diff --git a/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/feedback/FeedbackSubCategoryProvider.kt b/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/feedback/FeedbackSubCategoryProvider.kt
@@ -18,6 +18,7 @@ package com.duckduckgo.subscriptions.impl.feedback
 
 import com.duckduckgo.di.scopes.FragmentScope
 import com.duckduckgo.subscriptions.impl.R
+import com.duckduckgo.subscriptions.impl.feedback.SubscriptionFeedbackCategory.DUCK_AI
 import com.duckduckgo.subscriptions.impl.feedback.SubscriptionFeedbackCategory.ITR
 import com.duckduckgo.subscriptions.impl.feedback.SubscriptionFeedbackCategory.PIR
 import com.duckduckgo.subscriptions.impl.feedback.SubscriptionFeedbackCategory.SUBS_AND_PAYMENTS
@@ -37,6 +38,7 @@ class RealFeedbackSubCategoryProvider @Inject constructor() : FeedbackSubCategor
             SUBS_AND_PAYMENTS -> getSubsSubCategories()
             PIR -> getPirSubCategories()
             ITR -> getItrSubCategories()
+            DUCK_AI -> getDuckAiSubCategories()
         }
     }
 
@@ -76,4 +78,12 @@ class RealFeedbackSubCategoryProvider @Inject constructor() : FeedbackSubCategor
             R.string.feedbackSubCategoryItrOther to SubscriptionFeedbackItrSubCategory.OTHER,
         )
     }
+
+    private fun getDuckAiSubCategories(): Map<Int, SubscriptionFeedbackSubCategory> {
+        return mapOf(
+            R.string.feedbackSubCategoryDuckAiSubscriberModels to SubscriptionFeedbackDuckAiSubCategory.ACCESS_SUBSCRIPTION_MODELS,
+            R.string.feedbackSubCategoryDuckAiLoginThirdPartyBrowser to SubscriptionFeedbackDuckAiSubCategory.LOGIN_THIRD_PARTY_BROWSER,
+            R.string.feedbackSubCategoryDuckAiOther to SubscriptionFeedbackDuckAiSubCategory.OTHER,
+        )
+    }
 }
diff --git a/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/feedback/SubscriptionFeedbackCategoryFragment.kt b/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/feedback/SubscriptionFeedbackCategoryFragment.kt
@@ -24,15 +24,19 @@ import androidx.lifecycle.withStarted
 import com.duckduckgo.anvil.annotations.InjectWith
 import com.duckduckgo.common.ui.viewbinding.viewBinding
 import com.duckduckgo.di.scopes.FragmentScope
+import com.duckduckgo.subscriptions.api.Product
+import com.duckduckgo.subscriptions.impl.PrivacyProFeature
 import com.duckduckgo.subscriptions.impl.R
 import com.duckduckgo.subscriptions.impl.SubscriptionsConstants.MONTHLY_PLAN_US
 import com.duckduckgo.subscriptions.impl.SubscriptionsConstants.YEARLY_PLAN_US
 import com.duckduckgo.subscriptions.impl.databinding.ContentFeedbackCategoryBinding
+import com.duckduckgo.subscriptions.impl.feedback.SubscriptionFeedbackCategory.DUCK_AI
 import com.duckduckgo.subscriptions.impl.feedback.SubscriptionFeedbackCategory.ITR
 import com.duckduckgo.subscriptions.impl.feedback.SubscriptionFeedbackCategory.PIR
 import com.duckduckgo.subscriptions.impl.feedback.SubscriptionFeedbackCategory.SUBS_AND_PAYMENTS
 import com.duckduckgo.subscriptions.impl.feedback.SubscriptionFeedbackCategory.VPN
 import com.duckduckgo.subscriptions.impl.repository.AuthRepository
+import com.duckduckgo.subscriptions.impl.repository.toProductList
 import javax.inject.Inject
 import kotlinx.coroutines.launch
 
@@ -43,6 +47,9 @@ class SubscriptionFeedbackCategoryFragment : SubscriptionFeedbackFragment(R.layo
     @Inject
     lateinit var authRepository: AuthRepository
 
+    @Inject
+    lateinit var subscriptionFeature: PrivacyProFeature
+
     override fun onViewCreated(
         view: View,
         savedInstanceState: Bundle?,
@@ -62,6 +69,16 @@ class SubscriptionFeedbackCategoryFragment : SubscriptionFeedbackFragment(R.layo
         binding.categoryPir.setOnClickListener {
             listener.onUserClickedCategory(PIR)
         }
+        binding.categoryDuckAi.setOnClickListener {
+            listener.onUserClickedCategory(DUCK_AI)
+        }
+
+        lifecycleScope.launch {
+            val duckAiAvailable = isDuckAiAvailable()
+            withStarted {
+                binding.categoryDuckAi.isVisible = duckAiAvailable
+            }
+        }
 
         lifecycleScope.launch {
             val pirAvailable = isPirCategoryAvailable()
@@ -76,6 +93,11 @@ class SubscriptionFeedbackCategoryFragment : SubscriptionFeedbackFragment(R.layo
         return subscription.productId in listOf(MONTHLY_PLAN_US, YEARLY_PLAN_US)
     }
 
+    private suspend fun isDuckAiAvailable(): Boolean {
+        val isDuckAiEnabled = subscriptionFeature.duckAiPlus().isEnabled()
+        return isDuckAiEnabled && authRepository.getEntitlements().toProductList().any { it == Product.DuckAiPlus }
+    }
+
     interface Listener {
         fun onUserClickedCategory(category: SubscriptionFeedbackCategory)
     }
diff --git a/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/feedback/SubscriptionFeedbackParams.kt b/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/feedback/SubscriptionFeedbackParams.kt
@@ -22,10 +22,14 @@ import com.duckduckgo.subscriptions.api.PrivacyProUnifiedFeedback.PrivacyProFeed
 import com.duckduckgo.subscriptions.api.PrivacyProUnifiedFeedback.PrivacyProFeedbackSource.UNKNOWN
 import com.duckduckgo.subscriptions.api.PrivacyProUnifiedFeedback.PrivacyProFeedbackSource.VPN_EXCLUDED_APPS
 import com.duckduckgo.subscriptions.api.PrivacyProUnifiedFeedback.PrivacyProFeedbackSource.VPN_MANAGEMENT
+import com.duckduckgo.subscriptions.impl.feedback.SubscriptionFeedbackCategory.DUCK_AI
 import com.duckduckgo.subscriptions.impl.feedback.SubscriptionFeedbackCategory.ITR
 import com.duckduckgo.subscriptions.impl.feedback.SubscriptionFeedbackCategory.PIR
 import com.duckduckgo.subscriptions.impl.feedback.SubscriptionFeedbackCategory.SUBS_AND_PAYMENTS
 import com.duckduckgo.subscriptions.impl.feedback.SubscriptionFeedbackCategory.VPN
+import com.duckduckgo.subscriptions.impl.feedback.SubscriptionFeedbackDuckAiSubCategory.ACCESS_SUBSCRIPTION_MODELS
+import com.duckduckgo.subscriptions.impl.feedback.SubscriptionFeedbackDuckAiSubCategory.LOGIN_THIRD_PARTY_BROWSER
+import com.duckduckgo.subscriptions.impl.feedback.SubscriptionFeedbackDuckAiSubCategory.OTHER
 import com.duckduckgo.subscriptions.impl.feedback.SubscriptionFeedbackItrSubCategory.ACCESS_CODE_ISSUE
 import com.duckduckgo.subscriptions.impl.feedback.SubscriptionFeedbackItrSubCategory.CANT_CONTACT_ADVISOR
 import com.duckduckgo.subscriptions.impl.feedback.SubscriptionFeedbackItrSubCategory.UNHELPFUL
@@ -54,6 +58,7 @@ enum class SubscriptionFeedbackCategory {
     VPN,
     PIR,
     ITR,
+    DUCK_AI,
 }
 
 interface SubscriptionFeedbackSubCategory
@@ -86,6 +91,12 @@ enum class SubscriptionFeedbackItrSubCategory : SubscriptionFeedbackSubCategory
     OTHER,
 }
 
+enum class SubscriptionFeedbackDuckAiSubCategory : SubscriptionFeedbackSubCategory {
+    ACCESS_SUBSCRIPTION_MODELS,
+    LOGIN_THIRD_PARTY_BROWSER,
+    OTHER,
+}
+
 internal fun PrivacyProFeedbackSource.asParams(): String {
     return when (this) {
         DDG_SETTINGS -> "settings"
@@ -110,6 +121,7 @@ internal fun SubscriptionFeedbackCategory.asParams(): String {
         VPN -> "vpn"
         PIR -> "pir"
         ITR -> "itr"
+        DUCK_AI -> "duckAi"
     }
 }
 
@@ -119,6 +131,7 @@ internal fun SubscriptionFeedbackSubCategory.asParams(): String {
         is SubscriptionFeedbackSubsSubCategory -> this.asParams()
         is SubscriptionFeedbackPirSubCategory -> this.asParams()
         is SubscriptionFeedbackItrSubCategory -> this.asParams()
+        is SubscriptionFeedbackDuckAiSubCategory -> this.asParams()
         else -> "unknown"
     }
 }
@@ -159,3 +172,11 @@ internal fun SubscriptionFeedbackItrSubCategory.asParams(): String {
         SubscriptionFeedbackItrSubCategory.OTHER -> "somethingElse"
     }
 }
+
+internal fun SubscriptionFeedbackDuckAiSubCategory.asParams(): String {
+    return when (this) {
+        ACCESS_SUBSCRIPTION_MODELS -> "accessSubscriptionModels"
+        LOGIN_THIRD_PARTY_BROWSER -> "loginThirdPartyBrowser"
+        OTHER -> "somethingElse"
+    }
+}
diff --git a/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/feedback/SubscriptionFeedbackViewModel.kt b/subscriptions/subscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/feedback/SubscriptionFeedbackViewModel.kt
@@ -27,6 +27,7 @@ import com.duckduckgo.subscriptions.api.PrivacyProUnifiedFeedback.PrivacyProFeed
 import com.duckduckgo.subscriptions.api.PrivacyProUnifiedFeedback.PrivacyProFeedbackSource.VPN_EXCLUDED_APPS
 import com.duckduckgo.subscriptions.api.PrivacyProUnifiedFeedback.PrivacyProFeedbackSource.VPN_MANAGEMENT
 import com.duckduckgo.subscriptions.impl.R
+import com.duckduckgo.subscriptions.impl.feedback.SubscriptionFeedbackCategory.DUCK_AI
 import com.duckduckgo.subscriptions.impl.feedback.SubscriptionFeedbackCategory.ITR
 import com.duckduckgo.subscriptions.impl.feedback.SubscriptionFeedbackCategory.PIR
 import com.duckduckgo.subscriptions.impl.feedback.SubscriptionFeedbackCategory.SUBS_AND_PAYMENTS
@@ -103,11 +104,6 @@ class SubscriptionFeedbackViewModel @Inject constructor(
                 REPORT_PROBLEM -> {
                     val source = newMetadata.source
                     when (source) {
-                        SUBSCRIPTION_SETTINGS -> {
-                            newMetadata = newMetadata.copy(category = SUBS_AND_PAYMENTS)
-                            FeedbackSubCategory(newMetadata.category!!.asTitle())
-                        }
-
                         VPN_MANAGEMENT, VPN_EXCLUDED_APPS -> {
                             newMetadata = newMetadata.copy(category = VPN)
                             FeedbackSubCategory(newMetadata.category!!.asTitle())
@@ -427,6 +423,7 @@ class SubscriptionFeedbackViewModel @Inject constructor(
             VPN -> R.string.feedbackCategoryVpn
             PIR -> R.string.feedbackCategoryPir
             ITR -> R.string.feedbackCategoryItr
+            DUCK_AI -> R.string.feedbackCategoryDuckAi
         }
     }
 
@@ -477,6 +474,14 @@ class SubscriptionFeedbackViewModel @Inject constructor(
                 }
             }
 
+            is SubscriptionFeedbackDuckAiSubCategory -> {
+                when (this) {
+                    SubscriptionFeedbackDuckAiSubCategory.ACCESS_SUBSCRIPTION_MODELS -> R.string.feedbackSubCategoryDuckAiSubscriberModels
+                    SubscriptionFeedbackDuckAiSubCategory.LOGIN_THIRD_PARTY_BROWSER -> R.string.feedbackSubCategoryDuckAiLoginThirdPartyBrowser
+                    SubscriptionFeedbackDuckAiSubCategory.OTHER -> R.string.feedbackSubCategoryDuckAiOther
+                }
+            }
+
             else -> {
                 -1
             }
diff --git a/subscriptions/subscriptions-impl/src/main/res/layout/content_feedback_category.xml b/subscriptions/subscriptions-impl/src/main/res/layout/content_feedback_category.xml
@@ -41,6 +41,13 @@
             android:layout_height="wrap_content"
             app:primaryText="@string/feedbackCategoryVpn" />
 
+        <com.duckduckgo.common.ui.view.listitem.OneLineListItem
+            android:id="@+id/categoryDuckAi"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            app:primaryText="@string/feedbackCategoryDuckAi" />
+
         <com.duckduckgo.common.ui.view.listitem.OneLineListItem
             android:id="@+id/categoryPir"
             android:layout_width="match_parent"
diff --git a/subscriptions/subscriptions-impl/src/main/res/values/donottranslate.xml b/subscriptions/subscriptions-impl/src/main/res/values/donottranslate.xml
@@ -17,4 +17,9 @@
 <resources>
     <string name="subscriptionSettingSubscribeWithDuckAiSubtitle">Includes our VPN, Duck.ai Plus, Personal Information Removal, and Identity Theft Restoration.</string>
     <string name="subscriptionSettingSubscribeWithDuckAiSubtitleRow">Includes our VPN, Duck.ai Plus and Identity Theft Restoration.</string>
+
+    <string name="feedbackCategoryDuckAi">Duck.ai</string>
+    <string name="feedbackSubCategoryDuckAiSubscriberModels">Unable to access the subscriber-only Duck.ai models</string>
+    <string name="feedbackSubCategoryDuckAiLoginThirdPartyBrowser">Can\'t access Duck.ai with my subscription in other browsers</string>
+    <string name="feedbackSubCategoryDuckAiOther">Other Duck.ai feedback</string>
 </resources>
diff --git a/subscriptions/subscriptions-impl/src/test/java/com/duckduckgo/subscriptions/impl/feedback/SubscriptionFeedbackViewModelTest.kt b/subscriptions/subscriptions-impl/src/test/java/com/duckduckgo/subscriptions/impl/feedback/SubscriptionFeedbackViewModelTest.kt

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ package com.duckduckgo.subscriptions.impl.feedback`
`18`	`18`
`19`	`19`	`import com.duckduckgo.di.scopes.FragmentScope`
`20`	`20`	`import com.duckduckgo.subscriptions.impl.R`
	`21`	`+import com.duckduckgo.subscriptions.impl.feedback.SubscriptionFeedbackCategory.DUCK_AI`
`21`	`22`	`import com.duckduckgo.subscriptions.impl.feedback.SubscriptionFeedbackCategory.ITR`
`22`	`23`	`import com.duckduckgo.subscriptions.impl.feedback.SubscriptionFeedbackCategory.PIR`
`23`	`24`	`import com.duckduckgo.subscriptions.impl.feedback.SubscriptionFeedbackCategory.SUBS_AND_PAYMENTS`
`@@ -37,6 +38,7 @@ class RealFeedbackSubCategoryProvider @Inject constructor() : FeedbackSubCategor`
`37`	`38`	`SUBS_AND_PAYMENTS -> getSubsSubCategories()`
`38`	`39`	`PIR -> getPirSubCategories()`
`39`	`40`	`ITR -> getItrSubCategories()`
	`41`	`+ DUCK_AI -> getDuckAiSubCategories()`
`40`	`42`	`}`
`41`	`43`	`}`
`42`	`44`
`@@ -76,4 +78,12 @@ class RealFeedbackSubCategoryProvider @Inject constructor() : FeedbackSubCategor`
`76`	`78`	`R.string.feedbackSubCategoryItrOther to SubscriptionFeedbackItrSubCategory.OTHER,`
`77`	`79`	`)`
`78`	`80`	`}`
	`81`	`+`
	`82`	`+ private fun getDuckAiSubCategories(): Map<Int, SubscriptionFeedbackSubCategory> {`
	`83`	`+ return mapOf(`
	`84`	`+ R.string.feedbackSubCategoryDuckAiSubscriberModels to SubscriptionFeedbackDuckAiSubCategory.ACCESS_SUBSCRIPTION_MODELS,`
	`85`	`+ R.string.feedbackSubCategoryDuckAiLoginThirdPartyBrowser to SubscriptionFeedbackDuckAiSubCategory.LOGIN_THIRD_PARTY_BROWSER,`
	`86`	`+ R.string.feedbackSubCategoryDuckAiOther to SubscriptionFeedbackDuckAiSubCategory.OTHER,`
	`87`	`+ )`
	`88`	`+ }`
`79`	`89`	`}`