Commit graph

69 commits

Author SHA1 Message Date
Brian Clements
2d98b0616a Omaha #4117 fix 14.3/14.4 shared display interoperability bug
14.4 now defaults to sending directly to user id (if known)

Change-Id: Id0d78a6f6287cebe7b6f110143b1b6a735078e5d

Former-commit-id: 424c3630897847a6b2362418618d0806093223ce
2015-02-12 09:34:38 -06:00
Brian Clements
1c2d8e01d0 Omaha #3709 unify collaboration color management
group chat session colors controlled by session color manager
color config persistence moved to utility
shared display uses same action to change colors as other sessions

Change-Id: I8ba4a3fb4842e3f96f05ee6d16b7e81e9567f6d7

Former-commit-id: c0cd560fb1b6e8c04047c0d7b7d407e9072f0cec
2015-01-14 13:00:25 -06:00
Brian Clements
3d33ce1341 Omaha #3709 reworked custom user color configuration
Change-Id: I8b69dc378976684e989cae883e99ade9553c04d3

Former-commit-id: 18825c076fe273c9ae2e8040ccea2de0698b2877
2015-01-12 11:06:57 -06:00
Brian Clements
dfb43fda31 Omaha #3708 collaboration feed room supports blacklists
refactored SiteConfigurationManager

Change-Id: I74282074862674cac6b9190adafe38ed6d607dc5

Former-commit-id: 9b2e76141b7cdd49c145d9d54f83e49ba3ea0d78
2014-10-13 11:11:32 -05:00
Brian Clements
87964cb500 Omaha #3705 added collaboration public room search, bookmarking
Change-Id: I298254111d1eb305820c313ebe176f091fe7a818

Former-commit-id: 919c816ba7af2082b9dcb0308128fa1b228475d2
2014-10-09 08:38:45 -05:00
Nate Jensen
8e74892cd6 Omaha #3356 remove OBE register buddies from collaboration
Change-Id: I49099386a48b650c9e6ea1a96b519fbc178f769f

Former-commit-id: 89de611bd1abdd016ae8a96db4c820004c52b406
2014-09-03 10:00:11 -05:00
Brian Clements
e4c85f7cd5 Omaha #3373 jaxb manager refactor
api changes
reworked ogc jaxb manager to use parent class

Change-Id: I92b4cd6a48faf80462b9ca483a4f5d6cba78de48

Former-commit-id: 125c31f035057676d8c97a9b6c7a1d7b1b7f5bcb
2014-07-16 09:00:59 -05:00
Brian Clements
9d626a97e5 Omaha #3281 peer2peer chat view improvements
bounced chat messages now result in error messages in window
fixed view secondary id bug with userids (removed resource from key)

Change-Id: I76a68bf290b0c5205361bc6c78fda99336d7c62d

Former-commit-id: a31b7f213081f384bd23d53a431ce53593254c25
2014-06-20 09:04:15 -05:00
Steve Harris
cc7e6bc52a Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts (these go to ufcore):
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/AbstractGraphicsTarget.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/cmenu/ChangePointStyleAction.java


Former-commit-id: da50f581c90ea0cca5f43c45c44cb8ac045a6c8c
2014-06-18 08:52:25 -05:00
Brian Clements
9a427606ae Omaha #3078 collaboration shared display data over private chat
Change-Id: I0ede9310eb109adc1b08673027e9e36a68a09fbf

Former-commit-id: a51847aff197f805a4e48c9ecdb0c16f874e6a78
2014-06-17 14:32:17 -05:00
Brian Clements
37699395ef Omaha #3078 added private chat to collaboration
Change-Id: Ifcc4a33c1551e4209721fcc181b0becb49bdb5ae

Former-commit-id: 93f7d7088e7d7888a878558c6f2fcc368bf3ab05
2014-06-17 11:52:58 -05:00
Brian Clements
b6a2bf0ae4 Omaha #3288 collaboration feed venue config comes from server
Change-Id: I5bc747507e44cc31093d7a7f470a263d0cf116c0

Former-commit-id: baab2ea12e1117446295ae60bc06228eb6139895
2014-06-17 09:26:24 -05:00
Brian Clements
5424eb0258 Issue #2903 changed collaboration jaxb xml to be base64 encoded
Change-Id: I0de0db3bf455a14d747520f34ef66d986815e42c

Former-commit-id: afcfdf1ed08cd64deb085b909f0965e4ab68d92d
2014-06-12 13:40:33 -05:00
Brian Clements
0e18d45bdf Omaha #3180 fixed inviting strangers and multiple users in collaboration
can now invite users to session from search dialog
fixed bug where only first person in selection would be invited


