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

Removed some unnecessary polling

Browse source
This commit is contained in:
varjolintu 2017-11-10 14:48:10 +02:00
parent 74031b6bec
commit d0244adefa
3 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
keepassxc-browser/background/event.js
View file

@ -128,17 +128,24 @@ kpxcEvent.onSaveSettings = function(callback, tab, settings) {
});
};
kpxcEvent.onGetStatus = function(callback, tab) {
keepass.testAssociation((response) => {
if (!response) {
kpxcEvent.showStatus(false, tab, callback);
return;
}
kpxcEvent.onGetStatus = function(callback, tab, internalPoll = false) {
// When internalPoll is true the event is triggered from content script in intervals -> don't poll KeePassXC
if (!internalPoll) {
keepass.testAssociation((response) => {
if (!response) {
kpxcEvent.showStatus(false, tab, callback);
return;
}
keepass.isConfigured().then((configured) => {
kpxcEvent.showStatus(configured, tab, callback);
});
}, tab, true);
} else {
keepass.isConfigured().then((configured) => {
kpxcEvent.showStatus(configured, tab, callback);
});
}, tab, true);
}
};
kpxcEvent.onReconnect = function(callback, tab) {

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

@ -631,7 +631,7 @@ keepass.generateNewKeyPair = function() {
keepass.isConfigured = function() {
return new Promise((resolve, reject) => {
if (typeof(keepass.databaseHash) === 'undefined' || keepass.databaseHash === 'no-hash') {
if (typeof(keepass.databaseHash) === 'undefined') {
keepass.getDatabaseHash((hash) => {
resolve(hash in keepass.keyRing);
});

26
keepassxc-browser/keepassxc-browser.js
View file

@ -396,7 +396,6 @@ cipPassword.callbackPasswordCopied = function(bool) {
cipPassword.callbackGeneratedPassword = function(entries) {
if (entries && entries.length >= 1) {
console.log(entries[0]);
jQuery('#cip-genpw-btn-clipboard:first').removeClass('btn-success');
jQuery('input#cip-genpw-textfield-password:first').val(entries[0].password);
if (isNaN(entries[0].login)) {
@ -408,7 +407,7 @@ cipPassword.callbackGeneratedPassword = function(entries) {
}
else {
if (jQuery('div#cip-genpw-error:first').length === 0) {
jQuery('button#cip-genpw-btn-generate:first').after('<div style=\'block\' id=\'cip-genpw-error\'>Cannot receive generated password.<br />Is your version of KeePassXC up-to-date?<br /><br /><a href=\'https://keepassxc.org\'>Please visit the KeePassXC homepage</a></div>');
jQuery('button#cip-genpw-btn-generate:first').after('<div style=\'block\' id=\'cip-genpw-error\'>Cannot receive generated password.<br />Is KeePassXC opened?<br /></div>');
jQuery('input#cip-genpw-textfield-password:first').parent().hide();
jQuery('input#cip-genpw-checkbox-next-field:first').parent('label').hide();
jQuery('button#cip-genpw-btn-generate').hide();
@ -1117,21 +1116,15 @@ cip.init = function() {
};
cip.detectNewActiveFields = function() {
const hiddenFields = cipFields.getHiddenFieldCount();
// If hidden fields aren't detected, setInterval is being looped in each frame of the page
//if (hiddenFields > 0) {
const divDetect = setInterval(function() {
const fields = cipFields.getAllFields();
if (fields.length > 1) {
cip.initCredentialFields(true);
clearInterval(divDetect);
}
}, 1000);
//}
const divDetect = setInterval(function() {
const fields = cipFields.getAllFields();
if (fields.length > 1) {
cip.initCredentialFields(true);
clearInterval(divDetect);
}
}, 1000);
};
// Try to do this in a way that database value if checked without polling the KeePassXC.. too many messages jumping around
// Switch credentials if database is changed or closed
cip.detectDatabaseChange = function() {
let dbDetectInterval = setInterval(function() {
@ -1148,7 +1141,8 @@ cip.detectDatabaseChange = function() {
// Switch back to default popup
browser.runtime.sendMessage({
action: 'get_status'
action: 'get_status',
args: [ true ] // Set polling to true, this is an internal function call
});
} else {
if (response.new !== 'no-hash' && response.new !== response.old) {