Merge into trunk : multiple-accounts : Code : Ubuntu Notes app

Reviewer	Review Type	Date Requested	Status
Michael Zanetti (community)		2014-02-06	Approve on 2014-02-13
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2014-02-12
Review via email: mp+205066@code.launchpad.net

lp:~rpadovani/reminders-app/multiple-accounts updated on 2014-02-06

55. By Riccardo Padovani on 2014-02-06: Added account preference

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-02-06:

#

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

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

review: Approve (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2014-02-06:

#

Download full text (3.3 KiB)

Hey Riccardo,

nice. Congrats to your first real C++ branch :) Obviously there are a few issues to fix. But you know how picky I am. Don't blame yourself for the length of the list. I intentionally explained lots of things.

====

Hmm... Why do you save the username? That just makes it more complex.

Instead of saving the username into the config, I would just save the token. This way, on startup we can just load the token from the config, set it to EvernoteConnection and not bother dealing with AccountService at all.
Once the token is set, the username will be automatically refreshed inside the UserStore.

====

Here's a couple of other things I'd like to have changed:

134 CameraHelper helper;
135 view.engine()->rootContext()->setContextProperty("cameraHelper", &helper);
136
137 + view.engine()->rootContext()->setContextProperty("accountPreference", new AccountPreference());

This works, but please align it to look the same as the CameraHelper. Apart from the visual difference, there is a theoretical issue with your code too: If you create a variable without "new", it will be allocated on the stack and automatically deleted when the function ends. If you do "new" you will allocate the object on the heap and need to delete it yourself. Now, given that the program is removed from the memory when the main() ends, this is really a theoretical issue here and doesn't really hurt us in practice. But I hope you get the idea and see the benefit of keeping things consistent with the existing code.

===

199 + var accountName = accountPreference.accountName;
200 + if (accountName) {
201 + var i;
202 + for (i = 0; i < accounts.count; i++) {
203 + if (accounts.get(i, "displayName") == accountName) {
204 + accountService.objectHandle = accounts.get(i, "accountServiceHandle");
205 + }
206 + }
207 + }

As said above, this should be more like:

if (accountPreferences.token) {
EvernoteConnection.token = accountPreferences.token;
} else {
// Do the AccountService stuff...
}

====

372 +void EvernoteConnection::clearToken()
373 +{
374 + if (!EvernoteConnection::instance()->token().isEmpty()) {
375 + setToken(NULL);
376 + emit tokenChanged();
377 + }
378 +}

Heh, you're inside EvernoteConnection, you can directly access m_token instead of going through EvernoteConnection::instance()->token(). Also, never use NULL if a QString parameter is required. And one more: setToken() already does the emit tokenChanged(), you're emitting that twice now.

This function could (and should) be as short as:

void EvernoteConnection::clearToken()
{
m_token.clear();
emit tokenChanged();
}

or:

void EvernoteConnection::clearToken()
{
setToken(QString());
}

I guess the latter one is the better one.

====

56 \ No newline at end of file

Make sure C++ code files always end with a newline. While this is again a theoretical issue in our case, it breaks compilation with some compilers, e.g. on Solaris.

====

283 + text: i18n.tr("Accounts")
284 + iconName: "contacts-app-symbolic"
285 + visible: accounts.count
286 + onTriggered: {
287 + openAccountPage(true);
288 + }
289 + }
290 +
291 + ToolbarButton {

I personally don't think its good to have the button in the too...

Hey Riccardo,

nice. Congrats to your first real C++ branch :) Obviously there are a few issues to fix. But you know how picky I am. Don't blame yourself for the length of the list. I intentionally explained lots of things.

====

Hmm... Why do you save the username? That just makes it more complex.

Instead of saving the username into the config, I would just save the token. This way, on startup we can just load the token from the config, set it to EvernoteConnection and not bother dealing with AccountService at all.
Once the token is set, the username will be automatically refreshed inside the UserStore.

====

Here's a couple of other things I'd like to have changed:

