diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-01-17 15:41:12 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-01-17 15:41:12 +0100 |
| commit | c17005218f454397535bcbddf09ecf75553fb2b8 (patch) | |
| tree | 24198055d980451c6ca15f4d2ca8d1ea944bddc5 /src/main/java/eu/siacs/conversations/services/NotificationService.java | |
| parent | be169215caa26bce5cf707ea7ce8db79da21f8e1 (diff) | |
| parent | dfc1cea882b33c7bf27bca5a349377b6ed966a75 (diff) | |
Merge pull request #897 from SamWhited/download_file_fixes
Correct the download file string on notifications
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services/NotificationService.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/services/NotificationService.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java index efdd2b60..8c3aff16 100644 --- a/src/main/java/eu/siacs/conversations/services/NotificationService.java +++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java @@ -264,11 +264,8 @@ public class NotificationService { if ((message = getFirstDownloadableMessage(messages)) != null) { mBuilder.addAction( R.drawable.ic_action_download, - mXmppConnectionService.getResources().getString( - message.getType() == Message.TYPE_IMAGE ? - R.string.download_image : - R.string.download_file - ), + mXmppConnectionService.getResources().getString(R.string.download_x_file, + UIHelper.getFileDescriptionString(mXmppConnectionService, message)), createDownloadIntent(message) ); } |