Nemcio/SysTray-X
1
0
Fork 0
mirror of https://github.com/Ximi1970/systray-x.git synced 2025-11-06 13:25:49 +01:00
Code Issues Packages Projects Releases Activity

Add debug, fix count on type switch

Browse Source
This commit is contained in:
Ximi1970
2022-07-03 14:16:05 +02:00
parent 1d94158182
commit cc546c33e4
2 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
webext/background.js
View File

@@ -175,8 +175,8 @@ SysTrayX.Messaging = {
}, },
listenerNewMail: function (folder, messages) { listenerNewMail: function (folder, messages) {
// console.debug("New mail in: " + folder.accountId + ", " + folder.path); console.debug("New mail in: " + folder.accountId + ", " + folder.path);
// console.debug("New messages: " + JSON.stringify(messages)); console.debug("New messages: " + JSON.stringify(messages));
if (messages.messages.length > 0) { if (messages.messages.length > 0) {
if (SysTrayX.Messaging.new[folder.accountId] === undefined) { if (SysTrayX.Messaging.new[folder.accountId] === undefined) {
@@ -192,10 +192,10 @@ SysTrayX.Messaging = {
messages.messages messages.messages
); );
// console.debug( // console.debug(
// "Messages: " + // "Messages: " +
// JSON.stringify(SysTrayX.Messaging.new[folder.accountId][folder.path]) // JSON.stringify(SysTrayX.Messaging.new[folder.accountId][folder.path])
// ); // );
} }
if (SysTrayX.Messaging.countType === "1") { if (SysTrayX.Messaging.countType === "1") {
@@ -225,8 +225,8 @@ SysTrayX.Messaging = {
}, },
listenerFolderInfoChanged: async function (folder, folderInfo) { listenerFolderInfoChanged: async function (folder, folderInfo) {
// console.debug("FolderInfoChanged: " + JSON.stringify(folder)); console.debug("FolderInfoChanged: " + JSON.stringify(folder));
// console.debug("FolderInfoChanged: " + JSON.stringify(folderInfo)); console.debug("FolderInfoChanged: " + JSON.stringify(folderInfo));
if (folderInfo.unreadMessageCount !== undefined) { if (folderInfo.unreadMessageCount !== undefined) {
if (SysTrayX.Messaging.unread[folder.accountId] === undefined) { if (SysTrayX.Messaging.unread[folder.accountId] === undefined) {
@@ -309,7 +309,7 @@ SysTrayX.Messaging = {
) )
); );
// console.debug("countUnread: Unread count"); console.debug("countUnread: " + count);
SysTrayX.Link.postSysTrayXMessage({ unreadMail: count }); SysTrayX.Link.postSysTrayXMessage({ unreadMail: count });
}, },
@@ -353,7 +353,7 @@ SysTrayX.Messaging = {
) )
); );
// console.debug("countNew: New count"); console.debug("countNew: " + count);
SysTrayX.Link.postSysTrayXMessage({ unreadMail: count }); SysTrayX.Link.postSysTrayXMessage({ unreadMail: count });
}, },
@@ -379,15 +379,9 @@ SysTrayX.Messaging = {
browser.folderChange.setFilters(SysTrayX.Messaging.filters); browser.folderChange.setFilters(SysTrayX.Messaging.filters);
} else { } else {
if (SysTrayX.Messaging.countType === "0") { if (SysTrayX.Messaging.countType === "0") {
// Update unread count getUnreadMailCount();
const getCountUnreadPromise = () =>
new Promise((res) => res(SysTrayX.Messaging.countUnread()));
await getCountUnreadPromise();
} else { } else {
// Update new count getNewMailCount();
const getCountNewPromise = () =>
new Promise((res) => res(SysTrayX.Messaging.countNew()));
await getCountNewPromise();
} }
} }
} }
@@ -413,6 +407,12 @@ SysTrayX.Messaging = {
if (SysTrayX.Info.browserInfo.majorVersion < 91) { if (SysTrayX.Info.browserInfo.majorVersion < 91) {
browser.folderChange.setCountType(Number(SysTrayX.Messaging.countType)); browser.folderChange.setCountType(Number(SysTrayX.Messaging.countType));
} else {
if (SysTrayX.Messaging.countType === "0") {
getUnreadMailCount();
} else {
getNewMailCount();
}
} }
} }
@@ -433,7 +433,7 @@ SysTrayX.Messaging = {
// Callback for unReadMessages // Callback for unReadMessages
// //
unreadCb: function (count) { unreadCb: function (count) {
// console.debug("unreadCb: Unread/New count"); console.debug("unreadCb: " + count);
SysTrayX.Link.postSysTrayXMessage({ unreadMail: count }); SysTrayX.Link.postSysTrayXMessage({ unreadMail: count });
}, },
@@ -697,6 +697,9 @@ SysTrayX.Link = {
postSysTrayXMessage: function (object) { postSysTrayXMessage: function (object) {
// Send object (will be stringified by postMessage) // Send object (will be stringified by postMessage)
console.debug("postSysTrayXMessage: " + JSON.stringify(object));
SysTrayX.Link.portSysTrayX.postMessage(object); SysTrayX.Link.portSysTrayX.postMessage(object);
}, },

10
webext/js/defaults.js
View File

@@ -378,8 +378,9 @@ const getUnreadMailCount = () => {
}); });
}); });
console.debug("getUnreadMailCount: " + count);
SysTrayX.Link.postSysTrayXMessage({ unreadMail: count }); SysTrayX.Link.postSysTrayXMessage({ unreadMail: count });
} };
// Count the new mail // Count the new mail
const getNewMailCount = () => { const getNewMailCount = () => {
@@ -395,6 +396,9 @@ const getNewMailCount = () => {
}); });
}); });
SysTrayX.Link.postSysTrayXMessage({ unreadMail: count }); console.debug("Filters: " + JSON.stringify(SysTrayX.Messaging.filters));
} console.debug("New: " + JSON.stringify(SysTrayX.Messaging.new));
console.debug("getNewMailCount: " + count);
SysTrayX.Link.postSysTrayXMessage({ unreadMail: count });
};