lint/TFDidThatSay
1
0
Fork 1
mirror of https://github.com/lint/TFDidThatSay synced 2025-07-04 16:36:46 +00:00
Code Issues Releases Wiki Activity

Better fix for Reddit NSNull crash

Browse Source
This commit is contained in:
lint
2019-12-28 15:12:35 -05:00
parent 3626668b8b
commit 2276c36ce0
1 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
tweak/Reddit.xm
View File

@ -7,6 +7,21 @@ static CGFloat pushshiftRequestTimeoutValue;
static NSArray *redditVersion; static NSArray *redditVersion;
int getRedditVersionPart(int index){
if (![redditVersion[index] isEqual:[NSNull null]]){
return [redditVersion[index] intValue];
} else {
NSArray *newVersionArray = [[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"] componentsSeparatedByString:@"."];
if (![newVersionArray[index] isEqual:[NSNull null]]){
return [newVersionArray[index] intValue];
} else {
return [@[@4, @48, @1][index] intValue];
}
}
}
%group Reddit_v4_current %group Reddit_v4_current
%hook CommentTreeNode %hook CommentTreeNode
@ -112,7 +127,7 @@ static NSArray *redditVersion;
id isNightMode; id isNightMode;
id textColor; id textColor;
if ([redditVersion[1] intValue] >= 45){ if (getRedditVersionPart(1) >= 45){
themeManager = [[%c(ThemeManager) alloc] initWithAppSettings:[%c(AppSettings) sharedSettings]]; themeManager = [[%c(ThemeManager) alloc] initWithAppSettings:[%c(AppSettings) sharedSettings]];
isNightMode = [[[%c(AccountManager) sharedManager] defaults] objectForKey:@"kUseNightKey"]; isNightMode = [[[%c(AccountManager) sharedManager] defaults] objectForKey:@"kUseNightKey"];
@ -124,7 +139,7 @@ static NSArray *redditVersion;
[themeManager release]; [themeManager release];
} else if ([redditVersion[1] intValue] >= 37){ } else if (getRedditVersionPart(1) >= 37){
themeManager = [[%c(ThemeManager) alloc] initWithTraitCollection:nil appSettings:[%c(AppSettings) sharedSettings]]; themeManager = [[%c(ThemeManager) alloc] initWithTraitCollection:nil appSettings:[%c(AppSettings) sharedSettings]];
isNightMode = [[[%c(AccountManager) sharedManager] defaults] objectForKey:@"kUseNightKey"]; isNightMode = [[[%c(AccountManager) sharedManager] defaults] objectForKey:@"kUseNightKey"];
@ -258,7 +273,7 @@ static NSArray *redditVersion;
id isNightMode; id isNightMode;
id textColor; id textColor;
if ([redditVersion[1] intValue] >= 45){ if (getRedditVersionPart(1) >= 45){
themeManager = [[%c(ThemeManager) alloc] initWithAppSettings:[%c(AppSettings) sharedSettings]]; themeManager = [[%c(ThemeManager) alloc] initWithAppSettings:[%c(AppSettings) sharedSettings]];
isNightMode = [[[%c(AccountManager) sharedManager] defaults] objectForKey:@"kUseNightKey"]; isNightMode = [[[%c(AccountManager) sharedManager] defaults] objectForKey:@"kUseNightKey"];
@ -270,7 +285,7 @@ static NSArray *redditVersion;
[themeManager release]; [themeManager release];
} else if ([redditVersion[1] intValue] >= 37){ } else if (getRedditVersionPart(1) >= 37){
themeManager = [[%c(ThemeManager) alloc] initWithTraitCollection:nil appSettings:[%c(AppSettings) sharedSettings]]; themeManager = [[%c(ThemeManager) alloc] initWithTraitCollection:nil appSettings:[%c(AppSettings) sharedSettings]];
isNightMode = [[[%c(AccountManager) sharedManager] defaults] objectForKey:@"kUseNightKey"]; isNightMode = [[[%c(AccountManager) sharedManager] defaults] objectForKey:@"kUseNightKey"];
@ -307,9 +322,9 @@ static NSArray *redditVersion;
[post setSelfPostRichTextAttributed:bodyMutableAttributedText]; [post setSelfPostRichTextAttributed:bodyMutableAttributedText];
[post setPreviewFeedPostTextString:bodyMutableAttributedText]; [post setPreviewFeedPostTextString:bodyMutableAttributedText];
if ([redditVersion[1] intValue] >= 44){ if (getRedditVersionPart(1) >= 44){
[[[[[self postActionSheetDelegate] controller] feedPostDetailCellNode] contentNode] configureSelfTextNode]; [[[[[self postActionSheetDelegate] controller] feedPostDetailCellNode] contentNode] configureSelfTextNode];
} else if ([redditVersion[1] intValue] >= 38) { } else if (getRedditVersionPart(1) >= 38) {
[[[[self postActionSheetDelegate] controller] feedPostDetailCellNode] configureSelfTextNode]; [[[[self postActionSheetDelegate] controller] feedPostDetailCellNode] configureSelfTextNode];
} else { } else {
[[[[self postActionSheetDelegate] controller] feedPostDetailCellNode] configureSelfTextNode]; [[[[self postActionSheetDelegate] controller] feedPostDetailCellNode] configureSelfTextNode];
@ -340,7 +355,7 @@ static NSArray *redditVersion;
%new %new
-(void) updatePostText{ -(void) updatePostText{
if ([redditVersion[1] intValue] >= 2){ if (getRedditVersionPart(1) >= 2){
[self reloadPostSection:YES]; [self reloadPostSection:YES];
} else { } else {
[self feedPostViewDidUpdatePost:[self postData] shouldReloadFeed:NO]; [self feedPostViewDidUpdatePost:[self postData] shouldReloadFeed:NO];
@ -366,7 +381,7 @@ static NSArray *redditVersion;
id undeleteItem; id undeleteItem;
if ([redditVersion[1] intValue] >= 18) { if (getRedditVersionPart(1) >= 18) {
undeleteItem = [[%c(RUIActionSheetItem) alloc] initWithLeftIconImage:newImage text:@"TF did that say?" identifier:@"undeleteItemIdentifier" context:[self comment]]; undeleteItem = [[%c(RUIActionSheetItem) alloc] initWithLeftIconImage:newImage text:@"TF did that say?" identifier:@"undeleteItemIdentifier" context:[self comment]];
} else { } else {
undeleteItem = [[%c(ActionSheetItem) alloc] initWithLeftIconImage:newImage text:@"TF did that say?" identifier:@"undeleteItemIdentifier" context:[self comment]]; undeleteItem = [[%c(ActionSheetItem) alloc] initWithLeftIconImage:newImage text:@"TF did that say?" identifier:@"undeleteItemIdentifier" context:[self comment]];
@ -476,7 +491,7 @@ static NSArray *redditVersion;
[comment setBodyText:body]; [comment setBodyText:body];
[comment setBodyAttributedText:bodyMutableAttributedText]; [comment setBodyAttributedText:bodyMutableAttributedText];
if ([redditVersion[1] intValue] >= 12) { if (getRedditVersionPart(1) >= 12) {
[comment setBodyRichTextAttributed:bodyMutableAttributedText]; [comment setBodyRichTextAttributed:bodyMutableAttributedText];
} }
@ -510,7 +525,7 @@ static NSArray *redditVersion;
id undeleteItem; id undeleteItem;
if ([redditVersion[1] intValue] >= 18) { if (getRedditVersionPart(1) >= 18) {
undeleteItem = [[%c(RUIActionSheetItem) alloc] initWithLeftIconImage:newImage text:@"TF did that say?" identifier:@"undeleteItemIdentifier" context:[self post]]; undeleteItem = [[%c(RUIActionSheetItem) alloc] initWithLeftIconImage:newImage text:@"TF did that say?" identifier:@"undeleteItemIdentifier" context:[self post]];
} else { } else {
undeleteItem = [[%c(ActionSheetItem) alloc] initWithLeftIconImage:newImage text:@"TF did that say?" identifier:@"undeleteItemIdentifier" context:[self post]]; undeleteItem = [[%c(ActionSheetItem) alloc] initWithLeftIconImage:newImage text:@"TF did that say?" identifier:@"undeleteItemIdentifier" context:[self post]];
@ -626,11 +641,11 @@ static NSArray *redditVersion;
[post setSelfText:body]; [post setSelfText:body];
[post setSelfTextAttributed:bodyMutableAttributedText]; [post setSelfTextAttributed:bodyMutableAttributedText];
if ([redditVersion[1] intValue] >= 8) { if (getRedditVersionPart(1) >= 8) {
[post setSelfPostRichTextAttributed:bodyMutableAttributedText]; [post setSelfPostRichTextAttributed:bodyMutableAttributedText];
} }
if ([redditVersion[1] intValue] >= 15) { if (getRedditVersionPart(1) >= 15) {
[post setPreviewFeedPostTextString:bodyMutableAttributedText]; [post setPreviewFeedPostTextString:bodyMutableAttributedText];
} }
@ -772,25 +787,18 @@ static void prefsChanged(CFNotificationCenterRef center, void *observer, CFStrin
NSString* processName = [[NSProcessInfo processInfo] processName]; NSString* processName = [[NSProcessInfo processInfo] processName];
redditVersion = [[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"] componentsSeparatedByString:@"."]; redditVersion = [[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"] componentsSeparatedByString:@"."];
for (int i = 0; i < [redditVersion count]; i++){
if ([redditVersion[i] isEqual:[NSNull null]]){
redditVersion = @[@4, @48, @1, @(-1)];
break;
}
}
if ([processName isEqualToString:@"Reddit"]){ if ([processName isEqualToString:@"Reddit"]){
if (isRedditEnabled) { if (isRedditEnabled) {
CFNotificationCenterAddObserver(CFNotificationCenterGetDarwinNotifyCenter(), NULL, prefsChanged, CFSTR("com.lint.undelete.prefs.changed"), NULL, CFNotificationSuspensionBehaviorDeliverImmediately); CFNotificationCenterAddObserver(CFNotificationCenterGetDarwinNotifyCenter(), NULL, prefsChanged, CFSTR("com.lint.undelete.prefs.changed"), NULL, CFNotificationSuspensionBehaviorDeliverImmediately);
if ([redditVersion[0] intValue] == 4){ if (getRedditVersionPart(0) == 4){
if ([redditVersion[1] intValue] <= 32){ if (getRedditVersionPart(1) <= 32){
%init(Reddit_v4_ios10); %init(Reddit_v4_ios10);
} else{ } else{
%init(Reddit_v4_current); %init(Reddit_v4_current);
} }
} else if ([redditVersion[0] intValue] == 3) { } else if (getRedditVersionPart(0) == 3) {
%init(Reddit_v3); %init(Reddit_v3);
} }
} }