Merge lp:~mzanetti/reminders-app/contenthub into lp:reminders-app

[Michael Zanetti]

Add better attachment handling and integrate with ContentHub

[lp:~mzanetti/reminders-app/contenthub]

348. By Michael Zanetti on 2015-02-16

cleanup

349. By Michael Zanetti on 2015-02-16

hide page title when in ContentPeerPicker

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:348
http://91.189.93.70:8080/job/reminders-app-ci/651/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1083/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1083/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/72

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/651/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:349
http://91.189.93.70:8080/job/reminders-app-ci/652/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1084/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1084/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/73

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/652/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:349
http://91.189.93.70:8080/job/reminders-app-ci/653/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1085/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1085/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/74

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/653/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:349
http://91.189.93.70:8080/job/reminders-app-ci/662/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2069/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/83/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/662/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/reminders-app/contenthub]

350. By Michael Zanetti on 2015-02-20

merge trunk

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:350
http://91.189.93.70:8080/job/reminders-app-ci/664/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2073
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2073/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/85

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/664/rebuild

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

lgtm, but I'm a bit puzzled by an if, see inline comment please :-)

review: Needs Information

[lp:~mzanetti/reminders-app/contenthub]

351. By Michael Zanetti on 2015-02-23

drop a debug print

352. By Michael Zanetti on 2015-02-23

cleanup more debug prints

[Riccardo Padovani (rpadovani)]

Now it's perfect, thanks :-)

review: Approve

=== modified file 'reminders.apparmor'
--- reminders.apparmor	2015-02-12 20:34:11 +0000
+++ reminders.apparmor	2015-02-23 17:57:16 +0000
@@ -7,7 +7,8 @@
         "webview",
         "push-notification-client",
         "calendar",
-        "connectivity"
+        "connectivity",
+        "content_exchange_source"
     ],
     "policy_version": 1.2
 }
\ No newline at end of file

=== modified file 'src/app/qml/components/NotesDelegate.qml'
--- src/app/qml/components/NotesDelegate.qml	2015-02-23 11:31:34 +0000
+++ src/app/qml/components/NotesDelegate.qml	2015-02-23 17:57:16 +0000
@@ -94,15 +94,10 @@
                 anchors.fill: parent
                 spacing: 0
 
-                Rectangle {
+                Item {
                     Layout.fillWidth: true
                     Layout.fillHeight: true
 
-                    gradient: Gradient {
-                        GradientStop{ position: 0.8; color: "transparent" }
-                        GradientStop{ position: 1; color: "#d9d9d9" }
-                    }
-
                     RowLayout {
                         anchors.fill: parent
                         anchors.margins: units.gu(1)
@@ -177,6 +172,14 @@
                     fillMode: Image.PreserveAspectCrop
                 }
             }
+            Rectangle {
+                anchors.fill: parent
+                gradient: Gradient {
+                    GradientStop{ position: 0.8; color: "transparent" }
+                    GradientStop{ position: 1; color: "#d9d9d9" }
+                }
+            }
         }
+
     }
 }

