Commit graph

34 commits

Author SHA1 Message Date
Brian Clements
f00f8eb1d9 Issue #2756 implemented HTTP public key auth scheme
collaboration HTTP server now requires auth header (configured via openfire)
added auth to cave client


Former-commit-id: 9d0b02e0a4 [formerly ce24bd1018] [formerly 9d0b02e0a4 [formerly ce24bd1018] [formerly d8e283e1b4 [formerly e0e4dfdedff283c809060257fbf04e777faf318d]]]
Former-commit-id: d8e283e1b4
Former-commit-id: f56cbac9fb [formerly edd72cbde4]
Former-commit-id: 6d4abdc37c
2014-02-28 16:15:17 -06:00
Mike Duff
6c60255b75 Issue #2632 - Implement buddy pounce (Contact Notifiers)
Review comments

Change-Id: I7492b84b59406cf2ddbc65d9e6fc7c0c41c30ce7

Former-commit-id: 377c1f9998 [formerly 5440ff64d1] [formerly 377c1f9998 [formerly 5440ff64d1] [formerly 5f433b4f6b [formerly 8ece6e53095ee80d7d4baa249125b3fe7a03add7]]]
Former-commit-id: 5f433b4f6b
Former-commit-id: 63fc5f8c66 [formerly ee06fc58b5]
Former-commit-id: 02fa0d3c59
2014-02-28 13:23:34 -06:00
Brian Clements
48cfc3c933 Issue #2751 fixed leader transfer infinite loop, added event validation
added username to paths in http urls to prevent old events from being picked up with new leader
added simple check to prevent invalid leader change events from being processed


Former-commit-id: 9217ba24c5 [formerly 3f362519aa] [formerly 9217ba24c5 [formerly 3f362519aa] [formerly 386e9cc96a [formerly 58c826ec371f10295fa6f4e236ff85a52698719d]]]
Former-commit-id: 386e9cc96a
Former-commit-id: 73cb7b7313 [formerly b9c9be4c4f]
Former-commit-id: 4abf737852
2014-02-24 13:19:07 -06:00
Brian Clements
9b0fd74f5b Issue #2751 implemented room/topic ownership transfer
Former-commit-id: a8ff1effc1 [formerly c3cadff705] [formerly a8ff1effc1 [formerly c3cadff705] [formerly ab72938246 [formerly cf5041f2d052c4900e2871e0fc8dc1a2b71794de]]]
Former-commit-id: ab72938246
Former-commit-id: 9d00fe2bab [formerly d9ac2c0037]
Former-commit-id: d218686d1f
2014-02-20 11:10:14 -06:00
Brian Clements
b47b194564 Issue #2751 fixed chat room bugs
fixed history messages having incorrect 'from' type
added ignore to dispose messages after room is closed
renamed tool tip for userid to match how JIDs are labled in client


Former-commit-id: 06c16118e1 [formerly dc074a9650] [formerly 06c16118e1 [formerly dc074a9650] [formerly 3a135b8eac [formerly 453604eca5fca9e5d14ba1842dc7f76f1e0180ca]]]
Former-commit-id: 3a135b8eac
Former-commit-id: 77bb396c9a [formerly bee7cdb71a]
Former-commit-id: ddc0945e40
2014-02-19 08:32:26 -06:00
Nate Jensen
337aa2f312 Merge "Issue #2756 new collaboration openfire plugin and http service" into development
Former-commit-id: ac0a10678b [formerly 020d54c48a] [formerly ac0a10678b [formerly 020d54c48a] [formerly b08d96b1e8 [formerly e483f4311d00726f023d30e6d3f4e813c559390e]]]
Former-commit-id: b08d96b1e8
Former-commit-id: 4bb0997749 [formerly a6bb05f2e3]
Former-commit-id: 3c9ebe52d3
2014-02-18 14:51:13 -06:00
Nate Jensen
1e6b1343b0 Merge "Issue #2793 improved collaboration disconnect handling" into development
Former-commit-id: 1738248fac [formerly c63289fa14] [formerly 1738248fac [formerly c63289fa14] [formerly b3c45b303c [formerly bf0a607b05ffb042e998d2c9940091137da21dc0]]]
Former-commit-id: b3c45b303c
Former-commit-id: 2e468e9ec1 [formerly 173c646576]
Former-commit-id: b1dc1e8849
2014-02-18 11:22:19 -06:00
Brian Clements
c38397e00b Issue #2793 improved collaboration disconnect handling
collaboration was being shutdown even though smack was trying to reconnect
changed to notify of disconnect, but not shutdown until reconnect fails