134	CameraHelper helper;
135	view.engine()->rootContext()->setContextProperty("cameraHelper", &helper);
136	
137	+ view.engine()->rootContext()->setContextProperty("accountPreference", new AccountPreference());

This works, but please align it to look the same as the CameraHelper. Apart from the visual difference, there is a theoretical issue with your code too: If you create a variable without "new", it will be allocated on the stack and automatically deleted when the function ends. If you do "new" you will allocate the object on the heap and need to delete it yourself. Now, given that the program is removed from the memory when the main() ends, this is really a theoretical issue here and doesn't really hurt us in practice. But I hope you get the idea and see the benefit of keeping things consistent with the existing code.

===

199	+ var accountName = accountPreference.accountName;
200	+ if (accountName) {
201	+ var i;
202	+ for (i = 0; i < accounts.count; i++) {
203	+ if (accounts.get(i, "displayName") == accountName) {
204	+ accountService.objectHandle = accounts.get(i, "accountServiceHandle");
205	+ }
206	+ }
207	+ }

As said above, this should be more like:

if (accountPreferences.token) {
    EvernoteConnection.token = accountPreferences.token;
} else {
  // Do the AccountService stuff...
}

====

372	+void EvernoteConnection::clearToken()
373	+{
374	+ if (!EvernoteConnection::instance()->token().isEmpty()) {
375	+ setToken(NULL);
376	+ emit tokenChanged();
377	+ }
378	+}

Heh, you're inside EvernoteConnection, you can directly access m_token instead of going through EvernoteConnection::instance()->token(). Also, never use NULL if a QString parameter is required. And one more: setToken() already does the emit tokenChanged(), you're emitting that twice now.

This function could (and should) be as short as:

void EvernoteConnection::clearToken()
{
    m_token.clear();
    emit tokenChanged();
}

or:

void EvernoteConnection::clearToken()
{
    setToken(QString());
}

I guess the latter one is the better one.

====

56	\ No newline at end of file

Make sure C++ code files always end with a newline. While this is again a theoretical issue in our case, it breaks compilation with some compilers, e.g. on Solaris.

====

283	+ text: i18n.tr("Accounts")
284	+ iconName: "contacts-app-symbolic"
285	+ visible: accounts.count
286	+ onTriggered: {
287	+ openAccountPage(true);
288	+ }
289	+ }
290	+
291	+ ToolbarButton {

I personally don't think its good to have the button in the toolbar all the time, given that in practice you will never ever use it :)

How about putting it into the HUD? David, Dani, Alan, what's your opinion on this?

review: Needs Fixing

lp:~rpadovani/reminders-app/multiple-accounts updated on 2014-02-06

56. By Riccardo Padovani on 2014-02-06: Fixes some problems

Revision history for this message

Riccardo Padovani (rpadovani) wrote on 2014-02-06:

#

Download full text (4.2 KiB)

> Hey Riccardo,
>
> nice. Congrats to your first real C++ branch :) Obviously there are a few
> issues to fix. But you know how picky I am. Don't blame yourself for the
> length of the list. I intentionally explained lots of things.
>

Thanks for your support and explanations :-)

> ====
>
> Hmm... Why do you save the username? That just makes it more complex.
>
> Instead of saving the username into the config, I would just save the token.
> This way, on startup we can just load the token from the config, set it to
> EvernoteConnection and not bother dealing with AccountService at all.
> Once the token is set, the username will be automatically refreshed inside the
> UserStore.
>

Well, I thinked is not secure to manage directly accounts without use AccountService, because we save accessToken, but if you say it's ok, I do in this way

> ====
>
> Here's a couple of other things I'd like to have changed:
>
> 134 CameraHelper helper;
> 135 view.engine()->rootContext()->setContextProperty("cameraHelper",
> &helper);
> 136
> 137 +
> view.engine()->rootContext()->setContextProperty("accountPreference", new
> AccountPreference());
>
> This works, but please align it to look the same as the CameraHelper. Apart
> from the visual difference, there is a theoretical issue with your code too:
> If you create a variable without "new", it will be allocated on the stack and
> automatically deleted when the function ends. If you do "new" you will
> allocate the object on the heap and need to delete it yourself. Now, given
> that the program is removed from the memory when the main() ends, this is
> really a theoretical issue here and doesn't really hurt us in practice. But I
> hope you get the idea and see the benefit of keeping things consistent with
> the existing code.
>

