X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserPC.git;a=blobdiff_plain;f=src%2Fviews%2FBrowserView.cpp;fp=src%2Fviews%2FBrowserView.cpp;h=591e16aa3ae44361e6f43c70d40b20d51af406fe;hp=440c694ab02a7ca130bfc58dbeb85ba9fa2a1b8b;hb=cd1c3d0483b9026736fdcb151d90dda872d8a400;hpb=588db73b94af7b596b0e532f4557aa8b6c41f5c3

diff --git a/src/views/BrowserView.cpp b/src/views/BrowserView.cpp
index 440c694..591e16a 100644
--- a/src/views/BrowserView.cpp
+++ b/src/views/BrowserView.cpp
@@ -21,8 +21,9 @@
 #include "BrowserView.h"
 #include "Settings.h"
 #include "ui_BrowserView.h"
+#include "databases/CookiesDatabase.h"
+#include "databases/DomainsDatabase.h"
 #include "filters/MouseEventFilter.h"
-#include "helpers/DomainsDatabaseHelper.h"
 #include "helpers/SearchEngineHelper.h"
 #include "helpers/UserAgentHelper.h"
 #include "interceptors/UrlRequestInterceptor.h"
@@ -94,6 +95,13 @@ BrowserView::BrowserView(QWidget *parent) : QWidget(parent)
     connect(webEngineCookieStorePointer, SIGNAL(cookieAdded(QNetworkCookie)), this, SLOT(cookieAdded(QNetworkCookie)));
     connect(webEngineCookieStorePointer, SIGNAL(cookieRemoved(QNetworkCookie)), this, SLOT(cookieRemoved(QNetworkCookie)));
 
+    // Get a list of durable cookies.
+    QList<QNetworkCookie*> *durableCookiesListPointer = CookiesDatabase::getCookies();
+
+    // Add the durable cookies to the store.
+    for (QNetworkCookie *cookiePointer : *durableCookiesListPointer)
+        addCookieToStore(*cookiePointer);
+
     // Store a copy of the WebEngine default user agent.
     webEngineDefaultUserAgent = webEngineProfilePointer->httpUserAgent();
 
@@ -152,7 +160,8 @@ BrowserView::~BrowserView()
     webEnginePagePointer->deleteLater();
 }
 