=== modified file 'src/app/qml/ui/NotePage.qml'
--- src/app/qml/ui/NotePage.qml	2014-12-10 18:09:10 +0000
+++ src/app/qml/ui/NotePage.qml	2015-02-23 17:57:16 +0000
@@ -23,7 +23,7 @@
 
 Page {
     id: root
-    title: noteView.title || i18n.tr("Untitled")
+    title: noteView.title
     property alias note: noteView.note
 
     signal editNote(var note)

=== modified file 'src/app/qml/ui/NoteView.qml'
--- src/app/qml/ui/NoteView.qml	2014-12-10 18:09:10 +0000
+++ src/app/qml/ui/NoteView.qml	2015-02-23 17:57:16 +0000
@@ -19,12 +19,14 @@
 import QtQuick 2.3
 import Ubuntu.Components 1.1
 import com.canonical.Oxide 1.0
+import Ubuntu.Content 1.0
 import Evernote 0.1
 import "../components"
 
 Item {
     id: root
-    property string title: note ? note.title : ""
+    property string title: contentPeerPicker.visible ? ""
+                            : note ? note.title : i18n.tr("Untitled")
     property var note: null
 
     signal openTaggedNotes(string title, string tagGuid)
@@ -40,7 +42,7 @@
 
         userScripts: [
             UserScript {
-                context: 'reminders://todo'
+                context: 'reminders://interaction'
                 url: Qt.resolvedUrl("reminders-scripts.js");
             }
         ]
@@ -70,16 +72,32 @@
 
         messageHandlers: [
             ScriptMessageHandler {
-                msgId: 'todo'
-                contexts: ['reminders://todo']
+                msgId: 'interaction'
+                contexts: ['reminders://interaction']
                 callback: function(message, frame) {
                     var data = message.args;
 
                     switch (data.type) {
-                        case "checkboxChanged":
+                    case "checkboxChanged":
                         note.markTodo(data.todoId, data.checked);
                         NotesStore.saveNote(note.guid);
                         break;
+                    case "attachmentOpened":
+                        var filePath = root.note.resource(data.resourceHash).hashedFilePath;
+                        contentPeerPicker.filePath = filePath;
+
+                        if (data.mediaType == "application/pdf") {
+                            contentPeerPicker.contentType = ContentType.Documents;
+                        } else if (data.mediaType.split("/")[0] == "audio" ) {
+                            contentPeerPicker.contentType = ContentType.Music;
+                        } else if (data.mediaType.split("/")[0] == "image" ) {
+                            contentPeerPicker.contentType = ContentType.Pictures;
+                        } else if (data.mediaType == "application/octet-stream" ) {
+                            contentPeerPicker.contentType = ContentType.All;
+                        } else {
+                            contentPeerPicker.contentType = ContentType.Unknown;
+                        }
+                        contentPeerPicker.visible = true;
                     }
                 }
             }
@@ -121,4 +139,32 @@
             }
         }
     }
+
+    ContentItem {
+        id: exportItem
+        name: i18n.tr("Attachment")
+    }
+
+    ContentPeerPicker {
+        id: contentPeerPicker
+        visible: false
+        contentType: ContentType.Unknown
+        handler: ContentHandler.Destination
+        anchors.fill: parent
+
+        property string filePath: ""
+        onPeerSelected: {
+            var transfer = peer.request();
+            if (transfer.state === ContentTransfer.InProgress) {
+                var items = new Array()
+                var path = contentPeerPicker.filePath;
+                exportItem.url = path
+                items.push(exportItem);
+                transfer.items = items;
+                transfer.state = ContentTransfer.Charged;
+            }
+            contentPeerPicker.visible = false
+        }
+        onCancelPressed: contentPeerPicker.visible = false
+    }
 }

=== modified file 'src/app/qml/ui/reminders-scripts.js'
--- src/app/qml/ui/reminders-scripts.js	2014-07-14 15:40:30 +0000
+++ src/app/qml/ui/reminders-scripts.js	2015-02-23 17:57:16 +0000
@@ -1,12 +1,22 @@
 function handleClickEvent(event) {
     var todoTag = "en-todo";
-    if (event.srcElement.id.slice(0, todoTag.length) === todoTag) {
+    var attachmentTag = "en-attachment";
+
+    var idFields = event.srcElement.id.split("/");
+    if (idFields[0] === todoTag) {
         message = new Object;
         message.type = "checkboxChanged";
-        message.todoId = event.srcElement.id;
+        message.todoId = idFields[1];
         message.checked = event.srcElement.checked;
-        oxide.sendMessage('todo', message);
+        oxide.sendMessage('interaction', message);
+    } else if (idFields[0] === attachmentTag) {
+        message = new Object;
+        message.type = "attachmentOpened";
+        message.resourceHash = idFields[1];
+        message.mediaType = idFields[2] + "/" + idFields[3]
+        oxide.sendMessage('interaction', message);
     }
+
 }
 
 var doc = document.documentElement;

=== modified file 'src/libqtevernote/evernoteconnection.cpp'
--- src/libqtevernote/evernoteconnection.cpp	2014-12-14 20:19:58 +0000
+++ src/libqtevernote/evernoteconnection.cpp	2015-02-23 17:57:16 +0000
@@ -161,8 +161,10 @@
     m_errorMessage.clear();
     emit errorChanged();
 
-    m_notesStoreHttpClient->close();
-    m_userStoreHttpClient->close();
+    try {
+        m_notesStoreHttpClient->close();
+        m_userStoreHttpClient->close();
+    } catch (...) {}
     emit isConnectedChanged();
 }
 

