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

Fixed outgoing file transfer

Browse source
This commit is contained in:
Sylvain Berfini 2017-10-18 15:27:43 +02:00
parent c87d93611d
commit a408e61437
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1101,7 +1101,7 @@ public class ChatFragment extends Fragment implements OnClickListener, ChatMessa
} }
String fileName = path.substring(path.lastIndexOf("/") + 1); String fileName = path.substring(path.lastIndexOf("/") + 1);
String extension = LinphoneUtils.getExtensionFromFileName(fileName); String extension = LinphoneUtils.getExtensionFromFileName(fileName);
Content content = chatRoom.getCore().createContent(); // "image", extension, result, null Content content = Factory.instance().createContent(); // "image", extension, result, null
content.setType("image"); content.setType("image");
content.setSubtype(extension); content.setSubtype(extension);
content.setBuffer(result, result.length); content.setBuffer(result, result.length);
@ -1158,7 +1158,7 @@ public class ChatFragment extends Fragment implements OnClickListener, ChatMessa
String fileName = path.substring(path.lastIndexOf("/") + 1); String fileName = path.substring(path.lastIndexOf("/") + 1);
String extension = LinphoneUtils.getExtensionFromFileName(fileName); String extension = LinphoneUtils.getExtensionFromFileName(fileName);
Content content = chatRoom.getCore().createContent();//"file", extension, result, null Content content = Factory.instance().createContent();//"file", extension, result, null
content.setType("file"); content.setType("file");
content.setSubtype(extension); content.setSubtype(extension);
content.setBuffer(result, result.length); content.setBuffer(result, result.length);

1
src/android/org/linphone/LinphoneManager.java
View file

@ -460,6 +460,7 @@ public class LinphoneManager implements CoreListener, ChatMessageListener, Senso
} }
bufferToFill.setContent(data, size); bufferToFill.setContent(data, size);
bufferToFill.setSize(size); bufferToFill.setSize(size);
return bufferToFill;
} else { } else {
Log.e("Error, upload task asking for more bytes( " + (size+offset) + " ) than available (" + mUploadingImage.length + ")"); Log.e("Error, upload task asking for more bytes( " + (size+offset) + " ) than available (" + mUploadingImage.length + ")");
} }

2
submodules/linphone

@ -1 +1 @@
Subproject commit f1e0a444018a655088057e84f078dc9ac90f4211 Subproject commit a9e3caf17f8c233f5ab9a517a1382c6fd3453a24