Fix the address bar's security label

Author: Jochen Neubeck

BrowserWindow.cpp

@@ -730,7 +730,7 @@ HRESULT BrowserWindow::HandleTabSecurityUpdate(size_t tabId, ICoreWebView2* webv
     jsonObj[L"message"] = web::json::value(MG_SECURITY_UPDATE);
     jsonObj[L"args"] = web::json::value::parse(L"{}");
     jsonObj[L"args"][L"tabId"] = web::json::value::number(tabId);
-    jsonObj[L"args"][L"state"] = securityEvent.at(L"securityState");
+    jsonObj[L"args"][L"state"] = securityEvent.at(L"visibleSecurityState");
 
     return PostJsonToWebView(jsonObj, m_controlsWebView.Get());
 }

Tab.cpp

@@ -69,7 +69,7 @@ HRESULT Tab::Init(ICoreWebView2Environment* env, bool shouldBeActive)
         // Enable listening for security events to update secure icon
         RETURN_IF_FAILED(m_contentWebView->CallDevToolsProtocolMethod(L"Security.enable", L"{}", nullptr));
 
-        BrowserWindow::CheckFailure(m_contentWebView->GetDevToolsProtocolEventReceiver(L"Security.securityStateChanged", &m_securityStateChangedReceiver), L"");
+        BrowserWindow::CheckFailure(m_contentWebView->GetDevToolsProtocolEventReceiver(L"Security.visibleSecurityStateChanged", &m_securityStateChangedReceiver), L"");
 
         // Forward security status updates to browser
         RETURN_IF_FAILED(m_securityStateChangedReceiver->add_DevToolsProtocolEventReceived(Callback<ICoreWebView2DevToolsProtocolEventReceivedEventHandler>(

wvbrowser_ui/controls_ui/default.js

@@ -336,7 +336,7 @@ function updateLockIcon() {
         return;
     }
 
-    switch (activeTab.securityState) {
+    switch (activeTab.securityState?.securityState) {
         case 'insecure':
             labelElement.className = 'label-insecure';
             break;