SPARK1778: Don't lookup empty JID (#195)

Maybe also fixing SPARK-1275
This commit is contained in:
Guus der Kinderen
2016-08-20 09:38:25 +02:00
committed by wroot
parent 820b18eef0
commit 9b4b04b4b3

View File

@ -229,8 +229,11 @@ public class RosterDialog implements ActionListener {
fullJID = fullJID + "@" + SparkManager.getConnection().getServiceName(); fullJID = fullJID + "@" + SparkManager.getConnection().getServiceName();
} }
if ( !fullJID.isEmpty() && !fullJID.startsWith( "@" ))
{
vcardNickname = SparkManager.getUserManager().getNickname( fullJID ); vcardNickname = SparkManager.getUserManager().getNickname( fullJID );
} }
}
String nickname = nicknameField.getText(); String nickname = nicknameField.getText();
if (!ModelUtil.hasLength(nickname) && ModelUtil.hasLength(jid)) { if (!ModelUtil.hasLength(nickname) && ModelUtil.hasLength(jid)) {