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

[Riccardo Padovani]

Upgraded the WebView to Oxide

All works now, thanks oSoMoN!

===

I updated the NoteView to Oxide, but I have few notes:

- I used com.canonical.Oxide 1.0 instead of Ubuntu.Web 0.2 because I need UserScript and WebContextDelegateWorker types, that there aren't in Ubuntu.Web
- I'm not sure about onMessage new implementation. seems it works but have a double-check, please
- I removed the Flickable because I was not able to reproduce the wrong behavior there was with old WebView
- After this update, the app will not work on trusty, because Oxide is old on trusty. I needed to upgrade to Utopic (seems stable, btw)

Needs to find a workaround to https://bugs.launchpad.net/oxide/+bug/1338639

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

PASSED: Continuous integration, rev:169
http://91.189.93.70:8080/job/reminders-app-ci/450/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/898
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/898/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/146

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

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

I put this on hold because there is a segmentation fault in phone mode when you try to view a note: http://paste.ubuntu.com/7760088/

I'll talk to oSoMoN asap

[Olivier Tilloy (osomon)]

I investigated bug #1338639 and commented on my findings there, including a workaround until the bug is properly fixed in oxide.

[Olivier Tilloy (osomon)]

31 +// FIXME: we need com.canonical.Oxide to have UserScript type available and
32 +// WebContextDelegateWorker to intercette messages. As
33 +// soon as this will be implemented also in Ubuntu.Web we will switch to last
34 +// one
35 +import com.canonical.Oxide 1.0

UserScript and WebContextDelegateWorker will probably never be exposed through the Ubuntu.Web API (at least not in the foreseeable future), which is intended as a simple API for application developers to display web content. For advanced functionality like this, it’s fine to use oxide directly (although it’s not publicly advertised and documented). So this comment can be removed.

[Olivier Tilloy (osomon)]

I don’t think the use of a WebContextDelegateWorker is correct here. If I understand the intent correctly, you want to:

 - remove that WebContextDelegateWorker
 - update the reminders-scripts.js script to use oxide.sendMessage(…) instead of navigator.qt.postMessage(…)
 - add an Oxide.ScriptMessageHandler to the messageHandlers property of the webview to handle the message sent above

See http://bazaar.launchpad.net/~oxide-developers/oxide/oxide.trunk/view/head:/qt/tests/qmltests/api/tst_ScriptMessage.qml for a complete example of how user scripts work in oxide.

[Olivier Tilloy (osomon)]

> After this update, the app will not work on trusty, because Oxide is
> old on trusty. I needed to upgrade to Utopic (seems stable, btw)

Note that oxide 1.0.2 will soon be backported to trusty via the trusty-security channel.

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

PASSED: Continuous integration, rev:171
http://91.189.93.70:8080/job/reminders-app-ci/451/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/921
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/921/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/147

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

review: Approve (continuous-integration)

[David Planella (dpm)]

For this to run on the emulator or on a device, it needs the "webview" policy added to apparmor.json

review: Needs Fixing

[David Planella (dpm)]

After testing this branch on the emulator:

- The single note views with plain text work well
- The font in general appears to be really small
- RTM notes are displayed as expected
- Image attachments are displayed as expected
- TODO checklists seem to no longer work

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

172. By Riccardo Padovani on 2014-07-12

Set a minimum font size

173. By Riccardo Padovani on 2014-07-12

Added webview to apparmor.json

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

PASSED: Continuous integration, rev:173
http://91.189.93.70:8080/job/reminders-app-ci/452/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/997
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/997/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/148

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

review: Approve (continuous-integration)

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

174. By Riccardo Padovani on 2014-07-14

Updated UserScript to work. Thanks to oSoMoN

175. By Riccardo Padovani on 2014-07-14

Removed unused try/catch

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

PASSED: Continuous integration, rev:175
http://91.189.93.70:8080/job/reminders-app-ci/458/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1012
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1012/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/154

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

review: Approve (continuous-integration)

[David Planella (dpm)]

As per the discussion in the meeting yesterday, and after checking out that the trusty PPA daily updates are disabled (*), I'll top-approve this MP.

(*) we can reenable them once Oxide 1.0.2 is backported to Trusty

review: Approve

=== modified file 'apparmor.json'
--- apparmor.json	2014-07-14 07:38:42 +0000
+++ apparmor.json	2014-07-14 15:44:46 +0000
@@ -3,7 +3,8 @@
         "networking",
         "accounts",
         "content_exchange",
