From 6b156200cee55832700b8d92e2995c3a1a771e7e Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 12 Jan 2018 17:07:08 +0100
Subject: [PATCH] Added error message for failed file transfer

---
 res/values/strings.xml                               | 2 ++
 src/android/org/linphone/chat/ChatEventsAdapter.java | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5e867a6dd..dbf97d9af 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -191,6 +191,7 @@
     <string name="processing_image">Processing image, can take up to a few seconds depending on the size of the file</string>
     <string name="displayed">Read</string>
     <string name="delivered">Delivered</string>
+    <string name="sent">Sent</string>
     <string name="resend">Resend</string>
     <string name="error_opening_file">An error occurs when opening this file.</string>
     <string name="conversation_information">Infos</string>
@@ -273,6 +274,7 @@
     <!-- Errors -->
     <string name="skipable_error_service_not_ready">Warning: service is not ready</string>
     <string name="error">Error</string>
+    <string name="file_transfer_error">File transfer error</string>
     <string name="warning_wrong_destination_address">Cannot build destination address from %s</string>
     <string name="error_unknown">Unknown error</string>
     <string name="error_call_declined">Call declined</string>
diff --git a/src/android/org/linphone/chat/ChatEventsAdapter.java b/src/android/org/linphone/chat/ChatEventsAdapter.java
index 5aa72c157..da0b2e6f1 100644
--- a/src/android/org/linphone/chat/ChatEventsAdapter.java
+++ b/src/android/org/linphone/chat/ChatEventsAdapter.java
@@ -192,7 +192,13 @@ public class ChatEventsAdapter extends ListSelectionAdapter implements ChatMessa
 			    } else if (status == ChatMessage.State.NotDelivered) {
 				    holder.imdmLayout.setVisibility(View.VISIBLE);
 				    holder.imdmIcon.setImageResource(R.drawable.chat_error);
-				    holder.imdmLabel.setText(R.string.resend);
+				    holder.imdmLabel.setText(R.string.error);
+				    holder.imdmLabel.setTextColor(mContext.getResources().getColor(R.color.colorI));
+				    // TODO resend
+			    } else if (status == ChatMessage.State.FileTransferError) {
+				    holder.imdmLayout.setVisibility(View.VISIBLE);
+				    holder.imdmIcon.setImageResource(R.drawable.chat_error);
+				    holder.imdmLabel.setText(R.string.file_transfer_error);
 				    holder.imdmLabel.setTextColor(mContext.getResources().getColor(R.color.colorI));
 			    }