Merge pull request #69 from webOS-ports/Garfonso/work

Garfonso/work

app-enyo/source/CDavApp.js

@@ -198,11 +198,7 @@ enyo.kind({
 		this.$.numEvents.setContent($L("Number of events: tbd"));
 
 		this.$.running.setContent($L("Sync is not running."));
-		if (this.lastStatus) {
-			this.$.lastMessage.setContent($L("Last Status: ") + this.lastStatus);
-		} else {
-			this.$.lastMessage.setContent($L("Status: "));
-		}
+		this.$.lastMessage.setContent($L("Status: "));
 		this.$.numDownloaded.setContent($L("Downloads: No downloads"));
 		this.$.numUploaded.setContent($L("Uploads: No uploads"));
 	},
@@ -289,6 +285,10 @@ enyo.kind({
 				}
 			}
 
+			if (!found) {
+				this.$.running.setContent($L("Sync is running."));
+			}
+
 		} else {
 			this.$.running.setContent($L("Sync is not running."));
 			if (this.lastStatus) {

app/app/assistants/check-status-assistant.js

@@ -181,6 +181,10 @@ CheckStatusAssistant.prototype.processStatus = function (status) {
 			}
 		}
 
+		if (!found) {
+			this.runningDisplay.innerHTML = "Sync is running.";
+		}
+
 	} else {
 		this.runningDisplay.innerHTML = "Sync is not running.";
 		this.downNumbersDisplay.innerHTML = "No downloads";

build.sh

@@ -1,29 +1,3 @@
 #!/bin/bash
 
-RESULT=org.webosports.cdav_0.3.20_all
-
-rm *.ipk
-
-mv service/javascript/kinds.js service/javascript/kinds_no_upsync.js
-mv service/javascript/kinds_upsync.js service/javascript/kinds.js
-
-palm-package package app service accounts accounts-google-mojo accounts-icloud accounts-yahoo
-
-mv $RESULT".ipk" $RESULT"_upsync.ipk"
-
-palm-package package app-enyo service accounts-enyo accounts-google accounts-icloud accounts-yahoo
-
-mv $RESULT".ipk" $RESULT"_enyo_upsync.ipk"
-
-mv service/javascript/kinds.js service/javascript/kinds_upsync.js
-mv service/javascript/kinds_no_upsync.js service/javascript/kinds.js
-
-palm-package package app service accounts accounts-google-mojo accounts-icloud accounts-yahoo
-
-mv $RESULT".ipk" $RESULT"_no_upsync.ipk"
-
-palm-package package app-enyo service accounts-enyo accounts-google accounts-icloud accounts-yahoo
-
-mv $RESULT".ipk" $RESULT"_enyo_no_upsync.ipk"
-
-palm-install $RESULT"_upsync.ipk"
+node build.js $1

service/javascript/assistants/serviceassistant.js

@@ -63,6 +63,7 @@ var ServiceAssistant = Transport.ServiceAssistantBuilder({
 
 			if (launchArgs.$activity && launchArgs.$activity.name && launchArgs.$activity.name.indexOf("SyncOnEdit") === 0) {
 				Log.log("SyncOnEdit => run only this sync!");
+				launchArgs.syncOnEdit = true;
 				if (launchArgs.$activity.name.indexOf("contact") > 0) {
 					launchArgs.capability = "CONTACTS";
 				} else if (launchArgs.$activity.name.indexOf("calendarevent") > 0) {

service/javascript/assistants/syncassistant.js

@@ -21,8 +21,11 @@ var SyncAssistant = Class.create(Sync.SyncCommand, {
 		this.recreateActivitiesOnComplete = true;
 
 		if (!args.capability) {
+			SyncStatus.setRunning(this.client.clientId);
 			errorOut = function (msg) {
 				Log.log(msg);
+				SyncStatus.setStatus("Error: " + msg);
+				SyncStatus.setDone(this.client.clientId);
 				outerfuture.result = { returnValue: false, success: false, message: msg };
 				return outerfuture;
 			};
@@ -98,13 +101,25 @@ var SyncAssistant = Class.create(Sync.SyncCommand, {
 			future.then(this, function syncsCB() {
 				var result = checkResult(future);
 				Log.log("All syncs done, returning.");
+				SyncStatus.setDone(this.client.clientId);
 				outerfuture.result = result;
 			});
 		} else {
+			if (args.syncOnEdit) {
+				SyncStatus.setRunning(this.client.clientId);
+			}
 			//we have a capability, run usual sync
 			this.SyncKey = new SyncKey(this.client, this.handler);
 
-			this.$super(run)(outerfuture);
+			this.$super(run)(future);
+			future.then(function syncCameBackCB() {
+				var result = checkResult(future);
+				Log.debug("Sync came back: ", result);
+				if (args.syncOnEdit) {
+					SyncStatus.setDone(this.client.clientId);
+				}
+				outerfuture.result = result;
+			});
 		}
 
 		return outerfuture;

service/javascript/utils/SyncStatus.js

@@ -23,18 +23,20 @@ var SyncStatus = (function () {
 			acctObj = {};
 			perAccountStatus[accountId] = acctObj;
 		}
-		kind = acctObj[kindName];
-		if (!kind) {
+		kind = acctObj[(kindName || "empty")];
+		if (kindName && !kind) {
 			kind = {};
 			acctObj[kindName] = kind;
 		}
 
 		//transport running status to outside
-		if (field === "running") {
+		if (field === "running" && !kindName) {
 			acctObj.running = value;
 		}
 
-		kind[field] = value;
+		if (kind) {
+			kind[field] = value;
+		}
 		if (!silent) {
 			callCallbacks(accountId);
 		}