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

[File sharing] Fix sharing contacts file

Browse source
This commit is contained in:
Brieuc Viel 2017-08-23 12:02:07 +02:00
parent cae4a52b8b
commit 6594c2b624
2 changed files with 50 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
src/android/org/linphone/ChatFragment.java
View file

@ -84,12 +84,14 @@ import org.linphone.core.LinphoneContent;
import org.linphone.core.LinphoneCore; import org.linphone.core.LinphoneCore;
import org.linphone.core.LinphoneCoreFactory; import org.linphone.core.LinphoneCoreFactory;
import org.linphone.core.LinphoneCoreListenerBase; import org.linphone.core.LinphoneCoreListenerBase;
import org.linphone.core.LinphoneFriend;
import org.linphone.mediastream.Log; import org.linphone.mediastream.Log;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
@ -923,6 +925,32 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
return null; 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 @Override
public void onContactsUpdated() { public void onContactsUpdated() {
if(fileSharedUri != null){ if(fileSharedUri != null){
@ -1087,19 +1115,29 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
@Override @Override
public void onActivityResult(int requestCode, int resultCode, Intent data) { public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == ADD_PHOTO && resultCode == Activity.RESULT_OK) { if(data != null) {
String fileToUploadPath = null; if (requestCode == ADD_PHOTO && resultCode == Activity.RESULT_OK) {
if (data != null && data.getData() != null) { String fileToUploadPath = null;
fileToUploadPath = getRealPathFromURI(data.getData()); if (data != null && data.getData() != null) {
if(fileToUploadPath == null) if(data.getData().toString().contains("com.android.contacts/contacts/")){
fileToUploadPath = data.getData().toString(); fileToUploadPath = getCVSPathFromLookupUri(data.getData()).toString();
} else if (imageToUploadUri != null) { } else {
fileToUploadPath = imageToUploadUri.getPath(); 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 { } else {
super.onActivityResult(requestCode, resultCode, data); LinphoneActivity.instance().displayCustomToast("Something wrong happened", Toast.LENGTH_LONG);
} }
} }

2
submodules/linphone

@ -1 +1 @@
Subproject commit 30cd76587184e9b1e64b0de7117a4d4b00351254 Subproject commit 0399162c4c6e778c73e549e49aba7e364234d148