Merge lp:~mzanetti/reminders-app/fix-attaching-images into lp:reminders-app

[Michael Zanetti]

fix attaching images

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

PASSED: Continuous integration, rev:67
http://91.189.93.70:8080/job/reminders-app-ci/211/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1346
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/211
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/211

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

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

Doesn't work on mako.

I click the button in the toolbar and have this output:
http://paste.ubuntu.com/6951603/

Then I choose the photo and click on pick.
First of all, the gallery is open, and I have to return to the app using a swype.
In the app there is no photo.
The output on terminal after I pick the photo is:
http://paste.ubuntu.com/6951616/

review: Needs Fixing

[Riccardo Padovani (rpadovani)]

After a total reset of mako it works as expected.
Sorry for the delay!

review: Approve

=== modified file 'src/app/qml/ui/EditNotePage.qml'
--- src/app/qml/ui/EditNotePage.qml	2014-02-05 10:14:57 +0000
+++ src/app/qml/ui/EditNotePage.qml	2014-02-17 22:05:11 +0000
@@ -47,8 +47,9 @@
          target: priv.activeTransfer ? priv.activeTransfer : null
          onStateChanged: {
              if (priv.activeTransfer.state === ContentTransfer.Charged) {
-                 print("attaching", priv.activeTransfer.items[0].url.toString())
-                 note.attachFile(priv.insertPosition, priv.activeTransfer.items[0].url.toString())
+                 var file = priv.activeTransfer.items[0].url.toString()
+                 print("attaching file", file, "on note", note)
+                 note.attachFile(priv.insertPosition, file);
              }
          }
      }

=== modified file 'src/plugin/Evernote/note.cpp'
--- src/plugin/Evernote/note.cpp	2014-02-05 17:26:54 +0000
+++ src/plugin/Evernote/note.cpp	2014-02-17 22:05:11 +0000
@@ -261,12 +261,12 @@
 
 void Note::attachFile(int position, const QUrl &fileName)
 {
-    QFile importedFile(fileName.toString());
+    QFile importedFile(fileName.path());
     if (!importedFile.exists()) {
+        qWarning() << "File doesn't exist. Cannot attach.";
         return;
     }
 
-    qDebug() << "attaching file" << position << fileName;
     Resource *resource = addResource(fileName.path());
     m_content.attachFile(position, fileName.path(), resource->hash(), resource->type());
     emit contentChanged();