isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Emit JSON object instead of string

Browse Source
This commit is contained in:
Alinson S. Xavier
2016-05-19 10:35:44 -04:00
parent dd5f37290c
commit 2399dccddc
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/org/isoron/uhabits/sync/SyncManager.java
View File

@@ -162,20 +162,28 @@ public class SyncManager
e.save(); e.save();
Log.i("SyncManager", "Adding to outbox: " + msg.toString()); Log.i("SyncManager", "Adding to outbox: " + msg.toString());
pendingEmit.add(e); pendingEmit.add(e);
if(readyToEmit) emitPending(); if(readyToEmit) emitPending();
} }
private void emitPending() private void emitPending()
{ {
for (Event e : pendingEmit) try
{ {
Log.i("SyncManager", "Emitting: " + e.message); for (Event e : pendingEmit)
socket.emit(EVENT_POST_COMMAND, e.message); {
pendingConfirmation.add(e); 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() public void close()
@@ -190,8 +198,7 @@ public class SyncManager
public void call(Object... args) public void call(Object... args)
{ {
Log.i("SyncManager", "Sending auth message"); Log.i("SyncManager", "Sending auth message");
JSONObject authMsg = buildAuthMessage(); socket.emit(EVENT_AUTH, buildAuthMessage());
socket.emit(EVENT_AUTH, authMsg.toString());
} }
private JSONObject buildAuthMessage() private JSONObject buildAuthMessage()
@@ -219,7 +226,6 @@ public class SyncManager
try try
{ {
Log.d("SyncManager", String.format("Received command: %s", args[0].toString())); Log.d("SyncManager", String.format("Received command: %s", args[0].toString()));
JSONObject root = new JSONObject(args[0].toString()); JSONObject root = new JSONObject(args[0].toString());
updateLastSync(root.getLong("timestamp")); updateLastSync(root.getLong("timestamp"));
executeCommand(root); executeCommand(root);
@@ -260,8 +266,7 @@ public class SyncManager
Log.i("SyncManager", "Requesting commands since last sync"); Log.i("SyncManager", "Requesting commands since last sync");
Long lastSync = prefs.getLong("lastSync", 0); Long lastSync = prefs.getLong("lastSync", 0);
JSONObject fetchMsg = buildFetchMessage(lastSync); socket.emit(EVENT_FETCH, buildFetchMessage(lastSync));
socket.emit(EVENT_FETCH, fetchMsg.toString());
} }
private JSONObject buildFetchMessage(Long lastSync) private JSONObject buildFetchMessage(Long lastSync)