From 8f7fa235a13eb457f44530702972553ed0c68fd2 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 14 Feb 2018 14:55:49 +0100
Subject: [PATCH] Fix crash when clicking on image in chat in some cases

---
 src/android/org/linphone/chat/ChatEventsAdapter.java | 6 +++++-
 submodules/linphone                                  | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/android/org/linphone/chat/ChatEventsAdapter.java b/src/android/org/linphone/chat/ChatEventsAdapter.java
index b04169745..8fdce67cc 100644
--- a/src/android/org/linphone/chat/ChatEventsAdapter.java
+++ b/src/android/org/linphone/chat/ChatEventsAdapter.java
@@ -407,7 +407,11 @@ public class ChatEventsAdapter extends ListSelectionAdapter implements ChatMessa
 			contentUri = Uri.parse(path);
 		} else {
 			file = new File(path);
-			contentUri = FileProvider.getUriForFile(mContext, "org.linphone.provider", file);
+			try {
+				contentUri = FileProvider.getUriForFile(mContext, "org.linphone.provider", file);
+			} catch (Exception e) {
+				contentUri = Uri.parse(path);
+			}
 		}
 		String type = null;
 		String extension = MimeTypeMap.getFileExtensionFromUrl(contentUri.toString());
diff --git a/submodules/linphone b/submodules/linphone
index b5b6ef454..d0da718ac 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit b5b6ef454533557a5df6667c26643d0be9d9140a
+Subproject commit d0da718ac4e154a59fd3e8f595881767f006e826