FIxes facebook and google talk accounts.

Fixes NullPointerException when status message is null.
Renames "On The Phone" status to "On the phone", in order to improve compatibility.
cusax-fix
Yana Stamcheva 15 years ago
parent 7a2b6bfe63
commit c1e7e67e06

Binary file not shown.

After

Width:  |  Height:  |  Size: 818 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 890 B

@ -638,7 +638,8 @@ else if(mode.equals(Presence.Mode.away))
{
// on the phone a special status
// which is away with custom status message
if(presence.getStatus().contains(JabberStatusEnum.ON_THE_PHONE))
if(presence.getStatus() != null
&& presence.getStatus().contains(JabberStatusEnum.ON_THE_PHONE))
return jabberStatusEnum.getStatus(JabberStatusEnum.ON_THE_PHONE);
else
return jabberStatusEnum.getStatus(JabberStatusEnum.AWAY);

@ -58,7 +58,7 @@ public class JabberStatusEnum
* On The Phone Chat status.
* Indicates that the user is talking to the phone.
*/
public static final String ON_THE_PHONE = "On The Phone";
public static final String ON_THE_PHONE = "On the phone";
/**
* The Free For Chat status. Indicates that the user is eager to

Loading…
Cancel
Save