From: Debayan Sutradhar <debayansutradhar3@gmail.com>
Date: Wed, 02 Jun 2021 21:36:04 +0530
Subject: Refactored and cleanup
---
Refactored and cleanup
---


--- 'a/src/main/java/com/stream_pi/server/connection/ClientConnection.java'
+++ b/src/main/java/com/stream_pi/server/connection/ClientConnection.java
@@ -919,31 +919,17 @@ public class ClientConnection extends Th
                         @Override
                         protected Void call()
                         {
-                            try
-                            {
-                                boolean result = false;
-
-                                if(action instanceof ToggleAction)
-                                {
-                                    result = serverListener.onToggleActionClicked((ToggleAction) action, toggle, profileID);
-                                }
-                                else if (action instanceof NormalAction)
-                                {
-                                    result = serverListener.onNormalActionClicked((NormalAction) action, profileID);
-                                }
+                            getLogger().info("action "+action.getID()+" clicked!");
 
-                                if(!result)
-                                {
-                                    sendActionFailed(profileID, actionID);
-                                }
-                            }
-                            catch (SevereException e)
+                            if(action instanceof ToggleAction)
                             {
-                                exceptionAndAlertHandler.handleSevereException(e);
+                                serverListener.onToggleActionClicked((ToggleAction) action, toggle, profileID,
+                                        getRemoteSocketAddress());
                             }
-                            catch (Exception e)
+                            else if (action instanceof NormalAction)
                             {
-                                e.printStackTrace();
+                                serverListener.onNormalActionClicked((NormalAction) action, profileID,
+                                        getRemoteSocketAddress());
                             }
                             return null;
                         }

--- 'a/src/main/java/com/stream_pi/server/connection/ServerListener.java'
+++ b/src/main/java/com/stream_pi/server/connection/ServerListener.java
@@ -8,10 +8,12 @@ import com.stream_pi.server.window.setti
 import com.stream_pi.util.exception.SevereException;
 import javafx.stage.Stage;
 
+import java.net.SocketAddress;
+
 public interface ServerListener
 {
-    boolean onNormalActionClicked(NormalAction action, String profileID);
-    boolean onToggleActionClicked(ToggleAction action, boolean toggle, String profileID);
+    void onNormalActionClicked(NormalAction action, String profileID, SocketAddress socketAddress);
+    void onToggleActionClicked(ToggleAction action, boolean toggle, String profileID, SocketAddress socketAddress);
 
     void clearTemp();
 

--- 'a/src/main/java/com/stream_pi/server/controller/Controller.java'
+++ b/src/main/java/com/stream_pi/server/controller/Controller.java
@@ -371,27 +371,23 @@ public class Controller extends Base imp
     }
 
     @Override
-    public synchronized boolean onNormalActionClicked(NormalAction action, String profileID)
+    public synchronized void onNormalActionClicked(NormalAction action, String profileID, SocketAddress socketAddress)
     {
-        try{
-            getLogger().info("action "+action.getID()+" clicked!");
+        try
+        {
             action.onActionClicked();
-            return true;
         }
         catch (MinorException e)
         {
-            e.setTitle("Unable to execute action! ["+action.getDisplayText()+"]");
-            handleMinorException(e);
-            return false;
+            sendActionFailed(e, socketAddress, profileID, action.getID());
         }
     }
 
     @Override
-    public boolean onToggleActionClicked(ToggleAction action, boolean toggle, String profileID)
+    public synchronized void onToggleActionClicked(ToggleAction action, boolean toggle, String profileID, SocketAddress socketAddress)
     {
         try
         {
-            getLogger().info("action "+action.getID()+" clicked!");
             if(toggle)
             {
                 action.onToggleOn();
@@ -400,14 +396,10 @@ public class Controller extends Base imp
             {
                 action.onToggleOff();
             }
-
-            return true;
         }
         catch (MinorException e)
         {
-            e.setTitle("Unable to execute action! ["+action.getDisplayText()+"]");
-            handleMinorException(e);
-            return false;
+            sendActionFailed(e, socketAddress, profileID, action.getID());
         }
     }
 
@@ -585,6 +577,13 @@ public class Controller extends Base imp
     @Override
     public void sendActionFailed(MinorException exception, SocketAddress socketAddress, String profileID, String actionID)
     {
+        if(exception.getTitle() != null)
+        {
+            exception.setShortMessage(exception.getTitle()+"\n"+exception.getShortMessage());
+        }
+
+        exception.setTitle("Error while running action");
+
         handleMinorException(exception);
 
         executor.execute(new Task<Void>() {