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

Status: Merged
Approved by: Arto Jalkanen on 2015-12-04
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 2015-12-03 Approve on 2015-12-04
Jenkins Bot continuous-integration Approve on 2015-12-03
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.
review: Approve (continuous-integration)
Arto Jalkanen (ajalkane) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/qml/content-hub/contenttyperesolver.js'
2--- src/app/qml/content-hub/contenttyperesolver.js 2015-08-29 00:54:25 +0000
3+++ src/app/qml/content-hub/contenttyperesolver.js 2015-12-03 12:11:38 +0000
4@@ -55,6 +55,9 @@
5 'ppt': CH.ContentType.Documents,
6 'pptx': CH.ContentType.Documents,
7 'pdf': CH.ContentType.Documents,
8+
9+ 'vcf': CH.ContentType.Contacts,
10+ 'vcard': CH.ContentType.Contacts,
11 }
12
13 function resolveContentType(fileUrl) {
14@@ -78,4 +81,3 @@
15 var lastDotIndex = fileUrl.lastIndexOf('.')
16 return lastDotIndex > -1 ? fileUrl.substring(lastDotIndex + 1) : ''
17 }
18-

Subscribers

People subscribed via source and target branches