Merge branch 'dev' into fix-updater

tisfeng · Jan 26, 2024 · 99009f9 · 99009f9
2 parents a06a42c + b6974d1
commit 99009f9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/...ferenceWindow/DisableAutoSelectTextViewController/EZDisableAutoSelectTextViewController.m b/...ferenceWindow/DisableAutoSelectTextViewController/EZDisableAutoSelectTextViewController.m
@@ -57,7 +57,7 @@ - (void)viewDidLoad {
 }
 
 - (void)setup {
-    self.appModelList = [[EZLocalStorage.shared selectTextTypeAppModelList] mutableCopy];
+    [self setupAppModelList];
 
     [self.titleTextField mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.left.right.inset(kMargin + 5); // ???: Why is the actual inset is 18?
@@ -78,6 +78,18 @@ - (void)setup {
     }];
 }
 
+- (void)setupAppModelList {
+    self.appModelList = [[NSMutableArray alloc] init];
+    NSArray<EZAppModel *> *allAppModelList = [EZLocalStorage.shared selectTextTypeAppModelList];
+    NSWorkspace* workspace = [NSWorkspace sharedWorkspace];
+    for (EZAppModel *appModel in allAppModelList) {
+        NSURL *appURL = [workspace URLForApplicationWithBundleIdentifier:appModel.appBundleID];
+        if (appURL) {
+            [self.appModelList addObject:appModel];
+        }
+    }
+}
+
 
 #pragma mark - Getter && Setter
 

diff --git a/Easydict/NewApp/View/SettingView/Tabs/DisabledAppTab.swift b/Easydict/NewApp/View/SettingView/Tabs/DisabledAppTab.swift
@@ -25,7 +25,12 @@ private class DisabledAppViewModel: ObservableObject {
     }
 
     func fetchDisabledApps() {
-        appModelList = EZLocalStorage.shared().selectTextTypeAppModelList
+        let allAppModelList = EZLocalStorage.shared().selectTextTypeAppModelList
+
+        appModelList = allAppModelList.compactMap { appModel in
+            let url = NSWorkspace.shared.urlForApplication(withBundleIdentifier: appModel.appBundleID)
+            return url == nil ? nil : appModel
+        }
     }
 
     func saveDisabledApps() {