fix: validate Bing service always fails (#422)

* fix: validate Bing service always fail * perf: use from instead of self.queryModel.queryFromLanguage * perf: enable new SwiftUI Settings by default
tisfeng · Feb 25, 2024 · 401bba0 · 401bba0
1 parent de0be3f
commit 401bba0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/Easydict/Feature/Service/Bing/EZBingService.m b/Easydict/Feature/Service/Bing/EZBingService.m
@@ -104,10 +104,6 @@ - (BOOL)isEnglishWordToChinese:(NSString *)text from:(nonnull EZLanguage)from to
 }
 
 - (void)bingTranslate:(NSString *)text useDictQuery:(BOOL)useDictQuery from:(nonnull EZLanguage)from to:(nonnull EZLanguage)to completion:(nonnull void (^)(EZQueryResult *, NSError *_Nullable))completion {
-    if ([self prehandleQueryTextLanguage:text from:from to:to completion:completion]) {
-        return;
-    }
-
     self.isDictQueryResult = NO;
     if (useDictQuery) {
         [self.request translateTextFromDict:text completion:^(NSDictionary * _Nullable json, NSError * _Nullable error) {

diff --git a/Easydict/Feature/Service/Model/EZQueryService.m b/Easydict/Feature/Service/Model/EZQueryService.m
@@ -178,8 +178,8 @@ - (BOOL)prehandleQueryTextLanguage:(NSString *)text
         }
     }
 
-    NSString *fromLanguage = [self languageCodeForLanguage:self.queryModel.queryFromLanguage];
-    NSString *toLanguage = [self languageCodeForLanguage:self.queryModel.queryTargetLanguage];
+    NSString *fromLanguage = [self languageCodeForLanguage:from];
+    NSString *toLanguage = [self languageCodeForLanguage:to];
 
     BOOL unsupportedLanguage = NO;
 

diff --git a/Easydict/NewApp/Configuration/Configuration+Defaults.swift b/Easydict/NewApp/Configuration/Configuration+Defaults.swift
@@ -55,7 +55,7 @@ extension Defaults.Keys {
     static let clearInput = Key<Bool>("EZConfiguration_kClearInputKey", default: true)
     static let keepPrevResultWhenEmpty = Key<Bool>("EZConfiguration_kKeepPrevResultKey", default: true)
     static let selectQueryTextWhenWindowActivate = Key<Bool>("EZConfiguration_kSelectQueryTextWhenWindowActivate", default: false)
-    static let enableBetaNewApp = Key<Bool>("EZConfiguration_kEnableBetaNewAppKey", default: false)
+    static let enableBetaNewApp = Key<Bool>("EZConfiguration_kEnableBetaNewAppKey", default: true)
 
     static let enableBetaFeature = Key<Bool>("EZBetaFeatureKey", default: false)