Constant condition and null-check

Author: veniware

Protest/Protocols/Telnet.cs

@@ -131,7 +131,7 @@ private static async void HandleDownstream(HttpListenerContext ctx, WebSocket ws
                 int count = stream.Read(data, 0, data.Length);
 
                 if (count == 0) { //remote host closed the connection
-                    if (ws.State == WebSocketState.Open) {
+                    if (ws!.State == WebSocketState.Open) {
                         try {
                             await ws?.CloseAsync(WebSocketCloseStatus.NormalClosure, String.Empty, CancellationToken.None);
                         }
@@ -146,7 +146,7 @@ private static async void HandleDownstream(HttpListenerContext ctx, WebSocket ws
                     if (data[i] > 127) data[i] = 46; //.
                 }
 
-                await ws.SendAsync(new ArraySegment<byte>(data, 0, count), WebSocketMessageType.Text, true, CancellationToken.None);
+                await ws!.SendAsync(new ArraySegment<byte>(data, 0, count), WebSocketMessageType.Text, true, CancellationToken.None);
 
                 //string dataString = Encoding.ASCII.GetString(data, 0, count);
                 //Console.Write(dataString);

Protest/Tasks/Fetch.cs

@@ -717,24 +717,26 @@ public static byte[] DevicesTask(string[] hosts, bool dns, bool wmi, bool ldap,
                 }
             }
 
-            if (task.cancellationToken.IsCancellationRequested) {
-                KeepAlive.Broadcast("{\"action\":\"abort-fetch\",\"type\":\"devices\"}"u8.ToArray(), "/fetch/status");
-                Logger.Action(origin, "Devices fetch task aborted");
+            if (task is not null) {
+                if (task.cancellationToken.IsCancellationRequested) {
+                    KeepAlive.Broadcast("{\"action\":\"abort-fetch\",\"type\":\"devices\"}"u8.ToArray(), "/fetch/status");
+                    Logger.Action(origin, "Devices fetch task aborted");
 
-                task?.Dispose();
-                task = null;
-                return;
-            }
+                    task?.Dispose();
+                    task = null;
+                    return;
+                }
 
-            result = new Result() {
-                name = task.name,
-                type = Type.devices,
-                started = task.started,
-                finished = DateTime.UtcNow.Ticks,
-                dataset = dataset,
-                successful = task.CompletedSteps,
-                unsuccessful = task.TotalSteps - task.CompletedSteps,
-            };
+                result = new Result() {
+                    name         = task.name,
+                    type         = Type.devices,
+                    started      = task.started,
+                    finished     = DateTime.UtcNow.Ticks,
+                    dataset      = dataset,
+                    successful   = task.CompletedSteps,
+                    unsuccessful = task.TotalSteps - task.CompletedSteps,
+                };
+            }
 
             KeepAlive.Broadcast($"{{\"action\":\"finish-fetch\",\"type\":\"devices\",\"task\":{Encoding.UTF8.GetString(Status())}}}", "/fetch/status");
             Logger.Action(origin, "Fetch task finished");

Protest/Tasks/Issues.cs

@@ -162,7 +162,7 @@ public static async void WebSocketHandler(HttpListenerContext ctx) {
         }
         catch { }
         finally {
-            if (ws?.State == WebSocketState.Open) {
+            if (ws.State == WebSocketState.Open) {
                 try {
                     await ws.CloseAsync(WebSocketCloseStatus.NormalClosure, null, CancellationToken.None);
                 }