Skip to content

Fix AppListView SIGABRT and AppListModel memory leak #99

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

Closed
mszhangopopop wants to merge 2 commits into from
Closed

Fix AppListView SIGABRT and AppListModel memory leak #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e86bed
Move sheet presentation to SelectorSheetModifier
mszhangopopop Apr 18, 2026
03b8705
CFNotificationCenter observer memory leak
mszhangopopop Apr 18, 2026
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
9 changes: 4 additions & 5 deletions TrollFools/AppListModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,10 @@ final class AppListModel: ObservableObject {
.store(in: &cancellables)

let darwinCenter = CFNotificationCenterGetDarwinNotifyCenter()
CFNotificationCenterAddObserver(darwinCenter, Unmanaged.passRetained(self).toOpaque(), { _, observer, _, _, _ in
guard let observer = Unmanaged<AppListModel>.fromOpaque(observer!).takeUnretainedValue() as AppListModel? else {
return
}
observer.applicationChanged.send()
CFNotificationCenterAddObserver(darwinCenter, Unmanaged.passUnretained(self).toOpaque(), { _, observer, _, _, _ in
guard let observerPtr = observer else { return }
let observerObj = Unmanaged<AppListModel>.fromOpaque(observerPtr).takeUnretainedValue()
observerObj.applicationChanged.send()
}, "com.apple.LaunchServices.ApplicationsChanged" as CFString, nil, .coalesce)
}

Expand Down
32 changes: 27 additions & 5 deletions TrollFools/AppListView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,10 @@ struct AppListView: View {
var content: some View {
styledNavigationView
.animation(.easeOut, value: appList.activeScopeApps.keys)
.sheet(item: $selectorOpenedURL) { urlWrapper in
AppListView()
.environmentObject(AppListModel(selectorURL: urlWrapper.url))
}
.modifier(SelectorSheetModifier(isSelectorMode: appList.isSelectorMode, selectorOpenedURL: $selectorOpenedURL))
.onOpenURL { url in
guard !appList.isSelectorMode else { return }

let ext = url.pathExtension.lowercased()
guard url.isFileURL,
ext == "dylib" || ext == "deb" || ext == "zip"
Expand All @@ -120,7 +119,14 @@ struct AppListView: View {
}
}

selectorOpenedURL = urlIdent
if selectorOpenedURL != nil {
selectorOpenedURL = nil
DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
selectorOpenedURL = urlIdent
}
} else {
selectorOpenedURL = urlIdent
}
}
.onAppear {
if Double.random(in: 0 ..< 1) < 0.1 {
Expand Down Expand Up @@ -508,6 +514,22 @@ struct AppListView: View {
}
}

struct SelectorSheetModifier: ViewModifier {
let isSelectorMode: Bool
@Binding var selectorOpenedURL: URLIdentifiable?

func body(content: Content) -> some View {
if isSelectorMode {
content
} else {
content.sheet(item: $selectorOpenedURL) { urlWrapper in
AppListView()
.environmentObject(AppListModel(selectorURL: urlWrapper.url))
}
}
}
}

struct URLIdentifiable: Identifiable {
let url: URL
var id: String { url.absoluteString }
Expand Down
Loading