Commit graph

36 commits

Author SHA1 Message Date
Brian Clements
8aff9ee95c Issue #2751 ensured that room admins know real userids
the server can be queried for userids by room admins
this does not update the stored participant info in muc
added cached, on-demand check for userid for participants
needed for leadership transfer


Former-commit-id: dc94769c14 [formerly 44d161729f [formerly b3bf76b676b7e75559236d67c687cd5011859a8b]]
Former-commit-id: 44d161729f
Former-commit-id: 2afc1a9319
2014-03-07 15:37:29 -06:00
Mike Duff
ec892bb7a7 Issue #2798 - Fix user presence messages and settings
Peer review comments

Change-Id: I615edc12a7fe93540b5e62cf673b92829cac3dfa

Former-commit-id: 9c873e6dd9 [formerly e97e745b61 [formerly b087558dce4e19596c93d47e986af50fae806a74]]
Former-commit-id: e97e745b61
Former-commit-id: 25425a4268
2014-03-05 14:39:55 -06:00
Brian Clements
fd18963221 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: d8e283e1b4 [formerly ce24bd1018 [formerly e0e4dfdedff283c809060257fbf04e777faf318d]]
Former-commit-id: ce24bd1018
Former-commit-id: 9d0b02e0a4
2014-02-28 16:15:17 -06:00
Mike Duff
512e634a97 Issue #2632 - Implement buddy pounce (Contact Notifiers)
Review comments

Change-Id: I7492b84b59406cf2ddbc65d9e6fc7c0c41c30ce7

Former-commit-id: 5f433b4f6b [formerly 5440ff64d1 [formerly 8ece6e53095ee80d7d4baa249125b3fe7a03add7]]
Former-commit-id: 5440ff64d1
Former-commit-id: 377c1f9998
2014-02-28 13:23:34 -06:00
Brian Clements
a173972437 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: 386e9cc96a [formerly 3f362519aa [formerly 58c826ec371f10295fa6f4e236ff85a52698719d]]
Former-commit-id: 3f362519aa
Former-commit-id: 9217ba24c5
2014-02-24 13:19:07 -06:00
Brian Clements
4e165aba58 Issue #2751 implemented room/topic ownership transfer
Former-commit-id: ab72938246 [formerly c3cadff705 [formerly cf5041f2d052c4900e2871e0fc8dc1a2b71794de]]
Former-commit-id: c3cadff705
Former-commit-id: a8ff1effc1
2014-02-20 11:10:14 -06:00
Brian Clements
abc01f5475 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: 3a135b8eac [formerly dc074a9650 [formerly 453604eca5fca9e5d14ba1842dc7f76f1e0180ca]]
Former-commit-id: dc074a9650
Former-commit-id: 06c16118e1
2014-02-19 08:32:26 -06:00
Nate Jensen
961239e181 Merge "Issue #2756 new collaboration openfire plugin and http service" into development
Former-commit-id: b08d96b1e8 [formerly 020d54c48a [formerly e483f4311d00726f023d30e6d3f4e813c559390e]]
Former-commit-id: 020d54c48a
Former-commit-id: ac0a10678b
2014-02-18 14:51:13 -06:00
Nate Jensen
d4cc8b1827 Merge "Issue #2793 improved collaboration disconnect handling" into development
Former-commit-id: b3c45b303c [formerly c63289fa14 [formerly bf0a607b05ffb042e998d2c9940091137da21dc0]]
Former-commit-id: c63289fa14
Former-commit-id: 1738248fac
2014-02-18 11:22:19 -06:00
Brian Clements
1c8f5dd579 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: 7028f7fd4d [formerly a28fcf0dc5 [formerly 231c3cd84e3c86caba81708581be911e771aa774]]
Former-commit-id: a28fcf0dc5
Former-commit-id: 9095a1584f
2014-02-18 11:11:33 -06:00
Brian Clements
68fac79fe7 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: 5b4f1e8288 [formerly f6b2827434 [formerly ff23569984eee43927c10ca041ca7e0ca4d40a3b]]
Former-commit-id: f6b2827434
Former-commit-id: f0c89ef6c6
2014-02-18 10:03:12 -06:00
Brian Clements
ca8869b8ef 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: 3dfd8fbafb [formerly 3b5648c055 [formerly 9a4b091f7e2655f48fd061021d161c4eb2e63dd8]]
Former-commit-id: 3b5648c055
Former-commit-id: 6d71686332
2014-02-17 16:39:43 -06:00
Nate Jensen
47b27c602f Issue #2751 first cut of transfer leadership
Change-Id: Ia0495d8d5acfe28801ceb416090d47c250ecf0f9

