ubuntu-touch-coreapps-reviewers team mailing list archive

[Michael Zanetti <michael.zanetti@xxxxxxxxxxxxx>]

Michael Zanetti has proposed merging lp:~mardy/reminders-app/new-api into lp:reminders-app.

Requested reviews:
  Ubuntu Notes app developers (notes-app-dev)

For more details, see:
https://code.launchpad.net/~mardy/reminders-app/new-api/+merge/271505
-- 
Your team Ubuntu Notes app developers is requested to review the proposed merge of lp:~mardy/reminders-app/new-api into lp:reminders-app.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-09-08 18:10:48 +0000
+++ CMakeLists.txt	2015-09-17 15:42:30 +0000
@@ -15,7 +15,7 @@
 
 set(APP_NAME reminders)
 set(DESKTOP_FILE "${PROJECT_NAME}.desktop")
-set(APPLICATION_FILE "${PROJECT_NAME}_${APP_NAME}.application")
+set(APPLICATION_ACCOUNTS_FILE "${PROJECT_NAME}_${APP_NAME}.accounts")
 set(ICON ${APP_NAME}.png)
 set(AUTOPILOT_DIR reminders)
 set(APP_HARDCODE reminders)
@@ -109,8 +109,8 @@
 )
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} DESTINATION ${DESKTOP_DIR})
 
-configure_file(${APPLICATION_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_FILE})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_FILE} DESTINATION ${APPLICATION_DIR})
+configure_file(${APPLICATION_ACCOUNTS_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_ACCOUNTS_FILE})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_ACCOUNTS_FILE} DESTINATION ${APPLICATION_DIR})
 
 # Tests
 enable_testing()

=== renamed file 'com.ubuntu.reminders_reminders.application.in' => 'com.ubuntu.reminders_reminders.accounts.in'
--- com.ubuntu.reminders_reminders.application.in	2015-03-20 11:16:35 +0000
+++ com.ubuntu.reminders_reminders.accounts.in	2015-09-17 15:42:30 +0000
@@ -1,15 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<application id="@PROJECT_NAME@_@APP_NAME@">
-
-  <description>Notes</description>
-
-  <services>
-    <service id="com.ubuntu.reminders_reminders">
-      <description>Synchronize your notes with Evernote</description>
-    </service>
-    <service id="com.ubuntu.reminders_reminders-sandbox">
-      <description>Synchronize your notes with the Evernote Sandbox</description>
-    </service>
-  </services>
-
-</application>
+{
+  "services": [
+    {
+      "provider": "@PROJECT_NAME@_evernote-account-plugin_evernote",
+      "description": "Synchronize your notes with Evernote"
+    }
+  ]
+}

=== modified file 'manifest.json.in'
--- manifest.json.in	2015-07-25 01:54:11 +0000
+++ manifest.json.in	2015-09-17 15:42:30 +0000
@@ -1,19 +1,17 @@
 {
     "description": "Ubuntu Notes app, powered by Evernote",
-    "framework": "ubuntu-sdk-15.04",
+    "framework": "ubuntu-sdk-15.10-dev1",
     "architecture": "@CLICK_ARCH@",
     "hooks": {
         "reminders": {
-            "account-application": "com.ubuntu.reminders_reminders.application",
-            "account-service": "@ACCOUNT_SERVICE_DIR@/com.ubuntu.reminders_reminders.service",
+            "accounts": "com.ubuntu.reminders_reminders.accounts",
             "apparmor": "reminders.apparmor",
             "desktop": "com.ubuntu.reminders.desktop",
             "urls": "reminders.url-dispatcher",
             "content-hub": "reminders-contenthub.json"
         },
         "evernote-account-plugin": {
-            "account-qml-plugin": "@ACCOUNT_QML_PLUGIN_DIR@/evernote",
-            "account-provider": "@ACCOUNT_PROVIDER_DIR@/com.ubuntu.reminders_evernote-account-plugin.provider"
+            "accounts": "com.ubuntu.reminders_evernote-account-plugin.accounts"
         },
         "pushHelper": {
             "apparmor": "push-helper.apparmor",

=== modified file 'src/account-plugin/CMakeLists.txt'
--- src/account-plugin/CMakeLists.txt	2014-09-24 15:02:10 +0000
+++ src/account-plugin/CMakeLists.txt	2015-09-17 15:42:30 +0000
@@ -25,6 +25,7 @@
     set(PROVIDER_FILE data/providers/${EVERNOTE_PROVIDER_ID}.provider)
     set(SERVICE_FILE data/services/${EVERNOTE_SERVICE_ID}.service)
     set(QML_PLUGIN_FILE qml/${account_name}/Main.qml)
+    set(PLUGIN_ACCOUNTS_FILE com.ubuntu.reminders_evernote-account-plugin.accounts)
 
     install(FILES ${ICON_FILE} DESTINATION ${ACCOUNT_ICON_DIR})
 
@@ -40,6 +41,10 @@
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${QML_PLUGIN_FILE}
             DESTINATION ${ACCOUNT_QML_PLUGIN_DIR}/${EVERNOTE_ACCOUNT_NAME})
 
+    configure_file(${PLUGIN_ACCOUNTS_FILE}.in
+            ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_ACCOUNTS_FILE})
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_ACCOUNTS_FILE}
+            DESTINATION ${CMAKE_INSTALL_PREFIX})
 endfunction()
 
 # Build and install the files for the production plugin