-        "audio"
+        "audio",
+        "webview"
     ],
     "policy_version": 1.2
 }
\ No newline at end of file

=== modified file 'src/app/qml/reminders.qml'
--- src/app/qml/reminders.qml	2014-07-03 07:50:06 +0000
+++ src/app/qml/reminders.qml	2014-07-14 15:44:46 +0000
@@ -76,7 +76,8 @@
         if (root.narrowMode) {
             print("creating noteview");
             var component = Qt.createComponent(Qt.resolvedUrl("ui/NotePage.qml"));
-            var page = component.createObject(root, {note: note});
+            var page = component.createObject(root);
+            page.note = note;
             page.editNote.connect(function(note) {root.switchToEditMode(note)})
             pagestack.push(page)
         } else {

=== modified file 'src/app/qml/ui/NoteView.qml'
--- src/app/qml/ui/NoteView.qml	2014-05-09 14:57:31 +0000
+++ src/app/qml/ui/NoteView.qml	2014-07-14 15:44:46 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-import Ubuntu.Components.Extras.Browser 0.1
+import com.canonical.Oxide 1.0 
 import Evernote 0.1
 import "../components"
 
@@ -40,47 +40,53 @@
         visible: running
     }
 
-    // FIXME: This is a workaround for an issue in the WebView. For some reason certain
-    // documents cause a binding loop in the webview's contentHeight. Wrapping it inside
-    // another flickable prevents this from happening.
-    Flickable {
-        anchors { fill: parent }
-        contentHeight: height
-
-        UbuntuWebView {
-            id: noteTextArea
-            anchors { fill: parent}
-            property string html: note.htmlContent
-            onHtmlChanged: {
-                loadHtml(html, "file:///")
-            }
-
-            Connections {
-                target: note
-                onResourcesChanged: {
-                    noteTextArea.loadHtml(noteTextArea.html, "file:///")
-                }
-            }
-
-            experimental.preferences.standardFontFamily: 'Ubuntu'
-            experimental.preferences.navigatorQtObjectEnabled: true
-            experimental.preferredMinimumContentsWidth: root.width
-            experimental.userScripts: [Qt.resolvedUrl("reminders-scripts.js")]
-            experimental.onMessageReceived: {
-                var data = null;
-                try {
-                    data = JSON.parse(message.data);
-                } catch (error) {
-                    print("Failed to parse message:", message.data, error);
-                }
-
-                switch (data.type) {
-                case "checkboxChanged":
-                    note.markTodo(data.todoId, data.checked);
-                    NotesStore.saveNote(note.guid);
-                    break;
-                }
-            }
-        }
+    WebContext {
+        id: webContext 
+
+        userScripts: [
+            UserScript {
+                context: 'reminders://todo'
+                url: Qt.resolvedUrl("reminders-scripts.js");
+            }
+        ]
     }
+
+    WebView {
+        id: noteTextArea
+        anchors { fill: parent}
+
+        property string html: note.htmlContent
+        
+        onHtmlChanged: {
+            loadHtml(html, "file:///")
+        }
+
+        context: webContext
+        preferences.standardFontFamily: 'Ubuntu'
+        preferences.minimumFontSize: 14
+
+        Connections {
+            target: note
+            onResourcesChanged: {
+                noteTextArea.loadHtml(noteTextArea.html, "file:///")
+            }
+        }
+
+        messageHandlers: [
+            ScriptMessageHandler {
+                msgId: 'todo'
+                contexts: ['reminders://todo']
+                callback: function(message, frame) {
+                    var data = message.args;
+
+                    switch (data.type) {
+                        case "checkboxChanged":
+                        note.markTodo(data.todoId, data.checked);
+                        NotesStore.saveNote(note.guid);
+                        break;
+                    }
+                } 
+            }
+        ]
+     }
 }

=== modified file 'src/app/qml/ui/reminders-scripts.js'
--- src/app/qml/ui/reminders-scripts.js	2013-12-17 23:19:58 +0000
+++ src/app/qml/ui/reminders-scripts.js	2014-07-14 15:44:46 +0000
@@ -5,7 +5,7 @@
         message.type = "checkboxChanged";
         message.todoId = event.srcElement.id;
         message.checked = event.srcElement.checked;
-        navigator.qt.postMessage(JSON.stringify(message));
+        oxide.sendMessage('todo', message);
     }
 }