Merge lp:~mardy/reminders-app/app-access2 into lp:reminders-app

[Alberto Mardegan]

Request access to the Evernote account

Use the new OnlineAccounts.Client module to setup the Evernote account.

Request access to the Evernote account

Use the new OnlineAccounts.Client module to setup the Evernote account.

Notes:
- I tested this only on the desktop.
- (not directly related to this branch) The AccountSelectorPage will never open, because it's impossible to add a second account; I'd suggest adding an "Accounts" button on the toolbar to open it, so that we allow selecting accounts and create new ones. Or just remove the AccountSelectorPage, if we don't want to support having more than one account.

[lp:~mardy/reminders-app/app-access2]

43. By Alberto Mardegan on 2014-05-16

Translate button label

44. By Alberto Mardegan on 2014-05-16

Add missing dependency

[David Planella (dpm)]

This works well on the device, but when running the app from the desktop with Qt Creator, I get:

 file:///tmp/build-app-access2-Desktop-Default/src/app/qml/reminders.qml:326:17: Cannot assign to non-existent property "applicationId"
                      applicationId: "com.ubuntu.reminders_reminders"
                      ^
I manually installed /usr/share/accounts/applications/com.ubuntu.reminders_reminders.application, but that did not seem to make a difference.

[Alberto Mardegan (mardy)]

In the last commit I added "qtdeclarative5-online-accounts-client0.1 (>= 0.3)" to debian/control; do you have it? (I have 0.3+14.10.20140506.1-0ubuntu1, FWIW)

[David Planella (dpm)]

I do, but while the 0.3 version is the same, you seem to have a more recent date, and for utopic

$ apt-cache policy qtdeclarative5-online-accounts-client0.1
qtdeclarative5-online-accounts-client0.1:
  Instaŀlat: 0.3+14.04.20140328-0ubuntu3
  Candidat: 0.3+14.04.20140328-0ubuntu3
  Taula de versió:
 *** 0.3+14.04.20140328-0ubuntu3 0
        500 http://de.archive.ubuntu.com/ubuntu/ trusty/universe amd64 Packages
        100 /var/lib/dpkg/status

[lp:~mardy/reminders-app/app-access2]

45. By Alberto Mardegan on 2014-05-16

Update dependency version

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

FAILED: Continuous integration, rev:45
http://91.189.93.70:8080/job/reminders-app-ci/359/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2666/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2666/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/203
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/203/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/360
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/54

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

review: Needs Fixing (continuous-integration)

[David Planella (dpm)]

Thanks, it seems that on 14.04 we'll need a backported version of some Online Accounts packages for Reminders to work. Alberto has put them in the core apps PPA, so if you are developing on 14.04, make sure you've added that PPA and that you update these packages:

qtdeclarative5-online-accounts-client0.1 (version: 0.3+14.10.20140506.1-0ubuntu2)
ubuntu-system-settings-online-accounts (version: 0.3+14.10.20140506.1)

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-05-12 11:19:30 +0000
+++ CMakeLists.txt	2014-05-16 12:52:31 +0000
@@ -12,6 +12,7 @@
 
 set(APP_NAME reminders)
 set(DESKTOP_FILE "${PROJECT_NAME}.desktop")
+set(APPLICATION_FILE "${PROJECT_NAME}_${APP_NAME}.application")
 set(ICON ${APP_NAME}.png)
 set(AUTOPILOT_DIR reminders)
 set(APP_HARDCODE reminders)
@@ -33,6 +34,7 @@
     set(BIN_DIR /lib/${ARCH_TRIPLET}/bin)
     set(DATA_DIR /)
     set(DESKTOP_DIR ${DATA_DIR})
+    set(APPLICATION_DIR ${DATA_DIR})
     if(NOT BZR_REVNO)
         set(BZR_REVNO "latest")
     endif(NOT BZR_REVNO)
@@ -50,6 +52,7 @@
     set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
     set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON}")
     set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
