Merge 7c4a54bf7c into 7bef2ccc68

GPClient/enhancedwebpage.cpp

@@ -1,8 +1,6 @@
+
 #include "enhancedwebpage.h"
-#include <QWebEngineCertificateError>
-#include <plog/Log.h>
 
 bool EnhancedWebPage::certificateError(const QWebEngineCertificateError &certificateError) {
-    LOGI << "An error occurred during certificate verification for " << certificateError.url().toString() << "; " << certificateError.errorDescription();
+    return true;
-    return certificateError.isOverridable();
 };

GPClient/enhancedwebpage.h

@@ -3,10 +3,9 @@
 
 #include <QtWebEngineWidgets/qwebenginepage.h>
 
-class EnhancedWebPage : public QWebEnginePage
+class EnhancedWebPage : public QWebEnginePage {
-{
+    protected:
-protected:
+    bool certificateError(const QWebEngineCertificateError &certificateError);
-    bool certificateError(const QWebEngineCertificateError &certificateError) override;
 };
 
 #endif // !ECHANCEDWEBPAG

README.md

@@ -23,7 +23,7 @@ A GlobalProtect VPN client (GUI) for Linux based on Openconnect and built with Q
 |OS|Stable version | Development version|
 |---|--------------|--------------------|
 |Linux Mint, Ubuntu 18.04 or later|[ppa:yuezk/globalprotect-openconnect](https://launchpad.net/~yuezk/+archive/ubuntu/globalprotect-openconnect)|[ppa:yuezk/globalprotect-openconnect-snapshot](https://launchpad.net/~yuezk/+archive/ubuntu/globalprotect-openconnect-snapshot)|
-|Arch, Manjaro|[globalprotect-openconnect](https://archlinux.org/packages/extra/x86_64/globalprotect-openconnect/)|[AUR: globalprotect-openconnect-git](https://aur.archlinux.org/packages/globalprotect-openconnect-git/)|
+|Arch, Manjaro|[globalprotect-openconnect](https://archlinux.org/packages/community/x86_64/globalprotect-openconnect/)|[AUR: globalprotect-openconnect-git](https://aur.archlinux.org/packages/globalprotect-openconnect-git/)|
 |Fedora|[copr: yuezk/globalprotect-openconnect](https://copr.fedorainfracloud.org/coprs/yuezk/globalprotect-openconnect/)|[copr: yuezk/globalprotect-openconnect](https://copr.fedorainfracloud.org/coprs/yuezk/globalprotect-openconnect/)|
 |openSUSE, CentOS 8|[OBS: globalprotect-openconnect](https://build.opensuse.org/package/show/home:yuezk/globalprotect-openconnect)|[OBS: globalprotect-openconnect-snapshot](https://build.opensuse.org/package/show/home:yuezk/globalprotect-openconnect-snapshot)|
 
@@ -77,9 +77,8 @@ sudo dnf install globalprotect-openconnect
 
 - openSUSE Leap
 
-  ```sh  
+  ```sh
-  sudo zypper ar https://download.opensuse.org/repositories/home:/yuezk/15.4/home:yuezk.repo
+  sudo zypper ar https://download.opensuse.org/repositories/home:/yuezk/openSUSE_Leap_15.2/home:yuezk.repo
-  
   sudo zypper ref
   sudo zypper install globalprotect-openconnect
   ```