Merge pull request #901 from kriztan/patch-2

Daniel Gultsch created 11 years ago

Added new file type names for file transfers

Change summary

src/main/java/eu/siacs/conversations/utils/UIHelper.java | 4 ++++
src/main/res/values/strings.xml                          | 2 ++
2 files changed, 6 insertions(+)

Detailed changes

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;
 		}

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>