Merge lp:~abreu-alexandre/webbrowser-app/webapp-properties-ua-override-fix-rtm-14.09 into lp:webbrowser-app/rtm-14.09

[Alexandre Abreu]

A Webapp has the option to either specify a command line option to have a specific UA overriding the default or hgave a local webapp-properties.json file that defines the UA override such as:

{
    "name": "MyWebapp",
    "includes":["http://user-agent.me/*"],
    "domain":"user-agent.me",
    "homepage":"http://user-agent.me/",
    "user-agent-override": "Mozilla/5.0 custom-user-agent-string (unlike AnyOtheBrowser)"
}

This currently does not work, or to be more precise works but the url is set before during the init flow, and the UA string is being set after the website was browsed to.

Backport of

https://code.launchpad.net/~abreu-alexandre/webbrowser-app/fix-webapp-properties-ua-override/+merge/238991

Here is the description of the MR replicated:

"A Webapp has the option to either specify a command line option to have a specific UA overriding the default or hgave a local webapp-properties.json file that defines the UA override such as:

{
    "name": "MyWebapp",
    "includes":["http://user-agent.me/*"],
    "domain":"user-agent.me",
    "homepage":"http://user-agent.me/",
    "user-agent-override": "Mozilla/5.0 custom-user-agent-string (unlike AnyOtheBrowser)"
}

This currently does not work, or to be more precise works but the url is set before during the init flow, and the UA string is being set after the website was browsed to."

[Olivier Tilloy (osomon)]

Not needed any longer, as the entire trunk was backported to RTM.

review: Disapprove

Unmerged revisions

777. By Alexandre Abreu on 2014-12-05

BAckport webapp-properties.json UA override fix to RTM

=== modified file 'src/app/webcontainer/WebApp.qml'
--- src/app/webcontainer/WebApp.qml	2014-11-10 17:08:15 +0000
+++ src/app/webcontainer/WebApp.qml	2014-12-05 16:47:50 +0000
@@ -38,7 +38,7 @@
     property alias webappUrlPatterns: webview.webappUrlPatterns
     property alias popupRedirectionUrlPrefix: webview.popupRedirectionUrlPrefix
     property alias webviewOverrideFile: webview.webviewOverrideFile
-    property string localUserAgentOverride: ""
+    property alias localUserAgentOverride: webview.localUserAgentOverride
 
     property bool backForwardButtonsVisible: false
     property bool chromeVisible: false
@@ -58,16 +58,6 @@
         }
     ]
 
-    function getLocalUserAgentOverrideIfAny() {
-        if (localUserAgentOverride.length !== 0)
-            return localUserAgentOverride
-
-        if (webappName && unityWebapps.model.exists(webappName))
-            return unityWebapps.model.userAgentOverrideFor(webappName)
-
-        return ""
-    }
-
     Item {
         anchors.fill: parent
 
@@ -82,7 +72,6 @@
             }
             height: parent.height - osk.height - (webapp.chromeless ? 0 : chromeLoader.item.visibleHeight)
             developerExtrasEnabled: webapp.developerExtrasEnabled
-            localUserAgentOverride: getLocalUserAgentOverrideIfAny()
         }
 
         Loader {

=== modified file 'src/app/webcontainer/webapp-container.qml'
--- src/app/webcontainer/webapp-container.qml	2014-10-08 09:23:14 +0000
+++ src/app/webcontainer/webapp-container.qml	2014-12-05 16:47:50 +0000
@@ -78,7 +78,7 @@
         webappModelSearchPath: root.webappModelSearchPath
         webappUrlPatterns: root.webappUrlPatterns
 
-        localUserAgentOverride: root.localUserAgentOverride
+        localUserAgentOverride: getLocalUserAgentOverrideIfAny()
 
         popupRedirectionUrlPrefix: root.popupRedirectionUrlPrefix
         webviewOverrideFile: root.webviewOverrideFile
@@ -102,6 +102,16 @@
         Component.onCompleted: i18n.domain = "webbrowser-app"
     }
 
+    function getLocalUserAgentOverrideIfAny() {
+        if (localUserAgentOverride.length !== 0)
+            return localUserAgentOverride
+
+        if (webappName && webappModel.exists(webappName))
+            return webappModel.userAgentOverrideFor(webappName)
+
+        return ""
+    }
+
     UnityWebApps.UnityWebappsAppModel {
         id: webappModel
         searchPath: root.webappModelSearchPath