diff options
| author | iNPUTmice <daniel@gultsch.de> | 2015-01-18 20:26:22 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2015-01-18 20:26:22 +0100 |
| commit | 149a6716b8a5d4afe61e8a9c257a0d551a6d0e3d (patch) | |
| tree | 17a4c64b0d50e93d2945ea6bb48a04afd9f2cc60 /src | |
| parent | 6756386eee42e0bd7995c82be75a2179f8f61099 (diff) | |
proper desc for offering and sending images in conversations overview
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/utils/UIHelper.java | 8 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java index d1a4b4a91..32227ff8f 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 c50355ed1..2dac29da8 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> |