X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fro%2Fieval%2Ffonbot%2FPollServerAsyncTask.java;h=07c014b0979c9245e17aa1f83b71b5917c6c9cdf;hb=9ead79ec352a50d44f9eefb2496d4471733215e8;hp=1be09c36a1730857fc4c1749daf2127090ae5f51;hpb=8bfdcf7a444359151c18720b01443d6f507bec7e;p=fonbot.git

diff --git a/src/ro/ieval/fonbot/PollServerAsyncTask.java b/src/ro/ieval/fonbot/PollServerAsyncTask.java
index 1be09c3..07c014b 100644
--- a/src/ro/ieval/fonbot/PollServerAsyncTask.java
+++ b/src/ro/ieval/fonbot/PollServerAsyncTask.java
@@ -109,24 +109,29 @@ public final class PollServerAsyncTask extends AsyncTask<Void, Void, List<PollSe
 			conn.setRequestProperty("Authorization", "Basic "+Base64.encodeToString(
 					(user+':'+password).getBytes(), Base64.NO_WRAP));
 			conn.connect();
-			final byte[] buf=new byte[4096*1024];
 			Log.d(getClass().getName(), "Server poll got response code "+conn.getResponseCode()+" and message "+conn.getResponseMessage());
 			if(conn.getResponseCode()!=200)
 				return commands;
-			conn.getInputStream().read(buf);
-			final JSONArray array=new JSONArray(new String(buf));
-			final List<String> list=new ArrayList<String>();
+
+			final JSONArray array;
+			{
+				final byte[] buf=new byte[4096*1024];
+				conn.getInputStream().read(buf);
+				array=new JSONArray(new String(buf));
+			}
+
 			for(int i=0;i<array.length();i++){
 				final JSONObject object=array.getJSONObject(i);
 
-				for(int j=0;object.has("arg"+j);j++)
-					list.add(object.getString("arg"+j));
+				final JSONArray jsonargs=object.getJSONArray("args");
+				final String[] args=new String[jsonargs.length()];
+				for(int j=0;j<args.length;j++)
+					args[j]=jsonargs.getString(j);
 
 				commands.add(new Command(//NOPMD command changes for each JSON object
 						toNonNull(object.getString("command")),
-						toNonNull(list.toArray(new String[list.size()])),
+						args,
 						toNonNull(object.getString("replyto"))));
-				list.clear();
 			}
 		} catch (MalformedURLException e) {
 			e.printStackTrace();