narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

Merge pull request #898 from SamWhited/unknown_filetype_string_fix

Browse source 
Fix string substitutions with unknown filetypes
This commit is contained in:
Daniel Gultsch 2015-01-18 11:57:17 +01:00
parent c17005218f 83c806a774
commit d8c9e12d45
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/eu/siacs/conversations/utils/UIHelper.java
View file

@ -175,10 +175,10 @@ public class UIHelper {
try { try {
mime = URLConnection.guessContentTypeFromName(path); mime = URLConnection.guessContentTypeFromName(path);
} catch (final StringIndexOutOfBoundsException ignored) { } catch (final StringIndexOutOfBoundsException ignored) {
return ""; return context.getString(R.string.file);
} }
if (mime == null) { if (mime == null) {
return ""; return context.getString(R.string.file);
} else if (mime.startsWith("audio/")) { } else if (mime.startsWith("audio/")) {
return context.getString(R.string.audio); return context.getString(R.string.audio);
} else if(mime.startsWith("video/")) { } else if(mime.startsWith("video/")) {

1
src/main/res/values/strings.xml
View file

@ -362,6 +362,7 @@
<string name="choose_file">Choose file</string> <string name="choose_file">Choose file</string>
<string name="receiving_x_file">Receiving %1$s (%2$d%% completed)</string> <string name="receiving_x_file">Receiving %1$s (%2$d%% completed)</string>
<string name="download_x_file">Download %s</string> <string name="download_x_file">Download %s</string>
<string name="file">file</string>
<string name="open_x_file">Open %s</string> <string name="open_x_file">Open %s</string>
<string name="sending_file">sending (%1$d%% completed)</string> <string name="sending_file">sending (%1$d%% completed)</string>
<string name="preparing_file">Preparing file for transmission</string> <string name="preparing_file">Preparing file for transmission</string>