Skip to content

[Safari] Broken individual search engine selection in iOS 18.5 #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dinodev90 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[Safari] Broken individual search engine selection in iOS 18.5 #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d730ff
Fix host permission check
dinodev90 Jun 4, 2025
9efd574
[Safari] Fix runtime crash with Xcode 16.4 by adding WebKit framework…
dinodev90 Jun 4, 2025
d570a52
[Safari] version bump
dinodev90 Jun 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions safari/Universal/Kagi Search.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -198,6 +199,7 @@
FE08124C2C14D36000D0899F /* rule-builder.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = "rule-builder.js"; sourceTree = "<group>"; };
FE08124F2C14D39200D0899F /* kagi-content-script.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = "kagi-content-script.js"; sourceTree = "<group>"; };
FE7FB18B2C053F2F00198663 /* content-script.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = "content-script.js"; sourceTree = "<group>"; };
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 */
Expand All @@ -219,6 +221,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
FE9E48DF2DF01B2400473AB5 /* WebKit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -249,6 +252,7 @@
3E1A51352B1734B70010A4C4 /* Frameworks */ = {
isa = PBXGroup;
children = (
FE9E48DE2DF01B2400473AB5 /* WebKit.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down
4 changes: 2 additions & 2 deletions safari/Universal/MainConfig.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
11 changes: 3 additions & 8 deletions safari/Universal/Shared (Extension)/Resources/popup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ function fetchAndUpdateKnownHostList() {
}

// Redirect engine list UI updates
if (knownHosts.indexOf("*://*/*") > -1) {
if (knownHosts.indexOf("*://*/*") > -1 || knownHosts.indexOf("<all_urls>") > -1) {
// TODO: Do we need custom logic for the "All websites allowed" permission?
} else {
if (enginesToDisplayInRedirectList.length > 0) {
Expand Down Expand Up @@ -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("<all_urls>") > -1)

if (hasAllUrlsPermissions) {
hostsHtml += `<details class="allUrls"><summary>All Search Engines <a href="#" class="revokePermissions" data-engine="All">${symbolTrashBase64ImgTag}<span class="confirmationText"> (tap again to remove permissions)</span></a></summary><ul class="noListStyle"><li>`;
Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion safari/Universal/iOS (Extension)/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down