From 9ac802e77785f63e86eb4bff1184f9767cb0ea0f Mon Sep 17 00:00:00 2001
From: Ilia Smirnov <ilia.smirnov@jetbrains.com>
Date: Tue, 30 Sep 2025 10:26:07 +0200
Subject: [PATCH] IJPL-210395 Get rid of the LLMC consent in Settings

GitOrigin-RevId: 90696c7f7a1d37318e17e9dc8fba6433b26ee8d3
---
 .../resources/messages/IdeBundle.properties   |  4 ---
 .../intellij/ide/gdpr/ConsentSettingsUi.java  |  3 ---
 .../ui/consents/AiDataCollectionConsentUi.kt  | 25 -------------------
 .../src/com/intellij/ui/AppUIUtil.kt          |  8 ++----
 4 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 platform/platform-impl/src/com/intellij/ide/gdpr/ui/consents/AiDataCollectionConsentUi.kt

diff --git a/platform/platform-api/resources/messages/IdeBundle.properties b/platform/platform-api/resources/messages/IdeBundle.properties
index 218545e3e401..624c9c535f99 100644
--- a/platform/platform-api/resources/messages/IdeBundle.properties
+++ b/platform/platform-api/resources/messages/IdeBundle.properties
@@ -2723,10 +2723,6 @@ gdpr.usage.statistics.disabled.externally.warning=Sending usage statistics is te
 gdpr.usage.statistics.enabled.for.free.license.warning=Under a non-commercial license, the IDE collects usage data to verify compliance \
   with the license terms and sends anonymous feature usage statistics to JetBrains to help improve the product. \
   For more information, refer to the <a href="https://www.jetbrains.com/legal/docs/privacy/privacy/">JetBrains Privacy Policy</a>.
-gdpr.ai.data.collection.consent.additional.notice.1=This option enables or disables the detailed data collection by JetBrains AI in all IDEs.
-gdpr.ai.data.collection.consent.additional.notice.2=\
-  Even if this setting is disabled, the AI Assistant plugin will send the data essential for this feature to large language model providers \
-  and models hosted on JetBrains servers. If you work on a project where you don't want to share your data, you can disable the plugin.
 gdpr.consent.externally.disabled.warning=This option is disabled externally
 gdpr.data.collection.consent.group.comment.text=Help shape the future of JetBrains products. By sharing your data and usage statistics, you allow us to better understand how you use our tools and how we can improve them. Learn more <a href="https://www.jetbrains.com/legal/docs/terms/product_data_collection/">here</a>.
 gdpr.data.collection.consent.group.setting.enabled.warning.text=Data collection has been enabled by your organization administrator.
diff --git a/platform/platform-impl/src/com/intellij/ide/gdpr/ConsentSettingsUi.java b/platform/platform-impl/src/com/intellij/ide/gdpr/ConsentSettingsUi.java
index c4591d6b503d..45576f8d90f1 100644
--- a/platform/platform-impl/src/com/intellij/ide/gdpr/ConsentSettingsUi.java
+++ b/platform/platform-impl/src/com/intellij/ide/gdpr/ConsentSettingsUi.java
@@ -107,9 +107,6 @@ public class ConsentSettingsUi extends JPanel implements ConfigurableUi<List<Con
     if (ConsentOptions.condUsageStatsConsent().test(consent)) {
       return new UsageStatisticsConsentUi(consent);
     }
-    if (ConsentOptions.condAiDataCollectionConsent().test(consent)) {
-      return new AiDataCollectionConsentUi(consent);
-    }
     if (ConsentOptions.condTraceDataCollectionComConsent().test(consent) ||
         ConsentOptions.condTraceDataCollectionNonComConsent().test(consent)) {
       return new TraceDataCollectionConsentUI(consent);
diff --git a/platform/platform-impl/src/com/intellij/ide/gdpr/ui/consents/AiDataCollectionConsentUi.kt b/platform/platform-impl/src/com/intellij/ide/gdpr/ui/consents/AiDataCollectionConsentUi.kt
deleted file mode 100644
index 4e0c14d27480..000000000000
--- a/platform/platform-impl/src/com/intellij/ide/gdpr/ui/consents/AiDataCollectionConsentUi.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.ide.gdpr.ui.consents
-
-import com.intellij.ide.IdeBundle
-import com.intellij.ide.gdpr.Consent
-import com.intellij.openapi.util.NlsSafe
-import com.intellij.openapi.util.text.StringUtil
-
-internal class AiDataCollectionConsentUi(private val consent: Consent) : ConsentUi {
-  override fun getCheckBoxText(): @NlsSafe String = StringUtil.capitalize(consent.name)
-
-  override fun getCheckBoxCommentText(): @NlsSafe String = """${consent.text}
-${IdeBundle.message("gdpr.ai.data.collection.consent.additional.notice.1")}
-${IdeBundle.message("gdpr.ai.data.collection.consent.additional.notice.2")}"""
-
-  override fun getForcedState(): ConsentForcedState? {
-    val externalSettings = AiDataCollectionExternalSettings.findSettingsImplementedByAiAssistant()
-    if (externalSettings != null && externalSettings.isForciblyDisabled()) {
-      val description = externalSettings.getForciblyDisabledDescription()
-                        ?: IdeBundle.message("gdpr.consent.externally.disabled.warning")
-      return ConsentForcedState.ExternallyDisabled(description)
-    }
-    return null
-  }
-}
\ No newline at end of file
diff --git a/platform/platform-impl/src/com/intellij/ui/AppUIUtil.kt b/platform/platform-impl/src/com/intellij/ui/AppUIUtil.kt
index 170b3a9c6152..5e2cef0c8d19 100644
--- a/platform/platform-impl/src/com/intellij/ui/AppUIUtil.kt
+++ b/platform/platform-impl/src/com/intellij/ui/AppUIUtil.kt
@@ -346,12 +346,8 @@ object AppUIUtil {
       }
     }
     result.removeIf(ConsentOptions.condTraceDataCollectionConsent()) // IJPL-208500
-    val traceConsentManager = TraceConsentManager.getInstance()
-    if (traceConsentManager != null && traceConsentManager.isTraceConsentEnabled()) {
-      val isLegacyAiDataCollectionConsent = ConsentOptions.condAiDataCollectionConsent()
-      result.removeIf(isLegacyAiDataCollectionConsent) // IJPL-195651; AI data collection (LLMC) consent should not be present on UI while it's staying a default consent as a part of migration from LLMC to TRACE consent
-    }
-    if (traceConsentManager?.canDisplayTraceConsent() != true) {
+    result.removeIf(ConsentOptions.condAiDataCollectionConsent()) // IJPL-195651; AI data collection (LLMC) consent should not be present on UI while it's staying a default consent as a part of migration from LLMC to TRACE consent
+    if (TraceConsentManager.getInstance()?.canDisplayTraceConsent() != true) {
       removeTraceConsents(result)
     } else {
       val licenseTypeFlag = LicensingFacade.getInstance()?.metadata?.getOrNull(10)