mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-18 03:48:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Imdn view

Browse source
This commit is contained in:
Erwan Croze 2019-01-30 13:50:55 +01:00
parent 3c462d71f2
commit c05862e261
2 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
res/layout/chat_bubble.xml
View file

@ -114,7 +114,8 @@
android:gravity="center"
android:maxLines="1"
android:text="FILE"
android:textAlignment="center" />
android:textAlignment="center"
android:visibility="gone" />
<ImageView

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

@ -44,6 +44,7 @@ import org.linphone.core.ChatMessage;
import org.linphone.core.ChatMessageListenerStub;
import org.linphone.core.ChatRoom;
import org.linphone.core.ChatRoomSecurityLevel;
import org.linphone.core.Content;
import org.linphone.core.Core;
import org.linphone.core.ParticipantImdnState;
import org.linphone.core.PresenceActivity;
@ -134,12 +135,12 @@ public class ImdnFragment extends Fragment {
refreshInfo();
}
};
mMessage.setListener(mListener);
if (mMessage != null) mMessage.setListener(mListener);
RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
layoutParams.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
layoutParams.setMargins(100, 10, 10, 10);
if (mMessage.isOutgoing()) {
if (mMessage != null && mMessage.isOutgoing()) {
mBubble.background.setBackgroundColor(0x26ff6600);
Compatibility.setTextAppearance(mBubble.contactName, getActivity(), R.style.font3);
Compatibility.setTextAppearance(mBubble.fileTransferAction, getActivity(), R.style.font15);
@ -224,11 +225,10 @@ public class ImdnFragment extends Fragment {
mBubble.messageText.setVisibility(View.VISIBLE);
}
String appData = (mMessage.getContents().length > 0) ? mMessage.getContents()[0].getFilePath() : "";
if (appData != null) { // Something to display
mBubble.fileName.setVisibility(View.VISIBLE);
mBubble.fileName.setText(LinphoneUtils.getNameFromFilePath(appData));
// We purposely chose not to display the image
Content fileTransferContent = mMessage.getFileTransferInformation();
if (fileTransferContent != null && fileTransferContent.isFile()) { // Something to display
displayAttachedFile(mMessage, mBubble);
}
mRead.removeAllViews();
@ -331,4 +331,23 @@ public class ImdnFragment extends Fragment {
first = false;
}
}
private void displayAttachedFile(ChatMessage message, ChatBubbleViewHolder holder) {
holder.fileName.setVisibility(View.VISIBLE);
Content fileContent = message.getFileTransferInformation();
String appData = fileContent.getFilePath();
if (fileContent != null && fileContent.isFile() && appData != null) {
String extension = (LinphoneUtils.getExtensionFromFileName(message.getFileTransferInformation().getName()));
if(extension != null) extension = extension.toUpperCase();
else extension = "FILE";
if (extension.length() > 4) extension = extension.substring(0, 3);
LinphoneUtils.scanFile(message);
holder.fileName.setText(extension);
holder.fileName.setVisibility(View.VISIBLE);
holder.fileName.setTag(appData);
}
}
}