~singpolyma/cheogram-android

d8c9e12d456bcf824fe39a8730ef5c0fc5e947f6 — Daniel Gultsch 9 years ago c170052 + 83c806a
Merge pull request #898 from SamWhited/unknown_filetype_string_fix

Fix string substitutions with unknown filetypes
M src/main/java/eu/siacs/conversations/utils/UIHelper.java => src/main/java/eu/siacs/conversations/utils/UIHelper.java +2 -2
@@ 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/")) {

M src/main/res/values/strings.xml => src/main/res/values/strings.xml +1 -0
@@ 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>