From a3bd5e50fa94cedf824b853c437636e9784b80fe Mon Sep 17 00:00:00 2001 From: Joe Zeffiro Date: Wed, 1 Jul 2020 06:14:56 -0700 Subject: [PATCH 1/2] KeyManager: Block remaps on authenticator game state Similar to 01bdbe5aabf4a14aa52b32acd2abc3f1270a2d34, we do not want to block input when the user is inputting their authenticator code at the login screen. --- .../src/main/java/net/runelite/client/input/KeyManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/input/KeyManager.java b/runelite-client/src/main/java/net/runelite/client/input/KeyManager.java index 066f8089c8..762e8efb86 100644 --- a/runelite-client/src/main/java/net/runelite/client/input/KeyManager.java +++ b/runelite-client/src/main/java/net/runelite/client/input/KeyManager.java @@ -145,6 +145,6 @@ public class KeyManager return true; } - return client.getGameState() != GameState.LOGIN_SCREEN; + return client.getGameState() != GameState.LOGIN_SCREEN && client.getGameState() != GameState.LOGIN_SCREEN_AUTHENTICATOR; } } From 349efebd58f0725988a9d290e1d0399189c286d8 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Mon, 6 Jul 2020 21:56:09 -0700 Subject: [PATCH 2/2] keyremapping: Remove vestigial LOGIN_SCREEN guard clause Key remaps have been blocked at the KeyManager level as of commit 01bdbe5aabf4a14aa52b32acd2abc3f1270a2d34, so a LOGIN_SCREEN game state check is no longer needed within individual KeyListeners. --- .../client/plugins/keyremapping/KeyRemappingListener.java | 3 +-- .../client/plugins/keyremapping/KeyRemappingListenerTest.java | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java index f07ccbf553..25c0da9576 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java @@ -33,7 +33,6 @@ import java.util.Map; import java.util.Set; import javax.inject.Inject; import net.runelite.api.Client; -import net.runelite.api.GameState; import net.runelite.api.VarClientStr; import net.runelite.client.callback.ClientThread; import net.runelite.client.input.KeyListener; @@ -68,7 +67,7 @@ class KeyRemappingListener implements KeyListener @Override public void keyPressed(KeyEvent e) { - if (client.getGameState() == GameState.LOGIN_SCREEN || !plugin.chatboxFocused()) + if (!plugin.chatboxFocused()) { return; } diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/keyremapping/KeyRemappingListenerTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/keyremapping/KeyRemappingListenerTest.java index cbaefc875f..4d3b3b3005 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/keyremapping/KeyRemappingListenerTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/keyremapping/KeyRemappingListenerTest.java @@ -30,7 +30,6 @@ import com.google.inject.testing.fieldbinder.BoundFieldModule; import java.awt.event.KeyEvent; import javax.inject.Inject; import net.runelite.api.Client; -import net.runelite.api.GameState; import net.runelite.client.config.ModifierlessKeybind; import org.junit.Before; import org.junit.Test; @@ -64,8 +63,6 @@ public class KeyRemappingListenerTest public void setUp() { Guice.createInjector(BoundFieldModule.of(this)).injectMembers(this); - - when(client.getGameState()).thenReturn(GameState.LOGGED_IN); } @Test