From 0572a1e4e6cd16938f3a05c270d658f3827e8a0b Mon Sep 17 00:00:00 2001
From: Chris Lane <chris@chrislane.com>
Date: Fri, 2 Nov 2018 12:04:08 +0000
Subject: NOISSUE use https more widely
---
CMakeLists.txt | 2 +-
api/logic/minecraft/auth/YggdrasilTask.cpp | 2 +-
api/logic/minecraft/forge/ForgeXzDownload.cpp | 2 +-
api/logic/modplatform/ftb/FtbPackInstallTask.cpp | 4 ++--
api/logic/net/URLConstants.cpp | 2 +-
api/logic/net/URLConstants.h | 16 ++++++++--------
api/logic/translations/TranslationsModel.cpp | 2 +-
application/BuildConfig.h | 2 +-
application/MainWindow.cpp | 6 +++---
application/dialogs/AboutDialog.cpp | 2 +-
application/dialogs/AboutDialog.ui | 2 +-
application/pages/global/ExternalToolsPage.ui | 4 ++--
12 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e920708a..29e9e26c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,7 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Werror=return-type")
##################################### Set Application options #####################################
######## Set URLs ########
-set(MultiMC_NEWS_RSS_URL "http://multimc.org/rss.xml" CACHE STRING "URL to fetch MultiMC's news RSS feed from.")
+set(MultiMC_NEWS_RSS_URL "https://multimc.org/rss.xml" CACHE STRING "URL to fetch MultiMC's news RSS feed from.")
######## Set version numbers ########
set(MultiMC_VERSION_MAJOR 0)
diff --git a/api/logic/minecraft/auth/YggdrasilTask.cpp b/api/logic/minecraft/auth/YggdrasilTask.cpp
index 666e57d6..4a63d9b1 100644
--- a/api/logic/minecraft/auth/YggdrasilTask.cpp
+++ b/api/logic/minecraft/auth/YggdrasilTask.cpp
@@ -122,7 +122,7 @@ void YggdrasilTask::processReply()
tr("<b>SSL Handshake failed.</b><br/>There might be a few causes for it:<br/>"
"<ul>"
"<li>You use Windows XP and need to <a "
- "href=\"http://www.microsoft.com/en-us/download/details.aspx?id=38918\">update "
+ "href=\"https://www.microsoft.com/en-us/download/details.aspx?id=38918\">update "
"your root certificates</a></li>"
"<li>Some device on your network is interfering with SSL traffic. In that case, "
"you have bigger worries than Minecraft not starting.</li>"
diff --git a/api/logic/minecraft/forge/ForgeXzDownload.cpp b/api/logic/minecraft/forge/ForgeXzDownload.cpp
index 4083bdea..ea968835 100644
--- a/api/logic/minecraft/forge/ForgeXzDownload.cpp
+++ b/api/logic/minecraft/forge/ForgeXzDownload.cpp
@@ -30,7 +30,7 @@ ForgeXzDownload::ForgeXzDownload(QString relative_path, MetaEntryPtr entry) : Ne
m_pack200_xz_file.setFileTemplate("./dl_temp.XXXXXX");
m_status = Job_NotStarted;
m_url_path = relative_path;
- m_url = "http://files.minecraftforge.net/maven/" + m_url_path + ".pack.xz";
+ m_url = "https://files.minecraftforge.net/maven/" + m_url_path + ".pack.xz";
}
void ForgeXzDownload::start()
diff --git a/api/logic/modplatform/ftb/FtbPackInstallTask.cpp b/api/logic/modplatform/ftb/FtbPackInstallTask.cpp
index 9b7689d9..253c2f05 100644
--- a/api/logic/modplatform/ftb/FtbPackInstallTask.cpp
+++ b/api/logic/modplatform/ftb/FtbPackInstallTask.cpp
@@ -32,11 +32,11 @@ void FtbPackInstallTask::downloadPack()
QString url;
if(m_pack.type == FtbPackType::Private)
{
- url = QString("http://ftb.cursecdn.com/FTB2/privatepacks/%1").arg(packoffset);
+ url = QString("https://ftb.cursecdn.com/FTB2/privatepacks/%1").arg(packoffset);
}
else
{
- url = QString("http://ftb.cursecdn.com/FTB2/modpacks/%1").arg(packoffset);
+ url = QString("https://ftb.cursecdn.com/FTB2/modpacks/%1").arg(packoffset);
}
job->addNetAction(Net::Download::makeCached(url, entry));
archivePath = entry->getFullPath();
diff --git a/api/logic/net/URLConstants.cpp b/api/logic/net/URLConstants.cpp
index 5d848d80..10b72748 100644
--- a/api/logic/net/URLConstants.cpp
+++ b/api/logic/net/URLConstants.cpp
@@ -4,7 +4,7 @@ namespace URLConstants {
QString getLegacyJarUrl(QString version)
{
- return "http://" + AWS_DOWNLOAD_VERSIONS + getJarPath(version);
+ return "https://" + AWS_DOWNLOAD_VERSIONS + getJarPath(version);
}
QString getJarPath(QString version)
diff --git a/api/logic/net/URLConstants.h b/api/logic/net/URLConstants.h
index 22d128b2..731d591e 100644
--- a/api/logic/net/URLConstants.h
+++ b/api/logic/net/URLConstants.h
@@ -25,15 +25,15 @@ const QString LIBRARY_BASE("libraries.minecraft.net/");
//const QString SKINS_BASE("skins.minecraft.net/MinecraftSkins/");
const QString SKINS_BASE("crafatar.com/skins/");
const QString AUTH_BASE("authserver.mojang.com/");
-const QString FORGE_LEGACY_URL("http://files.minecraftforge.net/minecraftforge/json");
-const QString FORGE_GRADLE_URL("http://files.minecraftforge.net/maven/net/minecraftforge/forge/json");
-const QString MOJANG_STATUS_URL("http://status.mojang.com/check");
-const QString MOJANG_STATUS_NEWS_URL("http://status.mojang.com/news");
-const QString LITELOADER_URL("http://dl.liteloader.com/versions/versions.json");
+const QString FORGE_LEGACY_URL("https://files.minecraftforge.net/minecraftforge/json");
+const QString FORGE_GRADLE_URL("https://files.minecraftforge.net/maven/net/minecraftforge/forge/json");
+const QString MOJANG_STATUS_URL("https://status.mojang.com/check");
+const QString MOJANG_STATUS_NEWS_URL("https://status.mojang.com/news");
+const QString LITELOADER_URL("https://dl.liteloader.com/versions/versions.json");
const QString IMGUR_BASE_URL("https://api.imgur.com/3/");
-const QString FMLLIBS_OUR_BASE_URL("http://files.multimc.org/fmllibs/");
-const QString FMLLIBS_FORGE_BASE_URL("http://files.minecraftforge.net/fmllibs/");
-const QString TRANSLATIONS_BASE_URL("http://files.multimc.org/translations/");
+const QString FMLLIBS_OUR_BASE_URL("https://files.multimc.org/fmllibs/");
+const QString FMLLIBS_FORGE_BASE_URL("https://files.minecraftforge.net/fmllibs/");
+const QString TRANSLATIONS_BASE_URL("https://files.multimc.org/translations/");
QString getJarPath(QString version);
QString getLegacyJarUrl(QString version);
diff --git a/api/logic/translations/TranslationsModel.cpp b/api/logic/translations/TranslationsModel.cpp
index 185cc8c4..c32483f0 100644
--- a/api/logic/translations/TranslationsModel.cpp
+++ b/api/logic/translations/TranslationsModel.cpp
@@ -200,7 +200,7 @@ void TranslationsModel::downloadIndex()
qDebug() << "Downloading Translations Index...";
d->m_index_job.reset(new NetJob("Translations Index"));
MetaEntryPtr entry = ENV.metacache()->resolveEntry("translations", "index");
- d->m_index_task = Net::Download::makeCached(QUrl("http://files.multimc.org/translations/index"), entry);
+ d->m_index_task = Net::Download::makeCached(QUrl("https://files.multimc.org/translations/index"), entry);
d->m_index_job->addNetAction(d->m_index_task);
connect(d->m_index_job.get(), &NetJob::failed, this, &TranslationsModel::indexFailed);
connect(d->m_index_job.get(), &NetJob::succeeded, this, &TranslationsModel::indexRecieved);
diff --git a/application/BuildConfig.h b/application/BuildConfig.h
index 05fff490..77c42dd4 100644
--- a/application/BuildConfig.h
+++ b/application/BuildConfig.h
@@ -51,7 +51,7 @@ public:
/**
* This is used to fetch the news RSS feed.
- * It defaults in CMakeLists.txt to "http://multimc.org/rss.xml"
+ * It defaults in CMakeLists.txt to "https://multimc.org/rss.xml"
*/
QString NEWS_RSS_URL;
diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp
index 4ee49b80..a636f499 100644
--- a/application/MainWindow.cpp
+++ b/application/MainWindow.cpp
@@ -1568,12 +1568,12 @@ void MainWindow::on_actionReportBug_triggered()
void MainWindow::on_actionPatreon_triggered()
{
- DesktopServices::openUrl(QUrl("http://www.patreon.com/multimc"));
+ DesktopServices::openUrl(QUrl("https://www.patreon.com/multimc"));
}
void MainWindow::on_actionMoreNews_triggered()
{
- DesktopServices::openUrl(QUrl("http://multimc.org/posts.html"));
+ DesktopServices::openUrl(QUrl("https://multimc.org/posts.html"));
}
void MainWindow::newsButtonClicked()
@@ -1585,7 +1585,7 @@ void MainWindow::newsButtonClicked()
}
else
{
- DesktopServices::openUrl(QUrl("http://multimc.org/posts.html"));
+ DesktopServices::openUrl(QUrl("https://multimc.org/posts.html"));
}
}
diff --git a/application/dialogs/AboutDialog.cpp b/application/dialogs/AboutDialog.cpp
index 411f10fc..0b56ebfb 100644
--- a/application/dialogs/AboutDialog.cpp
+++ b/application/dialogs/AboutDialog.cpp
@@ -124,7 +124,7 @@ AboutDialog::~AboutDialog()
void AboutDialog::loadPatronList()
{
netJob.reset(new NetJob("Patreon Patron List"));
- netJob->addNetAction(Net::Download::makeByteArray(QUrl("http://files.multimc.org/patrons.txt"), &dataSink));
+ netJob->addNetAction(Net::Download::makeByteArray(QUrl("https://files.multimc.org/patrons.txt"), &dataSink));
connect(netJob.get(), &NetJob::succeeded, this, &AboutDialog::patronListLoaded);
netJob->start();
}
diff --git a/application/dialogs/AboutDialog.ui b/application/dialogs/AboutDialog.ui
index 5e8e3e68..e3cee582 100644
--- a/application/dialogs/AboutDialog.ui
+++ b/application/dialogs/AboutDialog.ui
@@ -180,7 +180,7 @@
</font>
</property>
<property name="text">
- <string notr="true"><html><head/><body><p><a href="http://github.com/MultiMC/MultiMC5">http://github.com/MultiMC/MultiMC5</a></p></body></html></string>
+ <string notr="true"><html><head/><body><p><a href="https://github.com/MultiMC/MultiMC5">https://github.com/MultiMC/MultiMC5</a></p></body></html></string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
diff --git a/application/pages/global/ExternalToolsPage.ui b/application/pages/global/ExternalToolsPage.ui
index 5f19898b..e79e9388 100644
--- a/application/pages/global/ExternalToolsPage.ui
+++ b/application/pages/global/ExternalToolsPage.ui
@@ -63,7 +63,7 @@
<item>
<widget class="QLabel" name="jprofilerLink">
<property name="text">
- <string notr="true"><html><head/><body><p><a href="http://www.ej-technologies.com/products/jprofiler/overview.html">http://www.ej-technologies.com/products/jprofiler/overview.html</a></p></body></html></string>
+ <string notr="true"><html><head/><body><p><a href="https://www.ej-technologies.com/products/jprofiler/overview.html">https://www.ej-technologies.com/products/jprofiler/overview.html</a></p></body></html></string>
</property>
</widget>
</item>
@@ -137,7 +137,7 @@
<item>
<widget class="QLabel" name="mceditLink">
<property name="text">
- <string notr="true"><html><head/><body><p><a href="http://www.mcedit.net/">http://www.mcedit.net/</a></p></body></html></string>
+ <string notr="true"><html><head/><body><p><a href="https://www.mcedit.net/">https://www.mcedit.net/</a></p></body></html></string>
</property>
</widget>
</item>
--
cgit