Former-commit-id: 9095a1584f [formerly a28fcf0dc5] [formerly 9095a1584f [formerly a28fcf0dc5] [formerly 7028f7fd4d [formerly 231c3cd84e3c86caba81708581be911e771aa774]]]
Former-commit-id: 7028f7fd4d
Former-commit-id: 9d9c4c7c27 [formerly 510c39713f]
Former-commit-id: 3bf2a08c57
2014-02-18 11:11:33 -06:00
Brian Clements
f866ac4365 Issue #2756 new collaboration openfire plugin and http service
new servlet http service that communicates with openfire for configuration
new openfire plugin to reflect new http service
openfire and http service no longer need to be on same machine
moved http header parsing code from ogc to common util
updated collaboration http code to prefer XML instead of HTML


Former-commit-id: f0c89ef6c6 [formerly f6b2827434] [formerly f0c89ef6c6 [formerly f6b2827434] [formerly 5b4f1e8288 [formerly ff23569984eee43927c10ca041ca7e0ca4d40a3b]]]
Former-commit-id: 5b4f1e8288
Former-commit-id: 02319f36e4 [formerly a1d9e40bd4]
Former-commit-id: 5889341612
2014-02-18 10:03:12 -06:00
Brian Clements
fab5759a01 Issue #2800 added equals/hashcode to classes used in roster tree
tree view uses hashmap to decide if a node is new
tree was collapsing groups/sessions on refresh since it thought they were new nodes


Former-commit-id: 6d71686332 [formerly 3b5648c055] [formerly 6d71686332 [formerly 3b5648c055] [formerly 3dfd8fbafb [formerly 9a4b091f7e2655f48fd061021d161c4eb2e63dd8]]]
Former-commit-id: 3dfd8fbafb
Former-commit-id: 0d07e417fc [formerly 9dc2967e3f]
Former-commit-id: cd7abc37fc
2014-02-17 16:39:43 -06:00
Nate Jensen
65068869e1 Issue #2751 first cut of transfer leadership
Change-Id: Ia0495d8d5acfe28801ceb416090d47c250ecf0f9

Former-commit-id: 63d5f94cbb [formerly e05f1eae96] [formerly 63d5f94cbb [formerly e05f1eae96] [formerly a85575a763 [formerly cd0a838d34c9d7533bf59a477a17f4cb1af75a00]]]
Former-commit-id: a85575a763
Former-commit-id: 139479b4e1 [formerly 11fb06810f]
Former-commit-id: 70285796ac
2014-02-13 15:35:53 -06:00
Nate Jensen
1aeeeffb0d Merge "Issue #2700 fixed subscribe request group input" into development
Former-commit-id: f2b32fa1ae [formerly 2643d01b74] [formerly f2b32fa1ae [formerly 2643d01b74] [formerly d8e2d2837e [formerly af0e70e20c2a5ca276e9b819285d34c0113cafe7]]]
Former-commit-id: d8e2d2837e
Former-commit-id: 1f3c4090a0 [formerly b31470f7e3]
Former-commit-id: 3fb847a74c
2014-02-13 14:02:55 -06:00
Brian Clements
aa06f65038 Issue #2751 user identity refactor
VenueParticipant no longer a subtype of UserId
New interface for both
refactored base classes to be generic for user types


Former-commit-id: 16ed18e0c6 [formerly ef52908906] [formerly 16ed18e0c6 [formerly ef52908906] [formerly 0ac7ff81cf [formerly e91ae6eacf4af9e25afc213c3cd0c269c8d465f4]]]
Former-commit-id: 0ac7ff81cf
Former-commit-id: e6de3a118d [formerly 3ec3ad0543]
Former-commit-id: 1cc21dc160
2014-02-13 13:51:39 -06:00
Brian Clements
a3157035bc Issue #2700 fixed subscribe request group input
user was being added to roster twice, the second time overwrote the group info
changed dialog to pass group info back so we only add once


