From 2399dccddc912186b20c1a459285e0b5ba830710 Mon Sep 17 00:00:00 2001
From: Alinson Xavier <axavier@uwaterloo.ca>
Date: Thu, 19 May 2016 10:35:44 -0400
Subject: [PATCH] Emit JSON object instead of string

---
 .../org/isoron/uhabits/sync/SyncManager.java  | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/isoron/uhabits/sync/SyncManager.java b/app/src/main/java/org/isoron/uhabits/sync/SyncManager.java
index c6c42ce40..92f8f98c7 100644
--- a/app/src/main/java/org/isoron/uhabits/sync/SyncManager.java
+++ b/app/src/main/java/org/isoron/uhabits/sync/SyncManager.java
@@ -162,20 +162,28 @@ public class SyncManager
         e.save();
 
         Log.i("SyncManager", "Adding to outbox: " + msg.toString());
+
         pendingEmit.add(e);
         if(readyToEmit) emitPending();
     }
 
     private void emitPending()
     {
-        for (Event e : pendingEmit)
+        try
         {
-            Log.i("SyncManager", "Emitting: " + e.message);
-            socket.emit(EVENT_POST_COMMAND, e.message);
-            pendingConfirmation.add(e);
-        }
+            for (Event e : pendingEmit)
+            {
+                Log.i("SyncManager", "Emitting: " + e.message);
+                socket.emit(EVENT_POST_COMMAND, new JSONObject(e.message));
+                pendingConfirmation.add(e);
+            }
 
-        pendingEmit.clear();
+            pendingEmit.clear();
+        }
+        catch (JSONException e)
+        {
+            throw new RuntimeException(e);
+        }
     }
 
     public void close()
@@ -190,8 +198,7 @@ public class SyncManager
         public void call(Object... args)
         {
             Log.i("SyncManager", "Sending auth message");
-            JSONObject authMsg = buildAuthMessage();
-            socket.emit(EVENT_AUTH, authMsg.toString());
+            socket.emit(EVENT_AUTH, buildAuthMessage());
         }
 
         private JSONObject buildAuthMessage()
@@ -219,7 +226,6 @@ public class SyncManager
             try
             {
                 Log.d("SyncManager", String.format("Received command: %s", args[0].toString()));
-
                 JSONObject root = new JSONObject(args[0].toString());
                 updateLastSync(root.getLong("timestamp"));
                 executeCommand(root);
@@ -260,8 +266,7 @@ public class SyncManager
             Log.i("SyncManager", "Requesting commands since last sync");
 
             Long lastSync = prefs.getLong("lastSync", 0);
-            JSONObject fetchMsg = buildFetchMessage(lastSync);
-            socket.emit(EVENT_FETCH, fetchMsg.toString());
+            socket.emit(EVENT_FETCH, buildFetchMessage(lastSync));
         }
 
         private JSONObject buildFetchMessage(Long lastSync)