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

0.3.29
webOS-ports · Apr 28, 2015 · 7b13c28 · 7b13c28
2 parents 7606e70 + 4e1446d
commit 7b13c28
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+0.3.29:
+	o fixed: Sync was not working anymore in 0.3.28.
+2015-04-28: Achim Königs <garfonso@mobo.info>
+
 0.3.28:
 	o fixed: LuneOS could not create Google accounts anymore.
 	o fixed: Under some circumstances allday events could not be synced to google

diff --git a/package/packageinfo.json b/package/packageinfo.json
@@ -2,7 +2,7 @@
 	"id": "org.webosports.cdav",
 	"package_format_version": 2,
 	"loc_name": "C+DAV synergy connector",
-	"version": "0.3.28",
+	"version": "0.3.29",
 	"vendor": "WebOS Ports - Stefan Schmidt",
 	"vendorurl": "www.webos-ports.org",
 	"app": "org.webosports.cdav.app",

diff --git a/service/javascript/assistants/syncassistant.js b/service/javascript/assistants/syncassistant.js
@@ -498,14 +498,14 @@ var SyncAssistant = Class.create(Sync.SyncCommand, {
 							uri: home,
 							remoteId: home
 						});
+					} else {
+						Log.log("Could not get remote folders. Skipping down sync.");
+						future.result = {
+							more: false,
+							entries: []
+						};
+						return future;
 					}
-				} else {
-					Log.log("Could not get remote folders. Skipping down sync.");
-					future.result = {
-						more: false,
-						entries: []
-					};
-					return future;
 				}
 
 				entries = ETag.parseEtags(rFolders, localFolders, this.currentCollectionId, this.SyncKey, "uri");

diff --git a/service/javascript/version.js b/service/javascript/version.js
@@ -1 +1 @@
-var PackageVersion = "0.3.28";
+var PackageVersion = "0.3.29";