From acc9edf4f69fef7a64f2cd4173312cc635363b33 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 25 Oct 2018 12:29:40 +0200
Subject: [PATCH] Fixed crash + added missing hint in contacts filter bar

---
 res/layout/contacts_list.xml                   | 1 +
 src/android/org/linphone/ui/ContactAvatar.java | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/res/layout/contacts_list.xml b/res/layout/contacts_list.xml
index a0f99d262..d5d45deb2 100644
--- a/res/layout/contacts_list.xml
+++ b/res/layout/contacts_list.xml
@@ -94,6 +94,7 @@
 
 		<EditText
             android:contentDescription="@string/content_description_search_contact"
+			android:hint="@string/chat_room_creation_filter_hint"
 			android:textCursorDrawable="@null"
 			android:id="@+id/searchField"
 			android:layout_width="match_parent"
diff --git a/src/android/org/linphone/ui/ContactAvatar.java b/src/android/org/linphone/ui/ContactAvatar.java
index 87767b9c1..0a496d309 100644
--- a/src/android/org/linphone/ui/ContactAvatar.java
+++ b/src/android/org/linphone/ui/ContactAvatar.java
@@ -108,7 +108,8 @@ public class ContactAvatar {
             holder.contactPicture.setVisibility(View.VISIBLE);
             holder.generatedAvatar.setVisibility(View.GONE);
         } else {
-            holder.generatedAvatar.setText(generateAvatar(contact.getFullName()));
+            holder.generatedAvatar.setText(generateAvatar(contact.getFullName() == null ?
+                    contact.getFirstName() + " " + contact.getLastName() : contact.getFullName()));
             holder.generatedAvatar.setVisibility(View.VISIBLE);
         }