latests

Author: spartacusrex99

src/org/minima/system/commands/maxima/maxima.java

@@ -103,7 +103,7 @@ public JSONObject runCommand() throws Exception {
 		}else if(func.equals("send")) {
 
 			if(!(existsParam("to") || existsParam("id")|| existsParam("publickey"))  || !existsParam("application") || !existsParam("data") ) {
-				throw new Exception("MUST specify to, application and data for a send command");
+				throw new Exception("MUST specify to|id|publickey, application and data for a send command");
 			}
 
 			//Send a message..

src/org/minima/system/network/minima/NIOManager.java

@@ -438,13 +438,6 @@ protected void processMessage(Message zMessage) throws Exception {
 				}
 			}
 
-			//Tell MAXIMA
-			Message maxconn = new Message(MaximaManager.MAXIMA_CONNECTED);
-			maxconn.addObject("nioclient", nioc);
-			maxconn.addString("uid", nioc.getUID());
-			maxconn.addBoolean("incoming", nioc.isIncoming());
-			Main.getInstance().getMaxima().PostMessage(maxconn);
-			
 		}else if(zMessage.getMessageType().equals(NIO_INCOMINGMSG)) {
 			//Who is it from
 			String uid = zMessage.getString("uid");

src/org/minima/system/network/minima/NIOMessage.java

@@ -211,6 +211,13 @@ public void run() {
 				newconn.addObject("client", nioclient);
 				Main.getInstance().getNetworkManager().getP2PManager().PostMessage(newconn);
 
+				//Tell MAXIMA
+				Message maxconn = new Message(MaximaManager.MAXIMA_CONNECTED);
+				maxconn.addObject("nioclient", nioclient);
+				maxconn.addString("uid", nioclient.getUID());
+				maxconn.addBoolean("incoming", nioclient.isIncoming());
+				Main.getInstance().getMaxima().PostMessage(maxconn);
+				
 				//Is this an incoming connection.. send a greeting!
 				if(nioclient.isIncoming()) {