Ubuntu Notes app

Merge lp:~mzanetti/reminders-app/only-resources into lp:reminders-app

  1. only-resources
  2. Merge into trunk
Proposed by Michael Zanetti
Status: Merged
Approved by: Michael Zanetti
Approved revision: 290
Merged at revision: 297
Proposed branch: lp:~mzanetti/reminders-app/only-resources
Merge into: lp:reminders-app
Prerequisite: lp:~rpadovani/reminders-app/updatedRole
Diff against target: 444 lines (+84/-47)
10 files modified
po/com.ubuntu.reminders.pot (+50/-30)
src/libqtevernote/jobs/evernotejob.cpp (+3/-0)
src/libqtevernote/jobs/evernotejob.h (+0/-1)
src/libqtevernote/jobs/fetchnotejob.cpp (+6/-5)
src/libqtevernote/jobs/fetchnotejob.h (+8/-3)
src/libqtevernote/jobs/savenotebookjob.h (+2/-0)
src/libqtevernote/jobs/savenotejob.h (+2/-0)
src/libqtevernote/jobs/savetagjob.h (+2/-0)
src/libqtevernote/notesstore.cpp (+8/-6)
src/libqtevernote/notesstore.h (+3/-2)
To merge this branch: bzr merge lp:~mzanetti/reminders-app/only-resources
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
David Planella Approve
Review via email: mp+239605@code.launchpad.net

This proposal supersedes a proposal from 2014-10-24.

Commit message

Don't reload the note's content when reloading a note for its resources

Description of the change

This changes the code to only load resources if we're interested in those instead of reloading the content along with the images. Should slightly improve performance when loading images from the server

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:288
http://91.189.93.70:8080/job/reminders-app-ci/570/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1266
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1266/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/266

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

review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:289
http://91.189.93.70:8080/job/reminders-app-ci/582/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/34
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/34/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/3

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

review: Approve (continuous-integration)
Revision history for this message
David Planella (dpm) :
review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/reminders-app-autolanding/284/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/61/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-autolanding/6/console

review: Needs Fixing (continuous-integration)
lp:~mzanetti/reminders-app/only-resources updated
290. By Michael Zanetti

