~singpolyma/cheogram-android

78ac43cfa21d0a012bd3c5f30fc7534f2af2e9f2 — Daniel Gultsch 9 years ago d8c9e12 + ae16439
Merge pull request #901 from kriztan/patch-2

Added new file type names for file transfers
M src/main/java/eu/siacs/conversations/utils/UIHelper.java => src/main/java/eu/siacs/conversations/utils/UIHelper.java +4 -0
@@ 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;
		}

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