Merge lp:~bhdouglass/rockwork/configuration-fix into lp:rockwork

[Brian Douglass]

This also includes all the jskit changes from the jskit merge request.

This fixes the evernote configuration problem, but the evernote app keeps having syncing issues. I'm not totally convinced this is RockWork's fault as it sometimes is successful.

=== modified file 'rockwork/AppSettingsPage.qml'
--- rockwork/AppSettingsPage.qml	2016-01-03 05:06:13 +0000
+++ rockwork/AppSettingsPage.qml	2016-02-06 16:23:43 +0000
@@ -42,10 +42,6 @@
                 request.action = Oxide.NavigationRequest.ActionReject;
                 pageStack.pop();
             }
-            else {
-                Qt.openUrlExternally(url);
-                request.action = Oxide.NavigationRequest.ActionReject;
-            }
         }
 
         Component.onCompleted: {

=== modified file 'rockworkd/libpebble/jskit/jskitmanager.cpp'
--- rockworkd/libpebble/jskit/jskitmanager.cpp	2016-02-06 16:23:42 +0000
+++ rockworkd/libpebble/jskit/jskitmanager.cpp	2016-02-06 16:23:43 +0000
@@ -1,5 +1,6 @@
 #include <QFile>
 #include <QDir>
+#include <QUrl>
 
 #include "jskitmanager.h"
 #include "jskitpebble.h"
@@ -57,8 +58,7 @@
 {
     if (m_engine) {
         QJSValue eventObj = m_engine->newObject();
-        QByteArray data = QByteArray::fromPercentEncoding(result.toUtf8());
-        eventObj.setProperty("response", m_engine->toScriptValue(data));
+        eventObj.setProperty("response", QUrl::fromPercentEncoding(result.toUtf8()));
 
         qCDebug(l) << "Sending" << eventObj.property("response").toString();
         m_jspebble->invokeCallbacks("webviewclosed", QJSValueList({eventObj}));