Merge lp:~ken-vandine/signon-ui/lp1235259 into lp:signon-ui

[Ken VanDine]

Use a MainView and pull in the UserAgent logic used in the Browser
component. Using the correct useragent fixes things like facebook
suggesting users should install the facebook app for iphone (LP: #1235259)

Use a MainView and pull in the UserAgent logic used in the Browser
component. Using the correct useragent fixes things like facebook
suggesting users should install the facebook app for iphone (LP: #1235259)

[Alberto Mardegan (mardy)]

Excellent! :-)

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== added file 'src/browser-process/UserAgent.qml'
--- src/browser-process/UserAgent.qml	1970-01-01 00:00:00 +0000
+++ src/browser-process/UserAgent.qml	2013-10-07 14:11:32 +0000
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtQuick.Window 2.0
+import Ubuntu.Components 0.1
+import "ua-overrides.js" as Overrides
+
+/*
+ * Useful documentation:
+ *   http://en.wikipedia.org/wiki/User_agent#Format
+ *   https://developer.mozilla.org/en-US/docs/Gecko_user_agent_string_reference
+ *   https://wiki.mozilla.org/B2G/User_Agent
+ *   https://github.com/mozilla-b2g/gaia/blob/master/build/ua-override-prefs.js
+ *   https://developers.google.com/chrome/mobile/docs/user-agent
+ */
+
+// This is an Item, not a QtObject, because it needs information about the Screen.
+Item {
+    // %1: form factor (Mobile, Tablet, Desktop)
+    // %2: WebKit version
+    readonly property string _template: "Mozilla/5.0 (Ubuntu; %1) WebKit/%2"
+
+    // See Source/WebCore/Configurations/Version.xcconfig in QtWebKit’s source tree
+    // TODO: determine this value at runtime
+    readonly property string _webkitVersion: "537.21"
+
+    // FIXME: this is a quick hack that will become increasingly unreliable
+    // as we support more devices, so we need a better solution for this
+    // FIXME: only handling phone and tablet for now, need to handle desktop too
+    readonly property string _formFactor: (Screen.width >= units.gu(60)) ? "Tablet" : "Mobile"
+
+    property string defaultUA: _template.arg(_formFactor).arg(_webkitVersion)
+
+    property var overrides: Overrides.overrides
+
+    function getDomain(url) {
+        var domain = url.toString()
+        var indexOfScheme = domain.indexOf("://")
+        if (indexOfScheme !== -1) {
+            domain = domain.slice(indexOfScheme + 3)
+        }
+        var indexOfPath = domain.indexOf("/")
+        if (indexOfPath !== -1) {
+            domain = domain.slice(0, indexOfPath)
+        }
+        return domain
+    }
+
+    function getDomains(domain) {
+        var components = domain.split(".")
+        var domains = []
+        for (var i = 0; i < components.length; i++) {
+            domains.push(components.slice(i).join("."))
+        }
+        return domains
+    }
+
+    function getUAString(url) {
+        var ua = defaultUA
+        var domains = getDomains(getDomain(url))
+        for (var i = 0; i < domains.length; i++) {
+            var domain = domains[i]
+            if (domain in overrides) {
+                var form = overrides[domain]
+                if (typeof form == "string") {
+                    return form
+                } else if (typeof form == "object") {
+                    return ua.replace(form[0], form[1])
+                }
+            }
+        }
+        return ua
+    }
+}

=== modified file 'src/browser-process/browser-process.pro'
--- src/browser-process/browser-process.pro	2013-10-04 17:15:49 +0000
+++ src/browser-process/browser-process.pro	2013-10-07 14:11:32 +0000
@@ -47,7 +47,9 @@
 OTHER_FILES += \
     webview.qml \
     KeyboardRectangle.qml \
-    StandardAnimation.qml
+    StandardAnimation.qml \
+    UserAgent.qml \
+    ua-overrides.js
 
 RESOURCES += \
     qml.qrc

=== modified file 'src/browser-process/qml.qrc'
--- src/browser-process/qml.qrc	2013-04-19 11:13:03 +0000
+++ src/browser-process/qml.qrc	2013-10-07 14:11:32 +0000
@@ -1,8 +1,9 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-  <file>webview.qml</file>
-  <file>KeyboardRectangle.qml</file>
-  <file>StandardAnimation.qml</file>
-</qresource>
+<RCC>
+    <qresource prefix="/">
+        <file>webview.qml</file>
+        <file>KeyboardRectangle.qml</file>
+        <file>StandardAnimation.qml</file>
+        <file>UserAgent.qml</file>
+        <file>ua-overrides.js</file>
+    </qresource>
 </RCC>
-

=== added file 'src/browser-process/ua-overrides.js'
--- src/browser-process/ua-overrides.js	1970-01-01 00:00:00 +0000
+++ src/browser-process/ua-overrides.js	2013-10-07 14:11:32 +0000
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+.pragma library
+
+// B2G’s list of overrides: https://github.com/mozilla-b2g/gaia/blob/master/build/ua-override-prefs.js
+
+// List of user agent string overrides in the form of an object.
+// Each key is a domain name for which the default user agent string doesn’t
+// work well enough. Values can either be a string (full override) or an array
+// containing two values that are passed to the String.replace method (the
+// first value may be either a string or a regular expression, the second value
+// must be a string).
+
+// Examples of valid entries:
+//     "example.org": "full override"
+//     "example.com": ["Ubuntu", "Ubuntu Edge"]
+//     "google.com": [/mobi/i, "b"]
+
+// The original list was initially built from the top 100 entries
+// at http://www.alexa.com/topsites (2013-08-16), using Chrome on
+// Android as a reference.
+
+var overrides = {
+    "mail.google.com": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
+    "google.com": ["Mobile", "Android; Mobile"],
+    "youtube.com": ["Mobile", "Android; Mobile"],
+    "yahoo.com": ["Mobile", "Android; Mobile"],
+    "baidu.com": ["Mobile", "Android; Mobile"],
+    "qq.com": [/WebKit\/[.0-9]*/, "Apple$& Mobile"],
+    "amazon.com": ["Mobile", "Android; Mobile"],
+    "linkedin.com": ["Mobile", "Android; Mobile"],
+    "blogspot.com": ["Mobile", "Android; Mobile"],
+    "taobao.com": ["Mobile", "Android; Mobile"],
+    "google.co.in": ["Mobile", "Android; Mobile"],
+    "bing.com": ["Mobile", "Android; Mobile"],
+    "yahoo.co.jp": ["Ubuntu", "Linux; Android 4; Galaxy Build/"],
+    "yandex.ru": ["Mobile", "Android; Mobile"],
+    "sina.com.cn": ["Mobile", "Android; Mobile"],
+    "ebay.com": ["Mobile", "Android; Mobile"],
+    "google.de": ["Mobile", "Android; Mobile"],
+    "tumblr.com": ["Mobile", "Android; Mobile"],
+    "google.co.uk": ["Mobile", "Android; Mobile"],
+    "msn.com": ["Mobile", "Android; Mobile"],
+    "google.fr": ["Mobile", "Android; Mobile"],
+    "mail.ru": ["Ubuntu", "Linux; Android 4; Galaxy Build/"],
+    "google.com.br": ["Mobile", "Android; Mobile"],
+    "google.co.jp": ["Mobile", "Android; Mobile"],
+    "hao123.com": ["Mobile", "Android; Mobile"],
+    "ask.com": ["Mobile", "Android; Mobile"],
+    "google.com.hk": ["Mobile", "Android; Mobile"],
+    "google.ru": ["Mobile", "Android; Mobile"],
+    "blogger.com": ["Mobile", "Android; Mobile"],
+    "imdb.com": ["Mobile", "Android; Mobile"],
+    "google.it": ["Mobile", "Android; Mobile"],
+    "google.es": ["Mobile", "Android; Mobile"],
+    "amazon.co.jp": ["Mobile", "Android; Mobile"],
+    "tmall.com": ["Mobile", "Android; Mobile"],
+    "fc2.com": ["Mobile", "Android; Mobile"],
+    "google.com.mx": ["Mobile", "Android; Mobile"],
+    "google.ca": ["Mobile", "Android; Mobile"],
+    "soso.com": ["Mobile", "Android; Mobile"],
+    "delta-search.com": ["Mobile", "Android; Mobile"],
+    "odnoklassniki.ru": ["Mobile", "Android; Mobile"],
+    "alibaba.com": ["Mobile", "Android; Mobile"],
+    "flickr.com": ["Mobile", "Android; Mobile"],
+    "amazon.de": ["Mobile", "Android; Mobile"],
+    "blogspot.in": ["Mobile", "Android; Mobile"],
+    "ifeng.com": ["Mobile", "Android; Mobile"],
+    "360.cn": ["Mobile", "Android; Mobile"],
+    "google.com.tr": ["Mobile", "Android; Mobile"],
+    "google.com.au": ["Mobile", "Android; Mobile"],
+    "youku.com": ["Mobile", "Android; Mobile"],
+    "ebay.de": ["Mobile", "Android; Mobile"],
+    "uol.com.br": ["Mobile", "Android; Mobile"],
+    "aol.com": ["Mobile", "Android; Mobile"],
+    "google.pl": ["Mobile", "Android; Mobile"],
+    "alipay.com": ["Mobile", "Android; Mobile"],
+    "dailymotion.com": ["Mobile", "Android; Mobile Safari"],
+    "amazon.co.uk": ["Mobile", "Android; Mobile"],
+    "ebay.co.uk": ["Mobile", "Android; Mobile"],
+    "facebook.com": [/WebKit\/[.0-9]*/, "Apple$& Firefox/18"],
+    "nytimes.com": ["Mobile", "Android; Mobile Safari"],
+};

=== modified file 'src/browser-process/webview.qml'
--- src/browser-process/webview.qml	2013-10-01 11:03:28 +0000
+++ src/browser-process/webview.qml	2013-10-07 14:11:32 +0000
@@ -3,71 +3,77 @@
 import QtWebKit 3.0
 import QtWebKit.experimental 1.0
 import Ubuntu.Components 0.1
-
-FocusScope {
-    id: browser
-    width: 400
-    height: 300
-    focus: true
-    property string qtwebkitdpr: "1.0"
-
-    QtObject {
-        // clumsy way of defining an enum in QML
-        id: formFactor
-        readonly property int desktop: 0
-        readonly property int phone: 1
-        readonly property int tablet: 2
-    }
-    // FIXME: this is a quick hack that will become increasingly unreliable
-    // as we support more devices, so we need a better solution for this
-    // FIXME: only handling phone and tablet for now
-    property int formFactor: (Screen.width >= units.gu(60)) ? formFactor.tablet : formFactor.phone
-
-    onQtwebkitdprChanged: {
-        // Do not make this patch to QtWebKit a hard requirement.
-        if (webview.experimental.hasOwnProperty('devicePixelRatio')) {
-            webview.experimental.devicePixelRatio = qtwebkitdpr
-        }
-    }
-
-    WebView {
-        id: webView
-        anchors {
-            top: parent.top
-            left: parent.left
-            right: parent.right
-            bottom: osk.top
-        }
-        focus: true
-        experimental.userAgent: {
-            // FIXME: using iOS 5.0's iPhone/iPad user-agent strings
-            // (source: http://stackoverflow.com/questions/7825873/what-is-the-ios-5-0-user-agent-string),
-            // this should be changed to a more neutral user-agent in the
-            // future as we don't want websites to recommend installing
-            // their iPhone/iPad apps.
-            if (browser.formFactor === formFactor.phone) {
-                return "Mozilla/5.0 (iPhone; CPU iPhone OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3"
-            } else if (browser.formFactor === formFactor.tablet) {
-                return "Mozilla/5.0 (iPad; CPU OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3"
-            }
-        }
-
-        experimental.preferences.developerExtrasEnabled: false
-        experimental.preferences.navigatorQtObjectEnabled: true
-
-
-        Component.onCompleted: url = request.startUrl
-
-        onLoadingChanged: {
-            console.log("Loading changed")
-            if (loadRequest.status === WebView.LoadSucceededStatus) {
-                request.onLoadFinished(true)
-            }
-        }
-        onUrlChanged: request.currentUrl = url
-    }
-
-    KeyboardRectangle {
-        id: osk
+import Ubuntu.Unity.Action 1.0 as UnityActions
+
+import "ua-overrides.js" as Overrides
+
+MainView {
+    id: root
+    width: units.gu(60)
+    height: units.gu(90)
+
+    Page {
+
+        FocusScope {
+            id: browser
+            anchors.fill: parent
+            focus: true
+            property string qtwebkitdpr: "1.0"
+
+            QtObject {
+                // clumsy way of defining an enum in QML
+                id: formFactor
+                readonly property int desktop: 0
+                readonly property int phone: 1
+                readonly property int tablet: 2
+            }
+            // FIXME: this is a quick hack that will become increasingly unreliable
+            // as we support more devices, so we need a better solution for this
+            // FIXME: only handling phone and tablet for now
+            property int formFactor: (Screen.width >= units.gu(60)) ? formFactor.tablet : formFactor.phone
+
+            onQtwebkitdprChanged: {
+                // Do not make this patch to QtWebKit a hard requirement.
+                if (webview.experimental.hasOwnProperty('devicePixelRatio')) {
+                    webview.experimental.devicePixelRatio = qtwebkitdpr
+                }
+            }
+
+            WebView {
+                id: webView
+                anchors {
+                    top: parent.top
+                    left: parent.left
+                    right: parent.right
+                    bottom: osk.top
+                }
+                focus: true
+                UserAgent {
+                    id: userAgent
+                }
+
+                experimental.userAgent: userAgent.defaultUA
+
+                experimental.preferences.developerExtrasEnabled: false
+                experimental.preferences.navigatorQtObjectEnabled: true
+
+                Component.onCompleted: url = request.startUrl
+
+                onLoadingChanged: {
+                    console.log("Loading changed")
+                    if (loadRequest.status === WebView.LoadSucceededStatus) {
+                        request.onLoadFinished(true)
+                    }
+                    else if (loadRequest.status === WebView.LoadFailedStatus) {
+                        request.cancel();
+                    }
+                }
+                onUrlChanged: request.currentUrl = url
+            }
+
+            KeyboardRectangle {
+                id: osk
+            }
+        }
     }
 }