Merge lp:~dpm/reminders-app/switch-to-production into lp:reminders-app

Proposed by David Planella
Status: Superseded
Proposed branch: lp:~dpm/reminders-app/switch-to-production
Merge into: lp:reminders-app
Diff against target: 49 lines (+6/-6)
3 files modified
src/account-plugin/data/providers/evernote.provider.in (+4/-4)
src/account-plugin/data/services/evernote.service (+1/-1)
src/plugin/Evernote/evernoteconnection.cpp (+1/-1)
To merge this branch: bzr merge lp:~dpm/reminders-app/switch-to-production
Reviewer Review Type Date Requested Status
Francis Ginther Pending
Ubuntu Notes app developers Pending
Review via email: mp+224120@code.launchpad.net

This proposal has been superseded by a proposal from 2014-06-25.

Commit message

Switch the account plugin to point to the Evernote production server.

Description of the change

Switch the account plugin to point to the Evernote production server.

Please do not review or merge this branch yet, as it's still lacking the replacement of the API key.

The API key is added to the account plugin during build on debian/rules:

 dh_auto_configure -- -DEVERNOTE_CONSUMER_KEY="consumerkey" \
  -DEVERNOTE_CONSUMER_SECRET="consumersecret"

These values are replaced in evernote.provider.in
http://bazaar.launchpad.net/~reminders-app-dev/reminders-app/trunk/view/head:/src/account-plugin/data/providers/evernote.provider.in#L19

And we'd like to see how Jenkins could inject it during build instead.

To post a comment you must log in.
165. By Riccardo Padovani

First implementation of the new header.

Approved by Ubuntu Phone Apps Jenkins Bot.

166. By Michael Zanetti

switch the plugin to the evernote production servers by default but keep a switch to fall back to the sandbox servers

167. By David Planella

Merged auth plugin changes for the switch to production

168. By David Planella

Added sandbox authentication plugin alongside the production one

169. By David Planella

Fixed installation as independent auth plugins (production and sandbox)

170. By David Planella

Switched actual key to production

171. By David Planella

Removed duplicate code for the sandbox plugin to prepare its generation from CMake variable replacement at build time

172. By David Planella

Updated Debian rules to build twice with different cmake variables for the account plugins

173. By David Planella

Add rules to build each auth plugin, specify only the keys in debian/rules

174. By David Planella

Fixed install rules for the set of two authentication plugins

175. By David Planella

Make the autopilot tests use the developer sandbox account

176. By David Planella

Merged branch to make the frontend and backend able to switch between sandbox and production servers

177. By David Planella

Fixed the host names

178. By David Planella

Added the evernote-sandbox service to the application file

179. By David Planella

Installed the Evernote API plugin with the auth plugin

180. By David Planella

Make only the production auth plugin install the API plugin, and make the sandbox plugin depend on it

181. By David Planella

Fixed condition for unconfigured connection

182. By David Planella

Fixed full hostname in the auth plugin provider file, set the host name in its QML file

183. By David Planella

Hardcode the hostname for now, until we find out why it cannot be read from the provider file

184. By David Planella

Un-hardcoded hostname, now reading it properly from the frontend, fixed Debian packaging short descriptions for the account plugins

185. By David Planella

Merged mzanetti's fixes to use production accounts

186. By David Planella

Merged from trunk

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/account-plugin/data/providers/evernote.provider.in'
2--- src/account-plugin/data/providers/evernote.provider.in 2014-01-30 12:53:13 +0000
3+++ src/account-plugin/data/providers/evernote.provider.in 2014-06-23 12:52:40 +0000
4@@ -1,6 +1,6 @@
5 <?xml version="1.0" encoding="UTF-8"?>
6 <provider id="evernote">
7- <name>Evernote Developer Sandbox</name>
8+ <name>Evernote</name>
9 <icon>evernote</icon>
10 <translations>account-plugins</translations>
11 <plugin>generic-oauth</plugin>
12@@ -12,9 +12,9 @@
13 <setting name="mechanism">HMAC-SHA1</setting>
14 <group name="oauth2">
15 <group name="HMAC-SHA1">
16- <setting name="RequestEndpoint">https://sandbox.evernote.com/oauth</setting>
17- <setting name="TokenEndpoint">https://sandbox.evernote.com/oauth</setting>
18- <setting name="AuthorizationEndpoint">https://sandbox.evernote.com/OAuth.action</setting>
19+ <setting name="RequestEndpoint">https://www.evernote.com/oauth</setting>
20+ <setting name="TokenEndpoint">https://www.evernote.com/oauth</setting>
21+ <setting name="AuthorizationEndpoint">https://www.evernote.com/OAuth.action</setting>
22 <setting name="Callback">https://wiki.ubuntu.com/</setting>
23 <setting name="ConsumerKey">@EVERNOTE_CONSUMER_KEY@</setting>
24 <setting name="ConsumerSecret">@EVERNOTE_CONSUMER_SECRET@</setting>
25
26=== modified file 'src/account-plugin/data/services/evernote.service'
27--- src/account-plugin/data/services/evernote.service 2014-01-30 12:53:13 +0000
28+++ src/account-plugin/data/services/evernote.service 2014-06-23 12:52:40 +0000
29@@ -1,7 +1,7 @@
30 <?xml version="1.0" encoding="UTF-8"?>
31 <service id="evernote">
32 <type>sharing</type>
33- <name>Evernote Developer Sandbox</name>
34+ <name>Evernote</name>
35 <icon>evernote</icon>
36 <provider>evernote</provider>
37 <translations>account-plugins</translations>
38
39=== modified file 'src/plugin/Evernote/evernoteconnection.cpp'
40--- src/plugin/Evernote/evernoteconnection.cpp 2014-04-30 20:11:18 +0000
41+++ src/plugin/Evernote/evernoteconnection.cpp 2014-06-23 12:52:40 +0000
42@@ -49,7 +49,7 @@
43 // application/version; platform/version; [ device/version ]
44 // E.g. "Evernote Windows/3.0.1; Windows/XP SP3"
45 QString EDAM_CLIENT_NAME = QStringLiteral("Reminders/0.1; Ubuntu/13.10");
46-QString EVERNOTE_HOST = QStringLiteral("sandbox.evernote.com");
47+QString EVERNOTE_HOST = QStringLiteral("www.evernote.com");
48 QString EDAM_USER_STORE_PATH = QStringLiteral("/edam/user");
49 QString EDAM_NOTE_STORE_PATH = QStringLiteral("/edam/note");
50

Subscribers

People subscribed via source and target branches