sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #901 from kriztan/patch-2 

Added new file type names for file transfers
This commit is contained in:
Daniel Gultsch 2015-01-18 11:57:34 +01:00
parent d8c9e12d45 ae16439bd6
commit 78ac43cfa2
2 changed files with 6 additions and 0 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

@ -187,6 +187,10 @@ public class UIHelper {
return context.getString(R.string.image); return context.getString(R.string.image);
} else if (mime.contains("pdf")) { } else if (mime.contains("pdf")) {
return context.getString(R.string.pdf_document) ; 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 { } else {
return mime; return mime;
} }

2
src/main/res/values/strings.xml
View File

@ -441,6 +441,8 @@
<string name="video">video file</string> <string name="video">video file</string>
<string name="image">image file</string> <string name="image">image file</string>
<string name="pdf_document">PDF document</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="received_x_file">Received %s</string>
<string name="disable_foreground_service">Disable foreground service</string> <string name="disable_foreground_service">Disable foreground service</string>
<string name="touch_to_open_conversations">Touch to open Conversations</string> <string name="touch_to_open_conversations">Touch to open Conversations</string>