Fix a startup check and button content bug

Author: Xayton

main.go

@@ -369,20 +369,18 @@ func loop() {
 		}
 	}
 
-	// check if the HTTPS certificates are expired and prompt the user to update them on macOS
-	if runtime.GOOS == "darwin" && cert.GetDefaultBrowserName() == "Safari" {
-		if *installCerts {
-			if config.CertsExist() {
-				cert.PromptExpiredCerts(config.GetCertificatesDir())
-			} else if cert.PromptInstallCertsSafari() {
-				// installing the certificates from scratch at this point should only happen if
-				// something went wrong during previous installation attempts
-				cert.GenerateAndInstallCertificates(config.GetCertificatesDir())
-			} else {
-				err = config.SetInstallCertsIni(configPath.String(), "false")
-				if err != nil {
-					log.Panicf("config.ini cannot be parsed: %s", err)
-				}
+	// Check if the HTTPS certificate is expired or exipring and prompt the user to update them on macOS.
+	if runtime.GOOS == "darwin" && *installCerts {
+		if config.CertsExist() {
+			cert.PromptExpiredCerts(config.GetCertificatesDir())
+		} else if cert.PromptInstallCertsSafari() {
+			// installing the certificates from scratch at this point should only happen if
+			// something went wrong during previous installation attempts
+			cert.GenerateAndInstallCertificates(config.GetCertificatesDir())
+		} else {
+			err = config.SetInstallCertsIni(configPath.String(), "false")
+			if err != nil {
+				log.Panicf("config.ini cannot be parsed: %s", err)
 			}
 		}
 	}

systray/systray_real.go

@@ -108,14 +108,14 @@ func (s *Systray) start() {
 					infoMsg = infoMsg + "- Certificate installed: No\n- Certificate trusted: N/A\n- Certificate expiration date: N/A"
 				}
 				pressedButton := utilities.UserPrompt("display dialog \"" + infoMsg + "\" buttons " + buttons + " with title \"Arduino Agent: Manage HTTPS certificate\"")
-				if strings.Contains(pressedButton, "Install certificate for Safari") {
+				if strings.Contains(pressedButton, "Install the certificate for Safari") {
 					cert.GenerateAndInstallCertificates(certDir)
 					err := config.SetInstallCertsIni(s.currentConfigFilePath.String(), "true")
 					if err != nil {
 						log.Errorf("cannot set installCerts value in config.ini: %s", err)
 					}
 					s.Restart()
-				} else if strings.Contains(pressedButton, "Uninstall certificate for Safari") {
+				} else if strings.Contains(pressedButton, "Uninstall the certificate for Safari") {
 					err := cert.UninstallCertificates()
 					if err != nil {
 						log.Errorf("cannot uninstall certificates something went wrong: %s", err)