Former-commit-id: 2509bb6d8c28cb78adc8fd4380d16a0f8f0d8acb
2014-05-19 15:54:36 -05:00
Brian Clements
a698d81571 Omaha #3061 added better checks for when to send invite/session payloads
Former-commit-id: 073d3c10ac7c5e9cd6f5e34864ec0261219cbfd5
2014-05-14 17:00:09 -05:00
Brian Clements
08a406ff18 Omaha #3107 added timeout handling logic for leader transfer verification
Former-commit-id: 294a489ba547bf90df9d6b6a5107c8993c5b8333
2014-05-09 15:43:46 -05:00
Brian Clements
1502354f87 Omaha #3061 only shared display capable clients get payload in invite
Former-commit-id: 6595f5be37941f35c33b46231deef7d41e967380
2014-05-05 15:29:06 -05:00
Brian Clements
17ab4f6184 Issue #3070 fixed contact request logic when adding to group
Former-commit-id: 57120491452b36bf15227bd4b6d0236221c71124
2014-04-25 13:41:17 -05:00
Brian Clements
02f08d75c6 Issue #3070 fixed contact request handling
no longer get empty group if user denies contact request
fixed UI update issue when server removes from your roster
added icon for pending contact request
fixed auto accept reply from users you initiated contact request with


Former-commit-id: 01e773fb9d4ec8b0ab75ddf714b79debb9ad4096
2014-04-24 16:10:27 -05:00
Brian Clements
f3ee7b453a Issue #2822 shared display invitations always go to cave
if user is logged in to a client that supports shared displays, invites always go there
behaviour unchanged if not logged into a client that supports shared displays
added better resource name than 'Smack' for cave clients


Former-commit-id: 796e4dcd2d81d8b34ae835dbe8443fd56ba873e3
2014-04-23 14:16:42 -05:00
Nate Jensen
9ec6169646 Merge "Issue #2903 added connection tests to session close methods" into development
Former-commit-id: 81b95799744bd155cc0df1147bb8a5372ea2fee4
2014-04-22 12:53:08 -05:00
Brian Clements
50f3f420eb Issue #2903 added connection tests to session close methods
fixes illegal state exception problem when booted from xmpp server


Former-commit-id: d570c81caed35576e867df15c2a8d900135fef5f
2014-04-22 12:36:40 -05:00
Brian Clements
1adbf6253a Issue #3056 made venue participant equals method case insensitive
needed since collaboration server lower cases room names
lower cased on creation so in memory matches what is on the server


Former-commit-id: 7a2423f4a90597706e52ce0f89bacb1a0e10f067
2014-04-22 11:55:36 -05:00
Brian Clements
6c47c78038 Issue #2822 fixed check for topic subscription before leader transfer
now only checks if the bare ID (no resource) is subscribed to topic
added method to check for same ID using multiple handles


Former-commit-id: 09d7a1113a6254d8f01cf42d863e9365aac23cc7
2014-04-21 13:07:14 -05:00
Brian Clements
bfafb0d055 Issue #3020 fixed error message when attempting to create already accessible room
Former-commit-id: 738e4cb06a549e6067274af033cc7ba725b1a8e2
2014-04-16 14:26:17 -05:00
Brian Clements
7afb1e66f5 Issue #2981 fixed NPE when cached shared group deleted on server
Former-commit-id: 8ee453e3f5256d3ffed255aaebc792155001bc8e
2014-04-16 09:23:26 -05:00
Brian Clements
5250f7a442 Issue #2822 only allow transfer leader if participant is using shared display
Former-commit-id: af9577548e40397c67f72eb60485ee8de48f169b
2014-04-15 15:15:11 -05:00
Brian Clements
8ab1bab974 Issue #2903 made xmpp reconnect an explicit action by user
moved non-session classes out of session package
connection classes moved to connection package
made separate classes for connection listeners
removed password from heap
login dialog remembers last server used
added reconnect handler to prompt user to re-login after disconnect


Former-commit-id: 762e7d3a1ff47f794aa843d2b159ac78b4ab12a3
2014-04-15 15:12:33 -05:00
Mike Duff
23474c5ead Issue #2785 - Throw error when CollaborationConnection needs connection and it doesn't exist
Change-Id: I2f2234da42e9210b574f7489fc37da0a63bf2133

Former-commit-id: a1f94a19ba7f0bff7bbf76fa24ff6ace9019d0f1
2014-04-09 10:17:22 -05:00
Mike Duff
efefe62e0f Issue #2785 - Change connection order of events
Fixed classpath
Change-Id: I15296306ee105a54379a370da7d53c7e46dc34bb

