Slightly better urlChanged listener

b100dian · Nov 14, 2020 · 468cde1 · 468cde1
1 parent c1d2312
commit 468cde1
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/qml/pages/LoginPage.qml b/qml/pages/LoginPage.qml
@@ -56,10 +56,12 @@ WebViewPage {
             active: true
             url: page.startUrl + "&state=" + page.processId
 
-            onLinkClicked: {
-                // This is currently not called for redirects (at least not in sailfish-components-webview 1.1.6.1
+            onUrlChanged: {
+                // This is currently not called for redirects (at least not in sailfish-components-webview 1.1.6.1).
                 // so I just leave this here in case it starts working, otherwise AuthServer is actually listening on 3000.
-                var request = {url: url};
+                // See also https://git.sailfishos.org/mer-core/qtmozembed/blob/master/src/qmozview_defined_wrapper.h
+                // which is wrapped in RawWebView https://github.com/sailfishos/sailfish-components-webview/blob/jb51257/1.1.6.1/import/webview/rawwebview.h
+                var request = {url: String(webView.url)};
                 if (isReturnUrl(request.url)) {
                     visible = false
                     request.action = WebView.IgnoreRequest