wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Made bookmarkSharingManager._updateOutgoingShare tolerant of outgoing shares that are lacking a server path annotation: it will warn that they're invalid and return, rather than dying.

Browse Source
This commit is contained in:
jonathandicarlo@jonathan-dicarlos-macbook-pro.local 2008-07-09 16:57:55 -07:00
parent 436fb329bb
commit 98215f2fc8
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
services/sync/modules/engines/bookmarks.js
View File

@ -449,8 +449,12 @@ BookmarksSharingManager.prototype = {
To be called asynchronously.
TODO: error handling*/
let self = yield;
// The folder has an annotation specifying the server path to the
// directory:
// The folder should have an annotation specifying the server path to
// the directory:
if (!this._annoSvc.itemHasAnnotation(folderId, SERVER_PATH_ANNO)) {
this._log.warn("Outgoing share is invalid and can't be synced.");
return;
}
let serverPath = this._annoSvc.getItemAnnotation(folderId,
SERVER_PATH_ANNO);
// TODO the above can throw an exception if the expected anotation isn't
@ -459,9 +463,6 @@ BookmarksSharingManager.prototype = {
// key that we'll use to encrypt.
let keyringFile = new Resource(serverPath + "/" + KEYRING_FILE_NAME);
keyringFile.pushFilter(new JsonFilter());
// TODO request for share/a317b645-2c2f-6946-aea0-d728509091d4/keyring
// fails with a 404 even though THE FILE IS THERE. Maybe it's not prepending this
// with /user/jono like it should be??? put debugging info into DAV.GET?
keyringFile.get(self.cb);
let keys = yield;
@ -486,8 +487,7 @@ BookmarksSharingManager.prototype = {
};
Crypto.encryptData.async( Crypto, self.cb, json, tmpIdentity );
let cyphertext = yield;
bmkFile.put( self.cb, cyphertext );
yield;
yield bmkFile.put( self.cb, cyphertext );
self.done();
},