IDE0031

common/ASC.Common/Collections/HttpRequestDictionary.cs

@@ -68,7 +68,7 @@ namespace ASC.Collections
 
         protected override object GetObjectFromCache(string fullKey)
         {
-            return Common.HttpContext.Current != null ? Common.HttpContext.Current.Items[fullKey] : null;
+            return Common.HttpContext.Current?.Items[fullKey];
         }
 
         protected override bool FitsCondition(object cached)

common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs

@@ -114,7 +114,7 @@ namespace ASC.Core
                     return settings;
                 }
             }
-            set { SaveSetting("SmtpSettings", value != null ? value.Serialize() : null, CoreContext.TenantManager.GetCurrentTenant().TenantId); }
+            set { SaveSetting("SmtpSettings", value?.Serialize(), CoreContext.TenantManager.GetCurrentTenant().TenantId); }
         }
 
         public string BaseDomain

common/ASC.Core.Common/Context/Impl/UserManager.cs

@@ -286,7 +286,7 @@ namespace ASC.Core
                 userRefs = store.GetRefsByUser(userID);
             }
 
-            var userRefsContainsNotRemoved = userRefs != null ? userRefs.Where(r => !r.Removed && r.RefType == UserGroupRefType.Contains).ToList() : null;
+            var userRefsContainsNotRemoved = userRefs?.Where(r => !r.Removed && r.RefType == UserGroupRefType.Contains).ToList();
 
             foreach (var g in GetGroupsInternal(tenant.TenantId).Where(g => !categoryId.HasValue || g.CategoryID == categoryId))
             {

common/ASC.FederatedLogin/LoginProviders/BaseLoginProvider.cs

@@ -77,7 +77,7 @@ namespace ASC.FederatedLogin.LoginProviders
             {
                 var token = Auth(context, Scopes);
 
-                return GetLoginProfile(token == null ? null : token.AccessToken);
+                return GetLoginProfile(token?.AccessToken);
             }
             catch (ThreadAbortException)
             {

common/ASC.FederatedLogin/LoginProviders/MailRuLoginProvider.cs

@@ -167,9 +167,7 @@ namespace ASC.FederatedLogin.LoginProviders
             var parser = JObject.Parse(token.OriginJson);
 
             return
-                parser == null
-                    ? null
-                    : parser.Value<string>("x_mailru_vid");
+                parser?.Value<string>("x_mailru_vid");
         }
     }
 }

common/ASC.FederatedLogin/LoginProviders/VKLoginProvider.cs

@@ -164,9 +164,7 @@ namespace ASC.FederatedLogin.LoginProviders
             var parser = JObject.Parse(token.OriginJson);
 
             return
-                parser == null
-                    ? null
-                    : parser.Value<string>("email");
+                parser?.Value<string>("email");
         }
     }
 }

common/ASC.MessagingSystem/DbSender/MessagesRepository.cs

@@ -206,7 +206,7 @@ namespace ASC.MessagingSystem.DbSender
                     }));
             }
 
-            i.InColumnValue("target", message.Target == null ? null : message.Target.ToString());
+            i.InColumnValue("target", message.Target?.ToString());
 
             dbManager.ExecuteNonQuery(i);
         }

common/ASC.MessagingSystem/MessageService.cs

@@ -205,7 +205,7 @@ namespace ASC.MessagingSystem
 
         public void Send(Dictionary<string, string> httpHeaders, MessageAction action, IEnumerable<string> d1)
         {
-            SendHeadersMessage(null, httpHeaders, action, null, d1 != null ? d1.ToArray() : null);
+            SendHeadersMessage(null, httpHeaders, action, null, d1?.ToArray());
         }
 
         public void Send(MessageUserData userData, Dictionary<string, string> httpHeaders, MessageAction action, MessageTarget target)
@@ -229,7 +229,7 @@ namespace ASC.MessagingSystem
 
         public void Send(Dictionary<string, string> httpHeaders, MessageAction action, MessageTarget target, IEnumerable<string> d1)
         {
-            SendHeadersMessage(null, httpHeaders, action, target, d1 != null ? d1.ToArray() : null);
+            SendHeadersMessage(null, httpHeaders, action, target, d1?.ToArray());
         }
 
         #endregion

common/ASC.VoipService/Twilio/TwilioResponseHelper.cs

@@ -46,7 +46,7 @@ namespace ASC.VoipService.Twilio
 
         public VoiceResponse Inbound(Tuple<Agent, bool> agentTuple)
         {
-            var agent = agentTuple != null ? agentTuple.Item1 : null;
+            var agent = agentTuple?.Item1;
             var anyOnline = agentTuple != null ? agentTuple.Item2 : false;
             var response = new VoiceResponse();
 

web/ASC.Web.Core/Extensions/StringExtension.cs

@@ -52,7 +52,7 @@ namespace System
         /// <returns></returns>
         public static string ReplaceSingleQuote(this string str)
         {
-            return str == null ? null : str.Replace("'", "′");
+            return str?.Replace("'", "′");
         }
 
         public static bool TestEmailRegex(this string emailAddress)

web/ASC.Web.Core/Helpers/ApiSystemHelper.cs

@@ -132,9 +132,7 @@ namespace ASC.Web.Core.Helpers
             var resObj = JObject.Parse(result);
 
             var variants = resObj.Value<JArray>("variants");
-            return variants == null
-                       ? null
-                       : variants.Select(jv => jv.Value<string>()).ToList();
+            return variants?.Select(jv => jv.Value<string>()).ToList();
         }
 
         #endregion