=== modified file 'src/libqtevernote/note.cpp'
--- src/libqtevernote/note.cpp	2015-02-12 22:57:46 +0000
+++ src/libqtevernote/note.cpp	2015-02-23 17:57:16 +0000
@@ -501,9 +501,11 @@
         return m_resources.value(hash);
     }
 
+    qDebug() << "adding resource" << fileName << type;
     Resource *resource = new Resource(data, hash, fileName, type, this);
     m_resources.insert(hash, resource);
     emit resourcesChanged();
+    emit contentChanged();
 
     QSettings infoFile(m_infoFile, QSettings::IniFormat);
     infoFile.beginGroup("resources");

=== modified file 'src/libqtevernote/note.h'
--- src/libqtevernote/note.h	2014-12-16 21:01:28 +0000
+++ src/libqtevernote/note.h	2015-02-23 17:57:16 +0000
@@ -148,7 +148,7 @@
     bool conflicting() const;
 
     QStringList resourceUrls() const;
-    Resource* resource(const QString &hash);
+    Q_INVOKABLE Resource* resource(const QString &hash);
     QList<Resource*> resources() const;
     Resource *addResource(const QByteArray &data, const QString &hash, const QString &fileName, const QString &type);
 

=== modified file 'src/libqtevernote/notesstore.cpp'
--- src/libqtevernote/notesstore.cpp	2015-02-12 21:57:51 +0000
+++ src/libqtevernote/notesstore.cpp	2015-02-23 17:57:16 +0000
@@ -787,7 +787,7 @@
             qDebug() << "refetching for image";
             refreshWithResourceData = true;
         }
-        roles << RoleResourceUrls;
+        roles << RoleHtmlContent << RoleEnmlContent << RoleResourceUrls;
     }
 
     if (what == FetchNoteJob::LoadContent) {
@@ -822,10 +822,10 @@
     if (refreshWithResourceData) {
         qDebug() << "refreshWithResourceData";
         refreshNoteContent(note->guid(), FetchNoteJob::LoadResources);
+    } else {
+        syncToCacheFile(note); // Syncs into the list cache
+        note->syncToCacheFile(); // Syncs note's content into notes cache
     }
-
-    syncToCacheFile(note); // Syncs into the list cache
-    note->syncToCacheFile(); // Syncs note's content into notes cache
 }
 
 void NotesStore::refreshNotebooks()

