prehistoric-systems/keepassxc-browser
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc-browser.git synced 2026-03-11 08:54:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

- added constant for default connection timeout value

Browse source 
- decide if settings value should be used based on parameter count
This commit is contained in:
Talkabout 2025-11-16 14:10:14 +01:00
parent a7ef451f4c
commit 511b9ed32e
No known key found for this signature in database
GPG key ID: 7AC97430FFA95559
4 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
keepassxc-browser/background/keepass.js
View file

@ -804,7 +804,12 @@ keepass.disableAutomaticReconnect = function() {
keepass.reconnectLoop = null;
};
keepass.reconnect = async function(tab = null, connectionTimeout = page.settings.connectionTimeout) {
keepass.reconnect = async function(tab = null, connectionTimeout = CONNECTION_TIMEOUT) {
if (arguments.length < 2) {
connectionTimeout = page.settings.connectionTimeout;
}
connectionTimeout = Math.min(60000, Math.max(CONNECTION_TIMEOUT, connectionTimeout))
keepassClient.connectToNative();
keepass.generateNewKeyPair();
const keyChangeResult = await keepass.changePublicKeys(tab, !!connectionTimeout, connectionTimeout).catch(() => false);

2
keepassxc-browser/background/page.js
View file

@ -14,7 +14,7 @@ const defaultSettings = {
bannerPosition: BannerPosition.TOP,
checkUpdateKeePassXC: CHECK_UPDATE_NEVER,
clearCredentialsTimeout: 10,
connectionTimeout: 1500,
connectionTimeout: CONNECTION_TIMEOUT,
colorTheme: 'system',
credentialSorting: SORT_BY_GROUP_AND_TITLE,
debugLogging: false,

3
keepassxc-browser/common/global.js
View file

@ -24,6 +24,9 @@ const CHECK_UPDATE_THREE_DAYS = 3;
const CHECK_UPDATE_ONE_WEEK = 7;
const CHECK_UPDATE_ONE_MONTH = 30;
// Default value for connection timeout
const CONNECTION_TIMEOUT = 1500;
const URL_WILDCARD = '1kpxcwc1';
const schemeSegment = '(\\*|http|https|ws|wss|ftp)';
const hostSegment = '(\\*|(?:\\*\\.)?(?:[^/*]+))?';

6
keepassxc-browser/options/options.js
View file

@ -181,11 +181,7 @@ options.initGeneralSettings = async function() {
});
$('#tab-general-settings input#connectionTimeout').addEventListener('change', async function(e) {
if (e.target.valueAsNumber < 1.5 || e.target.valueAsNumber > 60) {
return;
}
options.settings['connectionTimeout'] = e.target.valueAsNumber * 1000;
options.settings['connectionTimeout'] = Math.min(60000, Math.max(CONNECTION_TIMEOUT, e.target.valueAsNumber * 1000))
await options.saveSettings();
});