Merge pull request #329 from alpheios-project/comp-i662-lexical-dicts

Fix attach multiple times bug

Author: irina060981

src/background/background-process.js

@@ -575,19 +575,6 @@ export default class BackgroundProcess {
     this.setBadgeState()
   }
 
-  definedWindowIdByTabNum (tabId) {
-    let savedTab
-
-    for (let i = 0; i < this.tabs.size; i++) {
-      const tabsIter = this.tabs.values()
-      const tabInstance = tabsIter.next().value
-      if (tabInstance.tabObj && tabInstance.tabObj.tabId === tabId) {
-        savedTab = tabInstance
-      }
-    }
-    return savedTab ? savedTab.tabObj.windowId : 1
-  }
-
   /**
    * Called when a page is loaded.
    * Use this to listen on webNavigation.onCompleted rather than tabs.onUpdated
@@ -598,8 +585,9 @@ export default class BackgroundProcess {
    * @param details
    * @return {Promise.<void>}
    */
-  async navigationCompletedListener (tabId) {
-    const finalWindowId = this.definedWindowIdByTabNum(tabId)
+  async navigationCompletedListener (tabId, changeInfo, tab) {
+    if (changeInfo.status !== 'complete') { return }
+    const finalWindowId = tab.windowId
     const tmpTabUniqueId = Tab.createUniqueId(tabId, finalWindowId)
 
     if (this.tabs.has(tmpTabUniqueId)) {

src/safari-app-extension/AlpheiosReadingTools/Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>3.4.1</string>
 	<key>CFBundleVersion</key>
-	<string>incr-3.4.x.20211117323</string>
+	<string>comp-i662-lexical-dicts.20211118643</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.education</string>
 	<key>LSMinimumSystemVersion</key>

src/safari-app-extension/AlpheiosSafari/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>3.4.1</string>
 	<key>CFBundleVersion</key>
-	<string>incr-3.4.x.20211117323</string>
+	<string>comp-i662-lexical-dicts.20211118643</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSExtension</key>