Skip to content

Fix survey news showing multiple times and when users opt out #1095

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mousetraps merged 4 commits into from
Jun 23, 2016
Merged

Fix survey news showing multiple times and when users opt out #1095

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f33b666
Fix Never Check News Option
mjbvz Jun 23, 2016
47bbafb
Dont show on unknown
mjbvz Jun 23, 2016
7505637
Extract method to make code more readable
mjbvz Jun 23, 2016
987e9e9
Small cleanup to remove parameter
mjbvz Jun 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 27 additions & 34 deletions Nodejs/Product/Nodejs/NodejsPackage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,47 +582,40 @@ private void OnSurveyNewsDocumentCompleted(object sender, WebBrowserDocumentComp
}

internal void CheckSurveyNews(bool forceCheckAndWarnIfNoneAvailable) {
bool shouldQueryServer = false;
if (forceCheckAndWarnIfNoneAvailable) {
shouldQueryServer = true;
} else {
shouldQueryServer = true;
var options = GeneralOptionsPage;
// Ensure that we don't prompt the user on their very first project creation.
// Delay by 3 days by pretending we checked 4 days ago (the default of check
// once a week ensures we'll check again in 3 days).
if (options.SurveyNewsLastCheck == DateTime.MinValue) {
options.SurveyNewsLastCheck = DateTime.Now - TimeSpan.FromDays(4);
options.SaveSettingsToStorage();
}

var elapsedTime = DateTime.Now - options.SurveyNewsLastCheck;
switch (options.SurveyNewsCheck) {
case SurveyNewsPolicy.Disabled:
break;
case SurveyNewsPolicy.CheckOnceDay:
shouldQueryServer = elapsedTime.TotalDays >= 1;
break;
case SurveyNewsPolicy.CheckOnceWeek:
shouldQueryServer = elapsedTime.TotalDays >= 7;
break;
case SurveyNewsPolicy.CheckOnceMonth:
shouldQueryServer = elapsedTime.TotalDays >= 30;
break;
default:
Debug.Assert(false, String.Format("Unexpected SurveyNewsPolicy: {0}.", options.SurveyNewsCheck));
break;
}
}

if (shouldQueryServer) {
if (forceCheckAndWarnIfNoneAvailable || ShouldQuerySurveryNewsServer()) {
var options = GeneralOptionsPage;
options.SurveyNewsLastCheck = DateTime.Now;
options.SaveSettingsToStorage();
CheckSurveyNewsThread(new Uri(options.SurveyNewsFeedUrl), forceCheckAndWarnIfNoneAvailable);
}
}

private bool ShouldQuerySurveryNewsServer() {
var options = GeneralOptionsPage;
// Ensure that we don't prompt the user on their very first project creation.
// Delay by 3 days by pretending we checked 4 days ago (the default of check
// once a week ensures we'll check again in 3 days).
if (options.SurveyNewsLastCheck == DateTime.MinValue) {
options.SurveyNewsLastCheck = DateTime.Now - TimeSpan.FromDays(4);
options.SaveSettingsToStorage();
}

var elapsedTime = DateTime.Now - options.SurveyNewsLastCheck;
switch (options.SurveyNewsCheck) {
case SurveyNewsPolicy.Disabled:
return false;
case SurveyNewsPolicy.CheckOnceDay:
return elapsedTime.TotalDays >= 1;
case SurveyNewsPolicy.CheckOnceWeek:
return elapsedTime.TotalDays >= 7;
case SurveyNewsPolicy.CheckOnceMonth:
return elapsedTime.TotalDays >= 30;
default:
Debug.Assert(false, String.Format("Unexpected SurveyNewsPolicy: {0}.", options.SurveyNewsCheck));
return false;
}
}

internal static void NavigateTo(string filename, int line, int col) {
VsUtilities.NavigateTo(Instance, filename, NodejsProjectNode.IsNodejsFile(filename) ? typeof(NodejsEditorFactory).GUID : Guid.Empty, line, col);
}
Expand Down