Fix merge conflicts

Author: fnkkio

CMakeLists.txt

@@ -377,7 +377,6 @@ if (Qt5WebKitWidgets_FOUND AND ENABLE_QTWEBKIT)
 		src/modules/backends/web/qtwebkit/QtWebKitCookieJar.cpp
 		src/modules/backends/web/qtwebkit/QtWebKitFtpListingNetworkReply.cpp
 		src/modules/backends/web/qtwebkit/QtWebKitHistoryInterface.cpp
-		src/modules/backends/web/qtwebkit/QtWebKitInspector.cpp
 		src/modules/backends/web/qtwebkit/QtWebKitNetworkManager.cpp
 		src/modules/backends/web/qtwebkit/QtWebKitNotificationPresenter.cpp
 		src/modules/backends/web/qtwebkit/QtWebKitPage.cpp

src/core/Application.cpp

@@ -277,10 +277,9 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv),
 	QCryptographicHash hash(QCryptographicHash::Md5);
 	hash.addData(profilePath.toUtf8());
 
-	const QString identifier(QString::fromLatin1(hash.result().toHex()));
-	const QString server(applicationName() + (identifier.isEmpty() ? QString() : (QLatin1Char('-') + identifier)));
+	const QString serverName(applicationName() + QLatin1Char('-') + QString::fromLatin1(hash.result().toHex()));
 	QLocalSocket socket;
-	socket.connectToServer(server);
+	socket.connectToServer(serverName);
 
 	if (socket.waitForConnected(500))
 	{
@@ -311,9 +310,9 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv),
 
 	m_localServer->setSocketOptions(QLocalServer::UserAccessOption);
 
-	if (!m_localServer->listen(server) && m_localServer->serverError() == QAbstractSocket::AddressInUseError && QLocalServer::removeServer(server))
+	if (!m_localServer->listen(serverName) && m_localServer->serverError() == QAbstractSocket::AddressInUseError && QLocalServer::removeServer(serverName))
 	{
-		m_localServer->listen(server);
+		m_localServer->listen(serverName);
 	}
 
 	m_isFirstRun = !QFile::exists(profilePath);
@@ -445,7 +444,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv),
 
 	const WebBackend *webBackend(AddonsManager::getWebBackend());
 
-	if (!QSslSocket::supportsSsl() || (webBackend && webBackend->getSslVersion().isEmpty()))
+	if (!QSslSocket::supportsSsl() || (webBackend && !webBackend->hasSslSupport()))
 	{
 		QMessageBox::warning(nullptr, tr("Warning"), tr("SSL support is not available or incomplete.\nSome websites may work incorrectly or do not work at all."), QMessageBox::Close);
 	}
@@ -1017,14 +1016,7 @@ void Application::handleNewConnection()
 
 		if (!mainWindow || !SettingsManager::getOption(SettingsManager::Browser_OpenLinksInNewTabOption).toBool() || (isPrivate && !mainWindow->isPrivate()))
 		{
-			QVariantMap parameters;
-
-			if (isPrivate)
-			{
-				parameters[QLatin1String("hints")] = SessionsManager::PrivateOpen;
-			}
-
-			createWindow(parameters);
+			createWindow({{QLatin1String("hints"), (isPrivate ? SessionsManager::PrivateOpen : SessionsManager::DefaultOpen)}});
 		}
 	}
 	else
