From 6594c2b6246aef3f74f2bd43b993207f1aea22a9 Mon Sep 17 00:00:00 2001
From: Brieuc Viel <brieuc.viel@belledonne-communications.com>
Date: Wed, 23 Aug 2017 12:02:07 +0200
Subject: [PATCH] [File sharing] Fix sharing contacts file

---
 src/android/org/linphone/ChatFragment.java | 60 ++++++++++++++++++----
 submodules/linphone                        |  2 +-
 2 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/src/android/org/linphone/ChatFragment.java b/src/android/org/linphone/ChatFragment.java
index cd00bf941..a2da04e0a 100644
--- a/src/android/org/linphone/ChatFragment.java
+++ b/src/android/org/linphone/ChatFragment.java
@@ -84,12 +84,14 @@ import org.linphone.core.LinphoneContent;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCoreFactory;
 import org.linphone.core.LinphoneCoreListenerBase;
+import org.linphone.core.LinphoneFriend;
 import org.linphone.mediastream.Log;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.text.SimpleDateFormat;
@@ -923,6 +925,32 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 		return null;
 	}
 
+	public Uri getCVSPathFromLookupUri(Uri contentUri) {
+		String contactId = LinphoneUtils.getNameFromFilePath(contentUri.getPath());
+		LinphoneFriend[] friendList = LinphoneManager.getLc().getFriendList();
+		for(LinphoneFriend friend : friendList){
+			if(friend.getRefKey().toString().equals(contactId)) {
+				String contactVcard = friend.getVcardToString();
+				Uri path = createCvsFromString(contactVcard, contactId);
+				return path;
+			}
+		}
+		return null;
+	}
+
+	public Uri createCvsFromString(String vcardString, String contactId){
+		File vcfFile = new File(Environment.getExternalStorageDirectory(), "contact-"+contactId+".cvs");
+		try {
+			FileWriter fw = new FileWriter(vcfFile);
+			fw.write(vcardString);
+			fw.close();
+			return Uri.fromFile(vcfFile);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
 	@Override
 	public void onContactsUpdated() {
 		if(fileSharedUri != null){
@@ -1087,19 +1115,29 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 
 	@Override
 	public void onActivityResult(int requestCode, int resultCode, Intent data) {
-		if (requestCode == ADD_PHOTO && resultCode == Activity.RESULT_OK) {
-			String fileToUploadPath = null;
-			if (data != null && data.getData() != null) {
-				fileToUploadPath = getRealPathFromURI(data.getData());
-				if(fileToUploadPath == null)
-					fileToUploadPath = data.getData().toString();
-			} else if (imageToUploadUri != null) {
-				fileToUploadPath = imageToUploadUri.getPath();
+       	if(data != null) {
+			if (requestCode == ADD_PHOTO && resultCode == Activity.RESULT_OK) {
+				String fileToUploadPath = null;
+				if (data != null && data.getData() != null) {
+					if(data.getData().toString().contains("com.android.contacts/contacts/")){
+						fileToUploadPath = getCVSPathFromLookupUri(data.getData()).toString();
+					} else {
+						fileToUploadPath = getRealPathFromURI(data.getData());
+					}
+					if (fileToUploadPath == null)
+						fileToUploadPath = data.getData().toString();
+				} else if (imageToUploadUri != null) {
+					fileToUploadPath = imageToUploadUri.getPath();
+				}
+				if (LinphoneUtils.isExtensionImage(fileToUploadPath))
+					sendImageMessage(fileToUploadPath, 0);
+				else
+					sendFileSharingMessage(fileToUploadPath, 0);
+			} else {
+				super.onActivityResult(requestCode, resultCode, data);
 			}
-			sendImageMessage(fileToUploadPath, 0);
-
 		} else {
-			super.onActivityResult(requestCode, resultCode, data);
+			LinphoneActivity.instance().displayCustomToast("Something wrong happened", Toast.LENGTH_LONG);
 		}
 	}
 
diff --git a/submodules/linphone b/submodules/linphone
index 30cd76587..0399162c4 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 30cd76587184e9b1e64b0de7117a4d4b00351254
+Subproject commit 0399162c4c6e778c73e549e49aba7e364234d148