From: Marius Gavrilescu <marius@ieval.ro>
Date: Tue, 12 Mar 2013 08:56:52 +0000 (+0200)
Subject: Improve JSON parsing
X-Git-Tag: 0.000_001~57
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=9ead79ec352a50d44f9eefb2496d4471733215e8;hp=8bfdcf7a444359151c18720b01443d6f507bec7e;p=fonbot.git

Improve JSON parsing

Command arguments are now represented as JSON arrays, and the
JSON parsing code uses less memory. Previous versions can no
longer receive commands, since they expect command arguments in
the old arg0, arg1, ... form.
---

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();