webbrowser-app

src/app/webcontainer/AccountsPage.qml (+5/-29)
src/app/webcontainer/WebApp.qml (+1/-0)
src/app/webcontainer/WebViewImplOxide.qml (+5/-0)
src/app/webcontainer/WebViewImplWebkit.qml (+1/-0)
src/app/webcontainer/WebappContainerWebview.qml (+4/-1)
src/app/webcontainer/chrome-cookie-store.cpp (+0/-13)
src/app/webcontainer/chrome-cookie-store.h (+0/-7)
src/app/webcontainer/cookie-store.cpp (+12/-20)
src/app/webcontainer/online-accounts-cookie-store.cpp (+4/-5)
src/app/webcontainer/oxide-cookie-helper.cpp (+5/-4)
src/app/webcontainer/webapp-container.qml (+122/-78)

To merge this branch:

bzr merge lp:~mardy/webbrowser-app/per-account-dir2

Undecided

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Olivier Tilloy		2014-10-22	Approve on 2014-11-12
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-11-12
Review via email: mp+239263@code.launchpad.net

Commit message

Use a different data location for different accounts

Move the webview behind a Loader, and set the dataPath according to the account number.

Description of the change

Use a different data location for different accounts

Move the webview behind a Loader, and set the dataPath according to the account number.

This fixes the bug described in the linked bug report, and also another potential issue (which IIRC we never saw happening): merging all cookies from different accounts can lock the webapp into an invalid state. Usually the set of cookie keys is the same even among different accounts, so this problem does not happen because all the old keys are overwritten by the newly copied cookies. But if the sets of keys are not the same (that is, if one account has one cookie more than another one), the remote website could enter a wrong state.

Testing instructions: have multiple GMail or Twitter accounts configured, but make sure that only one (for each provider) has the webapp application enabled. Then use the GMail or the twitter webapp, and verify that they work properly.
Close the webapps, go to the Accounts in System Settings, and disable the webapps from the accounts where they are enabled, and enabled them in the other account. Open the webapps again, verify that you are logged in with the proper (new) account.
Then check that the cookies.db files have been created under <dataLocation>/id-<CredentialsId> (where CredentialsId can be seen with "account-console show <account-id>", and the account IDs can be seen with "account-console list").

lp:~mardy/webbrowser-app/per-account-dir2 updated on 2014-10-22

773. By Alberto Mardegan on 2014-10-22: cleanups

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-22:

FAILED: Continuous integration, rev:772
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1207/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6142
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4175
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/406
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/406
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/406/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/406
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5769
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7394
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7394/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14972
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3536
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4526
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4526/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1207/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-22:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1208/rebuild

review: Needs Fixing (continuous-integration)

lp:~mardy/webbrowser-app/per-account-dir2 updated on 2014-10-23

774. By Alberto Mardegan on 2014-10-23: Restore line removed by accident

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-23:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1209/rebuild

review: Needs Fixing (continuous-integration)

lp:~mardy/webbrowser-app/per-account-dir2 updated on 2014-11-04

775. By Alberto Mardegan on 2014-11-04

from trunk

