From 149a6716b8a5d4afe61e8a9c257a0d551a6d0e3d Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Sun, 18 Jan 2015 20:26:22 +0100
Subject: proper desc for offering and sending images in conversations overview

---
 src/main/java/eu/siacs/conversations/utils/UIHelper.java | 8 ++++++++
 src/main/res/values/strings.xml                          | 2 ++
 2 files changed, 10 insertions(+)

(limited to 'src/main')

diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
index d1a4b4a9..32227ff8 100644
--- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
@@ -129,6 +129,14 @@ public class UIHelper {
 					return new Pair<>(context.getString(R.string.file_deleted),true);
 				case Downloadable.STATUS_FAILED:
 					return new Pair<>(context.getString(R.string.file_transmission_failed),true);
+				case Downloadable.STATUS_UPLOADING:
+					if (message.getStatus() == Message.STATUS_OFFERED) {
+						return new Pair<>(context.getString(R.string.offering_x_file,
+								getFileDescriptionString(context, message)), true);
+					} else {
+						return new Pair<>(context.getString(R.string.sending_x_file,
+								getFileDescriptionString(context, message)), true);
+					}
 				default:
 					return new Pair<>("",false);
 			}
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index c50355ed..2dac29da 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -443,4 +443,6 @@
 	<string name="disable_foreground_service">Disable foreground service</string>
 	<string name="touch_to_open_conversations">Touch to open Conversations</string>
 	<string name="avatar_has_been_published">Avatar has been published!</string>
+    <string name="sending_x_file">Sending %s</string>
+    <string name="offering_x_file">Offering %s</string>
 </resources>
-- 
cgit v1.2.3