@@ -1033,12 +1025,7 @@ void Application::handleNewConnection()
 
 		if (sessionData.isClean || QMessageBox::warning(nullptr, tr("Warning"), tr("This session was not saved correctly.\nAre you sure that you want to restore this session anyway?"), (QMessageBox::Yes | QMessageBox::No), QMessageBox::No) == QMessageBox::Yes)
 		{
-			QVariantMap parameters;
-
-			if (isPrivate)
-			{
-				parameters[QLatin1String("hints")] = SessionsManager::PrivateOpen;
-			}
+			const QVariantMap parameters({{QLatin1String("hints"), (isPrivate ? SessionsManager::PrivateOpen : SessionsManager::DefaultOpen)}});
 
 			for (int i = 0; i < sessionData.windows.count(); ++i)
 			{
@@ -1084,12 +1071,7 @@ void Application::handlePositionalArguments(QCommandLineParser *parser, bool for
 
 	if (openHints.testFlag(SessionsManager::NewWindowOpen))
 	{
-		QVariantMap parameters;
-
-		if (openHints.testFlag(SessionsManager::PrivateOpen))
-		{
-			parameters[QLatin1String("hints")] = SessionsManager::PrivateOpen;
-		}
+		const QVariantMap parameters({{QLatin1String("hints"), (openHints.testFlag(SessionsManager::PrivateOpen) ? SessionsManager::PrivateOpen : SessionsManager::DefaultOpen)}});
 
 		if (urls.isEmpty())
 		{

src/core/BookmarksModel.cpp

@@ -1215,6 +1215,7 @@ QMimeData* BookmarksModel::mimeData(const QModelIndexList &indexes) const
 	if (indexes.count() == 1)
 	{
 		mimeData->setProperty("x-item-index", indexes.at(0));
+		mimeData->setProperty("x-url-title", indexes.at(0).data(TitleRole).toString());
 	}
 
 	for (int i = 0; i < indexes.count(); ++i)

src/core/Importer.cpp

@@ -99,6 +99,19 @@ BookmarksModel::Bookmark* BookmarksImportJob::getImportFolder() const
 	return m_importFolder;
 }
 
+QDateTime BookmarksImportJob::getDateTime(const QString &timestamp) const
+{
+#if QT_VERSION < 0x050800
+	const uint seconds(timestamp.toUInt());
+
+	return ((seconds > 0) ? QDateTime::fromTime_t(seconds) : QDateTime());
+#else
+	const qint64 seconds(timestamp.toLongLong());
+
+	return ((seconds != 0) ? QDateTime::fromSecsSinceEpoch(seconds) : QDateTime());
+#endif
+}
+
 bool BookmarksImportJob::areDuplicatesAllowed() const
 {
 	return m_areDuplicatesAllowed;

src/core/Importer.h

@@ -111,6 +111,7 @@ class BookmarksImportJob : public ImportJob
 	void setCurrentFolder(BookmarksModel::Bookmark *folder);
 	BookmarksModel::Bookmark* getCurrentFolder() const;
 	BookmarksModel::Bookmark* getImportFolder() const;
+	QDateTime getDateTime(const QString &timestamp) const;
 	bool areDuplicatesAllowed() const;
 
 private:

src/core/SessionsManager.cpp

@@ -558,12 +558,7 @@ bool SessionsManager::restoreSession(const SessionInformation &session, MainWind
 		m_sessionTitle = session.title;
 	}
 
-	QVariantMap parameters;
-
-	if (isPrivate)
-	{
-		parameters[QLatin1String("hints")] = PrivateOpen;
-	}
+	const QVariantMap parameters({{QLatin1String("hints"), (isPrivate ? SessionsManager::PrivateOpen : SessionsManager::DefaultOpen)}});
 
 	for (int i = 0; i < session.windows.count(); ++i)
 	{

src/core/TransfersManager.cpp

@@ -1046,7 +1046,12 @@ void TransfersManager::addTransfer(Transfer *transfer)
 	}
 	else
 	{
-		HistoryManager::addEntry(transfer->getSource());
+		const QString scheme(transfer->getSource().scheme());
+
+		if (scheme == QLatin1String("http") || scheme == QLatin1String("https"))
+		{
+			HistoryManager::addEntry(transfer->getSource());
+		}
 	}
 }
 

src/core/WebBackend.h

@@ -85,6 +85,7 @@ class WebBackend : public QObject, public Addon
 	virtual QVector<SpellCheckManager::DictionaryInformation> getDictionaries() const;
 	AddonType getType() const override;
 	virtual BackendCapabilities getCapabilities() const;
+	virtual bool hasSslSupport() const = 0;
 };
 
 }

src/main.cpp

@@ -207,14 +207,7 @@ int main(int argc, char *argv[])
 
 	if (Application::getWindows().isEmpty())
 	{
-		QVariantMap parameters;
-
-		if (isPrivate)
-		{
-			parameters[QLatin1String("hints")] = SessionsManager::PrivateOpen;
-		}
-
-		Application::createWindow(parameters);
+		Application::createWindow({{QLatin1String("hints"), (isPrivate ? SessionsManager::PrivateOpen : SessionsManager::DefaultOpen)}});
 	}
 
 	return Application::exec();

src/modules/backends/web/qtwebengine/QtWebEnginePage.cpp

@@ -337,19 +337,21 @@ QtWebEngineWebWidget* QtWebEnginePage::createWidget(SessionsManager::OpenHints h
 	return widget;
 }
 
-QString QtWebEnginePage::createJavaScriptList(QStringList rules) const
+QString QtWebEnginePage::createJavaScriptList(const QStringList &rules) const
 {
 	if (rules.isEmpty())
 	{
 		return {};
 	}
 
+	QStringList parsedRules(rules);
+
 	for (int i = 0; i < rules.count(); ++i)
 	{
-		rules[i].replace(QLatin1Char('\''), QLatin1String("\\'"));
+		parsedRules[i].replace(QLatin1Char('\''), QLatin1String("\\'"));
 	}
 
-	return QLatin1Char('\'') + rules.join(QLatin1String("','")) + QLatin1Char('\'');
+	return QLatin1Char('\'') + parsedRules.join(QLatin1String("','")) + QLatin1Char('\'');
 }
 
 QString QtWebEnginePage::createScriptSource(const QString &path, const QStringList &parameters) const
@@ -402,6 +404,13 @@ QVariant QtWebEnginePage::runScriptFile(const QString &path, const QStringList &
 	return runScriptSource(createScriptSource(path, parameters));
 }
 
+#if QTWEBENGINECORE_VERSION >= 0x050E00
+WebWidget::SslInformation QtWebEnginePage::getSslInformation() const
+{
+	return m_sslInformation;
+}
+#endif
+
 Session::Window::History QtWebEnginePage::getHistory() const
 {
 	QWebEngineHistory *pageHistory(history());
@@ -526,6 +535,10 @@ bool QtWebEnginePage::acceptNavigationRequest(const QUrl &url, NavigationType ty
 		}
 	}
 
+#if QTWEBENGINECORE_VERSION >= 0x050E00
+	m_sslInformation = {};
+#endif
+
 	if (type != NavigationTypeReload)
 	{
 		m_previousNavigationType = type;
@@ -584,6 +597,39 @@ bool QtWebEnginePage::acceptNavigationRequest(const QUrl &url, NavigationType ty
 	return true;
 }
 
+#if QTWEBENGINECORE_VERSION >= 0x050E00
+bool QtWebEnginePage::certificateError(const QWebEngineCertificateError &error)
+{
+	if (!m_widget || error.certificateChain().isEmpty())
+	{
+		return false;
+	}
+
+	const QList<QSslError> errors(QSslCertificate::verify(error.certificateChain(), error.url().host()));
+
+	m_sslInformation.errors.reserve(m_sslInformation.errors.count() + errors.count());
+
+	for (int i = 0; i < errors.count(); ++i)
+	{
+		m_sslInformation.errors.append({errors.at(i), error.url()});
+	}
+
+	const QString firstPartyUrl(m_widget->getUrl().toString());
+	const QString thirdPartyUrl(error.url().toString());
+
+	if (m_widget->getOption(SettingsManager::Security_IgnoreSslErrorsOption, m_widget->getUrl()).toStringList().contains(QString::fromLatin1(error.certificateChain().first().digest().toBase64())))
+	{
+		Console::addMessage(QStringLiteral("[accepted] The page at %1 was allowed to display insecure content from %2").arg(firstPartyUrl, thirdPartyUrl), Console::SecurityCategory, Console::WarningLevel, thirdPartyUrl, -1, m_widget->getWindowIdentifier());
+
+		return true;
+	}
+
+	Console::addMessage(QStringLiteral("[blocked] The page at %1 was not allowed to display insecure content from %2").arg(firstPartyUrl, thirdPartyUrl), Console::SecurityCategory, Console::WarningLevel, thirdPartyUrl, -1, m_widget->getWindowIdentifier());
+
+	return false;
+}
+#endif
+
 bool QtWebEnginePage::javaScriptConfirm(const QUrl &url, const QString &message)
 {
 	if (m_isIgnoringJavaScriptPopups)