Reapply domain settings when the host changes.

[PrivacyBrowserPC.git] / src / MainView.cpp

diff --git a/src/MainView.cpp b/src/MainView.cpp
index 5acb4470ec3a56a5b4223c895d56b9116da034b8..3bef1040a88bb160939b685cd2fbf10635f69844 100644 (file)
--- a/src/MainView.cpp
+++ b/src/MainView.cpp
@@ -23,7 +23,9 @@
 #include "MouseEventFilter.h"
 #include "Settings.h"
 #include "ui_MainView.h"
-#include "UserAgentHelper.h"
+#include "UrlRequestInterceptor.h"
+#include "helpers/SearchEngineHelper.h"
+#include "helpers/UserAgentHelper.h"
 
 // Qt framework headers.
 #include <QWebEngineProfile>
@@ -56,8 +58,8 @@ MainView::MainView(QWidget *parent) : QWidget(parent)
 
     // Update the URL line edit form the webengine view.
     connect(webEngineViewPointer, SIGNAL(loadStarted()), this, SLOT(updateInterface()));
-    connect(webEngineViewPointer, SIGNAL(loadProgress(int)), this, SLOT(updateInterface()));
-    connect(webEngineViewPointer, SIGNAL(loadFinished(bool)), this, SLOT(updateInterface()));
+    connect(webEngineViewPointer, SIGNAL(loadProgress(const int)), this, SLOT(updateInterface()));
+    connect(webEngineViewPointer, SIGNAL(loadFinished(const bool)), this, SLOT(updateInterface()));
 
     // Setup the URL bar buttons.
     connect(backButtonPointer, SIGNAL(clicked()), webEngineViewPointer, SLOT(back()));
@@ -73,7 +75,16 @@ MainView::MainView(QWidget *parent) : QWidget(parent)
     qApp->installEventFilter(mouseEventFilterPointer);
 
     // Listen for hovered link URLs.
-    connect(webEnginePagePointer, SIGNAL(linkHovered(QString)), this, SLOT(pageLinkHovered(QString)));
+    connect(webEnginePagePointer, SIGNAL(linkHovered(const QString)), this, SLOT(pageLinkHovered(const QString)));
+
+    // Instantiate the URL request interceptor.
+    UrlRequestInterceptor *urlRequestInterceptorPointer = new UrlRequestInterceptor();
+
+    // Set the URL request interceptor.
+    webEngineProfilePointer->setUrlRequestInterceptor(urlRequestInterceptorPointer);
+
+    // Reapply the domain settings when the host changes.
+    connect(urlRequestInterceptorPointer, SIGNAL(applyDomainSettings()), this, SLOT(applyDomainSettingsWithoutReloading()));
 
     // Disable the cache.
     webEngineProfilePointer->setHttpCacheType(QWebEngineProfile::NoCache);
@@ -117,10 +128,17 @@ void MainView::applyApplicationSettings() const
 // This exists as a separate function from `applyDomainSettings()` so it can be listed as a slot and function without the need for a boolean argument.
 void MainView::applyDomainSettingsAndReload() const
 {
-    // Apply the domain setings.  `true` reloads the website.
+    // Apply the domain settings.  `true` reloads the website.
     applyDomainSettings(true);
 }
 
+// This exists as a separate function from `applyDomainSettings()` so it can be listed as a slot and function without the need for a boolean argument.
+void MainView::applyDomainSettingsWithoutReloading() const
+{
+    // Apply the domain settings  `false` does not reload the website.
+    applyDomainSettings(false);
+}
+
 void MainView::applyDomainSettings(bool reloadWebsite) const
 {
     // Set the JavaScript status.
@@ -149,7 +167,7 @@ void MainView::applyDomainSettings(bool reloadWebsite) const
 void MainView::goHome() const
 {
     // Load the homepage.
-    webEngineViewPointer->setUrl(QUrl::fromUserInput(Settings::homepage().toString()));
+    webEngineViewPointer->setUrl(QUrl::fromUserInput(Settings::homepage()));
 }
 
 void MainView::loadUrlFromTextBox(QString urlFromUser) const
@@ -157,15 +175,24 @@ void MainView::loadUrlFromTextBox(QString urlFromUser) const
     // Remove the focus from the URL line edit.
     urlLineEditPointer->clearFocus();
 
-    // Check if the URL does not start with a valid protocol.
-    if (!urlFromUser.startsWith("http") && !urlFromUser.startsWith("file://"))
+    // Decide if the text is more likely to be a URL or a search.
+    if (urlFromUser.contains("."))  // The text is likely a URL.
     {
-        // Add `https://` to the beginning of the URL.
-        urlFromUser = "https://" + urlFromUser;
+        // Check if the URL does not start with a valid protocol.
+        if (!urlFromUser.startsWith("http") && !urlFromUser.startsWith("file://"))
+        {
+            // Add `https://` to the beginning of the URL.
+            urlFromUser = "https://" + urlFromUser;
+        }
+
+        // Load the URL.
+        webEngineViewPointer->setUrl(QUrl::fromUserInput(urlFromUser));
+    }
+    else  // The text is likely a search.
+    {
+        // Load the search.
+        webEngineViewPointer->setUrl(QUrl::fromUserInput(SearchEngineHelper::getSearchUrl(Settings::searchEngine()) + urlFromUser));
     }
-
-    // Load the URL.
-    webEngineViewPointer->setUrl(QUrl::fromUserInput(urlFromUser));
 }
 
 void MainView::pageLinkHovered(const QString &linkUrl) const