# HG changeset patch
# User Da Risk <darisk972@gmail.com>
# Date 1293987218 -3600
# Node ID 176d2f9d2ebf59f095133faa35e738a750ec9084
# Parent  53a2e0015adb6bd9266b81c2ecc1b4432431daf4
Fix a possible null pointer exception

diff -r 53a2e0015adb -r 176d2f9d2ebf res/values-fr/strings.xml
--- a/res/values-fr/strings.xml	Sun Jan 02 17:22:46 2011 +0100
+++ b/res/values-fr/strings.xml	Sun Jan 02 17:53:38 2011 +0100
@@ -86,7 +86,7 @@
 	<string name="CLP_hide_groups_sum">Cochez cette option pour cacher les groupes</string>
 	<string name="CLP_hidden_contact">Cachez les contacts</string>
 	<string name="CLP_hidden_contact_sum">Cochez cette option pour cacher les contacts déconnectés</string>
-	<string name="settings_account_username">Nom d\'utilisateur</string>
+	<string name="settings_account_username">Nom d\'utilisateur (JID)</string>
 	<string name="login_username_info_default">beem@beem-project.com</string>
 	<string name="settings_account_password">Mot de passe</string>
 	<string name="settings_account_server">Serveur</string>
diff -r 53a2e0015adb -r 176d2f9d2ebf res/values/strings.xml
--- a/res/values/strings.xml	Sun Jan 02 17:22:46 2011 +0100
+++ b/res/values/strings.xml	Sun Jan 02 17:53:38 2011 +0100
@@ -86,7 +86,7 @@
 	<string name="CLP_hidden_contact">Hide buddies</string>
 	<string name="CLP_hidden_contact_sum">Check this option to hide unconnected buddies
 	</string>
-	<string name="settings_account_username">Username</string>
+	<string name="settings_account_username">Username (JID)</string>
 	<string name="login_username_info_default">beem@beem-project.com</string>
 	<string name="settings_account_password">Password</string>
 	<string name="settings_account_server">Server</string>
diff -r 53a2e0015adb -r 176d2f9d2ebf src/com/beem/project/beem/ui/ContactList.java
--- a/src/com/beem/project/beem/ui/ContactList.java	Sun Jan 02 17:22:46 2011 +0100
+++ b/src/com/beem/project/beem/ui/ContactList.java	Sun Jan 02 17:53:38 2011 +0100
@@ -677,10 +677,12 @@
 	private Drawable getAvatarStatusDrawable(String avatarId) {
 	    Drawable avatarDrawable = null;
 	    try {
-		byte[] avatar = mXmppFacade.getAvatar(avatarId);
-		if (avatar != null) {
-		    ByteArrayInputStream in = new ByteArrayInputStream(avatar);
-		    avatarDrawable = Drawable.createFromStream(in, avatarId);
+		if (mXmppFacade != null) {
+		    byte[] avatar = mXmppFacade.getAvatar(avatarId);
+		    if (avatar != null) {
+			ByteArrayInputStream in = new ByteArrayInputStream(avatar);
+			avatarDrawable = Drawable.createFromStream(in, avatarId);
+		    }
 		}
 	    } catch (RemoteException e) {
 		Log.e(TAG, "Error while setting the avatar", e);