From 46e4c648fb3143e50101e7075f30df3396abafd8 Mon Sep 17 00:00:00 2001
From: Cookie Engineer <cookiengineer@protonmail.com>
Date: Sun, 4 Jul 2021 17:50:51 +0200
Subject: [PATCH] :bug: Fixes for About Dialog and Download URLs

---
 src/AboutDialog.cpp     |  3 +--
 src/HelpText.cpp        | 31 -------------------------------
 src/HelpText.h          |  2 --
 src/menus/HelpMenus.cpp |  8 +-------
 4 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp
index 86bf479bb..c69e08062 100644
--- a/src/AboutDialog.cpp
+++ b/src/AboutDialog.cpp
@@ -576,8 +576,7 @@ void AboutDialog::PopulateInformationPage( ShuttleGui & S )
    informationStr
       << wxT("<h2><center>")
       << XO("Build Information")
-      << wxT("</center></h2>\n")
-      << VerCheckHtml();
+      << wxT("</center></h2>\n");
  
    informationStr
       << wxT("<h3>")
diff --git a/src/HelpText.cpp b/src/HelpText.cpp
index 404c53dd6..9b9cf1b8c 100644
--- a/src/HelpText.cpp
+++ b/src/HelpText.cpp
@@ -219,11 +219,6 @@ static wxString HelpTextBuiltIn( const wxString & Key )
       wxStringOutputStream o;
       wxTextOutputStream s(o);
       s
-#if defined(IS_ALPHA) || defined(IS_BETA)
-         << wxT("<hr><center><h3>")
-         << XO("Get the Official Released Version of Audacity")
-         << wxT("</h3></center>")
-         << VerCheckHtml()
 #ifdef IS_ALPHA
          << alphamsg
 #else
@@ -386,29 +381,3 @@ const wxString VerCheckArgs(){
    return result;
 }
 
-// Text of hyperlink to check versions.
-const wxString VerCheckHtml()
-{
-   wxStringOutputStream o;
-   wxTextOutputStream s(o);
-   s
-      << "<center>[["
-      << VerCheckUrl().GET()
-      << "|"
-      << XO("Check Online")
-      << "]]</center>\n";
-   return o.GetString();
-}
-
-// Url with Version check args attached.
-const URLString VerCheckUrl()
-{
-   //The version we intend to use for live Audacity.
-#define VER_CHECK_URL "https://www.audacityteam.org/download/?"
-//For testing of our scriptlet.
-//#define VER_CHECK_URL "http://www.audacityteam.org/slug/?"
-//For testing locally
-//#define VER_CHECK_URL "http://localhost:63342/WorkingDocs/demos/download.html?"
-
-   return wxString( wxT(VER_CHECK_URL)) +VerCheckArgs();
-}
diff --git a/src/HelpText.h b/src/HelpText.h
index 2565f2002..08935e1c2 100644
--- a/src/HelpText.h
+++ b/src/HelpText.h
@@ -23,8 +23,6 @@ AUDACITY_DLL_API  wxString HelpText( const wxString & Key );
 AUDACITY_DLL_API TranslatableString TitleText( const wxString & Key );
 
 extern AUDACITY_DLL_API const wxString VerCheckArgs();
-extern AUDACITY_DLL_API const URLString VerCheckUrl();
-extern AUDACITY_DLL_API const wxString VerCheckHtml();
 extern AUDACITY_DLL_API wxString FormatHtmlText( const wxString & Text );
 
 #endif
diff --git a/src/menus/HelpMenus.cpp b/src/menus/HelpMenus.cpp
index 735ce1876..e11ee410d 100644
--- a/src/menus/HelpMenus.cpp
+++ b/src/menus/HelpMenus.cpp
@@ -431,7 +431,7 @@ void OnMenuTree(const CommandContext &context)
 
 void OnCheckForUpdates(const CommandContext &WXUNUSED(context))
 {
-   ::OpenInDefaultBrowser( VerCheckUrl());
+   ::OpenInDefaultBrowser("https://github.com/cookiengineer/audacity/releases");
 }
 
 void OnAbout(const CommandContext &context)
@@ -558,12 +558,6 @@ BaseItemSharedPtr HelpMenu()
       ,
 #endif
 
-         // DA: Does not fully support update checking.
-   #ifndef EXPERIMENTAL_DA
-         Command( wxT("Updates"), XXO("&Check for Updates..."),
-            FN(OnCheckForUpdates),
-            AlwaysEnabledFlag ),
-   #endif
          Command( wxT("About"), XXO("&About Audacity..."), FN(OnAbout),
             AlwaysEnabledFlag )
       )