Commit Graph

138 Commits

Author SHA1 Message Date
Dan Mills
a67aabffa4 add logic to detect when the same item is in both incoming & outgoing queues, but with different IDs - change the local ID in that case 2008-11-27 00:25:28 +09:00
Dan Mills
c221d2ea8e decrypt incoming items all in one go so as to sort them by index (which is inside the payload); don't attempt to change the index of an item if we're also changing its folder; only change index/parent if it's different from current value 2008-11-26 14:07:18 +09:00
Dan Mills
36a866416f query the bookmarks service to find out if we have an item (instead of our snapshot cache) 2008-11-25 14:49:18 +09:00
Dan Mills
fb99c9f85e fix bookmark deletion sync 2008-11-25 01:49:02 +09:00
Dan Mills
35bbc1b8c0 work with NewEngine 2008-11-20 09:21:12 +09:00
Dan Mills
6f6665b8e1 remove some sharing code, derive from NewEngine 2008-11-06 19:18:46 -08:00
Dan Mills
d3af90034a hg merge 2008-11-03 15:02:00 -08:00
Dan Mills
6151afb26d fix log4moz calls (new api), fix module imports for renamed modules 2008-11-03 15:00:38 -08:00
Dan Mills
6a2010fc4c disable bookmark sharing hooks 2008-10-16 12:30:30 -07:00
Dan Mills
75326713c1 Bug 443489: use the correct cookie xpcom interface 2008-10-16 12:29:21 -07:00
Dan Mills
e53290c477 catch exceptions from microsummaries that don't have a static title set 2008-08-13 15:23:15 -07:00
Dan Mills
72f3cc9e31 Bug 450396: password engine does not define a tracker 2008-08-13 15:19:56 -07:00
Dan Mills
556e90536f merge upstream changes 2008-08-08 14:43:36 -07:00
Dan Mills
1f877adb30 move some code from the engine to remote.js; rename FileEngine to BlobEngine (since it doesn't actually sync complete files); clean up SyncEngine's sync method 2008-08-08 14:42:57 -07:00
Anant Narayanan
c200956d6a Syncing for Awesome bar (bug 437133, r=thunder) 2008-08-07 20:00:35 -07:00
Anant Narayanan
94b9dfcd2e Automated merge with ssh://anarayanan@mozilla.com@hg.mozilla.org/labs/weave 2008-08-04 17:23:36 -07:00
Anant Narayanan
8d3528d073 Asynchronous bookmark sharing (bug 449113, r=thunder) 2008-08-04 17:23:23 -07:00
Dan Mills
c5a94ec81c filter out invalid tags when applying edit commands 2008-07-31 00:21:22 -07:00
Dan Mills
0102f2cd60 more tab sync fixes, only disposing is left to fix; also allow the notify wrapper to pass along an optional data payload 2008-07-30 21:58:13 -07:00
Dan Mills
16810a84f4 get tab sync halfway working again, with fileengine 2008-07-30 00:05:09 -07:00
Dan Mills
0ecc2cdce5 sync the *latest* 10 back-button entries per tab (not the earliest ones) 2008-07-29 15:37:59 -07:00
Dan Mills
58affe8131 Implement FileEngine 2008-07-25 17:02:43 -07:00
Dan Mills
c678010dcf split Engine into SyncEngine and FileEngine 2008-07-25 01:06:23 -07:00
Dan Mills
8a7e0e07a2 only wrap the first 10 entries in a tab 2008-07-23 15:46:13 -07:00
Dan Mills
112006ce5f rollback last commit (1843a139184a), it causes cookie unit test to fail 2008-07-16 21:11:18 -07:00
Dan Mills
76d45e6917 Bug 443489: Use nsICookie2 interface instead of nsICookie. Patch by fabrice@bellet.info 2008-07-16 20:51:25 -07:00
Chris Beard
e9ac166a41 * major revision to the login dialog to be more robust, adding error handling, styling and a help link
* some minor hacking of the login progress to improve performance
* expanded the application exit sync dialog to be a general modal sync dialog that will display whenever appropriate (e.g. during initial setup, on manual "sync now" requests, and on application exit)
* added a progress meter and status messages to the modal sync dialog to provide users with a better understanding of what's going on, and to assist in debugging
* added ability to cancel a modal sync request, including on application exit. when cancel is clicked on by the user, it will attempt to cancel the sync at the next opportunity (i.e. before the next sync engine is processed)
2008-07-09 17:17:24 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
98215f2fc8 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. 2008-07-09 16:57:55 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
436fb329bb Made wrapping of outgoing shares not crash if an outgoing share is missing an exptected annotation. 2008-07-09 13:45:10 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
3cc4b5541f Restored a line in bookmarkSharingManager.js which I took out by accident when removing debugging dumps and stuff, changeset 969. It should not have been taken out; without it you get 'mounts undefined' error. 2008-07-09 13:24:49 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
a0611ee8e1 I think I have fixed updateIncomingShare now. So everything should work, if I share with a user not myself. 2008-07-08 22:39:05 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
7f36e552e6 Removed a bunch of dump statements that were in bookmarkSharingManager for old debugging stuff that is now done; they were just cluttering up the log. 2008-07-08 15:05:24 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
cfe420f221 updateOutgoingShare now explicitly encodes data to json before encrypting and uploading. 2008-07-08 14:52:31 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
5d937affe2 Fixed a typo in sendXmppNotification call 2008-07-08 14:51:14 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
2895b903a2 Fixed another trivial bug in BookmarkSharingManager._stopSharing that was making it fail at sending out the xmpp notification. 2008-07-08 14:19:26 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
55ec19cf3c Fixed some trivial bugs in BookmarkStore._wrapMountOutgoing that were preventing the outgoing share from working properly. 2008-07-08 14:15:55 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
2b8d2d7cb3 Factored the sending of xmpp notifications in bookmarkSharingManager out into a separate function, to save some duplicated code and make it easier to break xmpp stuff into a separate class later. Also made the bookmarkSharingManager cache the current weave username, which it uses a lot. Finally it now prepends /user/this._myUsername/ to server URLs to make them into absolute paths before sending them to the sharing partner over xmpp, which fixes a leftover TODO from a copule days ago. 2008-07-08 14:11:21 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
1cf9a1dea9 Fixed a bunch of bugs in bookmark share: stuf related to server-side paths being incorrect (because the defaultPrefix in DAV was getting reset to an empty string or was getting applied wrong). Discovered that updateOutgoingShare and updateIncomingShare were both calling the same _wrapMount() function, which was incorrect, so I broke that up and fixed what parts are meant to be outgoing and which incoming. 2008-07-08 01:18:30 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
9cfef4be35 Fixed a whole bunch of bugs in bookmark share, mostly related to adding in needed JsonFilters for remote Resources and fixing the server paths which are passed into DAV for the keyring file and encrypted share data files. (Also fixed a minor bug in DAV itself so that mkcol won't quit right away if you pass it something that starts with a slash.) 2008-07-03 17:57:21 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
f11ad3f3e3 Updated a couple of comments in bookmark sharing 2008-07-01 14:41:04 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
11dda58df6 Fixed yet another typo: this._sharing._share, not this._sharing.share. 2008-07-01 10:35:15 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
b7f7372c9f Fixed typo where undefined value was getting passed into share and stopSharing: should be node.itemId, not node.id 2008-07-01 10:31:16 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
fd7f338963 Fixed missing import 2008-07-01 10:27:19 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
a410545ba4 Fixed another typo 2008-07-01 10:26:01 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
fcb7743ce0 Fixed typo in BookmarkSharingManager._bms initialization 2008-07-01 10:24:52 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
10d9360015 Merged 2008-07-01 10:18:43 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
ba7249a10a Made _share() and _stopSharing() take bookmark item ID numbers instead of XUL nodes. 2008-07-01 10:18:35 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
aa859a7626 Made _stopSharing and _stopOutgoingShare more fault-tolerant (they will no longer die if the expected annotation is missing. 2008-07-01 09:58:00 -07:00
Dan Mills
802f7a254d fix cookie command logging; skip cookie commands for items we don't have 2008-06-30 23:26:35 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
5d960d2e8f Combined shareData and stopSharingData into one function to reuse code; made it so that if it gets called when Weave.DAV is already locked, instead of failing it sets up an observer that will trigger the share to happen as soon as the sync-succeeded or sync-failed message is received. 2008-06-30 22:30:04 -07:00