diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2015-01-18 11:57:34 +0100 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2015-01-18 11:57:34 +0100 |
commit | 78ac43cfa21d0a012bd3c5f30fc7534f2af2e9f2 (patch) | |
tree | 64e0574828a83fe07976f18fedb0ecc363b5c7ce /src | |
parent | d8c9e12d456bcf824fe39a8730ef5c0fc5e947f6 (diff) | |
parent | ae16439bd6f0fb87848ee56795af75d3cce6a693 (diff) |
Merge pull request #901 from kriztan/patch-2
Added new file type names for file transfers
Diffstat (limited to '')
-rw-r--r-- | src/main/java/eu/siacs/conversations/utils/UIHelper.java | 4 | ||||
-rw-r--r-- | src/main/res/values/strings.xml | 2 |
2 files changed, 6 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 86bc3f38..b2ca8e4a 100644 --- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java @@ -187,6 +187,10 @@ public class UIHelper { return context.getString(R.string.image); } else if (mime.contains("pdf")) { return context.getString(R.string.pdf_document) ; + } else if (mime.contains("application/vnd.android.package-archive")) { + return context.getString(R.string.apk) ; + } else if (mime.contains("vcard")) { + return context.getString(R.string.vcard) ; } else { return mime; } diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index e9699745..8baf794a 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -441,6 +441,8 @@ <string name="video">video file</string> <string name="image">image file</string> <string name="pdf_document">PDF document</string> + <string name="apk">Android App</string> + <string name="vcard">Contact</string> <string name="received_x_file">Received %s</string> <string name="disable_foreground_service">Disable foreground service</string> <string name="touch_to_open_conversations">Touch to open Conversations</string> |