Remove force relay

FAForever · Oct 31, 2023 · 86d2f78 · 86d2f78
1 parent 8fd5129
commit 86d2f78
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 21 deletions.
diff --git a/src/main/java/com/faforever/client/fa/relay/ice/IceAdapterImpl.java b/src/main/java/com/faforever/client/fa/relay/ice/IceAdapterImpl.java
@@ -223,11 +223,6 @@ List<String> buildCommand(Path workDirectory, int adapterPort, int gpgPort, int
 
     cmd.addAll(standardIceOptions);
 
-    if (forgedAlliancePrefs.isForceRelay()) {
-      cmd.add("--force-relay");
-      log.info("Forcing ice adapter relay connection");
-    }
-
     if (forgedAlliancePrefs.isShowIceAdapterDebugWindow()) {
       cmd.add("--debug-window");
       cmd.add("--info-window");

diff --git a/src/main/java/com/faforever/client/preferences/ForgedAlliancePrefs.java b/src/main/java/com/faforever/client/preferences/ForgedAlliancePrefs.java
@@ -24,7 +24,6 @@ public class ForgedAlliancePrefs {
   ObjectProperty<Path> preferencesFile = new SimpleObjectProperty<>();
   ObjectProperty<Path> vaultBaseDirectory = new SimpleObjectProperty<>();
   BooleanProperty warnNonAsciiVaultPath = new SimpleBooleanProperty(true);
-  BooleanProperty forceRelay = new SimpleBooleanProperty(false);
   BooleanProperty autoDownloadMaps = new SimpleBooleanProperty(true);
   BooleanProperty allowIpv6 = new SimpleBooleanProperty(false);
 
@@ -60,18 +59,6 @@ public ObjectProperty<Path> preferencesFileProperty() {
     return preferencesFile;
   }
 
-  public boolean isForceRelay() {
-    return forceRelay.get();
-  }
-
-  public void setForceRelay(boolean forceRelay) {
-    this.forceRelay.set(forceRelay);
-  }
-
-  public BooleanProperty forceRelayProperty() {
-    return forceRelay;
-  }
-
   public boolean isAutoDownloadMaps() {
     return autoDownloadMaps.get();
   }

diff --git a/src/main/java/com/faforever/client/preferences/ui/SettingsController.java b/src/main/java/com/faforever/client/preferences/ui/SettingsController.java
@@ -310,7 +310,6 @@ private void bindGeneralPreferences() {
 
   private void bindGamePreferences() {
     ForgedAlliancePrefs forgedAlliancePrefs = preferences.getForgedAlliance();
-    forceRelayToggle.selectedProperty().bindBidirectional(forgedAlliancePrefs.forceRelayProperty());
     changeProcessPriorityToggle.selectedProperty()
         .bindBidirectional(forgedAlliancePrefs.changeProcessPriorityProperty());
     gameLocationTextField.textProperty()

diff --git a/src/test/java/com/faforever/client/fa/relay/ice/IceAdapterImplTest.java b/src/test/java/com/faforever/client/fa/relay/ice/IceAdapterImplTest.java
@@ -116,7 +116,6 @@ public void testBuildCommand() throws Exception {
     when(operatingSystem.getJavaExecutablePath()).thenReturn(javaExecutablePath);
     PlayerBean currentPlayer = PlayerBeanBuilder.create().defaultValues().get();
     when(playerService.getCurrentPlayer()).thenReturn(currentPlayer);
-    forgedAlliancePrefs.setForceRelay(true);
     forgedAlliancePrefs.setShowIceAdapterDebugWindow(true);
 
     List<String> command = instance.buildCommand(Path.of("."), 0, 0, 4711);
@@ -148,7 +147,6 @@ public void testAllowIpv6() throws Exception {
 
     when(operatingSystem.getJavaExecutablePath()).thenReturn(javaExecutablePath);
     forgedAlliancePrefs.setAllowIpv6(true);
-    forgedAlliancePrefs.setForceRelay(true);
     forgedAlliancePrefs.setShowIceAdapterDebugWindow(true);
     PlayerBean currentPlayer = PlayerBeanBuilder.create().defaultValues().get();
     when(playerService.getCurrentPlayer()).thenReturn(currentPlayer);