Commit graph

46 commits

Author SHA1 Message Date
Lee Venable
a5487de998 Issue #2865 - fixed font memory leak
Change-Id: I0cfbd494924aadcb134c60313836cb9ab815253d

Former-commit-id: 2c67c4f6c4 [formerly 2555d382f26278c5f972c17da778338142cdaaec]
Former-commit-id: 58d7f759b2
2014-03-11 10:31:50 -05:00
Brian Clements
4f9a2577f2 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: dc55cd5b5c [formerly e832f6420b6363a3c951725e0d23f460b2efb42e]
Former-commit-id: aee98ecfb0
2014-03-10 14:06:45 -05:00
Brian Clements
ac63129ad1 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: 44d161729f [formerly b3bf76b676b7e75559236d67c687cd5011859a8b]
Former-commit-id: dc94769c14
2014-03-07 15:37:29 -06:00
Nate Jensen
d3f18729c3 Merge "Issue #2632 - Fix problem with multiple notifiers per user." into development
Former-commit-id: cf4631f9bf [formerly e6dc5f076bfd4811b2b1cdaf3782a5066e032381]
Former-commit-id: 48fa8f8d1b
2014-03-05 14:41:12 -06:00
Mike Duff
c0bf150e15 Issue #2798 - Fix user presence messages and settings
Peer review comments

Change-Id: I615edc12a7fe93540b5e62cf673b92829cac3dfa

Former-commit-id: e97e745b61 [formerly b087558dce4e19596c93d47e986af50fae806a74]
Former-commit-id: 9c873e6dd9
2014-03-05 14:39:55 -06:00
Mike Duff
3bdf20dea3 Issue #2632 - Fix problem with multiple notifiers per user.
Change-Id: Ia6f9d18e9217c74e6ecf6a2df324860a2b817000

Former-commit-id: 8c693a5f70 [formerly 168a656194aa3b455f403aa92b290bbbe17d3b45]
Former-commit-id: 9963324b60
2014-03-05 12:02:33 -06:00
Brian Clements
d06182573e Issue #2837 collaboration icon changes
changed add/remove group icon colors
created icons for add/remove contact, alias contact and rename group


Former-commit-id: c0e4615967 [formerly 3f7cfbbf1c60cffa0aa31f53b29521b78774042e]
Former-commit-id: c9906cde88
2014-03-05 09:00:57 -06:00
Max Schenkelberg
654da3c0a2 Issue #2861 Rewrote HierarchicalPreferenceStore to be more efficient and thread safe when reading values.
Amend: Added comments and cleaned up preference store

Change-Id: Iac708c0988fc1b8f552d3bccf76b1706d6324b8d

Former-commit-id: a01a6d68d0 [formerly cc34e3dbebe13ec4f63b7529f5053391135837ef]
Former-commit-id: cbf8b9249c
2014-03-04 09:23:36 -06:00
Mike Duff
ee06fc58b5 Issue #2632 - Implement buddy pounce (Contact Notifiers)
Review comments

Change-Id: I7492b84b59406cf2ddbc65d9e6fc7c0c41c30ce7

Former-commit-id: 5440ff64d1 [formerly 8ece6e53095ee80d7d4baa249125b3fe7a03add7]
Former-commit-id: 5f433b4f6b
2014-02-28 13:23:34 -06:00
Mike Duff
d90f4495c2 Issue #2631 - Set preference defaults in the Activator.
Removed unused file.

Change-Id: Idd6fee39cae4cc8d4cf4cd2ae652ed0722d6cd2e

Former-commit-id: ed5cb91406 [formerly 61e803bb38b398fd6758d650b6120dc2514064b4]
Former-commit-id: a7b1e79d2d
2014-02-20 15:09:10 -06:00
Brian Clements
4b7ba54dc3 Issue #2751 collab menu icons, fixed NPE
new icons for change color and transfer leader menu items
fixed NPE when cancelling change color dialog


Former-commit-id: aaa2de20f4 [formerly 71c13c7a24fb4c3d7556d30ae35a3633b74f7bb3]
Former-commit-id: 89a48c3f6b
2014-02-20 11:50:54 -06:00
Brian Clements
d9ac2c0037 Issue #2751 implemented room/topic ownership transfer
Former-commit-id: c3cadff705 [formerly cf5041f2d052c4900e2871e0fc8dc1a2b71794de]
Former-commit-id: ab72938246
2014-02-20 11:10:14 -06:00
Nate Jensen
8b152a8027 Merge "Issue #2631 - Add sound preference for users joining a room. review comments" into development
Former-commit-id: df376abcb7 [formerly ff080a6b5184f486348a015f31b957325fa280fa]
Former-commit-id: f99cf7df47
2014-02-19 16:19:27 -06:00
Mike Duff
3100a71f34 Issue #2631 - Add sound preference for users joining a room.
review comments