Former-commit-id: a2d595f4232e86606f7e2338ece59961649080a3
2014-04-08 14:14:20 -05:00
Mike Duff
bcdfd5a0c9 Issue #2899 - Improve error messages.
Change-Id: Iba298e66d1b889fce8cde9103674c86558bd222c

Former-commit-id: e83da0adee12900da03cb4b273a90d13fc5fc327
2014-03-31 16:01:44 -05:00
Mike Duff
d803986440 Issue #2632 - Fixed notifier preference OK, Apply, Cancel actions
Change-Id: I9af93c4935c5d9dc6777be0e0435bb71be5f613b

Former-commit-id: a50bd58e95a929fe569f5df68dd4d4a8b6625807
2014-03-27 16:31:30 -05:00
Brian Clements
dc55cd5b5c Issue #2848 fixed session create, listen, join ordering
clients were missing events and messages because listeners weren't up before joining
collaboration connection needed to add to session map before joining the session
display containers needed to register with session event bus before joining the session
clients no longer send events to empty sessions


Former-commit-id: e832f6420b6363a3c951725e0d23f460b2efb42e
2014-03-10 14:06:45 -05:00
Brian Clements
44d161729f 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: b3bf76b676b7e75559236d67c687cd5011859a8b
2014-03-07 15:37:29 -06:00
Mike Duff
e97e745b61 Issue #2798 - Fix user presence messages and settings
Peer review comments

Change-Id: I615edc12a7fe93540b5e62cf673b92829cac3dfa

Former-commit-id: b087558dce4e19596c93d47e986af50fae806a74
2014-03-05 14:39:55 -06:00
Brian Clements
ce24bd1018 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: e0e4dfdedff283c809060257fbf04e777faf318d
2014-02-28 16:15:17 -06:00
Mike Duff
5440ff64d1 Issue #2632 - Implement buddy pounce (Contact Notifiers)
Review comments

Change-Id: I7492b84b59406cf2ddbc65d9e6fc7c0c41c30ce7

Former-commit-id: 8ece6e53095ee80d7d4baa249125b3fe7a03add7
2014-02-28 13:23:34 -06:00
Brian Clements
3f362519aa 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: 58c826ec371f10295fa6f4e236ff85a52698719d
2014-02-24 13:19:07 -06:00
Brian Clements
c3cadff705 Issue #2751 implemented room/topic ownership transfer
Former-commit-id: cf5041f2d052c4900e2871e0fc8dc1a2b71794de
2014-02-20 11:10:14 -06:00
Brian Clements
dc074a9650 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: 453604eca5fca9e5d14ba1842dc7f76f1e0180ca
2014-02-19 08:32:26 -06:00
Nate Jensen
020d54c48a Merge "Issue #2756 new collaboration openfire plugin and http service" into development
Former-commit-id: e483f4311d00726f023d30e6d3f4e813c559390e
2014-02-18 14:51:13 -06:00
Nate Jensen
c63289fa14 Merge "Issue #2793 improved collaboration disconnect handling" into development
Former-commit-id: bf0a607b05ffb042e998d2c9940091137da21dc0
2014-02-18 11:22:19 -06:00
Brian Clements
a28fcf0dc5 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: 231c3cd84e3c86caba81708581be911e771aa774
2014-02-18 11:11:33 -06:00
Brian Clements
f6b2827434 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: ff23569984eee43927c10ca041ca7e0ca4d40a3b
2014-02-18 10:03:12 -06:00
Brian Clements
3b5648c055 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: 9a4b091f7e2655f48fd061021d161c4eb2e63dd8
2014-02-17 16:39:43 -06:00
Nate Jensen
e05f1eae96 Issue #2751 first cut of transfer leadership
Change-Id: Ia0495d8d5acfe28801ceb416090d47c250ecf0f9

Former-commit-id: cd0a838d34c9d7533bf59a477a17f4cb1af75a00
2014-02-13 15:35:53 -06:00
Nate Jensen
2643d01b74 Merge "Issue #2700 fixed subscribe request group input" into development
Former-commit-id: af0e70e20c2a5ca276e9b819285d34c0113cafe7
2014-02-13 14:02:55 -06:00
Brian Clements
ef52908906 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: e91ae6eacf4af9e25afc213c3cd0c269c8d465f4
2014-02-13 13:51:39 -06:00
Brian Clements
579f7c826d 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: 0c4a7915870f374cb4e728303939335cb0691c84
2014-02-13 09:47:02 -06:00
Brian Clements
81ddf87b04 Issue #2797 fixed presence bug
a defensive copy was needed when sending presence to rooms


Former-commit-id: d0dab4bce76b45b71f4238d5a04c440cee936eaf
2014-02-12 16:54:46 -06:00