=== modified file 'src/libqtevernote/resource.cpp'
--- src/libqtevernote/resource.cpp	2015-02-12 20:30:07 +0000
+++ src/libqtevernote/resource.cpp	2015-02-23 17:57:16 +0000
@@ -35,7 +35,7 @@
     m_type(type)
 {
 
-    m_filePath = QStandardPaths::standardLocations(QStandardPaths::CacheLocation).first() + "/" + NotesStore::instance()->username() + "/" + hash + "." + type.split('/').last();
+    m_filePath = QStandardPaths::standardLocations(QStandardPaths::CacheLocation).first() + "/" + NotesStore::instance()->username() + "/" + hash + "." + m_fileName.split('.').last();
 
     QFile file(m_filePath);
     if (!data.isEmpty() && !file.exists()) {
@@ -84,7 +84,7 @@
         qWarning() << "cannot determine mime type of file" << m_fileName;
     }
 
-    m_filePath = QStandardPaths::standardLocations(QStandardPaths::CacheLocation).first() + "/" + NotesStore::instance()->username() + "/" + m_hash + "." + m_type.split('/').last();
+    m_filePath = QStandardPaths::standardLocations(QStandardPaths::CacheLocation).first() + "/" + NotesStore::instance()->username() + "/" + m_hash + "." + m_fileName.split('.').last();
 
     QFile copy(m_filePath);
     if (!copy.exists()) {
@@ -108,6 +108,11 @@
     return m_type;
 }
 
+QString Resource::hashedFilePath() const
+{
+    return m_filePath;
+}
+
 QByteArray Resource::imageData(const QSize &size)
 {
     if (!m_type.startsWith("image/")) {

=== modified file 'src/libqtevernote/resource.h'
--- src/libqtevernote/resource.h	2014-10-23 21:27:46 +0000
+++ src/libqtevernote/resource.h	2015-02-23 17:57:16 +0000
@@ -32,6 +32,7 @@
     Q_PROPERTY(QString hash READ hash CONSTANT)
     Q_PROPERTY(QString fileName READ fileName CONSTANT)
     Q_PROPERTY(QString type READ type CONSTANT)
+    Q_PROPERTY(QString hashedFilePath READ hashedFilePath CONSTANT)
 
 public:
     Resource(const QString &path, QObject *parent = 0);
@@ -43,6 +44,7 @@
     QString hash() const;
     QString fileName() const;
     QString type() const;
+    QString hashedFilePath() const;
 
     QByteArray imageData(const QSize &size = QSize());
 

=== modified file 'src/libqtevernote/resourceimageprovider.cpp'
--- src/libqtevernote/resourceimageprovider.cpp	2015-02-20 18:30:08 +0000
+++ src/libqtevernote/resourceimageprovider.cpp	2015-02-23 17:57:16 +0000
@@ -32,10 +32,13 @@
         }
         image = QImage::fromData(NotesStore::instance()->note(noteGuid)->resource(resourceHash)->imageData(tmpSize));
     } else if (mediaType.startsWith("audio")) {
-        image.load("/usr/share/icons/ubuntu-mobile/actions/scalable/media-playback-start.svg");
+        image.load("/usr/share/icons/suru/mimetypes/scalable/audio-x-generic-symbolic.svg");
+    } else if (mediaType == "application/pdf") {
+        image.load("/usr/share/icons/suru/mimetypes/scalable/application-pdf-symbolic.svg");
     } else {
-        image.load("/usr/share/icons/ubuntu-mobile/actions/scalable/help.svg");
+        image.load("/usr/share/icons/suru/mimetypes/scalable/empty-symbolic.svg");
     }
+
     *size = image.size();
     return image;
 }

=== modified file 'src/libqtevernote/utils/enmldocument.cpp'
--- src/libqtevernote/utils/enmldocument.cpp	2014-12-14 23:31:19 +0000
+++ src/libqtevernote/utils/enmldocument.cpp	2015-02-23 17:57:16 +0000
@@ -157,15 +157,11 @@
                 writer.writeStartElement("img");
                 if (mediaType.startsWith("image")) {
                     if (type == TypeRichText) {
-                        QUrl url("image://resource/" + mediaType);
-                        QUrlQuery arguments;
-                        arguments.addQueryItem("noteGuid", noteGuid);
-                        arguments.addQueryItem("hash", hash);
-                        url.setQuery(arguments);
-                        writer.writeAttribute("src", url.toString());
+                        writer.writeAttribute("src", composeMediaTypeUrl(mediaType, noteGuid, hash));
                     } else if (type  == TypeHtml) {
                         QString imagePath = QStandardPaths::standardLocations(QStandardPaths::CacheLocation).first() + "/" + NotesStore::instance()->username() + "/" + hash + "." + mediaType.split('/').last();
                         writer.writeAttribute("src", imagePath);
+                        writer.writeAttribute("id", "en-attachment/" + hash + "/" + mediaType);
                     }
 
                     //set the width
@@ -183,29 +179,37 @@
                     }
                 } else if (mediaType.startsWith("audio")) {
                     if (type == TypeRichText) {
-                        QUrl url("image://resource/" + mediaType);
-                        QUrlQuery arguments;
-                        arguments.addQueryItem("noteGuid", noteGuid);
-                        arguments.addQueryItem("hash", hash);
-                        url.setQuery(arguments);
-                        writer.writeAttribute("src", url.toString());
-                    } else if (type == TypeHtml) {
-                        QString imagePath = "file:///usr/share/icons/ubuntu-mobile/actions/scalable/media-playback-start.svg";
-                        writer.writeAttribute("src", imagePath);
-                        writer.writeCharacters(NotesStore::instance()->note(noteGuid)->resource(hash)->fileName());
+                        writer.writeAttribute("src", composeMediaTypeUrl(mediaType, noteGuid, hash));
+                    } else if (type == TypeHtml) {
+                        QString imagePath = "file:///usr/share/icons/suru/mimetypes/scalable/audio-x-generic-symbolic.svg";
+                        writer.writeAttribute("src", imagePath);
+                        writer.writeAttribute("id", "en-attachment/" + hash + "/" + mediaType);
+                        if (NotesStore::instance()->note(noteGuid)->resource(hash)) {
+                            writer.writeCharacters(NotesStore::instance()->note(noteGuid)->resource(hash)->fileName());
+                        }
+                    }
+                } else if (mediaType == "application/pdf") {
+                    if (type == TypeRichText) {
+                        writer.writeAttribute("src", composeMediaTypeUrl(mediaType, noteGuid, hash));
+                    } else if (type == TypeHtml) {
+                        QString imagePath = "file:///usr/share/icons/suru/mimetypes/scalable/application-pdf-symbolic.svg";
+                        writer.writeAttribute("src", imagePath);
+                        writer.writeAttribute("id", "en-attachment/" + hash + "/" + mediaType);
+                        if (NotesStore::instance()->note(noteGuid)->resource(hash)) {
+                            writer.writeCharacters(NotesStore::instance()->note(noteGuid)->resource(hash)->fileName());
+                        }
                     }
                 } else {
+                    qDebug() << "unknown mediatype" << mediaType;
                     if (type == TypeRichText) {
-                        QUrl url("image://resource/" + mediaType);
-                        QUrlQuery arguments;
-                        arguments.addQueryItem("noteGuid", noteGuid);
-                        arguments.addQueryItem("hash", hash);
-                        url.setQuery(arguments);
-                        writer.writeAttribute("src", url.toString());
+                        writer.writeAttribute("src", composeMediaTypeUrl(mediaType, noteGuid, hash));
                     } else if (type == TypeHtml) {
-                        QString imagePath = "file:///usr/share/icons/ubuntu-mobile/actions/scalable/help.svg";
+                        QString imagePath = "file:///usr/share/icons/suru/mimetypes/scalable/empty-symbolic.svg";
                         writer.writeAttribute("src", imagePath);
-                        writer.writeCharacters(NotesStore::instance()->note(noteGuid)->resource(hash)->fileName());
+                        writer.writeAttribute("id", "en-attachment/" + hash + "/" + mediaType);
+                        if (NotesStore::instance()->note(noteGuid)->resource(hash)) {
+                            writer.writeCharacters(NotesStore::instance()->note(noteGuid)->resource(hash)->fileName());
+                        }
                     }
                 }
             }
