aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-01-18 11:57:17 +0100
committerDaniel Gultsch <daniel@gultsch.de>2015-01-18 11:57:17 +0100
commitd8c9e12d456bcf824fe39a8730ef5c0fc5e947f6 (patch)
tree689b347b830ddc864dce6b0bd12ed7912293048c /src/main
parentc17005218f454397535bcbddf09ecf75553fb2b8 (diff)
parent83c806a774a09d54a0ef84ec5400c348256ff03b (diff)
Merge pull request #898 from SamWhited/unknown_filetype_string_fix
Fix string substitutions with unknown filetypes
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/eu/siacs/conversations/utils/UIHelper.java4
-rw-r--r--src/main/res/values/strings.xml1
2 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
index f468d9ae..86bc3f38 100644
--- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
@@ -175,10 +175,10 @@ public class UIHelper {
try {
mime = URLConnection.guessContentTypeFromName(path);
} catch (final StringIndexOutOfBoundsException ignored) {
- return "";
+ return context.getString(R.string.file);
}
if (mime == null) {
- return "";
+ return context.getString(R.string.file);
} else if (mime.startsWith("audio/")) {
return context.getString(R.string.audio);
} else if(mime.startsWith("video/")) {
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index fb6878ce..e9699745 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -362,6 +362,7 @@
<string name="choose_file">Choose file</string>
<string name="receiving_x_file">Receiving %1$s (%2$d%% completed)</string>
<string name="download_x_file">Download %s</string>
+ <string name="file">file</string>
<string name="open_x_file">Open %s</string>
<string name="sending_file">sending (%1$d%% completed)</string>
<string name="preparing_file">Preparing file for transmission</string>