Former-commit-id: 2d72c0f475 [formerly 579f7c826d] [formerly 2d72c0f475 [formerly 579f7c826d] [formerly caa8360ac7 [formerly 0c4a7915870f374cb4e728303939335cb0691c84]]]
Former-commit-id: caa8360ac7
Former-commit-id: 46ea69990d [formerly bafe2972a4]
Former-commit-id: 8b618ea95b
2014-02-13 09:47:02 -06:00
Brian Clements
e286a68dc1 Issue #2797 fixed presence bug
a defensive copy was needed when sending presence to rooms


Former-commit-id: 22031aa87d [formerly 81ddf87b04] [formerly 22031aa87d [formerly 81ddf87b04] [formerly 23e2039028 [formerly d0dab4bce76b45b71f4238d5a04c440cee936eaf]]]
Former-commit-id: 23e2039028
Former-commit-id: a1ba9c6b9d [formerly 09859bdee9]
Former-commit-id: 57dd054176
2014-02-12 16:54:46 -06:00
Brian Clements
f23e9fcea0 Issue #2793 improved error handling for packet extension
any exception thrown while parsing packets disconnects stream
changed to logging parsing problems and returning empty payload so we stay connected
added null check when sending to topic


Former-commit-id: 3034ac5994 [formerly e381edcd60] [formerly 3034ac5994 [formerly e381edcd60] [formerly b0714ba659 [formerly 808727ce287116be8c8e2a93ce0fc4b3a996c0ef]]]
Former-commit-id: b0714ba659
Former-commit-id: b94bc84429 [formerly 4406477877]
Former-commit-id: 73241ebeb7
2014-02-12 14:22:33 -06:00
Brian Clements
27f19f406a Issue #2699 removed over cautious handle validation
xmpp does not limit the characters that can go in a handle
fixed id from room parsing to account for special characters


Former-commit-id: 639f774567 [formerly 7d6e116b9f] [formerly 639f774567 [formerly 7d6e116b9f] [formerly 6518b88fe5 [formerly 24343a796d0089824dde2f7039cdf93ed0ebf88c]]]
Former-commit-id: 6518b88fe5
Former-commit-id: 6efb4f51d2 [formerly 8742be3a13]
Former-commit-id: 014b59e1a1
2014-02-07 10:06:06 -06:00
Brian Clements
cd1b7dec1b Issue #2699 fixed assumption that usersearch was exact
usersearch returns matches for any part of string
added method to restrict to exact matches only


Former-commit-id: bebd62c6b6 [formerly cfa3c9e0e8] [formerly bebd62c6b6 [formerly cfa3c9e0e8] [formerly 6ea009a2e1 [formerly 74daa7109149073c615d13c25092f6d08a77b936]]]
Former-commit-id: 6ea009a2e1
Former-commit-id: bc75d43bc3 [formerly aff354a3d7]
Former-commit-id: 9370df47fe
2014-02-03 15:34:58 -06:00
Brian Clements
592cf33f35 Issue #2699 added handle config to prefs
default handle autofills session dialogs
is also used to connect to feed venue (error popup if already taken)


Former-commit-id: 21c75d1d01 [formerly 1ff4ed1ae9] [formerly 21c75d1d01 [formerly 1ff4ed1ae9] [formerly 16c1aaed3e [formerly f10f42753c541d4003b4c67a84a1d50e033941d3]]]
Former-commit-id: 16c1aaed3e
Former-commit-id: 2f60d1b579 [formerly 7c867338c8]
Former-commit-id: 671bfaa75c
2014-02-03 12:59:57 -06:00
Brian Clements
f2a97eb00e Issue #2700 fixed subscribe back after contact request accept
we were sending the wrong presence type when accepting request
pidgin handled it, but it wasn't to the spec
fixed by adding contact to roster if not already a friend
request authorization dialog doesn't prompt for group if they are already in one


Former-commit-id: 7176bf59b8 [formerly b88eaeb73e] [formerly 7176bf59b8 [formerly b88eaeb73e] [formerly b0402be1d3 [formerly 4d860337ea821975b6ddb4846f102199347a4dcc]]]
Former-commit-id: b0402be1d3
Former-commit-id: 9210aae10a [formerly b651ada4b3]
Former-commit-id: 7e1425c419
2014-01-31 13:10:35 -06:00
Brian Clements
cf8b85f3d2 Issue #2698 added handles to venues
venues now handle identity differently with VenueParticipant instead of UserId
fixed alias bug due to roster entry change