Change-Id: I5ae0872dd3a498413f4f5b74bc4e7881bf0f9207

Former-commit-id: 663ea8decd [formerly f578e45e37f7ac0780d2dc6b6ea21e81630ddc78]
Former-commit-id: 95fcee385a
2014-02-19 15:26:14 -06:00
Brian Clements
bee7cdb71a 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: dc074a9650 [formerly 453604eca5fca9e5d14ba1842dc7f76f1e0180ca]
Former-commit-id: 3a135b8eac
2014-02-19 08:32:26 -06:00
Brian Clements
476d0c3257 Issue #2751 fixed blocked icon for roster entries
previous refactor broke type check for blocked icon logic
moved blocked icon logic to subclass that handles roster tree labels


Former-commit-id: a94b366e26 [formerly 7f3a2f5e631176426ece6384719f3b1c9b00105a]
Former-commit-id: 3307f5ea5e
2014-02-17 17:11:36 -06:00
Nate Jensen
11fb06810f Issue #2751 first cut of transfer leadership
Change-Id: Ia0495d8d5acfe28801ceb416090d47c250ecf0f9

Former-commit-id: e05f1eae96 [formerly cd0a838d34c9d7533bf59a477a17f4cb1af75a00]
Former-commit-id: a85575a763
2014-02-13 15:35:53 -06:00
Nate Jensen
b31470f7e3 Merge "Issue #2700 fixed subscribe request group input" into development
Former-commit-id: 2643d01b74 [formerly af0e70e20c2a5ca276e9b819285d34c0113cafe7]
Former-commit-id: d8e2d2837e
2014-02-13 14:02:55 -06:00
Brian Clements
3ec3ad0543 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: ef52908906 [formerly e91ae6eacf4af9e25afc213c3cd0c269c8d465f4]
Former-commit-id: 0ac7ff81cf
2014-02-13 13:51:39 -06:00
Brian Clements
bafe2972a4 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: 579f7c826d [formerly 0c4a7915870f374cb4e728303939335cb0691c84]
Former-commit-id: caa8360ac7
2014-02-13 09:47:02 -06:00
Brian Clements
f22268295e Issue #2799 fixed double click chat not working for roster entries
Former-commit-id: 1bf3a09056 [formerly 06cfbcccff89fd79efd3188c45653dce160fc90a]
Former-commit-id: 9d7490a158
2014-02-12 17:06:44 -06:00
Brian Clements
fab4fea177 Issue #2699 require non blank handle
previously defaulted to userid if handle left blank
now reprompts for handle
preferences now default to userid to pre-fill handle


Former-commit-id: 0765451a9d [formerly ae5f2d2b547241e7ba9c22aabaf64fceceb1b563]
Former-commit-id: ddf5b2a3ef
2014-02-12 09:13:48 -06:00
Brian Clements
8742be3a13 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: 7d6e116b9f [formerly 24343a796d0089824dde2f7039cdf93ed0ebf88c]
Former-commit-id: 6518b88fe5
2014-02-07 10:06:06 -06:00
Brian Clements
aff354a3d7 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: cfa3c9e0e8 [formerly 74daa7109149073c615d13c25092f6d08a77b936]
Former-commit-id: 6ea009a2e1
2014-02-03 15:34:58 -06:00
Brian Clements
7c867338c8 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: 1ff4ed1ae9 [formerly f10f42753c541d4003b4c67a84a1d50e033941d3]
Former-commit-id: 16c1aaed3e
2014-02-03 12:59:57 -06:00
Brian Clements
b651ada4b3 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: b88eaeb73e [formerly 4d860337ea821975b6ddb4846f102199347a4dcc]
Former-commit-id: b0402be1d3
2014-01-31 13:10:35 -06:00
Brian Clements
4f4d5c5d69 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: 3e585945d6 [formerly 9a8b011683ffe7194c48b1827d3a4f0ddf4f9627]
Former-commit-id: 3250eb34f5
2014-01-31 09:44:31 -06:00
Brian Clements
4a0682a9e8 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: c498307b30 [formerly 850cbc03ebea6f26ac7095abffe7729985c426c4]
Former-commit-id: 5b9f694930
2014-01-29 10:16:15 -06:00
Brian Clements
f22052321b 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: 6b1843f19a [formerly 8ad4c1674d2719a7781eb137669eb15212a1488c]
Former-commit-id: bd19366ada
2014-01-28 10:07:11 -06:00
Brian Clements
8944860cbb 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: f615f2226f [formerly 06a9db4836fa2753a913e2314a8c003380416eac]
Former-commit-id: 26ac549096
2014-01-27 10:14:10 -06:00
Nate Jensen
46dfbe9334 Merge "Issue #2630 added away timeout for collaboration inactivity" into development
Former-commit-id: bdb4d8bdeb [formerly 14d419fdd187e4e1e537590e626ec33d3f5b071f]
Former-commit-id: eafe61cd37
2014-01-15 13:48:13 -06:00
Brian Clements
53273c4e5a Issue #2630 added away timeout for collaboration inactivity
eclipse job in connection subscriber
preferences added to collaboration prefs page


