webbrowser-app

Merge lp:~mardy/webbrowser-app/per-account-dir into lp:webbrowser-app

per-account-dir
Merge into trunk

Proposed by Alberto Mardegan on 2014-10-07

Status:	Rejected
Rejected by:	Alberto Mardegan on 2014-10-23
Proposed branch:	lp:~mardy/webbrowser-app/per-account-dir
Merge into:	lp:webbrowser-app
Diff against target:	555 lines (+140/-136) 12 files modified src/app/WebViewImpl.qml (+5/-0) src/app/webcontainer/AccountsPage.qml (+5/-29) src/app/webcontainer/WebApp.qml (+1/-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.cpp (+2/-0) src/app/webcontainer/webapp-container.qml (+101/-57)
To merge this branch:	bzr merge lp:~mardy/webbrowser-app/per-account-dir
Related bugs:	Link a bug report

Reviewer	Review Type	Status
Alberto Mardegan (community)		Needs Resubmitting on 2014-10-23
PS Jenkins bot	continuous-integration	Needs Fixing on 2014-10-10
Review via email: mp+237428@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.

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

lp:~mardy/webbrowser-app/per-account-dir updated on 2014-10-08

758. By Alberto Mardegan on 2014-10-08: Remove unused property

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

lp:~mardy/webbrowser-app/per-account-dir updated on 2014-10-08

759. By Alberto Mardegan on 2014-10-08: Watch URL changes

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

lp:~mardy/webbrowser-app/per-account-dir updated on 2014-10-08

760. By Alberto Mardegan on 2014-10-08

from trunk

[ Alberto Mardegan ]
Filter out account services which belong to other webapps

761. By Alberto Mardegan on 2014-10-08

Use dataLocation

Apparmor rules prevent oxide from using ~/.cache/

762. By Alberto Mardegan on 2014-10-08

Check dates at a later stage

763. By Alberto Mardegan on 2014-10-08

Fix timestamp conversion

764. By Alberto Mardegan on 2014-10-08

Remove error msg

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Alberto Mardegan (mardy) wrote on 2014-10-23:

This is superseded by https://code.launchpad.net/~mardy/webbrowser-app/per-account-dir2/+merge/239263

review: Needs Resubmitting

Unmerged revisions

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/WebViewImpl.qml'
 --- src/app/WebViewImpl.qml	2014-09-15 14:53:14 +0000
 +++ src/app/WebViewImpl.qml	2014-10-08 14:35:55 +0000
@@ -29,6 +29,7 @@
      property var certificateError
      // Invalid certificates the user has explicitly allowed for this session
      property var allowedCertificates: []
++    property url dataPath
      /*experimental.certificateVerificationDialog: CertificateVerificationDialog {}
      experimental.authenticationDialog: AuthenticationDialog {}
@@ -39,6 +40,10 @@
      beforeUnloadDialog: BeforeUnloadDialog {}
      filePicker: filePickerLoader.item
++    context: WebContext {
++        dataPath: webview.dataPath
++    }
++
      onDownloadRequested: {
          if (downloadLoader.status == Loader.Ready) {
              var headers = { }
 === 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-10-08 14:35:55 +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-10-03 14:41:14 +0000
 +++ src/app/webcontainer/WebApp.qml	2014-10-08 14:35:55 +0000
@@ -38,6 +38,7 @@
      property alias webappUrlPatterns: webview.webappUrlPatterns
      property alias popupRedirectionUrlPrefix: webview.popupRedirectionUrlPrefix
      property alias webviewOverrideFile: webview.webviewOverrideFile
++    property alias dataPath: webview.dataPath
      property string localUserAgentOverride: ""
      property bool backForwardButtonsVisible: false
 === modified file 'src/app/webcontainer/WebViewImplWebkit.qml'
 --- src/app/webcontainer/WebViewImplWebkit.qml	2014-07-29 21:51:07 +0000
 +++ src/app/webcontainer/WebViewImplWebkit.qml	2014-10-08 14:35:55 +0000
@@ -35,6 +35,7 @@
      property var webappUrlPatterns: null
      property string localUserAgentOverride: ""
      property string popupRedirectionUrlPrefix: ""
++    property url dataPath // unused
      function getUAString() {
          return webview.localUserAgentOverride.length === 0 ? undefined : webview.localUserAgentOverride
 === modified file 'src/app/webcontainer/WebappContainerWebview.qml'
 --- src/app/webcontainer/WebappContainerWebview.qml	2014-09-02 06:29:12 +0000
 +++ src/app/webcontainer/WebappContainerWebview.qml	2014-10-08 14:35:55 +0000
@@ -30,6 +30,7 @@
      property bool withOxide: false
      property bool developerExtrasEnabled: false
      property string webappName: ""
++    property url dataPath
      property var currentWebview: webappContainerWebViewLoader.item
      property var webappUrlPatterns
      property string localUserAgentOverride: ""
@@ -39,9 +40,10 @@
      Loader {
          id: webappContainerWebViewLoader
          anchors.fill: parent
--        asynchronous: true
+     }
++    onUrlChanged: if (webappContainerWebViewLoader.item) webappContainerWebViewLoader.item.url = url
++
      Component.onCompleted: {
          var webappEngineSource =
                  withOxide ?
@@ -60,6 +62,7 @@
                      { localUserAgentOverride: containerWebview.localUserAgentOverride
                      , url: containerWebview.url
                      , webappName: containerWebview.webappName
++                    , dataPath: dataPath
                      , webappUrlPatterns: containerWebview.webappUrlPatterns
                      , developerExtrasEnabled: containerWebview.developerExtrasEnabled
                      , popupRedirectionUrlPrefix: containerWebview.popupRedirectionUrlPrefix})
 === 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-10-08 14:35:55 +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-10-08 14:35:55 +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-10-08 14:35:55 +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-10-08 14:35:55 +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-10-08 14:35:55 +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.cpp'
 --- src/app/webcontainer/webapp-container.cpp	2014-10-03 14:41:14 +0000
 +++ src/app/webcontainer/webapp-container.cpp	2014-10-08 14:35:55 +0000
@@ -157,6 +157,8 @@
+         }
          context->setContextProperty("webappContainerHelper", m_webappContainerHelper.data());
++        context->setContextProperty("cacheLocation",
++                                    QStandardPaths::writableLocation(QStandardPaths::CacheLocation));
          if ( ! m_popupRedirectionUrlPrefix.isEmpty()) {
              m_window->setProperty("popupRedirectionUrlPrefix", m_popupRedirectionUrlPrefix);
 === modified file 'src/app/webcontainer/webapp-container.qml'
 --- src/app/webcontainer/webapp-container.qml	2014-10-03 14:41:14 +0000
 +++ src/app/webcontainer/webapp-container.qml	2014-10-08 14:35:55 +0000
@@ -53,54 +53,52 @@
      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
--
--        localUserAgentOverride: root.localUserAgentOverride
--
--        popupRedirectionUrlPrefix: root.popupRedirectionUrlPrefix
--        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
++
++            localUserAgentOverride: root.localUserAgentOverride
++
++            popupRedirectionUrlPrefix: root.popupRedirectionUrlPrefix
++            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"
++
++            Component.onCompleted: i18n.domain = "webbrowser-app"
++        }
+     }
      UnityWebApps.UnityWebappsAppModel {
@@ -117,7 +115,9 @@
      // XXX: work around https://bugs.launchpad.net/unity8/+bug/1328839
      // by toggling fullscreen on the window only on desktop.
--    visibility: browser.currentWebview && browser.currentWebview.fullscreen &&
++    visibility: webappViewLoader.item &&
++                webappViewLoader.item.currentWebview &&
++                webappViewLoader.item.currentWebview.fullscreen &&
                  (formFactor === "desktop") ? Window.FullScreen : Window.AutomaticVisibility
      Loader {
@@ -134,17 +134,62 @@
+         }
+     }
++    Loader {
++        id: webappViewLoader
++        anchors.fill: parent
++
++        property var credentialsId: 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 && credentialsId) {
++                webappViewLoader.loaded.connect(function () {
++                    if (webappViewLoader.status == Loader.Ready) {
++                        moveCookies(webappViewLoader.credentialsId)
++                    }
++                });
++                webappViewLoader.credentialsId = credentialsId
++                webappViewLoader.sourceComponent = webappViewComponent
++            }
++            else {
++                loadWebAppView()
++            }
++        }
+     }
      Component {
          id: oxideCookieStoreComponent
          ChromeCookieStore {
--            dbPath: dataLocation + "/cookies.sqlite"
--            homepage: root.url
--            oxideStoreBackend: browser.currentWebview ? browser.currentWebview.context.cookieManager : null
+         }
+     }
@@ -155,6 +200,10 @@
+         }
+     }
++    Component.onCompleted: {
++        updateCurrentView()
++    }
++
      Component {
          id: onlineAccountStoreComponent
          OnlineAccountsCookieStore { }
@@ -163,7 +212,7 @@
      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();
@@ -171,27 +220,22 @@
+     }
      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.currentWebview.url = root.url
--            browser.webappName = root.webappName
--        }
++
++        webappViewLoader.loaded.connect(function () {
++            if (webappViewLoader.status === Loader.Ready) {
++                webappViewLoader.item.currentWebview.url = root.url
++            }
++        });
++        webappViewLoader.sourceComponent = webappViewComponent
+     }
      // Handle runtime requests to open urls as defined