Merge pull request #117 from RWELabs/development

Release v230401

README.md

@@ -114,7 +114,7 @@ Download the most recent version of Stardew Valley Mod Manager by visiting our r
 - [View All Releases](https://github.com/RyanWalpoleEnterprises/Stardew-Valley-Mod-Manager/releases)
 
 #### Need Help?
-If you're running into any issues with downloading or installing the application, see [download and installation help](#download-and-install.)
+If you're running into any issues with downloading or installing the application, see [download and installation help](https://rwe-labs.gitbook.io/sdvmm/getting-started/setup-and-configuration/downloading-the-application)
 
 ## Branches
 

source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/Forms/First Run/UpdateVersion.cs

@@ -82,8 +82,8 @@ private void Migrate()
             string InactiveModsDirRegex = "$InactiveModsDir=";
             string PresetsDirRegex = "$PresetsDir=";
             string CheckUpdateOnStartupRegex = "$CheckUpdateOnStartup=";
-            string IsCheckSMAPIUpdatesOnStartupRegex = "$CheckSMAPIUpdateOnStartup";
-            string ColorProfileRegex = "$ColorProfile";
+            string IsCheckSMAPIUpdatesOnStartupRegex = "$CheckSMAPIUpdateOnStartup=";
+            string ColorProfileRegex = "$ColorProfile=";
             string DoTelemetryRegex = "$DoTelemetry=";
 
             foreach (string line in FileRead.Lines)

source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/Forms/MainPage.cs

@@ -546,6 +546,10 @@ private void DoApplicationSettingSave()
             FileWrite.AppendText("      \"TelemetryData\": \"Check for Updates Enabled\"" + Environment.NewLine);
             FileWrite.AppendText("    }," + Environment.NewLine);
             FileWrite.AppendText("    {" + Environment.NewLine);
+            FileWrite.AppendText("      \"string\": \"" + Properties.Settings.Default.Version.ToLower() + "\"," + Environment.NewLine);
+            FileWrite.AppendText("      \"TelemetryData\": \"SDV Mod Manager Version\"" + Environment.NewLine);
+            FileWrite.AppendText("    }," + Environment.NewLine);
+            FileWrite.AppendText("    {" + Environment.NewLine);
             FileWrite.AppendText("      \"bool\": \"" + Properties.Settings.Default.CheckSMAPIUpdateOnStartup.ToLower() + "\"," + Environment.NewLine);
             FileWrite.AppendText("      \"TelemetryData\": \"Check for SMAPI Updates Enabled\"" + Environment.NewLine);
             FileWrite.AppendText("    }," + Environment.NewLine);
@@ -1017,11 +1021,13 @@ private void TabControl_SelectedIndexChanged(object sender, EventArgs e)
                 {
                     TelemetryOptInOut.Text = "Opt-Out";
                     TelemetrySettingStatus.Text = "You are currently sharing telemetry data with RWE Labs";
+                    VolunteerTelemetry.Enabled = true;
                 }
                 else if (Properties.Settings.Default.DoTelemetry == "FALSE")
                 {
                     TelemetryOptInOut.Text = "Opt-In";
                     TelemetrySettingStatus.Text = "You are not currently sharing telemetry data with RWE Labs";
+                    VolunteerTelemetry.Enabled = false;
                 }
                 if (Properties.Settings.Default.IgnoreWebsiteWarning == "FALSE")
                 {
@@ -1284,7 +1290,7 @@ private void GiveFeedbackLink_LinkClicked(object sender, LinkLabelLinkClickedEve
                 MainTabs.TabPages.Add(Tab_Feedback);
                 this.MainTabs.SelectedTab = Tab_Feedback;
                 GiveFeedbackLink.Enabled = false;
-                //FBView.Url = new Uri("https://labs.ryanwalpole.com/feedback/sdvmm/");
+                //FBView.Url = new Uri("https://rwelabs.github.io/sdvmm/feedback.html");
             }
         }
 
@@ -1771,5 +1777,26 @@ private void WebToolsWarningEnabled_CheckStateChanged(object sender, EventArgs e
                 Properties.Settings.Default.IgnoreWebsiteWarning = "TRUE";
             }
         }
+
+        private void VolunteerTelemetry_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                DialogResult DR = MessageBox.Show("Are you sure you'd like to voluntarily submit your telemetry file? You should only do this if you've been instructed to by RWE Labs or a representative from RWE Labs.","Voluntary Submission | RWE Labs Telemetry",MessageBoxButtons.YesNo,MessageBoxIcon.Question);
+                if(DR == DialogResult.Yes)
+                {
+                    DoTelemetricChecks.RunWorkerAsync();
+                    MessageBox.Show("Thank you for sending your data. We encourage you to not use this voluntary submission for the next 7 days unless otherwise instructed.","Voluntary Submission | RWE Labs Telemetry");
+                }
+                else
+                {
+                    //do nothing
+                }
+            }
+            catch(Exception ex)
+            {
+                MessageBox.Show("We ran into an issue sending your telemetry data to RWE Labs.", "Voluntary Submission | RWE Labs Telemetry");
+            }
+        }
     }
 }

source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/Forms/TelemetryOnboarding.resx

@@ -124,6 +124,10 @@
       "boolean": "true",
       "TelemetryData": "Check for Updates Enabled"
     },
+    {
+      "string": "230302",
+      "TelemetryData": "SDV Mod Manager Version"
+    },
     {
       "boolean": "false",
       "TelemetryData": "Check for SMAPI Updates Enabled"

source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/Properties/AssemblyInfo.cs

@@ -33,6 +33,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("23.01.00.02")]
-[assembly: AssemblyFileVersion("23.01.00.02")]
+[assembly: AssemblyVersion("24.04.00.01")]
+[assembly: AssemblyFileVersion("24.04.00.01")]
 [assembly: NeutralResourcesLanguage("en-AU")]

source-code/Mod Manager (Facelift Development)/Stardew Mod Manager/Properties/Settings.settings

@@ -33,7 +33,7 @@
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="Version" Type="System.String" Scope="User">
-      <Value Profile="(Default)">230301</Value>
+      <Value Profile="(Default)">230401</Value>
     </Setting>
     <Setting Name="CheckUpdateOnStartup" Type="System.String" Scope="User">
       <Value Profile="(Default)">TRUE</Value>