-void BrowserView::addCookieToStore(QNetworkCookie &cookie) const
+// The cookie is copied instead of referenced so that changes made to the cookie do not create a race condition with the display of the cookie in the dialog.
+void BrowserView::addCookieToStore(QNetworkCookie cookie) const
 {
     // Create a url.
     QUrl url;
@@ -201,7 +210,7 @@ void BrowserView::applyDomainSettingsWithoutReloading(const QString &hostname)
 void BrowserView::applyDomainSettings(const QString &hostname, const bool reloadWebsite)
 {
     // Get the record for the hostname.
-    QSqlQuery domainQuery = DomainsDatabaseHelper::getDomainQuery(hostname);
+    QSqlQuery domainQuery = DomainsDatabase::getDomainQuery(hostname);
 
     // Check if the hostname has domain settings.
     if (domainQuery.isValid())  // The hostname has domain settings.
@@ -210,10 +219,10 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload
         QSqlRecord domainRecord = domainQuery.record();
 
         // Set the JavaScript status.
-        switch (domainRecord.field(DomainsDatabaseHelper::JAVASCRIPT).value().toInt())
+        switch (domainRecord.field(DomainsDatabase::JAVASCRIPT).value().toInt())
         {
             // Set the default JavaScript status.
-            case (DomainsDatabaseHelper::SYSTEM_DEFAULT):
+            case (DomainsDatabase::SYSTEM_DEFAULT):
             {
                 webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptEnabled, Settings::javaScriptEnabled());
 
@@ -221,7 +230,7 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload
             }
 
             // Disable JavaScript.
-            case (DomainsDatabaseHelper::DISABLED):
+            case (DomainsDatabase::DISABLED):
             {
                 webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptEnabled, false);
 
@@ -229,7 +238,7 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload
             }
 
             // Enable JavaScript.
-            case (DomainsDatabaseHelper::ENABLED):
+            case (DomainsDatabase::ENABLED):
             {
                 webEngineSettingsPointer->setAttribute(QWebEngineSettings::JavascriptEnabled, true);
 
@@ -238,10 +247,10 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload
         }
 
         // Set the local storage status.
-        switch (domainRecord.field(DomainsDatabaseHelper::LOCAL_STORAGE).value().toInt())
+        switch (domainRecord.field(DomainsDatabase::LOCAL_STORAGE).value().toInt())
         {
             // Set the default local storage status.
-            case (DomainsDatabaseHelper::SYSTEM_DEFAULT):
+            case (DomainsDatabase::SYSTEM_DEFAULT):
             {
                 currentPrivacyWebEnginePointer->localStorageEnabled = Settings::localStorageEnabled();
 
@@ -249,7 +258,7 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload
             }
 
             // Disable local storage.
-            case (DomainsDatabaseHelper::DISABLED):
+            case (DomainsDatabase::DISABLED):
             {
                 currentPrivacyWebEnginePointer->localStorageEnabled = false;
 
@@ -257,7 +266,7 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload
             }
 
             // Enable local storage.
-            case (DomainsDatabaseHelper::ENABLED):
+            case (DomainsDatabase::ENABLED):
             {
                 currentPrivacyWebEnginePointer->localStorageEnabled = true;
 
@@ -266,10 +275,10 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload
         }
 
         // Set the DOM storage status.
-        switch (domainRecord.field(DomainsDatabaseHelper::DOM_STORAGE).value().toInt())
+        switch (domainRecord.field(DomainsDatabase::DOM_STORAGE).value().toInt())
         {
             // Set the default DOM storage status.
-            case (DomainsDatabaseHelper::SYSTEM_DEFAULT):
+            case (DomainsDatabase::SYSTEM_DEFAULT):
             {
                 webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, Settings::domStorageEnabled());
 
@@ -277,7 +286,7 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload
             }
 
             // Disable DOM storage.
-            case (DomainsDatabaseHelper::DISABLED):
+            case (DomainsDatabase::DISABLED):
             {
                 webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, false);
 
@@ -285,7 +294,7 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload
             }
 
             // Enable DOM storage.
-            case (DomainsDatabaseHelper::ENABLED):
+            case (DomainsDatabase::ENABLED):
             {
                 webEngineSettingsPointer->setAttribute(QWebEngineSettings::LocalStorageEnabled, true);
 
@@ -294,13 +303,13 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload
         }
 
         // Set the user agent.
-        webEngineProfilePointer->setHttpUserAgent(UserAgentHelper::getResultingDomainSettingsUserAgent(domainRecord.field(DomainsDatabaseHelper::USER_AGENT).value().toString()));
+        webEngineProfilePointer->setHttpUserAgent(UserAgentHelper::getResultingDomainSettingsUserAgent(domainRecord.field(DomainsDatabase::USER_AGENT).value().toString()));
 
         // Check if a custom zoom factor is set.
-        if (domainRecord.field(DomainsDatabaseHelper::ZOOM_FACTOR).value().toInt())
+        if (domainRecord.field(DomainsDatabase::ZOOM_FACTOR).value().toInt())
         {
             // Store the current zoom factor.
-            currentZoomFactor = domainRecord.field(DomainsDatabaseHelper::CUSTOM_ZOOM_FACTOR).value().toDouble();
+            currentZoomFactor = domainRecord.field(DomainsDatabase::CUSTOM_ZOOM_FACTOR).value().toDouble();
         }
         else
         {
@@ -312,7 +321,7 @@ void BrowserView::applyDomainSettings(const QString &hostname, const bool reload
         webEngineViewPointer->setZoomFactor(currentZoomFactor);
 
         // Apply the domain settings palette to the URL line edit.
-        emit updateDomainSettingsIndicator(true, domainRecord.field(DomainsDatabaseHelper::DOMAIN_NAME).value().toString());
+        emit updateDomainSettingsIndicator(true, domainRecord.field(DomainsDatabase::DOMAIN_NAME).value().toString());
     }
     else  // The hostname does not have domain settings.
     {