Done, thanks for explanation!

> ===
[...]
> As said above, this should be more like:
>
> if (accountPreferences.token) {
> EvernoteConnection.token = accountPreferences.token;
> } else {
> // Do the AccountService stuff...
> }

Ok, I implemented that, but now if accountPreferences.accountToken is not a valid token we have an authentication error, because there is no time to intercept UserStore.username, it is set after else is executed.
So I have no idea on how check if accountPreferences.token is not valid.
This isn't an uncommon user case: login with an account, user removes the account from Online Account, accountToken is no more valid.

> ====
>
> 372 +void EvernoteConnection::clearToken()
> 373 +{
> 374 + if (!EvernoteConnection::instance()->token().isEmpty()) {
> 375 + setToken(NULL);
> 376 + emit tokenChanged();
> 377 + }
> 378 +}
>
> Heh, you're inside EvernoteConnection, you can directly access m_token instead
> of going through EvernoteConnection::instance()->token(). Also, never use NULL
> if a QString parameter is required. And one more: setToken() already does the
> emit tokenChanged(), you're emitting that twice now.
>
> This function could (and should) be as short as:
>
> void EvernoteConnection::clearToken()
> {
> m_token.clear();
> emit tokenChanged();
> }
>
> or:
>
> void EvernoteConnection::clearTok...

> Hey Riccardo,
> 
> nice. Congrats to your first real C++ branch :) Obviously there are a few
> issues to fix. But you know how picky I am. Don't blame yourself for the
> length of the list. I intentionally explained lots of things.
>

Thanks for your support and explanations :-)

> ====
> 
> Hmm... Why do you save the username? That just makes it more complex.
> 
> Instead of saving the username into the config, I would just save the token.
> This way, on startup we can just load the token from the config, set it to
> EvernoteConnection and not bother dealing with AccountService at all.
> Once the token is set, the username will be automatically refreshed inside the
> UserStore.
>

Well, I thinked is not secure to manage directly accounts without use AccountService, because we save accessToken, but if you say it's ok, I do in this way

> ====
> 
> Here's a couple of other things I'd like to have changed:
> 
> 134     CameraHelper helper;
> 135     view.engine()->rootContext()->setContextProperty("cameraHelper",
> &helper);
> 136
> 137     +
> view.engine()->rootContext()->setContextProperty("accountPreference", new
> AccountPreference());
> 
> This works, but please align it to look the same as the CameraHelper. Apart
> from the visual difference, there is a theoretical issue with your code too:
> If you create a variable without "new", it will be allocated on the stack and
> automatically deleted when the function ends. If you do "new" you will
> allocate the object on the heap and need to delete it yourself. Now, given
> that the program is removed from the memory when the main() ends, this is
> really a theoretical issue here and doesn't really hurt us in practice. But I
> hope you get the idea and see the benefit of keeping things consistent with
> the existing code.
>

Done, thanks for explanation!

> ===
[...]
> As said above, this should be more like:
> 
> if (accountPreferences.token) {
>     EvernoteConnection.token = accountPreferences.token;
> } else {
>   // Do the AccountService stuff...
> }

Ok, I implemented that, but now if accountPreferences.accountToken is not a valid token we have an authentication error, because there is no time to intercept UserStore.username, it is set after else is executed. 
So I have no idea on how check if accountPreferences.token is not valid.
This isn't an uncommon user case: login with an account, user removes the account from Online Account, accountToken is no more valid.

