chylex/TweetDuck
1
0
Fork 0
mirror of https://github.com/chylex/TweetDuck.git synced 2025-04-29 11:34:13 +02:00
Code

Replace OpenExternalBrowserUnsafe with the new OpenAssociatedProgram

Browse Source
This commit is contained in:
chylex 2017-10-19 00:24:40 +02:00
parent 54613e5242
commit 15eb823c7f
6 changed files with 8 additions and 12 deletions

2
Core/Other/FormAbout.cs
View File

@ -21,7 +21,7 @@ public FormAbout(){
} }
private void OnLinkClicked(object sender, LinkLabelLinkClickedEventArgs e){ private void OnLinkClicked(object sender, LinkLabelLinkClickedEventArgs e){
BrowserUtils.OpenExternalBrowserUnsafe(e.Link.LinkData as string); BrowserUtils.OpenExternalBrowser(e.Link.LinkData as string);
} }
private void FormAbout_HelpRequested(object sender, HelpEventArgs hlpevent){ private void FormAbout_HelpRequested(object sender, HelpEventArgs hlpevent){

2
Core/Other/Settings/Dialogs/DialogSettingsCSS.cs
View File

@ -35,7 +35,7 @@ private void timerTestBrowser_Tick(object sender, EventArgs e){
} }
private void btnOpenWiki_Click(object sender, EventArgs e){ private void btnOpenWiki_Click(object sender, EventArgs e){
BrowserUtils.OpenExternalBrowserUnsafe("https://github.com/chylex/TweetDuck/wiki"); BrowserUtils.OpenExternalBrowser("https://github.com/chylex/TweetDuck/wiki");
} }
private void btnApply_Click(object sender, EventArgs e){ private void btnApply_Click(object sender, EventArgs e){

2
Core/Other/Settings/Dialogs/DialogSettingsCefArgs.cs
View File

@ -19,7 +19,7 @@ public DialogSettingsCefArgs(){
} }
private void btnHelp_Click(object sender, EventArgs e){ private void btnHelp_Click(object sender, EventArgs e){
BrowserUtils.OpenExternalBrowserUnsafe("http://peter.sh/experiments/chromium-command-line-switches/"); BrowserUtils.OpenExternalBrowser("http://peter.sh/experiments/chromium-command-line-switches/");
} }
private void btnApply_Click(object sender, EventArgs e){ private void btnApply_Click(object sender, EventArgs e){

4
Core/Other/Settings/TabSettingsFeedback.cs
View File

@ -16,7 +16,7 @@ public override void OnReady(){
} }
private void btnSendFeedback_Click(object sender, EventArgs e){ private void btnSendFeedback_Click(object sender, EventArgs e){
BrowserUtils.OpenExternalBrowserUnsafe("https://github.com/chylex/TweetDuck/issues/new"); BrowserUtils.OpenExternalBrowser("https://github.com/chylex/TweetDuck/issues/new");
} }
private void checkDataCollection_CheckedChanged(object sender, EventArgs e){ private void checkDataCollection_CheckedChanged(object sender, EventArgs e){
@ -24,7 +24,7 @@ private void checkDataCollection_CheckedChanged(object sender, EventArgs e){
} }
private void labelDataCollectionLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e){ private void labelDataCollectionLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e){
BrowserUtils.OpenExternalBrowserUnsafe("https://github.com/chylex/TweetDuck/wiki/Send-anonymous-data"); BrowserUtils.OpenExternalBrowser("https://github.com/chylex/TweetDuck/wiki/Send-anonymous-data");
} }
} }
} }

8
Core/Utils/BrowserUtils.cs
View File

@ -70,12 +70,12 @@ public static void OpenExternalBrowser(string url){
switch(CheckUrl(url)){ switch(CheckUrl(url)){
case UrlCheckResult.Fine: case UrlCheckResult.Fine:
OpenExternalBrowserUnsafe(url); WindowsUtils.OpenAssociatedProgram(url);
break; break;
case UrlCheckResult.Tracking: case UrlCheckResult.Tracking:
if (FormMessage.Warning("Blocked URL", "TweetDuck has blocked a tracking url due to privacy concerns. Do you want to visit it anyway?\n"+url, FormMessage.Yes, FormMessage.No)){ if (FormMessage.Warning("Blocked URL", "TweetDuck has blocked a tracking url due to privacy concerns. Do you want to visit it anyway?\n"+url, FormMessage.Yes, FormMessage.No)){
OpenExternalBrowserUnsafe(url); WindowsUtils.OpenAssociatedProgram(url);
} }
break; break;
@ -86,10 +86,6 @@ public static void OpenExternalBrowser(string url){
} }
} }
public static void OpenExternalBrowserUnsafe(string url){
using(Process.Start(url)){}
}
public static string GetFileNameFromUrl(string url){ public static string GetFileNameFromUrl(string url){
string file = Path.GetFileName(new Uri(url).AbsolutePath); string file = Path.GetFileName(new Uri(url).AbsolutePath);
return string.IsNullOrEmpty(file) ? null : file; return string.IsNullOrEmpty(file) ? null : file;

2
Updates/FormUpdateDownload.cs
View File

@ -31,7 +31,7 @@ private void timerDownloadCheck_Tick(object sender, EventArgs e){
timerDownloadCheck.Stop(); timerDownloadCheck.Stop();
if (FormMessage.Error("Update Has Failed", "Could not download the update: "+(updateInfo.DownloadError?.Message ?? "unknown error")+"\n\nDo you want to open the website and try downloading the update manually?", FormMessage.Yes, FormMessage.No)){ if (FormMessage.Error("Update Has Failed", "Could not download the update: "+(updateInfo.DownloadError?.Message ?? "unknown error")+"\n\nDo you want to open the website and try downloading the update manually?", FormMessage.Yes, FormMessage.No)){
BrowserUtils.OpenExternalBrowserUnsafe(Program.Website); BrowserUtils.OpenExternalBrowser(Program.Website);
DialogResult = DialogResult.OK; DialogResult = DialogResult.OK;
} }