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

---
 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 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'api')

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);
-- 
cgit v1.2.3