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

Updated linphone + improved file transfer bubbles layout

Browse source
This commit is contained in:
Sylvain Berfini 2018-03-06 18:03:08 +01:00
parent 88c369fe40
commit 2ad7488b4b
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -97,6 +97,7 @@ public class ChatEventsAdapter extends ListSelectionAdapter {
if (offset == total) {
holder.fileTransferProgressBar.setVisibility(View.GONE);
holder.fileTransferAction.setVisibility(View.GONE);
holder.fileTransferLayout.setVisibility(View.GONE);
displayAttachedFile(message, holder);
@ -329,7 +330,7 @@ public class ChatEventsAdapter extends ListSelectionAdapter {
holder.fileTransferLayout.setVisibility(View.VISIBLE);
holder.fileTransferProgressBar.setVisibility(View.GONE);
if (message.getState() == ChatMessage.State.InProgress && message.getFileTransferFilepath() != null) { // Incoming file transfer in progress
if (message.isFileTransferInProgress()) { // Incoming file transfer in progress
holder.fileTransferAction.setVisibility(View.GONE);
} else {
holder.fileTransferAction.setText(mContext.getString(R.string.accept));
@ -349,6 +350,7 @@ public class ChatEventsAdapter extends ListSelectionAdapter {
message.setListener(mListener);
message.setFileTransferFilepath(file.getPath());
message.downloadFile();
} else {
Log.w("WRITE_EXTERNAL_STORAGE permission not granted, won't be able to store the downloaded file");
LinphoneActivity.instance().checkAndRequestExternalStoragePermission();
@ -356,7 +358,7 @@ public class ChatEventsAdapter extends ListSelectionAdapter {
}
});
}
} else if (message.getState() == ChatMessage.State.InProgress && message.getFileTransferFilepath() != null) { // Outgoing file transfer in progress
} else if (message.isFileTransferInProgress()) { // Outgoing file transfer in progress
message.setListener(mListener); // add the listener for file upload progress display
holder.messageSendingInProgress.setVisibility(View.GONE);
holder.fileTransferLayout.setVisibility(View.VISIBLE);

2
submodules/linphone

@ -1 +1 @@
Subproject commit 9e4e48830be42c921072e781e3f5ecdb5cc4e07f
Subproject commit 0684cedc21487decf5b05b24133f4654b86c8024