Merge lp:~rpadovani/reminders-app/defaultNotebookLocalStorage into lp:reminders-app

[Riccardo Padovani]

Add a default notebook to local account

While the solution could be implemented in other ways (like counting number of notebooks) having a way to know if it's the first time user uses local account could be useful in future, e.g. we can add a tutorial.

Anyway, if you find this overkill, I'll study another solution.

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

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

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

I don't think we need a second setting for that, instead we can piggypack on the haveLocalUser one. In line 340, haveLocalUser is set to true. We can just add a check before that, like:

if (!haveLocalUser) {
    NotesStore.createNotebook(...)
    haveLocalUser = true;
}

Also, I don't really like the "First Notebook" one. Please use "Default Notebook" or similar.

review: Needs Fixing

[lp:~rpadovani/reminders-app/defaultNotebookLocalStorage]

343. By Riccardo Padovani on 2015-02-23

reverted unwanted changes

344. By Riccardo Padovani on 2015-02-23

Added default notebook to local user

345. By Riccardo Padovani on 2015-02-23

Fixed diverged branches

346. By Riccardo Padovani on 2015-02-23

reverted unwanted changes

[Riccardo Padovani (rpadovani)]

You're right, fixed, thanks :-)

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

PASSED: Continuous integration, rev:346
http://91.189.93.70:8080/job/reminders-app-ci/667/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2092
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2092/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/88

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

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

yip yip

review: Approve

=== modified file 'src/app/qml/reminders.qml'
--- src/app/qml/reminders.qml	2015-02-20 17:16:46 +0000
+++ src/app/qml/reminders.qml	2015-02-23 18:00:58 +0000
@@ -338,7 +338,8 @@
             EvernoteConnection.token = "";
             NotesStore.username = username;
             preferences.accountName = username;
-            if (username === "@local") {
+            if (username === "@local" && !preferences.haveLocalUser) {
+                NotesStore.createNotebook(i18n.tr("Default notebook"));
                 preferences.haveLocalUser = true;
             }