> ====
> 
> 372     +void EvernoteConnection::clearToken()
> 373     +{
> 374     + if (!EvernoteConnection::instance()->token().isEmpty()) {
> 375     + setToken(NULL);
> 376     + emit tokenChanged();
> 377     + }
> 378     +}
> 
> Heh, you're inside EvernoteConnection, you can directly access m_token instead
> of going through EvernoteConnection::instance()->token(). Also, never use NULL
> if a QString parameter is required. And one more: setToken() already does the
> emit tokenChanged(), you're emitting that twice now.
> 
> This function could (and should) be as short as:
> 
> void EvernoteConnection::clearToken()
> {
>     m_token.clear();
>     emit tokenChanged();
> }
> 
> or:
> 
> void EvernoteConnection::clearToken()
> {
>     setToken(QString());
> }
> 
> I guess the latter one is the better one.
>

Done, thanks for explanations. I'll try to learn C++ step by step :-)

> ====
> 
> 56      \ No newline at end of file
> 
> Make sure C++ code files always end with a newline. While this is again a
> theoretical issue in our case, it breaks compilation with some compilers, e.g.
> on Solaris.

Ok, thanks, I forced my text editor to add newline at the end of C++ files...

> 
> ====
> 
> 283     + text: i18n.tr("Accounts")
> 284     + iconName: "contacts-app-symbolic"
> 285     + visible: accounts.count
> 286     + onTriggered: {
> 287     + openAccountPage(true);
> 288     + }
> 289     + }
> 290     +
> 291     + ToolbarButton {
> 
> I personally don't think its good to have the button in the toolbar all the
> time, given that in practice you will never ever use it :)
> 
> How about putting it into the HUD? David, Dani, Alan, what's your opinion on
> this?

Mhh, you got a point, but I think that in the HUD is too hide. I have not modify this at the moment, but I'll do as soon as someone else give us an opinion!

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-02-07:

#

FAILED: Continuous integration, rev:56
http://91.189.93.70:8080/job/reminders-app-ci/196/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1170/console
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/196
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/196

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2014-02-07:

#

>
> Ok, I implemented that, but now if accountPreferences.accountToken is not a
> valid token we have an authentication error, because there is no time to
> intercept UserStore.username, it is set after else is executed.
> So I have no idea on how check if accountPreferences.token is not valid.
> This isn't an uncommon user case: login with an account, user removes the
> account from Online Account, accountToken is no more valid.

actually you do have a good point here... I didn't think of that. Maybe your previous version was indeed better. Sorry for that.

Thanks for fixing the rest. Lets hear the other's opinion on where the logout button should be placed.

Revision history for this message

David Planella (dpm) wrote on 2014-02-07:

#

> I personally don't think its good to have the button in the toolbar all the time,
> given that in practice you will never ever use it :)

> How about putting it into the HUD? David, Dani, Alan, what's your opinion on this?

I agree with Michael: I don't think we should clutter the toolbar with actions that most users will not use. However, I'm not too sure about putting them in the HUD. I personally think it should be part of the Online Accounts login workflow instead, but the best persons to ask should probably be Dani or mardy.

lp:~rpadovani/reminders-app/multiple-accounts updated on 2014-02-08

57. By Riccardo Padovani on 2014-02-08: Reverted changes to how the username is saved
58. By Riccardo Padovani on 2014-02-08: Merged from trunk

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-02-08:

#

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

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

review: Approve (continuous-integration)

lp:~rpadovani/reminders-app/multiple-accounts updated on 2014-02-12

59. By Riccardo Padovani on 2014-02-12: Added check on numbers of accounts

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-02-12:

#

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

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

