Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop12

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

1 files changed, 37 insertions, 45 deletions

diff --git a/launcher/launch/steps/CheckJava.cpp b/launcher/launch/steps/CheckJava.cpp
index f0187586..81337a88 100644
--- a/launcher/launch/steps/CheckJava.cpp
+++ b/launcher/launch/steps/CheckJava.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -34,12 +34,12 @@
  */
 
 #include "CheckJava.h"
-#include "java/JavaUtils.h"
-#include <launch/LaunchTask.h>
 #include <FileSystem.h>
-#include <QStandardPaths>
-#include <QFileInfo>
+#include <launch/LaunchTask.h>
 #include <sys.h>
+#include <QFileInfo>
+#include <QStandardPaths>
+#include "java/JavaUtils.h"
 
 void CheckJava::executeTask()
 {
@@ -49,59 +49,54 @@ void CheckJava::executeTask()
     bool perInstance = settings->get("OverrideJava").toBool() || settings->get("OverrideJavaLocation").toBool();
 
     auto realJavaPath = QStandardPaths::findExecutable(m_javaPath);
-    if (realJavaPath.isEmpty())
-    {
-        if (perInstance)
-        {
-            emit logLine(
-                QString("The java binary \"%1\" couldn't be found. Please fix the java path "
-                   "override in the instance's settings or disable it.").arg(m_javaPath),
-                MessageLevel::Warning);
-        }
-        else
-        {
+    if (realJavaPath.isEmpty()) {
+        if (perInstance) {
+            emit logLine(QString("The java binary \"%1\" couldn't be found. Please fix the java path "
+                                 "override in the instance's settings or disable it.")
+                             .arg(m_javaPath),
+                         MessageLevel::Warning);
+        } else {
             emit logLine(QString("The java binary \"%1\" couldn't be found. Please set up java in "
-                            "the settings.").arg(m_javaPath),
+                                 "the settings.")
+                             .arg(m_javaPath),
                          MessageLevel::Warning);
         }
         emitFailed(QString("Java path is not valid."));
         return;
-    }
-    else
-    {
+    } else {
         emit logLine("Java path is:\n" + m_javaPath + "\n\n", MessageLevel::Launcher);
     }
 
-    if (JavaUtils::getJavaCheckPath().isEmpty())
-    {
-        const char *reason = QT_TR_NOOP("Java checker library could not be found. Please check your installation.");
+    if (JavaUtils::getJavaCheckPath().isEmpty()) {
+        const char* reason = QT_TR_NOOP("Java checker library could not be found. Please check your installation.");
         emit logLine(tr(reason), MessageLevel::Fatal);
         emitFailed(tr(reason));
         return;
     }
 
     QFileInfo javaInfo(realJavaPath);
-    qlonglong javaUnixTime = javaInfo.lastModified().toMSecsSinceEpoch();
-    auto storedUnixTime = settings->get("JavaTimestamp").toLongLong();
+    qint64 javaUnixTime = javaInfo.lastModified().toMSecsSinceEpoch();
+    auto storedSignature = settings->get("JavaSignature").toString();
     auto storedArchitecture = settings->get("JavaArchitecture").toString();
     auto storedRealArchitecture = settings->get("JavaRealArchitecture").toString();
     auto storedVersion = settings->get("JavaVersion").toString();
     auto storedVendor = settings->get("JavaVendor").toString();
-    m_javaUnixTime = javaUnixTime;
+
+    QCryptographicHash hash(QCryptographicHash::Sha1);
+    hash.addData(QByteArray::number(javaUnixTime));
+    hash.addData(m_javaPath.toUtf8());
+    m_javaSignature = hash.result().toHex();
+
     // if timestamps are not the same, or something is missing, check!
-    if (javaUnixTime != storedUnixTime || storedVersion.size() == 0
-        || storedArchitecture.size() == 0 || storedRealArchitecture.size() == 0
-        || storedVendor.size() == 0)
-    {
+    if (m_javaSignature != storedSignature || storedVersion.size() == 0 || storedArchitecture.size() == 0 ||
+        storedRealArchitecture.size() == 0 || storedVendor.size() == 0) {
         m_JavaChecker.reset(new JavaChecker);
         emit logLine(QString("Checking Java version..."), MessageLevel::Launcher);
         connect(m_JavaChecker.get(), &JavaChecker::checkFinished, this, &CheckJava::checkJavaFinished);
         m_JavaChecker->m_path = realJavaPath;
         m_JavaChecker->performCheck();
         return;
-    }
-    else
-    {
+    } else {
         auto verString = instance->settings()->get("JavaVersion").toString();
         auto archString = instance->settings()->get("JavaArchitecture").toString();
         auto realArchString = settings->get("JavaRealArchitecture").toString();
@@ -113,10 +108,8 @@ void CheckJava::executeTask()
 
 void CheckJava::checkJavaFinished(JavaCheckResult result)
 {
-    switch (result.validity)
-    {
-        case JavaCheckResult::Validity::Errored:
-        {
+    switch (result.validity) {
+        case JavaCheckResult::Validity::Errored: {
             // Error message displayed if java can't start
             emit logLine(QString("Could not start java:"), MessageLevel::Error);
             emit logLines(result.errorLog.split('\n'), MessageLevel::Error);
@@ -124,31 +117,30 @@ void CheckJava::checkJavaFinished(JavaCheckResult result)
             emitFailed(QString("Could not start java!"));
             return;
         }
-        case JavaCheckResult::Validity::ReturnedInvalidData:
-        {
+        case JavaCheckResult::Validity::ReturnedInvalidData: {
             emit logLine(QString("Java checker returned some invalid data we don't understand:"), MessageLevel::Error);
             emit logLines(result.outLog.split('\n'), MessageLevel::Warning);
             emit logLine("\nMinecraft might not start properly.", MessageLevel::Launcher);
             emitSucceeded();
             return;
         }
-        case JavaCheckResult::Validity::Valid:
-        {
+        case JavaCheckResult::Validity::Valid: {
             auto instance = m_parent->instance();
             printJavaInfo(result.javaVersion.toString(), result.mojangPlatform, result.realPlatform, result.javaVendor);
             instance->settings()->set("JavaVersion", result.javaVersion.toString());
             instance->settings()->set("JavaArchitecture", result.mojangPlatform);
             instance->settings()->set("JavaRealArchitecture", result.realPlatform);
             instance->settings()->set("JavaVendor", result.javaVendor);
-            instance->settings()->set("JavaTimestamp", m_javaUnixTime);
+            instance->settings()->set("JavaSignature", m_javaSignature);
             emitSucceeded();
             return;
         }
     }
 }
 
-void CheckJava::printJavaInfo(const QString& version, const QString& architecture, const QString& realArchitecture, const QString & vendor)
+void CheckJava::printJavaInfo(const QString& version, const QString& architecture, const QString& realArchitecture, const QString& vendor)
 {
-    emit logLine(QString("Java is version %1, using %2 (%3) architecture, from %4.\n\n")
-                    .arg(version, architecture, realArchitecture, vendor), MessageLevel::Launcher);
+    emit logLine(
+        QString("Java is version %1, using %2 (%3) architecture, from %4.\n\n").arg(version, architecture, realArchitecture, vendor),
+        MessageLevel::Launcher);
 }