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

Updated linphone

Browse source
This commit is contained in:
Sylvain Berfini 2017-11-09 17:18:58 +01:00
parent 0a6fc494e8
commit 7b5142b8c6
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/android/org/linphone/chat/ChatEventsAdapter.java
View file

@ -305,7 +305,6 @@ public class ChatEventsAdapter extends BaseAdapter implements ChatMessageListene
} }
String externalBodyUrl = message.getExternalBodyUrl(); String externalBodyUrl = message.getExternalBodyUrl();
Log.e("External body url is " + externalBodyUrl);
Content fileTransferContent = message.getFileTransferInformation(); Content fileTransferContent = message.getFileTransferInformation();
String appData = message.getAppdata(); String appData = message.getAppdata();
if (externalBodyUrl != null || fileTransferContent != null) { // Incoming file transfer if (externalBodyUrl != null || fileTransferContent != null) { // Incoming file transfer

4
src/android/org/linphone/chat/ChatListFragment.java
View file

@ -1,5 +1,3 @@
package org.linphone.chat;
/* /*
ChatListFragment.java ChatListFragment.java
Copyright (C) 2017 Belledonne Communications, Grenoble, France Copyright (C) 2017 Belledonne Communications, Grenoble, France
@ -19,6 +17,8 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
package org.linphone.chat;
import android.app.Dialog; import android.app.Dialog;
import android.app.Fragment; import android.app.Fragment;
import android.graphics.Typeface; import android.graphics.Typeface;

2
submodules/linphone

@ -1 +1 @@
Subproject commit 7018a708c318e29a5fea288cb024ece801f79253 Subproject commit b0bf790f6ba4fefbe08105c711290c73be2ab80f