From ff52b5eb8ac83ae5fb0af63cbc0d5a56e982c52e Mon Sep 17 00:00:00 2001 From: Serraniel Date: Wed, 30 Jan 2019 20:50:22 +0100 Subject: [PATCH 1/3] #10 Fixed testing code --- Discord Media Loader.Application/Classes/Core.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Discord Media Loader.Application/Classes/Core.cs b/Discord Media Loader.Application/Classes/Core.cs index f570af6..8036846 100644 --- a/Discord Media Loader.Application/Classes/Core.cs +++ b/Discord Media Loader.Application/Classes/Core.cs @@ -183,13 +183,12 @@ namespace DML.Application.Classes while (!loggedIn) { - var token = "abc"; try { if (!string.IsNullOrEmpty(Settings.LoginToken)) { Logger.Debug("Trying to login with last known token..."); - loggedIn = await DMLClient.Login(token); + loggedIn = await DMLClient.Login(Settings.LoginToken); } } -- 2.43.4 From 560c3711fa203ebab232a339581f716a35d23c5c Mon Sep 17 00:00:00 2001 From: Serraniel Date: Wed, 30 Jan 2019 20:50:53 +0100 Subject: [PATCH 2/3] #10 Some optimization --- Discord Media Loader.Application/Classes/Core.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Discord Media Loader.Application/Classes/Core.cs b/Discord Media Loader.Application/Classes/Core.cs index 8036846..fa97eeb 100644 --- a/Discord Media Loader.Application/Classes/Core.cs +++ b/Discord Media Loader.Application/Classes/Core.cs @@ -192,7 +192,7 @@ namespace DML.Application.Classes } } - catch (HttpException e) + catch (HttpException) { Logger.Warn("HTTPException occured during login. Probably from login token."); } -- 2.43.4 From d90457b6e3221ea50e408b40fca45ab428c0e5d9 Mon Sep 17 00:00:00 2001 From: Serraniel Date: Wed, 30 Jan 2019 20:54:07 +0100 Subject: [PATCH 3/3] #20 Only continue after login dialog if "ok" is the dialog result. --- Discord Media Loader.Application/Classes/Core.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Discord Media Loader.Application/Classes/Core.cs b/Discord Media Loader.Application/Classes/Core.cs index f570af6..477643e 100644 --- a/Discord Media Loader.Application/Classes/Core.cs +++ b/Discord Media Loader.Application/Classes/Core.cs @@ -193,7 +193,7 @@ namespace DML.Application.Classes } } - catch (HttpException e) + catch (HttpException) { Logger.Warn("HTTPException occured during login. Probably from login token."); } @@ -202,7 +202,10 @@ namespace DML.Application.Classes { Logger.Debug("Showing dialog for username and password..."); var loginDlg = new LoginDialog(); - loginDlg.ShowDialog(); + if (loginDlg.ShowDialog() != DialogResult.OK) + { + return; + } } } -- 2.43.4