=== added file 'src/account-plugin/com.ubuntu.reminders_evernote-account-plugin.accounts.in'
--- src/account-plugin/com.ubuntu.reminders_evernote-account-plugin.accounts.in	1970-01-01 00:00:00 +0000
+++ src/account-plugin/com.ubuntu.reminders_evernote-account-plugin.accounts.in	2015-09-17 15:42:30 +0000
@@ -0,0 +1,21 @@
+{
+  "plugins": [
+    {
+      "provider": "evernote",
+      "name": "@EVERNOTE_ACCOUNT_DISPLAY_NAME@",
+      "icon": "@EVERNOTE_ICON_NAME@",
+      "qml": "@ACCOUNT_QML_PLUGIN_DIR@/evernote",
+      "auth": {
+        "oauth2/HMAC-SHA1": {
+          "RequestEndpoint": "https://@EVERNOTE_HOSTNAME@/oauth";,
+          "TokenEndpoint": "https://@EVERNOTE_HOSTNAME@/oauth";,
+          "AuthorizationEndpoint": "https://@EVERNOTE_HOSTNAME@/OAuth.action";,
+          "Callback": "https://wiki.ubuntu.com/";,
+          "ConsumerKey": "@EVERNOTE_CONSUMER_KEY@",
+          "ConsumerSecret": "@EVERNOTE_CONSUMER_SECRET@",
+          "HostName": "@EVERNOTE_HOSTNAME@"
+        }
+      }
+    }
+  ]
+}

=== modified file 'src/app/qml/reminders.qml'
--- src/app/qml/reminders.qml	2015-09-15 14:50:55 +0000
+++ src/app/qml/reminders.qml	2015-09-17 15:42:30 +0000
@@ -406,7 +406,7 @@
     AccountServiceModel {
         id: allAccounts
         applicationId: "com.ubuntu.reminders_reminders"
-        service: useSandbox ? "evernote-sandbox" : "evernote"
+        service: useSandbox ? "com.ubuntu.reminders_reminders_com.ubuntu.reminders_evernote-account-plugin_evernote-sandbox" : "com.ubuntu.reminders_reminders_com.ubuntu.reminders_evernote-account-plugin_evernote"
         includeDisabled: true
     }
 
@@ -705,7 +705,7 @@
     Setup {
         id: setup
         applicationId: "com.ubuntu.reminders_reminders"
-        providerId: useSandbox ? "com.ubuntu.reminders_evernote-account-plugin-sandbox" : "com.ubuntu.reminders_evernote-account-plugin"
+        providerId: useSandbox ? "com.ubuntu.reminders_evernote-account-plugin_evernote-sandbox" : "com.ubuntu.reminders_evernote-account-plugin_evernote"
     }
 
     Component {