Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added back code to handle Vcf sharing

Browse source
This commit is contained in:
Sylvain Berfini 2017-10-25 16:07:45 +02:00
parent 3126f3d85d
commit 53d83a49f8
1 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/android/org/linphone/chat/GroupChatFragment.java
View file

@ -24,7 +24,6 @@ import android.app.Dialog;
import android.app.Fragment; import android.app.Fragment;
import android.content.CursorLoader; import android.content.CursorLoader;
import android.content.Intent; import android.content.Intent;
import android.content.res.Configuration;
import android.database.Cursor; import android.database.Cursor;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
@ -66,6 +65,8 @@ import org.linphone.core.ChatRoomListener;
import org.linphone.core.Content; import org.linphone.core.Content;
import org.linphone.core.Core; import org.linphone.core.Core;
import org.linphone.core.EventLog; import org.linphone.core.EventLog;
import org.linphone.core.Friend;
import org.linphone.core.FriendList;
import org.linphone.core.Participant; import org.linphone.core.Participant;
import org.linphone.receivers.ContactsUpdatedListener; import org.linphone.receivers.ContactsUpdatedListener;
@ -275,16 +276,16 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
if (requestCode == ADD_PHOTO && resultCode == Activity.RESULT_OK) { if (requestCode == ADD_PHOTO && resultCode == Activity.RESULT_OK) {
String fileToUploadPath = null; String fileToUploadPath = null;
if (data != null && data.getData() != null) { if (data != null && data.getData() != null) {
/*if (data.getData().toString().contains("com.android.contacts/contacts/")) { if (data.getData().toString().contains("com.android.contacts/contacts/")) {
if (getCVSPathFromLookupUri(data.getData()) != null) { if (getCVSPathFromLookupUri(data.getData().toString()) != null) {
fileToUploadPath = getCVSPathFromLookupUri(data.getData()).toString(); fileToUploadPath = getCVSPathFromLookupUri(data.getData().toString()).toString();
} else { } else {
LinphoneActivity.instance().displayCustomToast("Something wrong happened", Toast.LENGTH_LONG); //TODO Error
return; return;
} }
} else { } else {
fileToUploadPath = getRealPathFromURI(data.getData()); fileToUploadPath = getRealPathFromURI(data.getData());
}*/ }
fileToUploadPath = getRealPathFromURI(data.getData()); fileToUploadPath = getRealPathFromURI(data.getData());
if (fileToUploadPath == null) { if (fileToUploadPath == null) {
fileToUploadPath = data.getData().toString(); fileToUploadPath = data.getData().toString();
@ -294,10 +295,11 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
} }
if (LinphoneUtils.isExtensionImage(fileToUploadPath)) { if (LinphoneUtils.isExtensionImage(fileToUploadPath)) {
addImageToPendingList(fileToUploadPath); addImageToPendingList(fileToUploadPath);
} } else {
else {
if (fileToUploadPath.startsWith("content://")) { if (fileToUploadPath.startsWith("content://")) {
fileToUploadPath = LinphoneUtils.getFilePath(this.getActivity().getApplicationContext(), Uri.parse(fileToUploadPath)); fileToUploadPath = LinphoneUtils.getFilePath(this.getActivity().getApplicationContext(), Uri.parse(fileToUploadPath));
} else if (fileToUploadPath.contains("com.android.contacts/contacts/")) {
fileToUploadPath = getCVSPathFromLookupUri(fileToUploadPath).toString();
} }
addFileToPendingList(fileToUploadPath); addFileToPendingList(fileToUploadPath);
} }
@ -354,6 +356,21 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
return null; return null;
} }
public Uri getCVSPathFromLookupUri(String content) {
String contactId = LinphoneUtils.getNameFromFilePath(content);
FriendList[] friendList = LinphoneManager.getLc().getFriendsLists();
for (FriendList list : friendList) {
for (Friend friend : list.getFriends()) {
if (friend.getRefKey().toString().equals(contactId)) {
String contactVcard = friend.getVcard().asVcard4String();
Uri path = LinphoneUtils.createCvsFromString(contactVcard);
return path;
}
}
}
return null;
}
private void getContactsForParticipants() { private void getContactsForParticipants() {
mParticipants = new ArrayList<>(); mParticipants = new ArrayList<>();
if (mChatRoom.getNbParticipants() > 1) { if (mChatRoom.getNbParticipants() > 1) {