review: Approve (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2014-02-13:

#

ack!

review: Approve

Ubuntu Notes app

Merge lp:~rpadovani/reminders-app/multiple-accounts into lp:reminders-app

Commit message

Description of the change

Preview Diff

Subscribers

 === modified file 'src/app/CMakeLists.txt'
 --- src/app/CMakeLists.txt	2014-01-27 20:27:37 +0000
 +++ src/app/CMakeLists.txt	2014-02-12 15:44:15 +0000
@@ -3,6 +3,7 @@
  set(reminders_SRCS
      main.cpp
      camerahelper.cpp
++    accountpreference.cpp
      ${QML_SRCS}
+ )
 === added file 'src/app/accountpreference.cpp'
 --- src/app/accountpreference.cpp	1970-01-01 00:00:00 +0000
 +++ src/app/accountpreference.cpp	2014-02-12 15:44:15 +0000
@@ -0,0 +1,39 @@
++/*
++ * Copyright: 2014 Canonical, Ltd
++ *
++ * This file is part of reminders
++ *
++ * reminders is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation, either version 3 of the License, or
++ * (at your option) any later version.
++ *
++ * reminders is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authors: Michael Zanetti <michael.zanetti@canonical.com>
++ *          Riccardo Padovani <rpadovani@ubuntu.com>
++ */
++#include "accountpreference.h"
++
++AccountPreference::AccountPreference(QObject *parent): QObject(parent),
++    m_settings(QStandardPaths::standardLocations(QStandardPaths::ConfigLocation).first() + "/com.ubuntu.reminders/reminders.conf", QSettings::IniFormat)
++{
++
++}
++
++QString AccountPreference::accountName() const
++{
++    return m_settings.value("accountName").toString();
++}
++
++void AccountPreference::setAccountName(const QString &accountName)
++{
++    m_settings.setValue("accountName", accountName);
++    emit accountNameChanged();
++}
 === added file 'src/app/accountpreference.h'
 --- src/app/accountpreference.h	1970-01-01 00:00:00 +0000
 +++ src/app/accountpreference.h	2014-02-12 15:44:15 +0000
@@ -0,0 +1,47 @@
++/*
++ * Copyright: 2014 Canonical, Ltd
++ *
++ * This file is part of reminders
++ *
++ * reminders is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation, either version 3 of the License, or
++ * (at your option) any later version.
++ *
++ * reminders is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authors: Michael Zanetti <michael.zanetti@canonical.com>
++ *          Riccardo Padovani <rpadovani@ubuntu.com>
++ */
++
++#ifndef ACCOUNTPREFERENCE_H
++#define ACCOUNTPREFERENCE_H
++
++#include <QSettings>
++#include <QStandardPaths>
++#include <QObject>
++#include <QDebug>
++
++class AccountPreference: public QObject
++{
++    Q_OBJECT
++    Q_PROPERTY(QString accountName READ accountName WRITE setAccountName NOTIFY accountNameChanged)
++public:
++    AccountPreference(QObject *parent = 0);
++    QString accountName() const;
++    void setAccountName(const QString &accountName);
++
++signals:
++    void accountNameChanged();
++
++private:
++    QSettings m_settings;
++};
++
++#endif
 === modified file 'src/app/main.cpp'
 --- src/app/main.cpp	2014-01-27 21:40:42 +0000
 +++ src/app/main.cpp	2014-02-12 15:44:15 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright: 2013 Canonical, Ltd
++ * Copyright: 2013 - 2014 Canonical, Ltd
+  *
   * This file is part of reminders
+  *
@@ -17,9 +17,11 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  *
   * Authors: Michael Zanetti <michael.zanetti@canonical.com>
++ *          Riccardo Padovani <rpadovani@ubuntu.com>
   */
  #include "camerahelper.h"
++#include "accountpreference.h"
  #include <QtGui/QGuiApplication>
  #include <QtQuick/QQuickView>
@@ -55,6 +57,10 @@
      CameraHelper helper;
      view.engine()->rootContext()->setContextProperty("cameraHelper", &helper);
++    // Set up account preferences
++    AccountPreference preferences;
++    view.engine()->rootContext()->setContextProperty("accountPreference", &preferences);
++
      // load the qml file
      view.setSource(QUrl::fromLocalFile("qml/reminders.qml"));
 === modified file 'src/app/qml/reminders.qml'
 --- src/app/qml/reminders.qml	2014-01-31 13:03:49 +0000
 +++ src/app/qml/reminders.qml	2014-02-12 15:44:15 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright: 2013 Canonical, Ltd
++ * Copyright: 2013 - 2014 Canonical, Ltd
+  *
   * This file is part of reminders
+  *
@@ -47,6 +47,18 @@
      // Temporary background color. This can be changed to other suitable backgrounds when we get official mockup designs
      backgroundColor: UbuntuColors.coolGrey
++    property var accountPage;
++
++    function openAccountPage(isChangingAccount) {
++        if (accountPage) {
++            accountPage.destroy(100)
++        }
++        var component = Qt.createComponent(Qt.resolvedUrl("ui/AccountSelectorPage.qml"));
++        accountPage = component.createObject(root, {accounts: accounts, isChangingAccount: isChangingAccount});
++        accountPage.accountSelected.connect(function(handle) { accountService.objectHandle = handle; pagestack.pop(); });
++        pagestack.push(accountPage);
++    }
++
      AccountServiceModel {
          id: accounts
          service: "evernote"
@@ -56,7 +68,9 @@
          id: accountService
          onObjectHandleChanged: authenticate(null);
          onAuthenticated: {
--            console.log("Access token is " + reply.AccessToken)
++            if (EvernoteConnection.token && EvernoteConnection.token != reply.AccessToken) {
++                EvernoteConnection.clearToken();
++            }
              EvernoteConnection.token = reply.AccessToken;
+         }
          onAuthenticationError: {
@@ -67,25 +81,34 @@
      Component.onCompleted: {
          pagestack.push(rootTabs)
          print("got accounts:", accounts.count)
--        switch (accounts.count) {
--        case 0:
--            print("No account available! Please setup an account in the system settings");
--            break;
--        case 1:
--            accountService.objectHandle = accounts.get(0, "accountServiceHandle");
--            break;
--        default:
--            var component = Qt.createComponent(Qt.resolvedUrl("ui/AccountSelectorPage.qml"));
--            var page = component.createObject(root, {accounts: accounts});
--            page.accountSelected.connect(function(handle) { accountService.objectHandle = handle; pagestack.pop(); });
--            pagestack.push(page);
++        var accountName = accountPreference.accountName;
++        if (accountName) {
++            var i;
++            for (i = 0; i < accounts.count; i++) {
++                if (accounts.get(i, "displayName") == accountName) {
++                    accountService.objectHandle = accounts.get(i, "accountServiceHandle");
++                }
++            }
++        }
++        if (!accountService.objectHandle) {
++            switch (accounts.count) {
++            case 0:
++                print("No account available! Please setup an account in the system settings");
++                break;
++            case 1:
++                accountService.objectHandle = accounts.get(0, "accountServiceHandle");
++                break;
++            default:
++                openAccountPage(false);
++            }
+         }
+     }
      Connections {
          target: UserStore
          onUsernameChanged: {
--            print("Logged in as user:", UserStore.username)
++            print("Logged in as user:", UserStore.username);
++            accountPreference.accountName = UserStore.username;
+         }
+     }
 === modified file 'src/app/qml/ui/AccountSelectorPage.qml'
 --- src/app/qml/ui/AccountSelectorPage.qml	2014-02-03 11:25:41 +0000
 +++ src/app/qml/ui/AccountSelectorPage.qml	2014-02-12 15:44:15 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright: 2013 Canonical, Ltd
++ * Copyright: 2013 - 2014 Canonical, Ltd
+  *
   * This file is part of reminders
+  *
@@ -27,6 +27,7 @@
      title: "Select Evernote account"
      property alias accounts: listView.model
++    property bool isChangingAccount
      signal accountSelected(var handle)
@@ -39,6 +40,7 @@
              width: parent.width
              height: units.gu(10)
              model: accounts
++            currentIndex: -1
              delegate: Standard {
                  text: displayName
@@ -49,4 +51,9 @@
+             }
+         }
+     }
++
++    tools: ToolbarItems {
++        locked: !isChangingAccount
++        opened: isChangingAccount
++    }
+ }
 === modified file 'src/app/qml/ui/NotebooksPage.qml'
 --- src/app/qml/ui/NotebooksPage.qml	2014-01-28 08:31:37 +0000
 +++ src/app/qml/ui/NotebooksPage.qml	2014-02-12 15:44:15 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright: 2013 Canonical, Ltd
++ * Copyright: 2013 - 2014 Canonical, Ltd
+  *
   * This file is part of reminders
+  *
@@ -43,6 +43,15 @@
          ToolbarSpacer { }
          ToolbarButton {
++            text: i18n.tr("Accounts")
++            iconName: "contacts-app-symbolic"
++            visible: accounts.count > 1
++            onTriggered: {
++                openAccountPage(true);
++            }
++        }
++
++        ToolbarButton {
              text: i18n.tr("Add notebook")
              iconName: "add"
              onTriggered: {
 === modified file 'src/app/qml/ui/NotesPage.qml'
 --- src/app/qml/ui/NotesPage.qml	2014-02-05 13:25:44 +0000
 +++ src/app/qml/ui/NotesPage.qml	2014-02-12 15:44:15 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright: 2013 Canonical, Ltd
++ * Copyright: 2013 - 2014 Canonical, Ltd
+  *
   * This file is part of reminders
+  *
@@ -46,6 +46,15 @@
          ToolbarSpacer { }
          ToolbarButton {
++            text: i18n.tr("Accounts")
++            iconName: "contacts-app-symbolic"
++            visible: accounts.count > 1
++            onTriggered: {
++                openAccountPage(true);
++            }
++        }
++
++        ToolbarButton {
              text: i18n.tr("Add note")
              iconName: "add"
              onTriggered: {
 === modified file 'src/app/qml/ui/RemindersPage.qml'
 --- src/app/qml/ui/RemindersPage.qml	2014-02-05 17:26:54 +0000
 +++ src/app/qml/ui/RemindersPage.qml	2014-02-12 15:44:15 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright: 2013 Canonical, Ltd
++ * Copyright: 2013 - 2014 Canonical, Ltd
+  *
   * This file is part of reminders
+  *
@@ -37,6 +37,15 @@
          ToolbarSpacer { }
          ToolbarButton {
++            text: i18n.tr("Accounts")
++            iconName: "contacts-app-symbolic"
++            visible: accounts.count > 1
++            onTriggered: {
++                openAccountPage(true);
++            }
++        }
++
++        ToolbarButton {
              text: i18n.tr("Add reminder")
              iconName: "add"
              onTriggered: {
 === modified file 'src/plugin/Evernote/evernoteconnection.cpp'
 --- src/plugin/Evernote/evernoteconnection.cpp	2014-01-30 11:23:28 +0000
 +++ src/plugin/Evernote/evernoteconnection.cpp	2014-02-12 15:44:15 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright: 2013 Canonical, Ltd
++ * Copyright: 2013 - 2014 Canonical, Ltd
+  *
   * This file is part of reminders
+  *
@@ -16,6 +16,7 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  *
   * Authors: Michael Zanetti <michael.zanetti@canonical.com>
++ *          Riccardo Padovani <rpadovani@ubuntu.com>
   */
  #include "evernoteconnection.h"
@@ -163,6 +164,13 @@
+     }
+ }
++void EvernoteConnection::clearToken()
++{
++    if (!EvernoteConnection::instance()->token().isEmpty()) {
++        setToken(QString());
++    }
++}
++
  void EvernoteConnection::enqueue(EvernoteJob *job)
+ {
      connect(job, &EvernoteJob::finished, this, &EvernoteConnection::startNextJob);
 === modified file 'src/plugin/Evernote/evernoteconnection.h'
 --- src/plugin/Evernote/evernoteconnection.h	2014-01-27 13:00:41 +0000
 +++ src/plugin/Evernote/evernoteconnection.h	2014-02-12 15:44:15 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright: 2013 Canonical, Ltd
++ * Copyright: 2013 - 2014 Canonical, Ltd
+  *
   * This file is part of reminders
+  *
@@ -16,6 +16,7 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  *
   * Authors: Michael Zanetti <michael.zanetti@canonical.com>
++ *          Riccardo Padovani <rpadovani@ubuntu.com>
   */
  #ifndef EVERNOTECONNECTION_H
@@ -64,6 +65,9 @@
      void enqueue(EvernoteJob *job);
++public slots:
++    void clearToken();
++
  signals:
      void tokenChanged();