Former-commit-id: a85575a763 [formerly e05f1eae96 [formerly cd0a838d34c9d7533bf59a477a17f4cb1af75a00]]
Former-commit-id: e05f1eae96
Former-commit-id: 63d5f94cbb
2014-02-13 15:35:53 -06:00
Nate Jensen
ec6d8585e1 Merge "Issue #2700 fixed subscribe request group input" into development
Former-commit-id: d8e2d2837e [formerly 2643d01b74 [formerly af0e70e20c2a5ca276e9b819285d34c0113cafe7]]
Former-commit-id: 2643d01b74
Former-commit-id: f2b32fa1ae
2014-02-13 14:02:55 -06:00
Brian Clements
01653c76de 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: 0ac7ff81cf [formerly ef52908906 [formerly e91ae6eacf4af9e25afc213c3cd0c269c8d465f4]]
Former-commit-id: ef52908906
Former-commit-id: 16ed18e0c6
2014-02-13 13:51:39 -06:00
Brian Clements
a0eb8342bf 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: caa8360ac7 [formerly 579f7c826d [formerly 0c4a7915870f374cb4e728303939335cb0691c84]]
Former-commit-id: 579f7c826d
Former-commit-id: 2d72c0f475
2014-02-13 09:47:02 -06:00
Brian Clements
b8a1c8f56d Issue #2797 fixed presence bug
a defensive copy was needed when sending presence to rooms


Former-commit-id: 23e2039028 [formerly 81ddf87b04 [formerly d0dab4bce76b45b71f4238d5a04c440cee936eaf]]
Former-commit-id: 81ddf87b04
Former-commit-id: 22031aa87d
2014-02-12 16:54:46 -06:00
Brian Clements
87a7bf82e5 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: b0714ba659 [formerly e381edcd60 [formerly 808727ce287116be8c8e2a93ce0fc4b3a996c0ef]]
Former-commit-id: e381edcd60
Former-commit-id: 3034ac5994
2014-02-12 14:22:33 -06:00
Brian Clements
6c6467d235 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: 6518b88fe5 [formerly 7d6e116b9f [formerly 24343a796d0089824dde2f7039cdf93ed0ebf88c]]
Former-commit-id: 7d6e116b9f
Former-commit-id: 639f774567
2014-02-07 10:06:06 -06:00
Brian Clements
ddbfe9a763 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: 6ea009a2e1 [formerly cfa3c9e0e8 [formerly 74daa7109149073c615d13c25092f6d08a77b936]]
Former-commit-id: cfa3c9e0e8
Former-commit-id: bebd62c6b6
2014-02-03 15:34:58 -06:00
Brian Clements
83d6ca0855 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: 16c1aaed3e [formerly 1ff4ed1ae9 [formerly f10f42753c541d4003b4c67a84a1d50e033941d3]]
Former-commit-id: 1ff4ed1ae9
Former-commit-id: 21c75d1d01
2014-02-03 12:59:57 -06:00
Brian Clements
dc59e8fa2d 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: b0402be1d3 [formerly b88eaeb73e [formerly 4d860337ea821975b6ddb4846f102199347a4dcc]]
Former-commit-id: b88eaeb73e
Former-commit-id: 7176bf59b8
2014-01-31 13:10:35 -06:00
Brian Clements
bd410b2529 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: 3250eb34f5 [formerly 3e585945d6 [formerly 9a8b011683ffe7194c48b1827d3a4f0ddf4f9627]]
Former-commit-id: 3e585945d6
Former-commit-id: 4e2cb3f7ae
2014-01-31 09:44:31 -06:00
Brian Clements
190400fc34 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: 5b9f694930 [formerly c498307b30 [formerly 850cbc03ebea6f26ac7095abffe7729985c426c4]]
Former-commit-id: c498307b30
Former-commit-id: 1f1be20d41
2014-01-29 10:16:15 -06:00
Brian Clements
aa642d5577 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: bd19366ada [formerly 6b1843f19a [formerly 8ad4c1674d2719a7781eb137669eb15212a1488c]]
Former-commit-id: 6b1843f19a
Former-commit-id: b4d930bcb9
2014-01-28 10:07:11 -06:00
Brian Clements
fffb6aaf9a 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: 26ac549096 [formerly f615f2226f [formerly 06a9db4836fa2753a913e2314a8c003380416eac]]
Former-commit-id: f615f2226f
Former-commit-id: b86ad8ca6f
2014-01-27 10:14:10 -06:00
Brian Clements
e3f615b2b7 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: bf6cf2f2ee [formerly 79446d983b [formerly 0176ba7963a5ff5bbd37b2e0867cbf97f4a3ef66]]
Former-commit-id: 79446d983b
Former-commit-id: 45b5df24d4
2014-01-15 10:24:09 -06:00
Brian Clements
7279fbf6b3 Issue #2563 added user server add/remove functionality
now persists user entered servers to localization


