diff --git a/safari/Universal/Kagi Search.xcodeproj/project.pbxproj b/safari/Universal/Kagi Search.xcodeproj/project.pbxproj index 031b4b2..7764764 100644 --- a/safari/Universal/Kagi Search.xcodeproj/project.pbxproj +++ b/safari/Universal/Kagi Search.xcodeproj/project.pbxproj @@ -79,6 +79,7 @@ FE0812512C14D39200D0899F /* kagi-content-script.js in Resources */ = {isa = PBXBuildFile; fileRef = FE08124F2C14D39200D0899F /* kagi-content-script.js */; }; FE7FB18C2C053F2F00198663 /* content-script.js in Resources */ = {isa = PBXBuildFile; fileRef = FE7FB18B2C053F2F00198663 /* content-script.js */; }; FE7FB18D2C053F2F00198663 /* content-script.js in Resources */ = {isa = PBXBuildFile; fileRef = FE7FB18B2C053F2F00198663 /* content-script.js */; }; + FE9E48DF2DF01B2400473AB5 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FE9E48DE2DF01B2400473AB5 /* WebKit.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -198,6 +199,7 @@ FE08124C2C14D36000D0899F /* rule-builder.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = "rule-builder.js"; sourceTree = ""; }; FE08124F2C14D39200D0899F /* kagi-content-script.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = "kagi-content-script.js"; sourceTree = ""; }; FE7FB18B2C053F2F00198663 /* content-script.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = "content-script.js"; sourceTree = ""; }; + FE9E48DE2DF01B2400473AB5 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS18.5.sdk/System/Library/Frameworks/WebKit.framework; sourceTree = DEVELOPER_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -219,6 +221,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + FE9E48DF2DF01B2400473AB5 /* WebKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -249,6 +252,7 @@ 3E1A51352B1734B70010A4C4 /* Frameworks */ = { isa = PBXGroup; children = ( + FE9E48DE2DF01B2400473AB5 /* WebKit.framework */, ); name = Frameworks; sourceTree = ""; diff --git a/safari/Universal/MainConfig.xcconfig b/safari/Universal/MainConfig.xcconfig index b778914..b302a20 100644 --- a/safari/Universal/MainConfig.xcconfig +++ b/safari/Universal/MainConfig.xcconfig @@ -1,3 +1,3 @@ -MARKETING_VERSION = 2.2.7 -CURRENT_PROJECT_VERSION = 38 // this needs to be increased with each version change as well (not set to 1 when version is updated) +MARKETING_VERSION = 2.2.8 +CURRENT_PROJECT_VERSION = 39 // this needs to be increased with each version change as well (not set to 1 when version is updated) PRODUCT_NAME = Kagi for Safari diff --git a/safari/Universal/Shared (Extension)/Resources/popup.js b/safari/Universal/Shared (Extension)/Resources/popup.js index 11d15f0..dbb661b 100644 --- a/safari/Universal/Shared (Extension)/Resources/popup.js +++ b/safari/Universal/Shared (Extension)/Resources/popup.js @@ -154,7 +154,7 @@ function fetchAndUpdateKnownHostList() { } // Redirect engine list UI updates - if (knownHosts.indexOf("*://*/*") > -1) { + if (knownHosts.indexOf("*://*/*") > -1 || knownHosts.indexOf("") > -1) { // TODO: Do we need custom logic for the "All websites allowed" permission? } else { if (enginesToDisplayInRedirectList.length > 0) { @@ -190,7 +190,7 @@ function updateKnownHostList(knownHosts) { var hostsHtml = ""; // Check if permissions have been granted for all urls instead of specific ones - let hasAllUrlsPermissions = (knownHosts.indexOf("*://*/*") > -1) + let hasAllUrlsPermissions = (knownHosts.indexOf("*://*/*") > -1 || knownHosts.indexOf("") > -1) if (hasAllUrlsPermissions) { hostsHtml += `
All Search Engines ${symbolTrashBase64ImgTag} (tap again to remove permissions)
  • `; @@ -319,12 +319,7 @@ document.addEventListener("DOMContentLoaded", (event) => { // ----------------------- document.getElementById("setup-permissions-button").onclick = async function(evt) { console.log("Checking kagi.com permissions"); - checkSetupPermissions() - .then((alreadyGranted) => { - if (!alreadyGranted) { - return browser.permissions.request(setupPermissions); - } - }) + browser.permissions.request(setupPermissions) .then((granted) => { updateSetupPermissionsUI(granted); if (!granted) { diff --git a/safari/Universal/iOS (Extension)/manifest.json b/safari/Universal/iOS (Extension)/manifest.json index b0b3064..fce8b0c 100644 --- a/safari/Universal/iOS (Extension)/manifest.json +++ b/safari/Universal/iOS (Extension)/manifest.json @@ -4,7 +4,7 @@ "name": "__MSG_extension_name__", "description": "__MSG_extension_description__", - "version": "2.2.7", + "version": "2.2.8", "icons": { "512": "images/Icon.png"