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
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
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
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
dae06b83f1
Added test_bookmark_sharing to version control; note this doesn't pass right now (and in fact the main test is commented out.)
2008-06-30 18:50:06 -07:00
Dan Mills
3d16ec76a6
fix cooe engine's resetGUIDs method by importing async module; don't call runInBatchMode in bookmark engine's resetGUIDs, it doesn't work atm
2008-06-29 11:44:27 -07:00
Dan Mills
80417871c4
merge upstream changes
2008-06-29 07:07:11 -07:00
Dan Mills
e03543007a
make resetguids async
2008-06-29 07:00:53 -07:00
Anant Narayanan
089c1c0f42
General restructure for performance improvements (bug 441907, r=thunder)
2008-06-27 20:16:43 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
d654677b9a
Fixed several minor bugs with bookmark sharing
2008-06-26 17:00:55 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
3f37543011
Set up bookmarkEngine._incomingShareOffer to use Myk's new Notification stuff to offer a notification to the user, asking them to accept or reject the incoming share.
2008-06-25 15:54:33 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
6f37a50f99
The share/stop sharing menu item is now added only to normal bookmark folders: Not to the main bookmark menu or to magic folders like 'recently tagged' or whatever.
2008-06-25 11:58:04 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
b24d0c7180
Moved all of the bookmark-share stuff out of the bookmarkEngine class into a new BookmarksSharingManager class.
2008-06-24 21:15:14 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
bc4d891c3a
Moved the folder name and annotation for the incoming shares root folder to string constants.
2008-06-24 18:38:29 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
fcd94e31e2
Fixed all the places where I was accidentally calling it incomingShareAnno instead of incomingSharedAnno (note the missing letter d). Same for outgoingSharedAnno.
2008-06-24 18:28:01 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
4cba1fd51c
Removed all uses of the 'weave/mounted-shares-id' annotation, since it's been made obsolete by INCOMING_SHARED_ANNO.
2008-06-24 18:23:43 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
0edbf9998f
Changes in the annotations relevant to incoming/outgoing share folders are now handled by editCommands in the syncCore.
2008-06-24 18:15:17 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
4bc77b8e05
Annotations on incoming and outgoing share folders are now wrapped for sync, and handled on incoming createCommands.
2008-06-24 18:09:41 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
c4fa84f683
Merged
2008-06-24 13:41:12 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
03d94018af
Added todo about exception handling
2008-06-24 13:41:01 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
ed99f7cb53
Make the stop-sharing-data command work
2008-06-23 18:23:08 -07:00
Justin Dolske
6ed3755104
Bug 433949 - Use WeaveCrypto component (NSS) instead of OpenSSL
2008-06-23 16:23:57 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
4489fb2ce3
The XMPP server is now configured to use LDAP for authentication (on sm-labs01, and soon to be on services.mozilla too) so the xmpp username/password will now be the same as the weave username/password. So I now use those to login, and I got rid of the two extra preferences which we used to have for xmpp username/password.
2008-06-20 17:19:10 -07:00
Atul Varma
ac90aaff04
Refactoring: consolidated duplicate code creating GUIDs via XPCOM gunk into a new function, Utils.makeGUID().
...
Note that there are some strange things re: whitespace in engines/bookmarks.js in this changeset; I literally only changed one line, though, and I'm not sure where they came from. Maybe it was js2-mode?
2008-06-20 12:34:29 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
4f11d0d14d
Fixed some more missing commas that were preventing engines/bookmarks.js from loading
2008-06-19 15:25:25 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
28bf4dc4f6
Added missing comma after function definition
2008-06-19 15:23:01 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
d58bdfe874
Backed out changeset 7720a1dd564a because the new crypto stuff that it uses hasn't been enabled yet.
2008-06-19 11:59:52 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
bff803b730
Applied dolske's patch from bug 433949 to make the bookmarkEngine work with the new improved Crypto interface.
2008-06-19 11:41:57 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
5725f10629
Reimplemented most of _updateIncomingShare to work with the new implementation of _updateOutgoingShare. No more need for the ugly hack to temporarily set the root directory of DAV, hooray
2008-06-18 23:27:48 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
423c88e98c
Implemented _stopOutgoingShare (though it's still not being called from anywhere).
2008-06-18 23:00:09 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
624280ac82
Added documentation to createIncomingShare, rewrote it a little to be consistent with the other new stuff, and made it use annotations to keep track of the server path to the shared data.
2008-06-18 22:37:06 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
e4d31fe71d
Gave the bookmarksEngine a permanent (lazy-initialized) reference to the annotation service, rather than recreating the reference every single time we use the service. Which is a lot of times now.
2008-06-18 20:53:11 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
9cc02dd84a
Implemented _updateAllOutgoingShares in bookmarkEngine.
2008-06-18 20:45:01 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
f903901b8e
Removed an unneeded yield statement from startXmppClient (this was raising warnings about yeilding without a callback.)
2008-06-18 18:48:17 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
8c09f36ad5
The xmpp messages that are sent when a share is offered now include the server-side path to the share directory.
2008-06-18 13:16:32 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
2a1462352b
Merged
2008-06-18 12:48:26 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
0bef123361
made all calls to Resource.get() and Resource.put() properly asynchronous.
2008-06-18 12:48:20 -07:00
Atul Varma
1ab8baed0c
Fixed typos.
2008-06-18 12:45:02 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
03cf0d6f73
Removed the check of whether the directory exists before creating it, in _createOutgoingShare(): realized it's not neccessary since DAV.MKCOL already does it.
2008-06-18 12:41:34 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
6503df042f
Added documentation to BookmarkEngine._updateOutgoingShare.
2008-06-18 12:29:25 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
eb2aa3c9bb
Complete rewrite of _createOutgoingShare and _updateOutgoingShare in BookmarkEngine, using remote.Resource objects and Crypto.
2008-06-18 12:26:51 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
43eec5b867
In the middle of trying to make createOutgoingShare work with Dan's changes (getSymKey having been moved to remote.js, etc.)
2008-06-16 17:52:24 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
f6cc70889f
Trying to debug _createOutgoingShare...
2008-06-16 15:52:15 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
6ce93ffd1d
Merged
2008-06-16 11:24:41 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
835100b96d
Fixed some minor bugs -- the name of the incoming shared folder is parsed correctly, and xmppClient now catches bounce errors that were previously parsed as messages.
2008-06-13 16:20:43 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
c548d4b940
Made the initialization of the xmppClient an asynchronous call. This included modifying xmppClient.js so that connect() can be passed a callback function that will get called once the connection has succeeded or failed. For most of our purposes this is probably a better API than what we had before where you call waitForConnection() and it busy-waits until the connection has succeeded or failed.
2008-06-12 17:35:44 -07:00
