MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

[rdct] IJPL-204792 reduce implicitly required properties for RemoteDev host

Browse Source 
Follow-up: 3167f76e18e2f675ffd1fd73ce6b992e6b09b497

(cherry picked from commit a397ec7e084b51b81f3a58325a0b09d8f4496810)

GitOrigin-RevId: d05c688076bd40032e22c8db6750edf1faecb6c6
This commit is contained in:
Aleksey Pivovarov
2025-09-25 14:22:27 +02:00
committed by intellij-monorepo-bot
parent 3dce5c0724
commit 82c74c7559
6 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/launch/src/com/intellij/tools/launch/ide/IdeLauncher.kt
View File

@@ -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}")

3
native/XPlatLauncher/src/remote_dev.rs
View File

@@ -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

5
platform/bootstrap/src/com/intellij/idea/Main.kt
View File

@@ -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) {

3
platform/platform-impl/bootstrap/src/com/intellij/platform/ide/bootstrap/ApplicationLoader.kt
View File

@@ -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

1
platform/platform-impl/bootstrap/src/com/intellij/platform/ide/bootstrap/eua.kt
View File

@@ -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
}

4
platform/platform-impl/src/com/intellij/ide/gdpr/ConsentOptions.java
View File

@@ -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));
}