Remember only friends

Fixes #2096
FAForever · Jan 4, 2021 · f95b021 · f95b021
1 parent 98db90d
commit f95b021
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/src/main/java/com/faforever/client/game/CreateGameController.java b/src/main/java/com/faforever/client/game/CreateGameController.java
@@ -237,10 +237,12 @@ private void initPassword() {
   }
 
   private void bindGameVisibility() {
-    preferencesService.getPreferences()
-        .getLastGame()
-        .lastGameOnlyFriendsProperty()
-        .bindBidirectional(onlyForFriendsCheckBox.selectedProperty());
+    onlyForFriendsCheckBox.selectedProperty().bindBidirectional(
+        preferencesService.getPreferences()
+            .getLastGame()
+            .lastGameOnlyFriendsProperty()
+    );
+
     onlyForFriendsCheckBox.selectedProperty().addListener(observable -> preferencesService.storeInBackground());
   }
 

diff --git a/src/test/java/com/faforever/client/game/CreateGameControllerTest.java b/src/test/java/com/faforever/client/game/CreateGameControllerTest.java
@@ -42,13 +42,15 @@
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.in;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -136,6 +138,15 @@ public void testMapSearchTextFieldFilteringPopulated() {
     assertThat(instance.filteredMapBeans.get(1).getDisplayName(), is("Test1"));
   }
 
+  @Test
+  public void showOnlyToFriendsRemembered() {
+    instance.onlyForFriendsCheckBox.setSelected(true);
+    assertThat(preferences.getLastGame().isLastGameOnlyFriends(), is(true));
+    instance.onlyForFriendsCheckBox.setSelected(false);
+    assertThat(preferences.getLastGame().isLastGameOnlyFriends(), is(false));
+    verify(preferencesService, times(2)).storeInBackground();
+  }
+
   @Test
   public void testMapSearchTextFieldKeyPressedUpForEmpty() {
     instance.mapSearchTextField.setText("Test");