From e6dfb5bd160a40d58cf454e6c7898cde1c17f706 Mon Sep 17 00:00:00 2001
From: varjolintu <sami.vanttinen@ahmala.org>
Date: Mon, 21 Aug 2023 08:44:19 +0300
Subject: [PATCH] Cleanup

---
 keepassxc-browser/background/client.js  | 15 +++++++--------
 keepassxc-browser/background/keepass.js |  9 ---------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/keepassxc-browser/background/client.js b/keepassxc-browser/background/client.js
index 5ed963e..624a994 100644
--- a/keepassxc-browser/background/client.js
+++ b/keepassxc-browser/background/client.js
@@ -56,7 +56,7 @@ const messageBuffer = {
     },
 
     removeMessageFromIndex(index) {
-        if (this.buffer.length >= index + 1) {
+        if (index >= 0 && index < this.buffer.length) {
             this.buffer.splice(index, 1);
         }
     }
@@ -95,17 +95,16 @@ class Message {
 //--------------------------------------------------------------------------
 
 keepassClient.sendNativeMessage = async function(request, enableTimeout = false, timeoutValue) {
+    if (!keepassClient.nativePort) {
+        return;
+    }
+
     const message = new Message(request, enableTimeout, timeoutValue);
     await navigator.locks.request('messageBuffer', async (lock) => {
         messageBuffer.addMessage({ request: request, message: message });
     });
 
-    // Send the request
-    if (keepassClient.nativePort) {
-        keepassClient.nativePort.postMessage(request);
-    }
-
-    // Wait for response
+    keepassClient.nativePort.postMessage(request);
     return await message.promise;
 };
 
@@ -115,7 +114,7 @@ keepassClient.handleNativeMessage = async function(response) {
     // Parse through the message buffer to find the corresponding Promise.
     await navigator.locks.request('messageBuffer', async (lock) => {
         for (let i = 0; i < messageBuffer.buffer.length; ++i) {
-            if (! messageBuffer.buffer[i]) {
+            if (!messageBuffer.buffer[i]) {
                 continue;
             }
 
diff --git a/keepassxc-browser/background/keepass.js b/keepassxc-browser/background/keepass.js
index ab65fac..3a749f0 100755
--- a/keepassxc-browser/background/keepass.js
+++ b/keepassxc-browser/background/keepass.js
@@ -15,7 +15,6 @@ keepass.latestVersionUrl = 'https://api.github.com/repos/keepassxreboot/keepassx
 keepass.cacheTimeout = 30 * 1000; // Milliseconds
 keepass.databaseHash = '';
 keepass.previousDatabaseHash = '';
-keepass.passwordRequestSent = false;
 keepass.reconnectLoop = null;
 
 const kpActions = {
@@ -169,13 +168,7 @@ keepass.retrieveCredentials = async function(tab, args = []) {
 
 keepass.generatePassword = async function(tab) {
     if (!keepass.isConnected) {
-        return '';
-    }
-
-    if (keepass.passwordRequestSent) {
         return undefined;
-    } else {
-        keepass.passwordRequestSent = true;
     }
 
     try {
@@ -208,11 +201,9 @@ keepass.generatePassword = async function(tab) {
             logError('generatePassword rejected');
         }
 
-        keepass.passwordRequestSent = false;
         return password;
     } catch (err) {
         logError(`generatePassword failed: ${err}`);
-        keepass.passwordRequestSent = false;
         return undefined;
     }
 };