Former-commit-id: 4e2cb3f7ae [formerly 3e585945d6] [formerly 4e2cb3f7ae [formerly 3e585945d6] [formerly 3250eb34f5 [formerly 9a8b011683ffe7194c48b1827d3a4f0ddf4f9627]]]
Former-commit-id: 3250eb34f5
Former-commit-id: 4190b13ae2 [formerly 4f4d5c5d69]
Former-commit-id: e04cb11154
2014-01-31 09:44:31 -06:00
Brian Clements
96e89d9f83 Issue #2698 made sessions private and invite only
removed venue info because you can't get it for private rooms
improved error handling for existing room when attempting to create
fixed default compression config


Former-commit-id: 1f1be20d41 [formerly c498307b30] [formerly 1f1be20d41 [formerly c498307b30] [formerly 5b9f694930 [formerly 850cbc03ebea6f26ac7095abffe7729985c426c4]]]
Former-commit-id: 5b9f694930
Former-commit-id: 07452b7778 [formerly 4a0682a9e8]
Former-commit-id: 76ec4d56c8
2014-01-29 10:16:15 -06:00
Brian Clements
ad3939140c Issue #2700 added contact request dialog
user is now prompted to accept contact request
added support for managing contacts that haven't accepted contact requests
contacts list shows new icon for contacts that haven't accepted contact requests


Former-commit-id: b4d930bcb9 [formerly 6b1843f19a] [formerly b4d930bcb9 [formerly 6b1843f19a] [formerly bd19366ada [formerly 8ad4c1674d2719a7781eb137669eb15212a1488c]]]
Former-commit-id: bd19366ada
Former-commit-id: bffa4d84fe [formerly f22052321b]
Former-commit-id: 737745ade7
2014-01-28 10:07:11 -06:00
Brian Clements
ff1882e80a Issue #2701 removed local groups from collaboration
added shared groups to represent groups managed by server
local group actions changed to modify roster groups
code cleanup on contacts manager including removing unneeded roster manager
update script to clean up localization files
removed ui option to create an empty group


Former-commit-id: b86ad8ca6f [formerly f615f2226f] [formerly b86ad8ca6f [formerly f615f2226f] [formerly 26ac549096 [formerly 06a9db4836fa2753a913e2314a8c003380416eac]]]
Former-commit-id: 26ac549096
Former-commit-id: cfe945d76b [formerly 8944860cbb]
Former-commit-id: dd9b3ca640
2014-01-27 10:14:10 -06:00
Brian Clements
67e65db850 Issue #2630 fixed status parsing bug
status from preference store wasn't being parsed correctly
changed connection data to store as Mode object instead of string
added parse method to collaboration utils


Former-commit-id: 45b5df24d4 [formerly 79446d983b] [formerly 45b5df24d4 [formerly 79446d983b] [formerly bf6cf2f2ee [formerly 0176ba7963a5ff5bbd37b2e0867cbf97f4a3ef66]]]
Former-commit-id: bf6cf2f2ee
Former-commit-id: bfbcbf382a [formerly 1219713128]
Former-commit-id: 7afcf37c11
2014-01-15 10:24:09 -06:00
Brian Clements
542e01f322 Issue #2563 added user server add/remove functionality
now persists user entered servers to localization


Former-commit-id: af9292ea71 [formerly 487aa58778] [formerly af9292ea71 [formerly 487aa58778] [formerly c8cfc788f3 [formerly 43fc94e9cc2a7f518971d509478f3b9a65588d19]]]
Former-commit-id: c8cfc788f3
Former-commit-id: a8f746f794 [formerly 0c5b0eaf69]
Former-commit-id: 30521ee989
2014-01-09 13:19:59 -06:00
Brian Clements
7da97f676f Issue #2563 fixed room id creation
room ids were being generated with the hostname used to connect to the server
they needed to be generated with what the server calls itself


