From b065907f359c3bf7d2cee16bca5988785e712300 Mon Sep 17 00:00:00 2001
From: Erwan Croze <erwan.croze@belledonne-communications.com>
Date: Wed, 25 Jul 2018 14:10:31 +0200
Subject: [PATCH] Some fix + update version

---
 AndroidManifest.xml                                       | 4 ++--
 src/android/org/linphone/LinphoneUtils.java               | 8 +++++---
 src/android/org/linphone/chat/GroupChatFragment.java      | 2 ++
 .../org/linphone/contacts/ContactsListFragment.java       | 2 --
 .../org/linphone/fragments/HistoryListFragment.java       | 2 ++
 submodules/linphone                                       | 2 +-
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fc3709860..7631235e0 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest package="org.linphone"
           xmlns:android="http://schemas.android.com/apk/res/android"
           android:installLocation="auto"
-          android:versionCode="1400"
-          android:versionName="1.4.0">
+          android:versionCode="1410"
+          android:versionName="1.4.1">
 
     <uses-sdk
         android:minSdkVersion="16"
diff --git a/src/android/org/linphone/LinphoneUtils.java b/src/android/org/linphone/LinphoneUtils.java
index 2cc0240ba..57995c899 100644
--- a/src/android/org/linphone/LinphoneUtils.java
+++ b/src/android/org/linphone/LinphoneUtils.java
@@ -913,9 +913,11 @@ public final class LinphoneUtils {
 		if (ourUri == null || sipUri == null) return ChatRoomSecurityLevel.ClearText;
 
 		for (ChatRoom cr : lc.getChatRooms()) {
-			for (Participant pa : cr.getParticipants()) {
-				if (pa.getAddress() != null && pa.getAddress().asStringUriOnly().compareTo(sipUri.asStringUriOnly()) == 0) {
-					return pa.getSecurityLevel();
+			if (cr != null && cr.getParticipants() != null) {
+				for (Participant pa : cr.getParticipants()) {
+					if (pa.getAddress() != null && pa.getAddress().asStringUriOnly().compareTo(sipUri.asStringUriOnly()) == 0) {
+						return pa.getSecurityLevel();
+					}
 				}
 			}
 		}
diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java
index de465bbb6..116deed98 100644
--- a/src/android/org/linphone/chat/GroupChatFragment.java
+++ b/src/android/org/linphone/chat/GroupChatFragment.java
@@ -228,6 +228,8 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 						fileSharedUri = LinphoneUtils.getFilePath(this.getActivity().getApplicationContext(), Uri.parse(fileSharedUri));
 					} else if (fileSharedUri.contains("com.android.contacts/contacts/")) {
 						fileSharedUri = LinphoneUtils.getCVSPathFromLookupUri(fileSharedUri).toString();
+					} else {
+						fileSharedUri = LinphoneUtils.getFilePath(this.getActivity().getApplicationContext(), Uri.parse(fileSharedUri));
 					}
 					addFileToPendingList(fileSharedUri);
 				}
diff --git a/src/android/org/linphone/contacts/ContactsListFragment.java b/src/android/org/linphone/contacts/ContactsListFragment.java
index 08ca996bb..a63cbca03 100644
--- a/src/android/org/linphone/contacts/ContactsListFragment.java
+++ b/src/android/org/linphone/contacts/ContactsListFragment.java
@@ -92,8 +92,6 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O
 			onlyDisplayChatAddress = getArguments().getBoolean("ChatAddressOnly");
         }
 
-        FriendList test[] = LinphoneManager.getLc().getFriendsLists();
-
         noSipContact = (TextView) view.findViewById(R.id.noSipContact);
         noContact = (TextView) view.findViewById(R.id.noContact);
 
diff --git a/src/android/org/linphone/fragments/HistoryListFragment.java b/src/android/org/linphone/fragments/HistoryListFragment.java
index 8ed717cba..2eb768d17 100644
--- a/src/android/org/linphone/fragments/HistoryListFragment.java
+++ b/src/android/org/linphone/fragments/HistoryListFragment.java
@@ -506,6 +506,8 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On
 				holder.contactPicture.setImageResource(R.drawable.avatar_medium_unregistered);
 			}
 
+			displayName = c.getFullName();
+
 			if (displayName == null) {
 				holder.contact.setText(LinphoneUtils.getAddressDisplayName(sipUri));
 			} else {
diff --git a/submodules/linphone b/submodules/linphone
index bdf6f37b1..c9601870b 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit bdf6f37b10a9d8a8fe040a28816ac8c9374bd601
+Subproject commit c9601870b236ee5090c2e38492ab70af84850163