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

Merge branch 'develop'

Browse source
This commit is contained in:
varjolintu 2017-11-04 10:27:36 +02:00
commit 7d84584d2b
4 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG
View file

@ -1,6 +1,10 @@
0.3.9 (04-11-2017)
=========================
- Removed incorrect timeout waiting on init
0.3.8 (01-11-2017) 0.3.8 (01-11-2017)
========================= =========================
- Use browser.local.storage instead of localStorage - Use browser.storage.local instead of localStorage
- Switched some functions to promise - Switched some functions to promise
0.3.7 (22-10-2017) 0.3.7 (22-10-2017)

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

@ -130,6 +130,11 @@ kpxcEvent.onSaveSettings = function(callback, tab, settings) {
kpxcEvent.onGetStatus = function(callback, tab) { kpxcEvent.onGetStatus = function(callback, tab) {
keepass.testAssociation((response) => { keepass.testAssociation((response) => {
if (!response) {
kpxcEvent.showStatus(false, tab, callback);
return;
}
keepass.isConfigured().then((configured) => { keepass.isConfigured().then((configured) => {
kpxcEvent.showStatus(configured, tab, callback); kpxcEvent.showStatus(configured, tab, callback);
}); });

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

@ -3,7 +3,7 @@ keepass.migrateKeyRing().then(() => {
page.initOpenedTabs().then(() => { page.initOpenedTabs().then(() => {
keepass.connectToNative(); keepass.connectToNative();
keepass.generateNewKeyPair(); keepass.generateNewKeyPair();
keepass.changePublicKeys(null, keepass.messageTimeout).then((pkRes) => { keepass.changePublicKeys(null).then((pkRes) => {
keepass.getDatabaseHash((gdRes) => {}, null); keepass.getDatabaseHash((gdRes) => {}, null);
}); });
}); });

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

@ -54,6 +54,7 @@ page.initOpenedTabs = function() {
// set initial tab-ID // set initial tab-ID
browser.tabs.query({ "active": true, "currentWindow": true }).then((tabs) => { browser.tabs.query({ "active": true, "currentWindow": true }).then((tabs) => {
if (tabs.length === 0) { if (tabs.length === 0) {
resolve();
return; // For example: only the background devtools or a popup are opened return; // For example: only the background devtools or a popup are opened
} }
page.currentTabId = tabs[0].id; page.currentTabId = tabs[0].id;