Former-commit-id: 24190efb75 [formerly c6fded1429e44033bb989c1d9caaac87c72eb440]
Former-commit-id: 57fb953b8d
2014-01-15 13:20:25 -06:00
Brian Clements
1219713128 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: 79446d983b [formerly 0176ba7963a5ff5bbd37b2e0867cbf97f4a3ef66]
Former-commit-id: bf6cf2f2ee
2014-01-15 10:24:09 -06:00
Brian Clements
0c5b0eaf69 Issue #2563 added user server add/remove functionality
now persists user entered servers to localization


Former-commit-id: 487aa58778 [formerly 43fc94e9cc2a7f518971d509478f3b9a65588d19]
Former-commit-id: c8cfc788f3
2014-01-09 13:19:59 -06:00
Brian Clements
27b4ec6df6 Issue #2563 fixed default xmpp port
The default port for postgres was there by mistake


Former-commit-id: e263cdb63a [formerly c6e76f765aa6cbb50b238bb3d01de7fe365d150d]
Former-commit-id: dfcf6e9ade
2014-01-07 10:52:50 -06:00
Brian Clements
d64d95d0c6 Issue #2563 modified server config parsing to allow for custom port
Replaced parsing code that assumed no colon in the server name, which prevented connecting to servers that didn't use the default XMPP port.


Former-commit-id: cea12a1a1d [formerly b995fe2036d4c0e26e25edd7f4bffd956d82921f]
Former-commit-id: b01e6f0c98
2014-01-06 14:14:38 -06:00
Brian Clements
0f4be44a23 Issue #2563 fixed label issue for non-grouped roster entry
the old code assumed that the username was populated in the roster object
new code uses the userId which is always populated


Former-commit-id: 73347283b6 [formerly 5fe0f88b3465ba65efabe2a41d1df392c85e041f]
Former-commit-id: d07bc465d4
2013-12-20 14:40:00 -06:00
Brian Clements
4b4c7ba50c 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: 2b8668a4eb [formerly 23d898308fb3aa673d85fdf00495d43e4c02a08f]
Former-commit-id: e4bd8a3e2c
2013-12-20 12:03:04 -06:00
Brian Clements
43021ae281 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: 09c0267237 [formerly b3173727f3f685119be3668779eb5da7e075df50]
Former-commit-id: af83c0cf87
2013-12-20 10:41:13 -06:00
Brian Clements
4015dc23ee 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: 80650337ce [formerly 3781483ef6dd1889aa0ecd6ccc83bfb2461713b5]
Former-commit-id: ce0a34b53c
2013-12-19 12:08:21 -06:00
Brian Clements
b8df043202 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: 8ece30944a [formerly 6fc85f79c126283eb4dbddfa94943523d9ff0a6d]
Former-commit-id: e6c4b39aca
2013-12-06 17:07:16 -06:00
Lee Venable
74603afd97 Issue #2483 - Fixed image memory leak.
Former-commit-id: a2f75e547d [formerly b590a1d5799a94068fe9e444e40bb3819d596071]
Former-commit-id: 3d6547d644
2013-10-23 08:26:49 -05:00
Matt Nash
274becd212 Issue #1476 make fix for collaboration for issues with closing of views when detached
Change-Id: Id35df245089ae352b5023ad2d31d1519379f8293

Former-commit-id: fdc6db0a50 [formerly 42a3798a2fcee3c383814b92c9010f77eb7b242a]
Former-commit-id: 1d25736871
2013-03-04 09:41:11 -06:00
Steve Harris
dbcae57f57 13.1.2-6 baseline
Former-commit-id: 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]
Former-commit-id: 59969775ad
2013-01-06 14:55:11 -06:00
Steve Harris
941337c553 13.1.2-2 baseline
Former-commit-id: c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]
Former-commit-id: 4ba416aeb3
2013-01-06 14:32:24 -06:00
Steve Harris
cbbdb231ce 12.11.1-4 baseline
Former-commit-id: d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]
Former-commit-id: 6958b861f0
2012-10-16 13:27:07 -05:00