From 2320b30d9b4446b34919b05c64e388cf7cb5eed4 Mon Sep 17 00:00:00 2001 From: Thanh Lai Date: Tue, 2 Oct 2018 21:35:24 -0700 Subject: [PATCH 1/4] Update Client.cs Check string is null, empty, or consists only of white-space characters --- Chatbase/Client.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Chatbase/Client.cs b/Chatbase/Client.cs index e8c9b18..b2c6c5d 100644 --- a/Chatbase/Client.cs +++ b/Chatbase/Client.cs @@ -189,16 +189,16 @@ public async Task Send(FBAgentMessageSet set) private Message setMessageWithClientProperties(Message msg) { - if (!String.IsNullOrEmpty(api_key)) { + if (!String.IsNullOrWhiteSpace(api_key)) { msg.api_key = api_key; } - if (!String.IsNullOrEmpty(user_id)) { + if (!String.IsNullOrWhiteSpace(user_id)) { msg.user_id = user_id; } - if (!String.IsNullOrEmpty(platform)) { + if (!String.IsNullOrWhiteSpace(platform)) { msg.platform = platform; } - if (!String.IsNullOrEmpty(version)) { + if (!String.IsNullOrWhiteSpace(version)) { msg.version = version; } From 69cfdf7a20f39db0ab6c673e5a23b574cb937228 Mon Sep 17 00:00:00 2001 From: Thanh Lai Date: Tue, 2 Oct 2018 21:36:26 -0700 Subject: [PATCH 2/4] Update FBAgentMessage.cs --- Chatbase/FBAgentMessage.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chatbase/FBAgentMessage.cs b/Chatbase/FBAgentMessage.cs index d4a8d2f..d8c4c8e 100644 --- a/Chatbase/FBAgentMessage.cs +++ b/Chatbase/FBAgentMessage.cs @@ -48,7 +48,7 @@ public class FBAgentMessage public bool RequiredFieldsSet() { - return !String.IsNullOrEmpty(api_key); + return !String.IsNullOrWhiteSpace(api_key); } public FBAgentMessage SetRecipientID(string id) From 3aa9a919a20e68e3b3594f58dd22a3422b97ebf1 Mon Sep 17 00:00:00 2001 From: Thanh Lai Date: Tue, 2 Oct 2018 21:37:38 -0700 Subject: [PATCH 3/4] Update FBUserMessage.cs --- Chatbase/FBUserMessage.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Chatbase/FBUserMessage.cs b/Chatbase/FBUserMessage.cs index 0cddc19..2071306 100644 --- a/Chatbase/FBUserMessage.cs +++ b/Chatbase/FBUserMessage.cs @@ -57,10 +57,10 @@ public class FBUserMessage public bool RequiredFieldsSet() { return !( - String.IsNullOrEmpty(sender.id) - || String.IsNullOrEmpty(recipient.id) - || String.IsNullOrEmpty(message.mid) - || String.IsNullOrEmpty(api_key) + String.IsNullOrWhiteSpace(sender.id) + || String.IsNullOrWhiteSpace(recipient.id) + || String.IsNullOrWhiteSpace(message.mid) + || String.IsNullOrWhiteSpace(api_key) ); } From 190965ef8f87d19f3f109744c1b880d122ea4486 Mon Sep 17 00:00:00 2001 From: Thanh Lai Date: Tue, 2 Oct 2018 21:38:34 -0700 Subject: [PATCH 4/4] Update Message.cs --- Chatbase/Message.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Chatbase/Message.cs b/Chatbase/Message.cs index 0a2d110..61fe01d 100755 --- a/Chatbase/Message.cs +++ b/Chatbase/Message.cs @@ -68,10 +68,10 @@ public static double CurrentUnixMilliseconds() public bool RequiredFieldsSet() { return !( - String.IsNullOrEmpty(api_key) - || String.IsNullOrEmpty(type) - || String.IsNullOrEmpty(user_id) - || String.IsNullOrEmpty(platform) + String.IsNullOrWhiteSpace(api_key) + || String.IsNullOrWhiteSpace(type) + || String.IsNullOrWhiteSpace(user_id) + || String.IsNullOrWhiteSpace(platform) ); }