From a84924e4370fd9011dfdb53055bb69686339ed8c Mon Sep 17 00:00:00 2001
From: Sven Kubiak <sk@svenkubiak.de>
Date: Mon, 21 Jun 2021 14:16:12 +0200
Subject: [PATCH] Bugfix and refactoring

---
 src/main/java/de/svenkubiak/jpushover/apis/OpenClient.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/de/svenkubiak/jpushover/apis/OpenClient.java b/src/main/java/de/svenkubiak/jpushover/apis/OpenClient.java
index a070a05..0e1e3fa 100644
--- a/src/main/java/de/svenkubiak/jpushover/apis/OpenClient.java
+++ b/src/main/java/de/svenkubiak/jpushover/apis/OpenClient.java
@@ -61,7 +61,6 @@ public class OpenClient {
         HttpRequest request = HttpRequest.newBuilder()
                 .uri(URI.create(Url.LOGIN.toString()))
                 .timeout(TIMEOUT)
-                .header(CONTENT_TYPE, APPLICATION_JSON)
                 .POST(HttpRequest.BodyPublishers.ofString(params.toString()))
                 .build();
         
@@ -231,7 +230,7 @@ public class OpenClient {
                 .append("&os=O"); 
         
         HttpRequest request = HttpRequest.newBuilder()
-                .uri(URI.create(Url.DELETE.toString()))
+                .uri(URI.create(Url.DELETE.toString().replace("###DEVICE_ID###", deviceName)))
                 .POST(HttpRequest.BodyPublishers.ofString(params.toString()))
                 .build();
 
@@ -250,7 +249,7 @@ public class OpenClient {
     }
     
     /**
-     * Closes the existing WebSocket to the Pushover API
+     * Closes the existing WebSocket connection to the Pushover API
      * 
      * @return true if close was successful, false otherwise
      */
@@ -259,6 +258,7 @@ public class OpenClient {
         if (webSocket != null) {
             webSocket.sendClose(WebSocket.NORMAL_CLOSURE, "ok");
             closed = webSocket.isInputClosed() && webSocket.isOutputClosed();
+            webSocket = null;
         }
         
         return closed;