+    set(APPLICATION_DIR ${CMAKE_INSTALL_DATADIR}/accounts/applications)
 endif(CLICK_MODE)
 
 file(GLOB_RECURSE I18N_SRC_FILES
@@ -64,6 +67,7 @@
 
 configure_file(${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} DESTINATION ${DESKTOP_DIR})
+install(FILES ${APPLICATION_FILE} DESTINATION ${APPLICATION_DIR})
  
 # Tests
 enable_testing()

=== added file 'com.ubuntu.reminders_reminders.application'
--- com.ubuntu.reminders_reminders.application	1970-01-01 00:00:00 +0000
+++ com.ubuntu.reminders_reminders.application	2014-05-16 12:52:31 +0000
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<application id="com.ubuntu.reminders_reminders">
+  <description>Reminders</description>
+
+  <services>
+    <service id="evernote">
+      <description>Synchronize your reminders with Evernote</description>
+    </service>
+  </services>
+
+</application>

=== modified file 'debian/control'
--- debian/control	2014-05-08 17:56:49 +0000
+++ debian/control	2014-05-16 12:52:31 +0000
@@ -22,6 +22,7 @@
          qtdeclarative5-evernote0.1,
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
          qtdeclarative5-localstorage-plugin,
+         qtdeclarative5-online-accounts-client0.1 (>= 0.3+14.10.20140506),
          qtdeclarative5-quicklayouts-plugin,
          qtdeclarative5-qtquick2-plugin,
          signon-plugin-oauth2 (>= 0.19-0~57~),

=== modified file 'debian/reminders-app.install'
--- debian/reminders-app.install	2014-01-30 13:45:37 +0000
+++ debian/reminders-app.install	2014-05-16 12:52:31 +0000
@@ -1,4 +1,5 @@
 usr/bin/*
+usr/share/accounts/applications/*
 usr/share/applications/*
 usr/share/locale
 usr/share/reminders/*

=== modified file 'manifest.json'
--- manifest.json	2014-05-07 19:11:05 +0000
+++ manifest.json	2014-05-16 12:52:31 +0000
@@ -4,6 +4,7 @@
     "architecture": "armhf",
     "hooks": {
         "reminders": {
+            "account-application": "com.ubuntu.reminders_reminders.application",
             "apparmor": "apparmor.json",
             "desktop": "com.ubuntu.reminders.desktop"
         }
@@ -19,4 +20,4 @@
     "x-test": {
         "autopilot": "reminders"
     }
-}
\ No newline at end of file
+}

=== modified file 'src/app/qml/reminders.qml'
--- src/app/qml/reminders.qml	2014-05-10 09:22:59 +0000
+++ src/app/qml/reminders.qml	2014-05-16 12:52:31 +0000
@@ -24,6 +24,7 @@
 import "ui"
 import Evernote 0.1
 import Ubuntu.OnlineAccounts 0.1
+import Ubuntu.OnlineAccounts.Client 0.1
 
 /*!
     \brief MainView with a Label and Button elements.
@@ -320,11 +321,17 @@
                 }
             }
 
+            Setup {
+                id: setup
+                applicationId: "com.ubuntu.reminders_reminders"
+                providerId: "evernote"
+            }
+
             Button {
                 objectName: "openAccountButton"
-                text: i18n.tr("Open account settings")
+                text: i18n.tr("Add account")
                 color: UbuntuColors.orange
-                onClicked: Qt.openUrlExternally("settings:///system/online-accounts")
+                onClicked: setup.exec()
             }
         }
    }

=== modified file 'src/app/qml/ui/AccountSelectorPage.qml'
--- src/app/qml/ui/AccountSelectorPage.qml	2014-03-13 18:11:32 +0000
+++ src/app/qml/ui/AccountSelectorPage.qml	2014-05-16 12:52:31 +0000
@@ -20,6 +20,7 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1
 import Ubuntu.OnlineAccounts 0.1
+import Ubuntu.OnlineAccounts.Client 0.1
 import Evernote 0.1
 
 Page {
@@ -32,6 +33,12 @@
 
     signal accountSelected(var handle)
 
+    Setup {
+        id: setup
+        applicationId: "com.ubuntu.reminders_reminders"
+        providerId: "evernote"
+    }
+
     Column {
         anchors { fill: parent; margins: units.gu(2) }
         spacing: units.gu(1)
@@ -51,6 +58,11 @@
                     onClicked: root.accountSelected(accountServiceHandle)
                 }
             }
+
+            footer: Button {
+                text: i18n.tr("Add account")
+                onClicked: setup.exec()
+            }
         }
     }