mirror of
https://github.com/igniterealtime/Spark.git
synced 2025-10-29 19:57:28 +00:00
Merge pull request #840 from igniterealtime/SPARK-2331
SPARK-2331 Spark sets a nickname even if it is forbidden
This commit is contained in:
commit
ca028f3a81
@ -481,12 +481,14 @@ public class VCardEditor {
|
||||
}
|
||||
|
||||
try {
|
||||
final VCardManager vcardManager = SparkManager.getVCardManager();
|
||||
vcardManager.setPersonalVCard(vcard);
|
||||
|
||||
// Save vcard on server
|
||||
org.jivesoftware.smackx.vcardtemp.VCardManager smackVCardManager = org.jivesoftware.smackx.vcardtemp.VCardManager.getInstanceFor( SparkManager.getConnection() );
|
||||
smackVCardManager.saveVCard( vcard );
|
||||
|
||||
// Save vcard on client
|
||||
final VCardManager vcardManager = SparkManager.getVCardManager();
|
||||
vcardManager.setPersonalVCard(vcard);
|
||||
|
||||
// Notify users.
|
||||
if (avatarBytes != null) {
|
||||
Presence presence = SparkManager.getWorkspace().getStatusBar()
|
||||
@ -498,7 +500,7 @@ public class VCardEditor {
|
||||
// Change my own presence
|
||||
SparkManager.getSessionManager().changePresence(newPresence);
|
||||
|
||||
// Chnage avatar in status bar.
|
||||
// Change avatar in status bar.
|
||||
StatusBar statusBar = SparkManager.getWorkspace()
|
||||
.getStatusBar();
|
||||
statusBar.setAvatar(new ImageIcon(vcard.getAvatar()));
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user