diff --git a/Podfile.lock b/Podfile.lock index 61597d0..98b425f 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -13,7 +13,7 @@ DEPENDENCIES: - YYModel SPEC REPOS: - https://github.com/cocoapods/specs.git: + trunk: - GCDWebServer - JRSwizzle - MMKV @@ -27,4 +27,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: fb1b1e412c5f88813595570bd6f951a741cda575 -COCOAPODS: 1.7.5 +COCOAPODS: 1.9.1 diff --git a/WeChatTweak.framework/Versions/A/Resources/Base.lproj/TweakPreferencesController.nib b/WeChatTweak.framework/Versions/A/Resources/Base.lproj/TweakPreferencesController.nib index 24255e9..2754c25 100644 Binary files a/WeChatTweak.framework/Versions/A/Resources/Base.lproj/TweakPreferencesController.nib and b/WeChatTweak.framework/Versions/A/Resources/Base.lproj/TweakPreferencesController.nib differ diff --git a/WeChatTweak.framework/Versions/A/Resources/Info.plist b/WeChatTweak.framework/Versions/A/Resources/Info.plist index 440711b..8e8e74a 100644 --- a/WeChatTweak.framework/Versions/A/Resources/Info.plist +++ b/WeChatTweak.framework/Versions/A/Resources/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 18G95 + 19C57 CFBundleDevelopmentRegion en CFBundleExecutable @@ -27,17 +27,17 @@ DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 11A420a + 11E146 DTPlatformVersion GM DTSDKBuild - 19A547 + 19E258 DTSDKName macosx10.15 DTXcode - 1100 + 1140 DTXcodeBuild - 11A420a + 11E146 LSMinimumSystemVersion 10.10 NSHumanReadableCopyright diff --git a/WeChatTweak.framework/Versions/A/Resources/en.lproj/TweakPreferencesController.nib b/WeChatTweak.framework/Versions/A/Resources/en.lproj/TweakPreferencesController.nib index 7b8b8b4..1142864 100644 Binary files a/WeChatTweak.framework/Versions/A/Resources/en.lproj/TweakPreferencesController.nib and b/WeChatTweak.framework/Versions/A/Resources/en.lproj/TweakPreferencesController.nib differ diff --git a/WeChatTweak.framework/Versions/A/Resources/zh-Hans.lproj/TweakPreferencesController.nib b/WeChatTweak.framework/Versions/A/Resources/zh-Hans.lproj/TweakPreferencesController.nib index fefca14..df8eb28 100644 Binary files a/WeChatTweak.framework/Versions/A/Resources/zh-Hans.lproj/TweakPreferencesController.nib and b/WeChatTweak.framework/Versions/A/Resources/zh-Hans.lproj/TweakPreferencesController.nib differ diff --git a/WeChatTweak.framework/Versions/A/Resources/zh-Hant.lproj/TweakPreferencesController.nib b/WeChatTweak.framework/Versions/A/Resources/zh-Hant.lproj/TweakPreferencesController.nib index 7d7a72f..daa9494 100644 Binary files a/WeChatTweak.framework/Versions/A/Resources/zh-Hant.lproj/TweakPreferencesController.nib and b/WeChatTweak.framework/Versions/A/Resources/zh-Hant.lproj/TweakPreferencesController.nib differ diff --git a/WeChatTweak.framework/Versions/A/WeChatTweak b/WeChatTweak.framework/Versions/A/WeChatTweak index ec2453f..6b2cc79 100755 Binary files a/WeChatTweak.framework/Versions/A/WeChatTweak and b/WeChatTweak.framework/Versions/A/WeChatTweak differ diff --git a/WeChatTweak/WeChatTweak.m b/WeChatTweak/WeChatTweak.m index 8c7e6fa..8a72783 100755 --- a/WeChatTweak/WeChatTweak.m +++ b/WeChatTweak/WeChatTweak.m @@ -16,6 +16,8 @@ #import "WTConfigManager.h" #import "RecallCacheManager.h" +static NSString * const WeChatTweakOpenNewWeChatKey = @"WeChatTweakOpenNewWeChatKey"; + // Global Function static NSString *(*original_NSHomeDirectory)(void); static NSArray *(*original_NSSearchPathForDirectoriesInDomains)(NSSearchPathDirectory directory, NSSearchPathDomainMask domainMask, BOOL expandTilde); @@ -420,7 +422,8 @@ static void __attribute__((constructor)) tweak(void) { } + (NSArray *)tweak_runningApplicationsWithBundleIdentifier:(NSString *)bundleIdentifier { - if ([bundleIdentifier isEqualToString:NSBundle.mainBundle.bundleIdentifier]) { + BOOL openNewWeChat = [NSUserDefaults.standardUserDefaults boolForKey:WeChatTweakOpenNewWeChatKey]; + if (openNewWeChat && [bundleIdentifier isEqualToString:NSBundle.mainBundle.bundleIdentifier] ) { return @[NSRunningApplication.currentApplication]; } else { return [self tweak_runningApplicationsWithBundleIdentifier:bundleIdentifier]; @@ -437,11 +440,16 @@ static void __attribute__((constructor)) tweak(void) { } - (void)openNewWeChatInstace:(id)sender { + [NSUserDefaults.standardUserDefaults setBool:YES forKey:WeChatTweakOpenNewWeChatKey]; + [NSUserDefaults.standardUserDefaults synchronize]; NSString *applicationPath = NSBundle.mainBundle.bundlePath; NSTask *task = [[NSTask alloc] init]; task.launchPath = @"/usr/bin/open"; task.arguments = @[@"-n", applicationPath]; [task launch]; + [task waitUntilExit]; + [NSUserDefaults.standardUserDefaults removeObjectForKey:WeChatTweakOpenNewWeChatKey]; + [NSUserDefaults.standardUserDefaults synchronize]; } #pragma mark - Auto Auth