[ CI bot ]
* Resync trunk
* Fix the override mechanism for navigator.userAgent, and add UA
  override rules for HSBC’s Brazilian mobile site and ESPN’s mobile
  site. (LP: #1316259)
[ Riccardo Padovani ]
* Fixed #1378975 - Fast double click on menu button opens menu twice
  (LP: #1378975)
* Updated the README
[ Jean-Francois Moy ]
* Twitter User Script - Hide the prompt to download the Android
  application. (LP: #1352789)
[ Ubuntu daily release ]
* New rebuild forced
[ Olivier Tilloy ]
* Prevent the browser from trying to download embedded flash
  applications. (LP: #1379806)
* Fix a harmless compilation warning found by clang (non-literal-null-
  conversion).
* Update UITK autopilot test imports. (LP: #1386276)
[ CI bot ]
* Resync trunk
[ Ubuntu daily release ]
* New rebuild forced
[ Olivier Tilloy ]
* Fix the override mechanism for navigator.userAgent, and add UA
  override rules for HSBC’s Brazilian mobile site and ESPN’s mobile
  site. (LP: #1316259)

776. By Alberto Mardegan on 2014-11-04

Revert pot changes

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-11-04:

All the webapp_container autopilot tests now fail: you need to replace "toolkit_emulators" by "uitk" in tests/autopilot/webapp_container/tests/__init__.py, to match a recent import renaming.

review: Needs Fixing

lp:~mardy/webbrowser-app/per-account-dir2 updated on 2014-11-04

777. By Alberto Mardegan on 2014-11-04: Fix autopilot tests

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-11-04:

In src/app/WebViewImpl.qml:

16 + context: WebContext {
17 + dataPath: webview.dataPath
18 + }

This replaces the use of the custom shared context with a bare one that doesn’t have the functionality of the shared one (UA override mechanism, session cookie mode selection, user scripts). This won’t work.

review: Needs Fixing

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-11-04:

Scratch the above comment, I hadn’t noticed that WebContext was resolving to UbuntuWebContext.qml.

However this change will break the browser, because it means we instantiate several contexts with the same datapath (which is the reason why the shared context is a singleton in the first place).

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-04:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1232/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-04:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1233/rebuild

review: Needs Fixing (continuous-integration)

lp:~mardy/webbrowser-app/per-account-dir2 updated on 2014-11-04

778. By Alberto Mardegan on 2014-11-04

Move context initialization to WebViewImplOxide.qml

779. By Alberto Mardegan on 2014-11-04

From trunk

[ Ubuntu daily release ]
* New rebuild forced
[ 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:

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-04:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1234/rebuild

review: Needs Fixing (continuous-integration)

lp:~mardy/webbrowser-app/per-account-dir2 updated on 2014-11-05

780. By Alberto Mardegan on 2014-11-05

from trunk

[ Ubuntu daily release ]
* New rebuild forced
[ Riccardo Padovani ]
* Added new upstream components to fit with design requests: multiple
  selection in History, standard swipe-to-delete. (LP: #1351167)
[ Olivier Tilloy ]
* Do not use a custom scheme to trigger the error page, this won’t
  work any longer as soon as oxide learns how to delegate unhandled
  schemes (see https://launchpad.net/bugs/1384460). (LP: #1384460)
* Ensure that the 'dataLocation' context property is updated when the
  application name changes. (LP: #1387754)
* Really honour the --fullscreen command-line switch. (LP: #1379766)

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-11-05:

In webapp-container.qml, there are 4 references to "browser.currentWebview" outside of webappViewComponent which are broken since "browser" is not defined outside its parent component. You’ll need to replace them with "webappViewLoader.item", and of course make the corresponding code conditional on the value of "webappViewLoader.item".

review: Needs Fixing

lp:~mardy/webbrowser-app/per-account-dir2 updated on 2014-11-05

781. By Alberto Mardegan on 2014-11-05: Don't use invalid browser.currentWebview
782. By Alberto Mardegan on 2014-11-05: Remove updateBrowserUrl function

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-05:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1239/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-05:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1240/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-11-07:

118 - asynchronous: true

Why did you remove this attribute from the Loader?

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-11-07:

A minor style suggestion, in WebViewImplOxide.qml:

  property url dataPath
  …
  context: WebContext {
    dataPath: webview.dataPath
  }

could have been written:

  property alias dataPath: context.dataPath
  …
  context: WebContext {}

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-11-07:

In webapp-container.qml:

Component.onCompleted: i18n.domain = "webbrowser-app"

should probably be moved to the top-level BrowserWindow component (although it works as is today, it might break in the future if we need translated strings before instantiating the WebApp component).

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-11-07:

In webapp-container.qml:

console.log("Cookies were not moved")

you might want to use console.warn(…) instead.

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-11-07:

It looks like the updateCurrentView() function is called in one place only, maybe its implementation can be moved to the Component.onCompleted body instead?

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-11-07:

463 + if (successful && credentialsId) {

Isn’t 'credentialsId' guaranteed to be non-null if 'successful' is true? Or are you checking that it’s ≠ 0 as well? If not, I would say that the 'successful' parameter is redundant.

lp:~mardy/webbrowser-app/per-account-dir2 updated on 2014-11-07

783. By Alberto Mardegan on 2014-11-07: Address review comments

Revision history for this message

Alberto Mardegan (mardy) wrote on 2014-11-07:

> 118 - asynchronous: true
>
> Why did you remove this attribute from the Loader?

I'm not sure; this was in the branch by Alex, on which I based my work. Let's ask him later.

> In webapp-container.qml:
> console.log("Cookies were not moved")
> you might want to use console.warn(…) instead.

It can be that cookies are not moved because the OA cookies are older then those in the webapp; actually, this is what will happen most of the times. So, the cookies not being moved is not really an error condition.

All your other suggestions have now been implemented.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-07:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1252/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-11:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1255/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Chris Coulson (chrisccoulson) wrote on 2014-11-11:

> Scratch the above comment, I hadn’t noticed that WebContext was resolving to
> UbuntuWebContext.qml.
>
> However this change will break the browser, because it means we instantiate
> several contexts with the same datapath (which is the reason why the shared
> context is a singleton in the first place).

We should really enforce this clearly in Oxide (currently, instantiating more than one WebContext with the same data path will result in obscure aborts like bug 1278315, but we could do an explicit abort with a more helpful error message)

lp:~mardy/webbrowser-app/per-account-dir2 updated on 2014-11-11

784. By Alberto Mardegan on 2014-11-11

From trunk

[ Ubuntu daily release ]
* New rebuild forced
[ Alexandre Abreu ]
* Fix facebook content hub share, the proper share API was not enabled
  to access from the webapp-container. (LP: #1386682)
[ Riccardo Padovani ]
* Enabled swipe gesture to delete a bookmark from the new tab view
  (LP: #1351165)
* Fixed #1351149 - Opening a page from the history view should do it
  in a new tab (LP: #1351149)
[ Alexandre Abreu ]
* Fix AP tests for webapp-container (LP: #1389194)
* Fix an inconsistent property binding that is mostly more than
  annoying when the override mechanism is used in certain cases (e.g.
  when the override does not directly implement the webview),
[ Olivier Tilloy ]
* Adjust the new tab view’s background colour to match the visual
  spec. (LP: #1389610)
* Clean up the AddressBar component, and convert a number of related
  autopilot tests to QML tests.
* Update dependency names for QML modules (but keep the old name as
  well for backward compatibility).

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-11:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1256/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-11-12:

The following autopilot test is broken:

webapp_container.tests.test_redirection_pattern.WebappContainerRedirectionPatternTestCase.test_browse_to_redirection_pattern_url

(it wasn’t caught by the CI job because it doesn’t run the webapp_container test suite yet, but I’ve asked CI to add it).

review: Needs Fixing

lp:~mardy/webbrowser-app/per-account-dir2 updated on 2014-11-12

785. By Alberto Mardegan on 2014-11-12

Revert alias on dataPath

Aliases work only on ids, not on property names.
Import Ubuntu.Web so that dataLocation is defined.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-12:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1268/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-11-12:

This looks good now, thanks!

review: Approve

lp:~mardy/webbrowser-app/per-account-dir2 updated on 2014-11-13

786. By Alberto Mardegan on 2014-11-13: OA: never set cookie mode to persistent

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-11-14:

In this last change, is the "webContextSessionCookieMode" property on webappViewLoader effectively going to override the engine’s root context "webContextSessionCookieMode" property so that UbuntuWebContext pick it up correctly?

If so, the change looks ok to me, but a comment to explain that would be welcome, as it might seem like black magic to an external developer trying to understand the code.

lp:~mardy/webbrowser-app/per-account-dir2 updated on 2014-11-25

787. By Alberto Mardegan on 2014-11-14

Add comment

788. By Alberto Mardegan on 2014-11-25

merge from trunk

[ CI bot ]
* Resync trunk
[ Ubuntu daily release ]
* New rebuild forced
[ Alexandre Abreu ]
* Make use of the hostMappingRules in oxide and expose it in the
  webcontext Improve container url AP tests with newly introduced
  hostmapping in oxide 1.3
* HTML5 apps are currently using a specific container/launcher as
  their runtime. They should use the webapp container instead. (LP:
  #1392281, #1388988)
[ Olivier Tilloy ]
* Update translation template.
[ Michael Sheldon ]
* Add mimetype and file extension mappings for the new EBooks
  ContentType. (LP: #1383732)
[ Olivier Tilloy ]
* Update runtime dependencies of -autopilot packages. Now that
  autopilot has been removed from touch images, autopilot-touch is
  what we should depend on to ensure all dependencies are correctly
  installed prior to running tests using phablet-test-run.
* Factor the security certificate details popover out of the
  AddressBar component, for improved maintainability.
* Simplify quite a bit the machinery needed to set up the QML tests.
* Always load the webview for a new tab right away. (LP: #1391609)
* Set a stroke color on toolbar buttons. (LP: #1351200)
* Add a sanity unit test that runs flake8 on the autopilot tests code.
* No-change rebuild against Qt 5.3.2.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Alberto Mardegan

Ubuntu Phablet Team

to status/vote changes:

Rachel Liu

 === modified file 'src/app/webcontainer/AccountsPage.qml'
 --- src/app/webcontainer/AccountsPage.qml	2014-08-21 15:15:21 +0000
 +++ src/app/webcontainer/AccountsPage.qml	2014-11-25 15:01:18 +0000
@@ -25,12 +25,10 @@
      property alias accountProvider: accountsLogin.accountProvider
      property alias applicationName: accountsLogin.applicationName
--    property var webappCookieStore: null
--    property var onlineAccountStoreComponent: null
--
--    signal done()
--
--    visible: false
++
++    signal done(bool successful, var credentialsId)
++
++    visible: true
      anchors.fill: parent
      AccountsLoginPage {
@@ -38,32 +36,10 @@
          anchors.fill: parent
--        QtObject {
--            id: internal
--            function onMoved(result) {
--                webappCookieStore.moved.disconnect(internal.onMoved)
--                if (!result) {
--                    console.error("Unable to move cookies")
--                }
--                accountsPage.done()
--            }
--        }
--
          onDone: {
              if (!accountsPage.visible)
                  return
--            if (!credentialsId) {
--                accountsPage.done()
--                return
--            }
--
--            if (webappCookieStore) {
--                var instance = onlineAccountStoreComponent.createObject(accountsLogin, { "accountId": credentialsId })
--                webappCookieStore.moved.connect(internal.onMoved)
--                webappCookieStore.moveFrom(instance)
--            } else {
--                accountsPage.done()
--            }
++            accountsPage.done(credentialsId != null, credentialsId)
+         }
+     }
+ }
 === modified file 'src/app/webcontainer/WebApp.qml'
 --- src/app/webcontainer/WebApp.qml	2014-11-19 17:16:38 +0000
 +++ src/app/webcontainer/WebApp.qml	2014-11-25 15:01:18 +0000
@@ -40,6 +40,7 @@
      property alias webviewOverrideFile: webview.webviewOverrideFile
      property alias blockOpenExternalUrls: webview.blockOpenExternalUrls
      property alias localUserAgentOverride: webview.localUserAgentOverride
++    property alias dataPath: webview.dataPath
      property alias runningLocalApplication: webview.runningLocalApplication
      property bool backForwardButtonsVisible: false
 === modified file 'src/app/webcontainer/WebViewImplOxide.qml'
 --- src/app/webcontainer/WebViewImplOxide.qml	2014-11-20 16:46:17 +0000
 +++ src/app/webcontainer/WebViewImplOxide.qml	2014-11-25 15:01:18 +0000
@@ -34,6 +34,7 @@
      property string localUserAgentOverride: ""
      property var webappUrlPatterns: null
      property string popupRedirectionUrlPrefixPattern: ""
++    property url dataPath
      // Mostly used for testing & avoid external urls to
      //  "leak" in the default browser
@@ -47,6 +48,10 @@
      currentWebview: webview
++    context: WebContext {
++        dataPath: webview.dataPath
++    }
++
      preferences.allowFileAccessFromFileUrls: runningLocalApplication
      preferences.allowUniversalAccessFromFileUrls: runningLocalApplication
 === modified file 'src/app/webcontainer/WebViewImplWebkit.qml'
 --- src/app/webcontainer/WebViewImplWebkit.qml	2014-11-12 21:24:10 +0000
 +++ src/app/webcontainer/WebViewImplWebkit.qml	2014-11-25 15:01:18 +0000
@@ -35,6 +35,7 @@
      property var webappUrlPatterns: null
      property string localUserAgentOverride: ""
      property string popupRedirectionUrlPrefixPattern: ""
++    property url dataPath // unused
      property bool runningLocalApplication: false
      function getUAString() {
 === modified file 'src/app/webcontainer/WebappContainerWebview.qml'
 --- src/app/webcontainer/WebappContainerWebview.qml	2014-11-13 00:05:18 +0000
 +++ src/app/webcontainer/WebappContainerWebview.qml	2014-11-25 15:01:18 +0000
@@ -30,6 +30,7 @@
      property bool withOxide: false
      property bool developerExtrasEnabled: false
      property string webappName: ""
++    property url dataPath
      property var currentWebview: webappContainerWebViewLoader.item ?
                                       webappContainerWebViewLoader.item.currentWebview
                                     : null
@@ -44,9 +45,10 @@
          id: webappContainerWebViewLoader
          objectName: "containerWebviewLoader"
          anchors.fill: parent
--        asynchronous: true
+     }
++    onUrlChanged: if (webappContainerWebViewLoader.item) webappContainerWebViewLoader.item.url = url
++
      Component.onCompleted: {
          var webappEngineSource =
                  withOxide ?
@@ -65,6 +67,7 @@
                      { localUserAgentOverride: containerWebview.localUserAgentOverride
                      , url: containerWebview.url
                      , webappName: containerWebview.webappName
++                    , dataPath: dataPath
                      , webappUrlPatterns: containerWebview.webappUrlPatterns
                      , developerExtrasEnabled: containerWebview.developerExtrasEnabled
                      , popupRedirectionUrlPrefixPattern: containerWebview.popupRedirectionUrlPrefixPattern
 === modified file 'src/app/webcontainer/chrome-cookie-store.cpp'
 --- src/app/webcontainer/chrome-cookie-store.cpp	2014-09-18 13:37:07 +0000
 +++ src/app/webcontainer/chrome-cookie-store.cpp	2014-11-25 15:01:18 +0000
@@ -33,19 +33,6 @@
                       this, SLOT(oxideCookiesUpdated(const QList<QNetworkCookie>&)));
+ }
--void ChromeCookieStore::setHomepage(const QUrl& homepage) {
--    if (homepage == m_homepage)
--        return;
--
--    m_homepage = homepage;
--
--    emit homepageChanged();
--}
--
--QUrl ChromeCookieStore::homepage() const {
--    return m_homepage;
--}
--
  void ChromeCookieStore::setOxideStoreBackend(QObject* backend)
+ {
      m_cookieHelper->setOxideStoreBackend(backend);
 === modified file 'src/app/webcontainer/chrome-cookie-store.h'
 --- src/app/webcontainer/chrome-cookie-store.h	2014-09-18 13:37:07 +0000
 +++ src/app/webcontainer/chrome-cookie-store.h	2014-11-25 15:01:18 +0000
@@ -30,7 +30,6 @@
+ {
      Q_OBJECT
--    Q_PROPERTY(QUrl homepage READ homepage WRITE setHomepage NOTIFY homepageChanged)
      Q_PROPERTY(QString dbPath READ dbPath WRITE setDbPath NOTIFY dbPathChanged)
      Q_PROPERTY(QObject* oxideStoreBackend READ oxideStoreBackend WRITE setOxideStoreBackend NOTIFY oxideStoreBackendChanged)
@@ -41,10 +40,6 @@
      void setDbPath(const QString& path);
      QString dbPath() const;
--    // dbpaths
--    void setHomepage(const QUrl& path);
--    QUrl homepage() const;
--
      // oxideStoreBackend
      void setOxideStoreBackend(QObject* backend);
      QObject* oxideStoreBackend() const;
@@ -55,7 +50,6 @@
  Q_SIGNALS:
      void dbPathChanged();
      void oxideStoreBackendChanged();
--    void homepageChanged();
  private Q_SLOTS:
      void oxideCookiesReceived(int requestId, const QVariant& cookies);
@@ -67,7 +61,6 @@
  private:
      OxideCookieHelper* m_cookieHelper;
--    QUrl m_homepage;
      QString m_dbPath;
  };
 === modified file 'src/app/webcontainer/cookie-store.cpp'
 --- src/app/webcontainer/cookie-store.cpp	2014-08-26 09:49:32 +0000
 +++ src/app/webcontainer/cookie-store.cpp	2014-11-25 15:01:18 +0000
@@ -91,8 +91,20 @@
      if (Q_UNLIKELY(!request))
          return;
++    QDateTime lastRemoteCookieUpdate =
++        request->_cookieStore->lastUpdateTimeStamp();
++    QDateTime lastLocalCookieUpdate = lastUpdateTimeStamp();
++
      delete request;
++    if (lastRemoteCookieUpdate.isValid() &&
++        lastLocalCookieUpdate.isValid() &&
++        (lastRemoteCookieUpdate < lastLocalCookieUpdate))
++    {
++        Q_EMIT moved(false);
++        return;
++    }
++
      connect(this, &CookieStore::cookiesSet,
              this, &CookieStore::moved);
@@ -104,26 +116,6 @@
      if (Q_UNLIKELY(!store))
          return;
--    QDateTime lastRemoteCookieUpdate = store->lastUpdateTimeStamp();
--    QDateTime lastLocalCookieUpdate = lastUpdateTimeStamp();
--
--    // Disabled for now since.
--    // There is an obvious race if the WebView is instanciated
--    // (since it creates a cookies db file at creation time).
--    // But when delaying the creation, only using the WebContext to
--    // access the cookieManager, and manually creating a cookies db file
--    // if none is found (since the cookie manager does not create one
--    // when setting its cookies), something fails.
--#if 0
--    if (lastRemoteCookieUpdate.isValid() &&
--        lastLocalCookieUpdate.isValid() &&
--        (lastRemoteCookieUpdate < lastLocalCookieUpdate))
--    {
--        Q_EMIT moved(false);
--        return;
--    }
--#endif
--
      CookieStoreRequest* storeRequest = new CookieStoreRequest(store);
      _currentStoreRequests.insert(storeRequest, true);
 === modified file 'src/app/webcontainer/online-accounts-cookie-store.cpp'
 --- src/app/webcontainer/online-accounts-cookie-store.cpp	2014-08-05 00:25:20 +0000
 +++ src/app/webcontainer/online-accounts-cookie-store.cpp	2014-11-25 15:01:18 +0000
@@ -116,15 +116,14 @@
      if (arguments.count() > 1)
+     {
--        QDateTime t;
--        QVariant timeStampVariant(arguments.at(1));
--        if (timeStampVariant.canConvert(QMetaType::LongLong))
++        qint64 timeStamp = arguments.at(1).toLongLong();
++        if (timeStamp != 0)
+         {
              qDebug() << "Got a cookie timestamp of"
--                     << arguments.at(1).toLongLong()
++                     << timeStamp
                       << "from Online Accounts DBUS cookiesForIdentity() call.";
--            t.fromMSecsSinceEpoch(arguments.at(1).toLongLong() * 1000);
++            QDateTime t = QDateTime::fromMSecsSinceEpoch(timeStamp * 1000);
              updateLastUpdateTimestamp(t);
+         }
+     }
 === modified file 'src/app/webcontainer/oxide-cookie-helper.cpp'
 --- src/app/webcontainer/oxide-cookie-helper.cpp	2014-10-03 11:47:36 +0000
 +++ src/app/webcontainer/oxide-cookie-helper.cpp	2014-11-25 15:01:18 +0000
@@ -53,6 +53,7 @@
      m_backend(0),
      q_ptr(q)
+ {
++    qRegisterMetaType<QList<QNetworkCookie> >();
+ }
  void OxideCookieHelperPrivate::setCookies(const QList<QNetworkCookie>& cookies)
@@ -75,7 +76,7 @@
          /* We don't simply use Q_EMIT because we want the signal to be emitted
           * asynchronously */
          QMetaObject::invokeMethod(q, "cookiesSet", Qt::QueuedConnection,
--                                  Q_ARG(const QList<QNetworkCookie>&, cookies));
++                                  Q_ARG(QList<QNetworkCookie>, cookies));
          return;
+     }
@@ -119,8 +120,8 @@
          QMetaObject::invokeMethod(m_backend, "setNetworkCookies",
                                    Qt::DirectConnection,
                                    Q_RETURN_ARG(int, requestId),
--                                  Q_ARG(const QUrl&, url),
--                                  Q_ARG(const QList<QNetworkCookie>&, it.value()));
++                                  Q_ARG(QUrl, url),
++                                  Q_ARG(QList<QNetworkCookie>, it.value()));
          if (Q_UNLIKELY(requestId == -1)) {
              m_failedCookies.append(cookiesWithDomain(it.value(), url.host()));
          } else {
@@ -133,7 +134,7 @@
          /* We don't simply use Q_EMIT because we want the signal to be emitted
           * asynchronously */
          QMetaObject::invokeMethod(q, "cookiesSet", Qt::QueuedConnection,
--                                  Q_ARG(const QList<QNetworkCookie>&, m_failedCookies));
++                                  Q_ARG(QList<QNetworkCookie>, m_failedCookies));
+     }
+ }
 === modified file 'src/app/webcontainer/webapp-container.qml'
 --- src/app/webcontainer/webapp-container.qml	2014-11-12 21:24:10 +0000
 +++ src/app/webcontainer/webapp-container.qml	2014-11-25 15:01:18 +0000
@@ -19,6 +19,7 @@
  import QtQuick 2.0
  import Ubuntu.Components 1.1
  import Ubuntu.UnityWebApps 0.1 as UnityWebApps
++import Ubuntu.Web 0.2
  import webcontainer.private 0.1
  import ".."
@@ -43,64 +44,60 @@
      property string localUserAgentOverride: ""
      property bool blockOpenExternalUrls: false
--    currentWebview: browser.currentWebview
++    currentWebview: webappViewLoader.item ? webappViewLoader.item.currentWebview : null
      property bool runningLocalApplication: false
      title: getWindowTitle()
      function getWindowTitle() {
++        var webappViewTitle = webappViewLoader.item ? webappViewLoader.item.title : ""
          if (typeof(webappName) === 'string' && webappName.length !== 0) {
              return webappName
--        } else if (browser.title) {
++        } else if (webappViewTitle) {
              // TRANSLATORS: %1 refers to the current page’s title
--            return i18n.tr("%1 - Ubuntu Web Browser").arg(browser.title)
++            return i18n.tr("%1 - Ubuntu Web Browser").arg(webappViewTitle)
          } else {
              return i18n.tr("Ubuntu Web Browser")
+         }
+     }
--    WebApp {
--        id: browser
--
--        // Initially set as non visible to leave a chance
--        // for the OA dialog to appear
--        visible: false
--
--        url: accountProvider.length === 0 ? root.url : ""
--
--        chromeVisible: root.chromeVisible
--        backForwardButtonsVisible: root.backForwardButtonsVisible
--        developerExtrasEnabled: root.developerExtrasEnabled
--        oxide: root.oxide
--        webappModelSearchPath: root.webappModelSearchPath
--        webappUrlPatterns: root.webappUrlPatterns
--        blockOpenExternalUrls: root.blockOpenExternalUrls
--
--        popupRedirectionUrlPrefixPattern: root.popupRedirectionUrlPrefixPattern
--
--        localUserAgentOverride: getLocalUserAgentOverrideIfAny()
--
--        runningLocalApplication: root.runningLocalApplication
--        webviewOverrideFile: root.webviewOverrideFile
--
--        anchors.fill: parent
--
--        webbrowserWindow: webbrowserWindowProxy
--
--        onWebappNameChanged: {
--            if (root.webappName !== browser.webappName) {
--                root.webappName = browser.webappName;
--                root.title = getWindowTitle();
++    Component {
++        id: webappViewComponent
++
++        WebApp {
++            id: browser
++
++            url: accountProvider.length !== 0 ? "" : root.url
++
++            dataPath: webappDataLocation
++            webappName: root.webappName
++            chromeVisible: root.chromeVisible
++            backForwardButtonsVisible: root.backForwardButtonsVisible
++            developerExtrasEnabled: root.developerExtrasEnabled
++            oxide: root.oxide
++            webappModelSearchPath: root.webappModelSearchPath
++            webappUrlPatterns: root.webappUrlPatterns
++            blockOpenExternalUrls: root.blockOpenExternalUrls
++
++            popupRedirectionUrlPrefixPattern: root.popupRedirectionUrlPrefixPattern
++
++            localUserAgentOverride: getLocalUserAgentOverrideIfAny()
++
++            runningLocalApplication: root.runningLocalApplication
++            webviewOverrideFile: root.webviewOverrideFile
++
++            anchors.fill: parent
++
++            webbrowserWindow: webbrowserWindowProxy
++
++            onWebappNameChanged: {
++                if (root.webappName !== browser.webappName) {
++                    root.webappName = browser.webappName;
++                    root.title = getWindowTitle();
++                }
+             }
+         }
--
--        onCurrentWebviewChanged: {
--            if (currentWebview)
--                root.updateCurrentView()
--        }
--
--        Component.onCompleted: i18n.domain = "webbrowser-app"
+     }
      function getLocalUserAgentOverrideIfAny() {
@@ -139,17 +136,72 @@
+         }
+     }
++    Loader {
++        id: webappViewLoader
++        anchors.fill: parent
++
++        property var credentialsId: null
++        property var webContextSessionCookieMode: null
++        property var webappDataLocation: credentialsId != null ? dataLocation + "/id-" + credentialsId : dataLocation
++    }
++
++    function onCookiesMoved(result) {
++        if (__webappCookieStore) {
++            __webappCookieStore.moved.disconnect(onCookiesMoved)
++        }
++        if (!result) {
++            console.log("Cookies were not moved")
++        }
++        webappViewLoader.item.url = root.url
++    }
++
++    function moveCookies(credentialsId) {
++        if (!__webappCookieStore) {
++            var context = webappViewLoader.item.currentWebview.context
++            __webappCookieStore = oxideCookieStoreComponent.createObject(this, {
++                "oxideStoreBackend": context.cookieManager,
++                "dbPath": context.dataPath + "/cookies.sqlite"
++            })
++        }
++
++        var storeComponent = localCookieStoreDbPath.length !== 0 ?
++                    localCookieStoreComponent : onlineAccountStoreComponent
++
++        var instance = storeComponent.createObject(root, { "accountId": credentialsId })
++        __webappCookieStore.moved.connect(onCookiesMoved)
++        __webappCookieStore.moveFrom(instance)
++    }
++
      Connections {
          target: accountsPageComponentLoader.item
--        onDone: loadWebAppView()
++        onDone: {
++            if (successful) {
++                webappViewLoader.loaded.connect(function () {
++                    if (webappViewLoader.status == Loader.Ready) {
++                        moveCookies(webappViewLoader.credentialsId)
++                    }
++                });
++                webappViewLoader.credentialsId = credentialsId
++                // If we need to preserve session cookies, make sure that the
++                // mode is "restored" and not "persistent", or the cookies
++                // transferred from OA would be lost.
++                // We check if the webContextSessionCookieMode is defined and, if so,
++                // we override it in the webapp loader.
++                if (typeof webContextSessionCookieMode === "string") {
++                    webappViewLoader.webContextSessionCookieMode = "restored"
++                }
++
++                webappViewLoader.sourceComponent = webappViewComponent
++            }
++            else {
++                loadWebAppView()
++            }
++        }
+     }
      Component {
          id: oxideCookieStoreComponent
          ChromeCookieStore {
--            dbPath: dataLocation + "/cookies.sqlite"
--            homepage: root.url
--            oxideStoreBackend: browser.currentWebview ? browser.currentWebview.context.cookieManager : null
+         }
+     }
@@ -160,57 +212,47 @@
+         }
+     }
--    Component {
--        id: onlineAccountStoreComponent
--        OnlineAccountsCookieStore { }
--    }
++    Component.onCompleted: {
++        i18n.domain = "webbrowser-app"
--    function updateCurrentView() {
          // check if we are to display the login view
          // or directly switch to the webapp view
--        if (accountProvider.length !== 0 && !__webappCookieStore && oxide) {
++        if (accountProvider.length !== 0 && oxide) {
              loadLoginView();
          } else {
              loadWebAppView();
+         }
+     }
++    Component {
++        id: onlineAccountStoreComponent
++        OnlineAccountsCookieStore { }
++    }
++
      function loadLoginView() {
--        if (!__webappCookieStore) {
--            __webappCookieStore = oxideCookieStoreComponent.createObject(this)
--        }
          accountsPageComponentLoader.setSource("AccountsPage.qml", {
              "accountProvider": accountProvider,
              "applicationName": unversionedAppId,
--            "webappCookieStore": __webappCookieStore,
--            "onlineAccountStoreComponent": localCookieStoreDbPath.length !== 0 ?
--                                               localCookieStoreComponent : onlineAccountStoreComponent
          })
+     }
      function loadWebAppView() {
          if (accountsPageComponentLoader.item)
              accountsPageComponentLoader.item.visible = false
--        browser.visible = true;
--        if (browser.currentWebview) {
--            browser.currentWebview.visible = true;
--            browser.webappName = root.webappName;
--            // As we use StateSaver to restore the URL, we need to check first if
--            // it has not been set previously before setting the URL to the default property
--            // homepage.
--            var current_url = browser.currentWebview.url.toString();
--            if (!current_url || current_url.length === 0) {
--                browser.currentWebview.url = root.url;
++        webappViewLoader.loaded.connect(function () {
++            if (webappViewLoader.status === Loader.Ready) {
++                // As we use StateSaver to restore the URL, we need to check first if
++                // it has not been set previously before setting the URL to the default property
++                // homepage.
++                var webView = webappViewLoader.item.currentWebview
++                var current_url = webView.url.toString();
++                if (!current_url || current_url.length === 0) {
++                    webView.url = root.url
++                }
+             }
--        }
--    }
--
--    function updateBrowserUrl(url) {
--        root.url = url;
--        if (browser.currentWebview) {
--            browser.currentWebview.url = url;
--        }
++        });
++        webappViewLoader.sourceComponent = webappViewComponent
+     }
      // Handle runtime requests to open urls as defined
@@ -223,7 +265,7 @@
          target: UriHandler
          onOpened: {
              // only consider the first one (if multiple)
--            if (uris.length === 0 || !browser.currentWebview) {
++            if (uris.length === 0 || !root.currentWebview) {
                  return;
+             }
              var requestedUrl = uris[0].toString();
@@ -232,7 +274,9 @@
                      && requestedUrl.match(popupRedirectionUrlPrefixPattern)) {
                  return;
+             }
--            updateBrowserUrl(requestedUrl);
++
++            root.url = requestedUrl
++            root.currentWebview.url = requestedUrl
+         }
+     }
+ }