Former-commit-id: a78b1d96af [formerly 82716fa147] [formerly a78b1d96af [formerly 82716fa147] [formerly 66df912a4e [formerly 99fb102b270baa5c45f1c9963f47344ede93a34a]]]
Former-commit-id: 66df912a4e
Former-commit-id: 12c7371565 [formerly 649483d3fd]
Former-commit-id: 33b9ecb2ab
2014-01-07 13:04:24 -06:00
Brian Clements
41f6c010af Issue #2563 roster updates for stock servers
added functionality that makes the contact list compatible with server rosters that could be modified with other clients
added support for roster entries that aren't in a local or server group


Former-commit-id: b120d74099 [formerly 2b8668a4eb] [formerly b120d74099 [formerly 2b8668a4eb] [formerly e4bd8a3e2c [formerly 23d898308fb3aa673d85fdf00495d43e4c02a08f]]]
Former-commit-id: e4bd8a3e2c
Former-commit-id: 0882672686 [formerly 4b4c7ba50c]
Former-commit-id: 98fd3e6a4c
2013-12-20 12:03:04 -06:00
Brian Clements
b9977a1357 Issue #2563 compatibility features for stock xmpp servers
added more listener handling for venue events and server disconnection
added capability to connect to a different server from UI
added better error messages for failed connection/login to server
fixed assumptions that server always sends HTTP url and has feed chatroom


Former-commit-id: 621a8536e6 [formerly 09c0267237] [formerly 621a8536e6 [formerly 09c0267237] [formerly af83c0cf87 [formerly b3173727f3f685119be3668779eb5da7e075df50]]]
Former-commit-id: af83c0cf87
Former-commit-id: 917d8dffee [formerly 43021ae281]
Former-commit-id: e5430b4510
2013-12-20 10:41:13 -06:00
Brian Clements
5ede797e27 Issue #2562 moved session data from chat to packet extension
delegated compression to smack
added timeout for http config
fixed getting all joined venues
fixed room invitation from non-cave client
create session checks for session name already used


Former-commit-id: 2c20a87634 [formerly 80650337ce] [formerly 2c20a87634 [formerly 80650337ce] [formerly ce0a34b53c [formerly 3781483ef6dd1889aa0ecd6ccc83bfb2461713b5]]]
Former-commit-id: ce0a34b53c
Former-commit-id: d58f8d7134 [formerly 4015dc23ee]
Former-commit-id: aa8d869635
2013-12-19 12:08:21 -06:00
Brian Clements
d7ddaa295d Issue #2561 removed ECF from collaboration
added smack 3.3.1 to cots
collaboration now uses smack directly for XMPP
moderate code cleanup on collaboration.comm
added double click to start chat in participant list


Former-commit-id: 5d1d44b60d [formerly 8ece30944a] [formerly 5d1d44b60d [formerly 8ece30944a] [formerly e6c4b39aca [formerly 6fc85f79c126283eb4dbddfa94943523d9ff0a6d]]]
Former-commit-id: e6c4b39aca
Former-commit-id: 5a7fca6352 [formerly b8df043202]
Former-commit-id: 0cf7b822ce
2013-12-06 17:07:16 -06:00
Ben Steffensmeier
a92af46f59 Issue #2491 Fix collaboration Xml.
Former-commit-id: a5f970e238 [formerly 3d36cec7be] [formerly a5f970e238 [formerly 3d36cec7be] [formerly fdeff81da2 [formerly 64517ab3139be3cc21d5df7ff9d36709435bd7cd]]]
Former-commit-id: fdeff81da2
Former-commit-id: 89c999410e [formerly 49ffb7e92c]
Former-commit-id: a0e805ded6
2013-10-31 14:06:37 -05:00
Steve Harris
b7f180d9d3 13.1.2-6 baseline
Former-commit-id: efd3392abe [formerly 8e5f9e0e6c] [formerly efd3392abe [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]
Former-commit-id: 59969775ad
Former-commit-id: 82a1ed77a4 [formerly dbcae57f57]
Former-commit-id: 05bdc0ecd2
2013-01-06 14:55:11 -06:00
Steve Harris
35e34308c5 12.11.1-4 baseline
Former-commit-id: 98171b5de9 [formerly d3497e47eb] [formerly 98171b5de9 [formerly d3497e47eb] [formerly 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: 2c82d9cb07 [formerly cbbdb231ce]
Former-commit-id: 560f0d9cc3
2012-10-16 13:27:07 -05:00