client: clear delayed message requests on disconnect

Author: tulir

client.go

@@ -549,6 +549,7 @@ func (cli *Client) Disconnect() {
 	cli.socketLock.Lock()
 	cli.unlockedDisconnect()
 	cli.socketLock.Unlock()
+	cli.clearDelayedMessageRequests()
 }
 
 // Disconnect closes the websocket connection.

retry.go

@@ -354,6 +354,14 @@ func (cli *Client) delayedRequestMessageFromPhone(info *types.MessageInfo) {
 	}
 }
 
+func (cli *Client) clearDelayedMessageRequests() {
+	cli.pendingPhoneRerequestsLock.Lock()
+	defer cli.pendingPhoneRerequestsLock.Unlock()
+	for _, cancel := range cli.pendingPhoneRerequests {
+		cancel()
+	}
+}
+
 // sendRetryReceipt sends a retry receipt for an incoming message.
 func (cli *Client) sendRetryReceipt(node *waBinary.Node, info *types.MessageInfo, forceIncludeIdentity bool) {
 	id, _ := node.Attrs["id"].(string)