Former-commit-id: c8cfc788f3 [formerly 487aa58778 [formerly 43fc94e9cc2a7f518971d509478f3b9a65588d19]]
Former-commit-id: 487aa58778
Former-commit-id: af9292ea71
2014-01-09 13:19:59 -06:00
Brian Clements
40763433f0 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: 66df912a4e [formerly 82716fa147 [formerly 99fb102b270baa5c45f1c9963f47344ede93a34a]]
Former-commit-id: 82716fa147
Former-commit-id: a78b1d96af
2014-01-07 13:04:24 -06:00
Brian Clements
b41eadd0be 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: e4bd8a3e2c [formerly 2b8668a4eb [formerly 23d898308fb3aa673d85fdf00495d43e4c02a08f]]
Former-commit-id: 2b8668a4eb
Former-commit-id: b120d74099
2013-12-20 12:03:04 -06:00
Brian Clements
24b3713680 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: af83c0cf87 [formerly 09c0267237 [formerly b3173727f3f685119be3668779eb5da7e075df50]]
Former-commit-id: 09c0267237
Former-commit-id: 621a8536e6
2013-12-20 10:41:13 -06:00
Brian Clements
c2b759b38e 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: ce0a34b53c [formerly 80650337ce [formerly 3781483ef6dd1889aa0ecd6ccc83bfb2461713b5]]
Former-commit-id: 80650337ce
Former-commit-id: 2c20a87634
2013-12-19 12:08:21 -06:00
Brian Clements
d0d14ec091 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: e6c4b39aca [formerly 8ece30944a [formerly 6fc85f79c126283eb4dbddfa94943523d9ff0a6d]]
Former-commit-id: 8ece30944a
Former-commit-id: 5d1d44b60d
2013-12-06 17:07:16 -06:00
Ben Steffensmeier
0bcf7f77c0 Issue #2491 Fix collaboration Xml.
Former-commit-id: fdeff81da2 [formerly 3d36cec7be [formerly 64517ab3139be3cc21d5df7ff9d36709435bd7cd]]
Former-commit-id: 3d36cec7be
Former-commit-id: a5f970e238
2013-10-31 14:06:37 -05:00
Steve Harris
1d4d25b49b 13.1.2-6 baseline
Former-commit-id: 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]
Former-commit-id: 8e5f9e0e6c
Former-commit-id: efd3392abe
2013-01-06 14:55:11 -06:00
Steve Harris
6e44abdba1 12.11.1-4 baseline
Former-commit-id: 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: d3497e47eb
Former-commit-id: 98171b5de9
2012-10-16 13:27:07 -05:00