From 82c74c755985a9f1d65218b1ee9afdd218f3dd0e Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <aleksey.pivovarov@jetbrains.com>
Date: Thu, 25 Sep 2025 14:22:27 +0200
Subject: [PATCH] [rdct] IJPL-204792 reduce implicitly required properties for
 RemoteDev host

Follow-up: 3167f76e18e2f675ffd1fd73ce6b992e6b09b497

(cherry picked from commit a397ec7e084b51b81f3a58325a0b09d8f4496810)

GitOrigin-RevId: d05c688076bd40032e22c8db6750edf1faecb6c6
---
 .../launch/src/com/intellij/tools/launch/ide/IdeLauncher.kt  | 3 ---
 native/XPlatLauncher/src/remote_dev.rs                       | 3 ---
 platform/bootstrap/src/com/intellij/idea/Main.kt             | 5 -----
 .../com/intellij/platform/ide/bootstrap/ApplicationLoader.kt | 3 ++-
 .../bootstrap/src/com/intellij/platform/ide/bootstrap/eua.kt | 1 +
 .../src/com/intellij/ide/gdpr/ConsentOptions.java            | 4 +++-
 6 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/build/launch/src/com/intellij/tools/launch/ide/IdeLauncher.kt b/build/launch/src/com/intellij/tools/launch/ide/IdeLauncher.kt
index b3f45e6d501f..85eeb03262db 100644
--- a/build/launch/src/com/intellij/tools/launch/ide/IdeLauncher.kt
+++ b/build/launch/src/com/intellij/tools/launch/ide/IdeLauncher.kt
@@ -51,12 +51,9 @@ object IdeLauncher {
         add("-ea")
         add("-Dfus.internal.test.mode=true")
         add("-Didea.updates.url=http://127.0.0.1") // we should not spoil jetstat, which relies on update requests
-        add("-Djb.privacy.policy.text=${quote("<!--999.999-->")}")
-        add("-Djb.consents.confirmation.enabled=false")
         add("-Didea.suppress.statistics.report=true")
         add("-Drsch.send.usage.stat=false")
         add("-Duse.linux.keychain=false")
-        add("-Didea.initially.ask.config=never")
         add("-Didea.home.path=${environmentPaths.sourcesRootFolder}")
         add("-Didea.config.path=${environmentPaths.configFolder}")
         add("-Didea.system.path=${environmentPaths.systemFolder}")
diff --git a/native/XPlatLauncher/src/remote_dev.rs b/native/XPlatLauncher/src/remote_dev.rs
index 7316bfcaa17b..cc5d6db7894b 100644
--- a/native/XPlatLauncher/src/remote_dev.rs
+++ b/native/XPlatLauncher/src/remote_dev.rs
@@ -193,9 +193,6 @@ impl RemoteDevLaunchConfiguration {
     fn get_remote_dev_properties(&self) -> Result<Vec<IdeProperty>> {
         let mut remote_dev_properties = vec![
             // TODO: remove once all of this is disabled for remote dev
-            ("jb.privacy.policy.text", "<!--999.999-->"),
-            ("jb.consents.confirmation.enabled", "false"),
-            ("idea.initially.ask.config", "never"),
             ("ide.show.tips.on.startup.default.value", "false"),
 
             // Prevent CWM plugin from being disabled, as it's required for Remote Dev
diff --git a/platform/bootstrap/src/com/intellij/idea/Main.kt b/platform/bootstrap/src/com/intellij/idea/Main.kt
index 1d1dbb947d15..8476b65baafa 100644
--- a/platform/bootstrap/src/com/intellij/idea/Main.kt
+++ b/platform/bootstrap/src/com/intellij/idea/Main.kt
@@ -196,11 +196,6 @@ private fun initRemoteDev(args: List<String>) {
   }
 
   val isSplitMode = args.firstOrNull() == AppMode.SPLIT_MODE_COMMAND
-  if (isSplitMode) {
-    System.setProperty("jb.privacy.policy.text", "<!--999.999-->")
-    System.setProperty("jb.consents.confirmation.enabled", "false")
-    System.setProperty("idea.initially.ask.config", "never")
-  }
 
   // avoid an icon jumping in dock for the backend process
   if (SystemInfoRt.isMac) {
diff --git a/platform/platform-impl/bootstrap/src/com/intellij/platform/ide/bootstrap/ApplicationLoader.kt b/platform/platform-impl/bootstrap/src/com/intellij/platform/ide/bootstrap/ApplicationLoader.kt
index 29efb57cacd0..06b23886752b 100644
--- a/platform/platform-impl/bootstrap/src/com/intellij/platform/ide/bootstrap/ApplicationLoader.kt
+++ b/platform/platform-impl/bootstrap/src/com/intellij/platform/ide/bootstrap/ApplicationLoader.kt
@@ -110,7 +110,8 @@ internal suspend fun loadApp(
     else {
       async(CoroutineName("language and region")) {
         val euaDocumentStatus = euaDocumentDeferred.await()
-        if (euaDocumentStatus is EndUserAgreementStatus.Required) {
+        if (euaDocumentStatus is EndUserAgreementStatus.Required ||
+            euaDocumentStatus is EndUserAgreementStatus.RemoteDev) {
           getLanguageAndRegionDialogIfNeeded()
         }
         else null
diff --git a/platform/platform-impl/bootstrap/src/com/intellij/platform/ide/bootstrap/eua.kt b/platform/platform-impl/bootstrap/src/com/intellij/platform/ide/bootstrap/eua.kt
index b7cec5fb19ab..f3624d26d629 100644
--- a/platform/platform-impl/bootstrap/src/com/intellij/platform/ide/bootstrap/eua.kt
+++ b/platform/platform-impl/bootstrap/src/com/intellij/platform/ide/bootstrap/eua.kt
@@ -39,6 +39,7 @@ internal suspend fun loadEuaDocument(appInfoDeferred: Deferred<ApplicationInfoEx
 
 internal sealed interface EndUserAgreementStatus {
   class Required(val document: EndUserAgreement.Document) : EndUserAgreementStatus
+  object RemoteDev : EndUserAgreementStatus
   object Accepted : EndUserAgreementStatus
   object NonJbVendor : EndUserAgreementStatus
 }
diff --git a/platform/platform-impl/src/com/intellij/ide/gdpr/ConsentOptions.java b/platform/platform-impl/src/com/intellij/ide/gdpr/ConsentOptions.java
index 96bf1f5ad77b..456e27085408 100644
--- a/platform/platform-impl/src/com/intellij/ide/gdpr/ConsentOptions.java
+++ b/platform/platform-impl/src/com/intellij/ide/gdpr/ConsentOptions.java
@@ -2,6 +2,7 @@
 package com.intellij.ide.gdpr;
 
 import com.intellij.diagnostic.LoadingState;
+import com.intellij.idea.AppMode;
 import com.intellij.l10n.LocalizationUtil;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ApplicationNamesInfo;
@@ -339,7 +340,8 @@ public final class ConsentOptions implements ModificationTracker {
       }
     }
     result.sort(Comparator.comparing(ConsentBase::getId));
-    boolean confirmationEnabled = Boolean.parseBoolean(System.getProperty(CONSENTS_CONFIRMATION_PROPERTY, "true"));
+    boolean confirmationEnabled = Boolean.parseBoolean(System.getProperty(CONSENTS_CONFIRMATION_PROPERTY, "true")) &&
+                              !AppMode.isRemoteDevHost();
     return new Pair<>(result, confirmationEnabled && needReconfirm(allDefaults, allConfirmed));
   }