Merge lp:~popey/ubuntu-filemanager-app/fix-1447721 into lp:ubuntu-filemanager-app

Status: Merged
Approved by: Arto Jalkanen
Approved revision: 507
Merged at revision: 507
Proposed branch: lp:~popey/ubuntu-filemanager-app/fix-1447721
Merge into: lp:ubuntu-filemanager-app
Diff against target: 18 lines (+3/-1)
1 file modified
src/app/qml/content-hub/contenttyperesolver.js (+3/-1)
To merge this branch: bzr merge lp:~popey/ubuntu-filemanager-app/fix-1447721
Reviewer Review Type Date Requested Status
Arto Jalkanen Approve
Jenkins Bot continuous-integration Approve
Review via email: mp+279429@code.launchpad.net

Commit message

Simple patch which adds support for opening vcard/vcf files via content hub. Contacts app is a target, others (like Dekko) may follow later.

Description of the change

Dropped a vcard file in ~/Documents and then tapped it to test, it launched content-hub and opened successfully in Contacts app. Tested on bq E4.5 running stable channel.

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Arto Jalkanen (ajalkane) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/app/qml/content-hub/contenttyperesolver.js'
--- src/app/qml/content-hub/contenttyperesolver.js 2015-08-29 00:54:25 +0000
+++ src/app/qml/content-hub/contenttyperesolver.js 2015-12-03 12:11:38 +0000
@@ -55,6 +55,9 @@
55 'ppt': CH.ContentType.Documents,55 'ppt': CH.ContentType.Documents,
56 'pptx': CH.ContentType.Documents,56 'pptx': CH.ContentType.Documents,
57 'pdf': CH.ContentType.Documents,57 'pdf': CH.ContentType.Documents,
58
59 'vcf': CH.ContentType.Contacts,
60 'vcard': CH.ContentType.Contacts,
58}61}
5962
60function resolveContentType(fileUrl) {63function resolveContentType(fileUrl) {
@@ -78,4 +81,3 @@
78 var lastDotIndex = fileUrl.lastIndexOf('.')81 var lastDotIndex = fileUrl.lastIndexOf('.')
79 return lastDotIndex > -1 ? fileUrl.substring(lastDotIndex + 1) : ''82 return lastDotIndex > -1 ? fileUrl.substring(lastDotIndex + 1) : ''
80}83}
81

Subscribers

People subscribed via source and target branches