Wait for state change

Mindgamesnl · May 5, 2024 · 641f43b · 641f43b
1 parent d476f1d
commit 641f43b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/...rc/main/java/com/craftmend/openaudiomc/generic/commands/subcommands/AcceptSubCommand.java b/...rc/main/java/com/craftmend/openaudiomc/generic/commands/subcommands/AcceptSubCommand.java
@@ -4,6 +4,7 @@
 
 import com.craftmend.openaudiomc.generic.commands.interfaces.SubCommand;
 import com.craftmend.openaudiomc.generic.environment.MagicValue;
+import com.craftmend.openaudiomc.generic.platform.interfaces.TaskService;
 import com.craftmend.openaudiomc.generic.user.User;
 import com.craftmend.openaudiomc.generic.storage.interfaces.Configuration;
 import com.craftmend.openaudiomc.generic.storage.enums.StorageKey;
@@ -27,7 +28,7 @@ public void onExecute(User sender, String[] args) {
 
         sender.sendMessage(MagicValue.COMMAND_PREFIX.get(String.class) + "Welcome to OpenAudioMc! you accepted the terms, enjoy the service!");
 
-        service.connectIfDown();
+        OpenAudioMc.resolveDependency(TaskService.class).runAsync(() -> service.connectIfDown());
 
         for (ClientConnection client : service.getClients()) {
             client.getAuth().publishSessionUrl();

diff --git a/.../src/main/java/com/craftmend/openaudiomc/generic/commands/subcommands/LinkSubCommand.java b/.../src/main/java/com/craftmend/openaudiomc/generic/commands/subcommands/LinkSubCommand.java
@@ -6,6 +6,7 @@
 import com.craftmend.openaudiomc.generic.commands.objects.Argument;
 import com.craftmend.openaudiomc.generic.networking.interfaces.NetworkingService;
 import com.craftmend.openaudiomc.generic.platform.OaColor;
+import com.craftmend.openaudiomc.generic.platform.interfaces.TaskService;
 import com.craftmend.openaudiomc.generic.rest.RestRequest;
 import com.craftmend.openaudiomc.generic.rest.routes.Endpoint;
 import com.craftmend.openaudiomc.generic.rest.types.ClaimCodeResponse;
@@ -28,7 +29,7 @@ public void onExecute(User sender, String[] args) {
         }
 
         // init connection so we receive the event
-        OpenAudioMc.getService(NetworkingService.class).connectIfDown();
+        OpenAudioMc.resolveDependency(TaskService.class).runAsync(() -> OpenAudioMc.getService(NetworkingService.class).connectIfDown());
 
         message(sender, OaColor.GRAY + "Generating link...");
 

diff --git a/...rc/main/java/com/craftmend/openaudiomc/generic/commands/subcommands/ReloadSubCommand.java b/...rc/main/java/com/craftmend/openaudiomc/generic/commands/subcommands/ReloadSubCommand.java
@@ -9,6 +9,7 @@
 import com.craftmend.openaudiomc.generic.client.objects.ClientConnection;
 import com.craftmend.openaudiomc.generic.networking.interfaces.NetworkingService;
 import com.craftmend.openaudiomc.generic.platform.Platform;
+import com.craftmend.openaudiomc.generic.platform.interfaces.TaskService;
 import com.craftmend.openaudiomc.generic.user.User;
 
 public class ReloadSubCommand extends SubCommand {
@@ -33,7 +34,7 @@ public void onExecute(User sender, String[] args) {
         OpenAudioMc.getService(NetworkingService.class).stop();
 
         message(sender, Platform.makeColor("RED") + "Re-activating account...");
-        OpenAudioMc.getService(NetworkingService.class).connectIfDown();
+        OpenAudioMc.resolveDependency(TaskService.class).runAsync(() -> OpenAudioMc.getService(NetworkingService.class).connectIfDown());
 
         EventApi.getInstance().callEvent(new SystemReloadEvent());
 

diff --git a/.../src/main/java/com/craftmend/openaudiomc/generic/networking/DefaultNetworkingService.java b/.../src/main/java/com/craftmend/openaudiomc/generic/networking/DefaultNetworkingService.java
@@ -127,7 +127,7 @@ public void connectIfDown() {
             }
             // update state
             OpenAudioMc.getService(OpenaudioAccountService.class).startVoiceHandshake();
-            OpenAudioMc.resolveDependency(TaskService.class).runAsync(() -> socketConnection.setupConnection());
+            socketConnection.setupConnection();
         } finally {
             connectLock.unlock();
         }