merge trunk

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:290
http://91.189.93.70:8080/job/reminders-app-ci/591/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/63
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/63/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/12

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'po/com.ubuntu.reminders.pot'
--- po/com.ubuntu.reminders.pot 2014-11-06 20:08:06 +0000
+++ po/com.ubuntu.reminders.pot 2014-11-07 19:53:57 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: \n"9"Project-Id-Version: \n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2014-10-23 23:05+0200\n"11"POT-Creation-Date: 2014-11-07 20:51+0100\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@
17"Content-Type: text/plain; charset=CHARSET\n"17"Content-Type: text/plain; charset=CHARSET\n"
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
1919
20#: com.ubuntu.reminders.desktop.in.in.h:1 src/app/qml/reminders.qml:26720#: com.ubuntu.reminders.desktop.in.in.h:1 src/app/qml/reminders.qml:274
21msgid "Reminders"21msgid "Reminders"
22msgstr ""22msgstr ""
2323
@@ -38,6 +38,12 @@
38msgid "Private"38msgid "Private"
39msgstr ""39msgstr ""
4040
41#. TRANSLATORS: the argument is a modification date that follows this format:
42#. http://qt-project.org/doc/qt-5/qml-qtqml-date.html
43#: src/app/qml/components/NotesDelegate.qml:107
44msgid "dddd, d hh:mm"
45msgstr ""
46
41#: src/app/qml/components/PulldownListView.qml:4047#: src/app/qml/components/PulldownListView.qml:40
42msgid "Release to refresh"48msgid "Release to refresh"
43msgstr ""49msgstr ""
@@ -55,33 +61,33 @@
55msgid "Mark as done"61msgid "Mark as done"
56msgstr ""62msgstr ""
5763
58#: src/app/qml/reminders.qml:20764#: src/app/qml/reminders.qml:214
59msgid "Notes"65msgid "Notes"
60msgstr ""66msgstr ""
6167
62#: src/app/qml/reminders.qml:23868#: src/app/qml/reminders.qml:245
63msgid "Notebooks"69msgid "Notebooks"
64msgstr ""70msgstr ""
6571
66#: src/app/qml/reminders.qml:28272#: src/app/qml/reminders.qml:289
67msgid "Tags"73msgid "Tags"
68msgstr ""74msgstr ""
6975
70#: src/app/qml/reminders.qml:32276#: src/app/qml/reminders.qml:329
71msgid ""77msgid ""
72"No note selected.\n"78"No note selected.\n"
73"Select a note to see it in detail."79"Select a note to see it in detail."
74msgstr ""80msgstr ""
7581
76#: src/app/qml/reminders.qml:35982#: src/app/qml/reminders.qml:366
77msgid "No account available"83msgid "No account available"
78msgstr ""84msgstr ""
7985
80#: src/app/qml/reminders.qml:36086#: src/app/qml/reminders.qml:367
81msgid "Please configure and authorize an Evernote account in System Settings"87msgid "Please configure and authorize an Evernote account in System Settings"
82msgstr ""88msgstr ""
8389
84#: src/app/qml/reminders.qml:380 src/app/qml/ui/AccountSelectorPage.qml:6390#: src/app/qml/reminders.qml:387
85msgid "Add account"91msgid "Add account"
86msgstr ""92msgstr ""
8793
@@ -89,6 +95,19 @@
89msgid "Select Evernote account"95msgid "Select Evernote account"
90msgstr ""96msgstr ""
9197
98#: src/app/qml/ui/AccountSelectorPage.qml:74
99#, qt-format
100msgid "%1 - Tap to authorize"
101msgstr ""
102
103#: src/app/qml/ui/AccountSelectorPage.qml:83
104msgid "Add new account"
105msgstr ""
106
107#: src/app/qml/ui/AccountSelectorPage.qml:92
108msgid "Back"
109msgstr ""
110
92#: src/app/qml/ui/EditNoteView.qml:100 src/app/qml/ui/EditNoteView.qml:112111#: src/app/qml/ui/EditNoteView.qml:100 src/app/qml/ui/EditNoteView.qml:112
93#: src/app/qml/ui/NotesPage.qml:71112#: src/app/qml/ui/NotesPage.qml:71
94msgid "Untitled"113msgid "Untitled"
@@ -141,12 +160,12 @@
141msgid "Add note"160msgid "Add note"
142msgstr ""161msgstr ""
143162
144#: src/app/qml/ui/NotesPage.qml:214163#: src/app/qml/ui/NotesPage.qml:215
145msgid ""164msgid ""
146"No notes available. You can create new notes using the \"Add note\" button."165"No notes available. You can create new notes using the \"Add note\" button."
147msgstr ""166msgstr ""
148167
149#: src/app/qml/ui/RemindersPage.qml:111168#: src/app/qml/ui/RemindersPage.qml:112
150msgid ""169msgid ""
151"No reminders available. You can create new reminders by setting a reminder "170"No reminders available. You can create new reminders by setting a reminder "
152"when viewing a note."171"when viewing a note."
@@ -164,69 +183,70 @@
164msgid "No tags available. You can tag notes while viewing them."183msgid "No tags available. You can tag notes while viewing them."
165msgstr ""184msgstr ""
166185
167#: src/libqtevernote/jobs/evernotejob.cpp:91186#: src/libqtevernote/jobs/evernotejob.cpp:94
168msgid "Authentication expired."187msgid "Authentication expired."
169msgstr ""188msgstr ""
170189
171#: src/libqtevernote/jobs/evernotejob.cpp:95190#: src/libqtevernote/jobs/evernotejob.cpp:98
172msgid "Limit exceeded."191msgid "Limit exceeded."
173msgstr ""192msgstr ""
174193
175#: src/libqtevernote/jobs/evernotejob.cpp:99194#: src/libqtevernote/jobs/evernotejob.cpp:102
176msgid "Rate limit exceeded."195msgid "Rate limit exceeded."
177msgstr ""196msgstr ""
178197
179#: src/libqtevernote/jobs/evernotejob.cpp:103198#: src/libqtevernote/jobs/evernotejob.cpp:106
180msgid "Quota exceeded."199msgid "Quota exceeded."
181msgstr ""200msgstr ""
182201
183#: src/libqtevernote/note.cpp:82 src/libqtevernote/note.cpp:260202#: src/libqtevernote/note.cpp:82 src/libqtevernote/note.cpp:116
203#: src/libqtevernote/note.cpp:294
184msgid "Today"204msgid "Today"
185msgstr ""205msgstr ""
186206
187#: src/libqtevernote/note.cpp:85207#: src/libqtevernote/note.cpp:85 src/libqtevernote/note.cpp:119
188msgid "Yesterday"208msgid "Yesterday"
189msgstr ""209msgstr ""
190210
191#: src/libqtevernote/note.cpp:88211#: src/libqtevernote/note.cpp:88 src/libqtevernote/note.cpp:122
192msgid "Last week"212msgid "Last week"
193msgstr ""213msgstr ""
194214
195#: src/libqtevernote/note.cpp:91215#: src/libqtevernote/note.cpp:91 src/libqtevernote/note.cpp:125
196msgid "Two weeks ago"216msgid "Two weeks ago"
197msgstr ""217msgstr ""
198218
199#. TRANSLATORS: the first argument refers to a month name and the second to a year219#. TRANSLATORS: the first argument refers to a month name and the second to a year
200#: src/libqtevernote/note.cpp:95220#: src/libqtevernote/note.cpp:95 src/libqtevernote/note.cpp:129
201#, qt-format221#, qt-format
202msgid "%1 %2"222msgid "%1 %2"
203msgstr ""223msgstr ""
204224
205#: src/libqtevernote/note.cpp:248225#: src/libqtevernote/note.cpp:282
206msgid "Done"226msgid "Done"
207msgstr ""227msgstr ""
208228
209#: src/libqtevernote/note.cpp:254229#: src/libqtevernote/note.cpp:288
210msgid "No date"230msgid "No date"
211msgstr ""231msgstr ""
212232
213#: src/libqtevernote/note.cpp:257233#: src/libqtevernote/note.cpp:291
214msgid "Overdue"234msgid "Overdue"
215msgstr ""235msgstr ""
216236
217#: src/libqtevernote/note.cpp:263237#: src/libqtevernote/note.cpp:297
218msgid "Tomorrow"238msgid "Tomorrow"
219msgstr ""239msgstr ""
220240
221#: src/libqtevernote/note.cpp:266241#: src/libqtevernote/note.cpp:300
222msgid "Next week"242msgid "Next week"
223msgstr ""243msgstr ""
224244
225#: src/libqtevernote/note.cpp:269245#: src/libqtevernote/note.cpp:303
226msgid "In two weeks"246msgid "In two weeks"
227msgstr ""247msgstr ""
228248
229#: src/libqtevernote/note.cpp:271249#: src/libqtevernote/note.cpp:305
230msgid "Later"250msgid "Later"
231msgstr ""251msgstr ""
232252
@@ -257,17 +277,17 @@
257msgid "on %1 %2"277msgid "on %1 %2"
258msgstr ""278msgstr ""
259279
260#: src/libqtevernote/notesstore.cpp:361280#: src/libqtevernote/notesstore.cpp:366
261#, qt-format281#, qt-format
262msgid "Error refreshing notes: %1"282msgid "Error refreshing notes: %1"
263msgstr ""283msgstr ""
264284
265#: src/libqtevernote/notesstore.cpp:542285#: src/libqtevernote/notesstore.cpp:551
266#, qt-format286#, qt-format
267msgid "Error refreshing notebooks: %1"287msgid "Error refreshing notebooks: %1"
268msgstr ""288msgstr ""
269289
270#: src/libqtevernote/notesstore.cpp:596290#: src/libqtevernote/notesstore.cpp:605
271#, qt-format291#, qt-format
272msgid "Error refreshing tags: %1"292msgid "Error refreshing tags: %1"
273msgstr ""293msgstr ""
274294
=== modified file 'src/libqtevernote/jobs/evernotejob.cpp'
--- src/libqtevernote/jobs/evernotejob.cpp 2014-09-19 21:36:50 +0000
+++ src/libqtevernote/jobs/evernotejob.cpp 2014-11-07 19:53:57 +0000
@@ -28,6 +28,9 @@
28#include <transport/TSSLSocket.h>28#include <transport/TSSLSocket.h>
29#include <Thrift.h>29#include <Thrift.h>
3030
31// Evernote SDK
32#include <Errors_types.h>
33
31#include <libintl.h>34#include <libintl.h>
3235
33#include <QDebug>36#include <QDebug>
3437
=== modified file 'src/libqtevernote/jobs/evernotejob.h'
--- src/libqtevernote/jobs/evernotejob.h 2014-09-19 21:31:39 +0000
+++ src/libqtevernote/jobs/evernotejob.h 2014-11-07 19:53:57 +0000
@@ -21,7 +21,6 @@
21#ifndef EVERNOTEJOB_H21#ifndef EVERNOTEJOB_H
22#define EVERNOTEJOB_H22#define EVERNOTEJOB_H
2323
24#include "notesstore.h"
25#include "evernoteconnection.h"24#include "evernoteconnection.h"
2625
27#include <QThread>26#include <QThread>
2827
=== modified file 'src/libqtevernote/jobs/fetchnotejob.cpp'
--- src/libqtevernote/jobs/fetchnotejob.cpp 2014-09-19 21:31:39 +0000
+++ src/libqtevernote/jobs/fetchnotejob.cpp 2014-11-07 19:53:57 +0000
@@ -20,11 +20,12 @@
2020
21#include "fetchnotejob.h"21#include "fetchnotejob.h"
2222
23FetchNoteJob::FetchNoteJob(const QString &guid, bool withResources, QObject *parent) :23FetchNoteJob::FetchNoteJob(const QString &guid, LoadWhat what, QObject *parent) :
24 NotesStoreJob(parent),24 NotesStoreJob(parent),
25 m_guid(guid),25 m_guid(guid),
26 m_withResources(withResources)26 m_what(what)
27{27{
28 qRegisterMetaType<LoadWhat>("LoadWhat");
28}29}
2930
30bool FetchNoteJob::operator==(const EvernoteJob *other) const31bool FetchNoteJob::operator==(const EvernoteJob *other) const
@@ -33,7 +34,7 @@
33 if (!otherJob) {34 if (!otherJob) {
34 return false;35 return false;
35 }36 }
36 return this->m_guid == otherJob->m_guid && this->m_withResources == otherJob->m_withResources;37 return this->m_guid == otherJob->m_guid && this->m_what == otherJob->m_what;
37}38}
3839
39void FetchNoteJob::attachToDuplicate(const EvernoteJob *other)40void FetchNoteJob::attachToDuplicate(const EvernoteJob *other)
@@ -44,10 +45,10 @@
4445
45void FetchNoteJob::startJob()46void FetchNoteJob::startJob()
46{47{
47 client()->getNote(m_result, token().toStdString(), m_guid.toStdString(), true, m_withResources, false, false);48 client()->getNote(m_result, token().toStdString(), m_guid.toStdString(), m_what == LoadContent, m_what == LoadResources, false, false);
48}49}
4950
50void FetchNoteJob::emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage)51void FetchNoteJob::emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage)
51{52{
52 emit resultReady(errorCode, errorMessage, m_result, m_withResources);53 emit resultReady(errorCode, errorMessage, m_result, m_what);
53}54}
5455
=== modified file 'src/libqtevernote/jobs/fetchnotejob.h'
--- src/libqtevernote/jobs/fetchnotejob.h 2014-09-19 21:31:39 +0000
+++ src/libqtevernote/jobs/fetchnotejob.h 2014-11-07 19:53:57 +0000
@@ -27,13 +27,18 @@
27{27{
28 Q_OBJECT28 Q_OBJECT
29public:29public:
30 explicit FetchNoteJob(const QString &guid, bool withResources, QObject *parent = 0);30 enum LoadWhat {
31 LoadContent,
32 LoadResources
33 };
34
35 explicit FetchNoteJob(const QString &guid, LoadWhat what, QObject *parent = 0);
3136
32 virtual bool operator==(const EvernoteJob *other) const override;37 virtual bool operator==(const EvernoteJob *other) const override;
33 virtual void attachToDuplicate(const EvernoteJob *other) override;38 virtual void attachToDuplicate(const EvernoteJob *other) override;
3439
35signals:40signals:
36 void resultReady(EvernoteConnection::ErrorCode error, const QString &errorMessage, const evernote::edam::Note &note, bool withResourceContent);41 void resultReady(EvernoteConnection::ErrorCode error, const QString &errorMessage, const evernote::edam::Note &note, LoadWhat what);
3742
38protected:43protected:
39 void startJob();44 void startJob();
@@ -43,7 +48,7 @@
43 evernote::edam::NoteStoreClient *m_client;48 evernote::edam::NoteStoreClient *m_client;
44 QString m_token;49 QString m_token;
45 QString m_guid;50 QString m_guid;
46 bool m_withResources;51 LoadWhat m_what;
4752
48 evernote::edam::Note m_result;53 evernote::edam::Note m_result;
4954
5055
=== modified file 'src/libqtevernote/jobs/savenotebookjob.h'
--- src/libqtevernote/jobs/savenotebookjob.h 2014-09-19 21:31:39 +0000
+++ src/libqtevernote/jobs/savenotebookjob.h 2014-11-07 19:53:57 +0000
@@ -23,6 +23,8 @@
2323
24#include "notesstorejob.h"24#include "notesstorejob.h"
2525
26class Notebook;
27
26class SaveNotebookJob : public NotesStoreJob28class SaveNotebookJob : public NotesStoreJob
27{29{
28 Q_OBJECT30 Q_OBJECT
2931
=== modified file 'src/libqtevernote/jobs/savenotejob.h'
--- src/libqtevernote/jobs/savenotejob.h 2014-09-19 21:31:39 +0000
+++ src/libqtevernote/jobs/savenotejob.h 2014-11-07 19:53:57 +0000
@@ -23,6 +23,8 @@
2323
24#include "notesstorejob.h"24#include "notesstorejob.h"
2525
26class Note;
27
26class SaveNoteJob : public NotesStoreJob28class SaveNoteJob : public NotesStoreJob
27{29{
28 Q_OBJECT30 Q_OBJECT
2931
=== modified file 'src/libqtevernote/jobs/savetagjob.h'
--- src/libqtevernote/jobs/savetagjob.h 2014-10-09 00:08:52 +0000
+++ src/libqtevernote/jobs/savetagjob.h 2014-11-07 19:53:57 +0000
@@ -23,6 +23,8 @@
2323
24#include "notesstorejob.h"24#include "notesstorejob.h"
2525
26class Tag;
27
26class SaveTagJob : public NotesStoreJob28class SaveTagJob : public NotesStoreJob
27{29{
28 Q_OBJECT30 Q_OBJECT
2931
=== modified file 'src/libqtevernote/notesstore.cpp'
--- src/libqtevernote/notesstore.cpp 2014-11-07 19:30:58 +0000
+++ src/libqtevernote/notesstore.cpp 2014-11-07 19:53:57 +0000
@@ -448,19 +448,19 @@
448 }448 }
449}449}
450450
451void NotesStore::refreshNoteContent(const QString &guid, bool withResourceContent)451void NotesStore::refreshNoteContent(const QString &guid, FetchNoteJob::LoadWhat what)
452{452{
453 Note *note = m_notesHash.value(guid);453 Note *note = m_notesHash.value(guid);
454 if (note) {454 if (note) {
455 note->setLoading(true);455 note->setLoading(true);
456 }456 }
457457
458 FetchNoteJob *job = new FetchNoteJob(guid, withResourceContent, this);458 FetchNoteJob *job = new FetchNoteJob(guid, what, this);
459 connect(job, &FetchNoteJob::resultReady, this, &NotesStore::fetchNoteJobDone);459 connect(job, &FetchNoteJob::resultReady, this, &NotesStore::fetchNoteJobDone);
460 EvernoteConnection::instance()->enqueue(job);460 EvernoteConnection::instance()->enqueue(job);
461}461}
462462
463void NotesStore::fetchNoteJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &result, bool withResourceContent)463void NotesStore::fetchNoteJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &result, FetchNoteJob::LoadWhat what)
464{464{
465 if (errorCode != EvernoteConnection::ErrorCodeNoError) {465 if (errorCode != EvernoteConnection::ErrorCodeNoError) {
466 qWarning() << "Error fetching note:" << errorMessage;466 qWarning() << "Error fetching note:" << errorMessage;
@@ -490,7 +490,7 @@
490 QString fileName = QString::fromStdString(resource.attributes.fileName);490 QString fileName = QString::fromStdString(resource.attributes.fileName);
491 QString mime = QString::fromStdString(resource.mime);491 QString mime = QString::fromStdString(resource.mime);
492492
493 if (withResourceContent) {493 if (what == FetchNoteJob::LoadResources) {
494 QByteArray resourceData = QByteArray(resource.data.body.data(), resource.data.size);494 QByteArray resourceData = QByteArray(resource.data.body.data(), resource.data.size);
495 note->addResource(resourceData, hash, fileName, mime);495 note->addResource(resourceData, hash, fileName, mime);
496 } else if (Resource::isCached(hash)) {496 } else if (Resource::isCached(hash)) {
@@ -500,7 +500,9 @@
500 }500 }
501 }501 }
502502
503 note->setEnmlContent(QString::fromStdString(result.content));503 if (what == FetchNoteJob::LoadContent) {
504 note->setEnmlContent(QString::fromStdString(result.content));
505 }
504 note->setReminderOrder(result.attributes.reminderOrder);506 note->setReminderOrder(result.attributes.reminderOrder);
505 QDateTime reminderTime;507 QDateTime reminderTime;
506 if (result.attributes.reminderTime > 0) {508 if (result.attributes.reminderTime > 0) {
@@ -518,7 +520,7 @@
518 emit dataChanged(noteIndex, noteIndex);520 emit dataChanged(noteIndex, noteIndex);
519521
520 if (refreshWithResourceData) {522 if (refreshWithResourceData) {
521 refreshNoteContent(note->guid(), true);523 refreshNoteContent(note->guid(), FetchNoteJob::LoadResources);
522 }524 }
523}525}
524526
525527
=== modified file 'src/libqtevernote/notesstore.h'
--- src/libqtevernote/notesstore.h 2014-11-07 19:30:58 +0000
+++ src/libqtevernote/notesstore.h 2014-11-07 19:53:57 +0000
@@ -23,6 +23,7 @@
2323
24#include "evernoteconnection.h"24#include "evernoteconnection.h"
25#include "utils/enmldocument.h"25#include "utils/enmldocument.h"
26#include "jobs/fetchnotejob.h"
2627
27// Thrift28// Thrift
28#include <arpa/inet.h> // seems thrift forgot this one29#include <arpa/inet.h> // seems thrift forgot this one
@@ -122,7 +123,7 @@
122123
123public slots:124public slots:
124 void refreshNotes(const QString &filterNotebookGuid = QString(), int startIndex = 0);125 void refreshNotes(const QString &filterNotebookGuid = QString(), int startIndex = 0);
125 void refreshNoteContent(const QString &guid, bool withResourceContent = false);126 void refreshNoteContent(const QString &guid, FetchNoteJob::LoadWhat what = FetchNoteJob::LoadContent);
126 void refreshNotebooks();127 void refreshNotebooks();
127 void refreshTags();128 void refreshTags();
128129
@@ -153,7 +154,7 @@
153private slots:154private slots:
154 void fetchNotesJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::NotesMetadataList &results, const QString &filterNotebookGuid);155 void fetchNotesJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::NotesMetadataList &results, const QString &filterNotebookGuid);
155 void fetchNotebooksJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const std::vector<evernote::edam::Notebook> &results);156 void fetchNotebooksJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const std::vector<evernote::edam::Notebook> &results);
156 void fetchNoteJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &result, bool withResourceContent);157 void fetchNoteJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &result, FetchNoteJob::LoadWhat what);
157 void createNoteJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &result);158 void createNoteJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &result);
158 void saveNoteJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &result);159 void saveNoteJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &result);
159 void saveNotebookJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage);160 void saveNotebookJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage);

Subscribers

People subscribed via source and target branches