@@ -225,7 +229,7 @@
                     writer.writeAttribute("height", QString::number(gu(2)));
                 } else if (type == TypeHtml){
                     writer.writeStartElement("input");
-                    writer.writeAttribute("id", "en-todo" + QString::number(todoIndex++));
+                    writer.writeAttribute("id", "en-todo/" + QString::number(todoIndex++));
                     writer.writeAttribute("type", "checkbox");
                     if (checked) {
                         writer.writeAttribute("checked", "true");
@@ -283,6 +287,16 @@
     return px * ppgu;
 }
 
+QString EnmlDocument::composeMediaTypeUrl(const QString &mediaType, const QString &noteGuid, const QString &hash) const
+{
+    QUrl url("image://resource/" + mediaType);
+    QUrlQuery arguments;
+    arguments.addQueryItem("noteGuid", noteGuid);
+    arguments.addQueryItem("hash", hash);
+    url.setQuery(arguments);
+    return url.toString();
+}
+
 void EnmlDocument::setRichText(const QString &richText)
 {
     // output
@@ -408,7 +422,7 @@
     writer.writeDTD("<!DOCTYPE en-note SYSTEM \"http://xml.evernote.com/pub/enml2.dtd\">");
 
     QString tmp = todoId;
-    int todoIndex = tmp.remove("en-todo").toInt();
+    int todoIndex = tmp.toInt();
     int todoCounter = 0;
 
     while (!reader.atEnd() && !reader.hasError()) {

=== modified file 'src/libqtevernote/utils/enmldocument.h'
--- src/libqtevernote/utils/enmldocument.h	2014-11-10 00:54:16 +0000
+++ src/libqtevernote/utils/enmldocument.h	2015-02-23 17:57:16 +0000
@@ -53,6 +53,8 @@
 
     qreal gu(qreal px) const;
 
+    QString composeMediaTypeUrl(const QString &mediaType, const QString &noteGuid, const QString &hash) const;
+
 private:
     QString m_enml;