Mercurial Mercurial > beem > otr / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix a possible null pointer exception
authorDa Risk <darisk972@gmail.com>
Sun, 02 Jan 2011 17:53:38 +0100
changeset 847 176d2f9d2ebf
parent 846 53a2e0015adb
child 848 0d604b75d5ae
Fix a possible null pointer exception
res/values-fr/strings.xml file | annotate | diff | comparison | revisions
res/values/strings.xml file | annotate | diff | comparison | revisions
src/com/beem/project/beem/ui/ContactList.java file | annotate | diff | comparison | revisions 
--- 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>
--- 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>
--- 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);
BEEM-OTR