Skip to content

Commit 49fa6ca

Browse files
committed
Remove ReaderPostContentProvider
1 parent 3b70cf5 commit 49fa6ca

File tree

6 files changed

+7
-59
lines changed

6 files changed

+7
-59
lines changed

WordPress/Classes/Models/ReaderPost.h

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
#import <Foundation/Foundation.h>
22
#import <CoreData/CoreData.h>
33
#import "BasePost.h"
4-
#import "ReaderPostContentProvider.h"
4+
5+
typedef NS_ENUM(NSUInteger, SourceAttributionStyle) {
6+
SourceAttributionStyleNone,
7+
SourceAttributionStylePost,
8+
SourceAttributionStyleSite,
9+
};
510

611
@class ReaderAbstractTopic;
712
@class ReaderCrossPostMeta;
@@ -13,7 +18,7 @@
1318
extern NSString * const ReaderPostStoredCommentIDKey;
1419
extern NSString * const ReaderPostStoredCommentTextKey;
1520

16-
@interface ReaderPost : BasePost <ReaderPostContentProvider>
21+
@interface ReaderPost : BasePost
1722

1823
@property (nonatomic, strong) NSString *authorDisplayName;
1924
@property (nonatomic, strong) NSString *authorEmail;

WordPress/Classes/Models/ReaderPost.m

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -393,14 +393,6 @@ - (NSString *)sourceAuthorNameForDisplay
393393
return self.sourceAttribution.authorName;
394394
}
395395

396-
- (NSURL *)sourceAuthorURLForDisplay
397-
{
398-
if (!self.sourceAttribution) {
399-
return nil;
400-
}
401-
return [NSURL URLWithString:self.sourceAttribution.authorURL];
402-
}
403-
404396
- (NSURL *)sourceAvatarURLForDisplay
405397
{
406398
if (!self.sourceAttribution) {
@@ -414,14 +406,6 @@ - (NSString *)sourceBlogNameForDisplay
414406
return self.sourceAttribution.blogName;
415407
}
416408

417-
- (NSURL *)sourceBlogURLForDisplay
418-
{
419-
if (!self.sourceAttribution) {
420-
return nil;
421-
}
422-
return [NSURL URLWithString:self.sourceAttribution.blogURL];
423-
}
424-
425409
- (BOOL)isSourceAttributionWPCom
426410
{
427411
return (self.sourceAttribution.blogID) ? YES : NO;

WordPress/Classes/Models/ReaderPostContentProvider.h

Lines changed: 0 additions & 37 deletions
This file was deleted.

WordPress/Classes/Networking/MediaHost+ReaderPost.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ extension MediaHost {
2828
username: username,
2929
authToken: authToken,
3030
failure: { error in
31-
// We just associate a ReaderPostContentProvider with the underlying error for simpler debugging.
3231
failure(ReaderPostError.baseInitializerError(error: error))
3332
}
3433
)

WordPress/Classes/System/WordPress-Bridging-Header.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
#import "ReaderCommentsViewController.h"
5151
#import "ReaderGapMarker.h"
5252
#import "ReaderPost.h"
53-
#import "ReaderPostContentProvider.h"
5453
#import "ReaderPostService.h"
5554
#import "ReaderSiteService.h"
5655
#import "ReaderSiteService_Internal.h"

WordPress/WordPress.xcodeproj/project.pbxproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7545,7 +7545,6 @@
75457545
5DB767401588F64D00EBE36C /* postPreview.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = postPreview.html; path = Resources/HTML/postPreview.html; sourceTree = "<group>"; };
75467546
5DBCD9D318F35D7500B32229 /* ReaderTopicService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReaderTopicService.h; sourceTree = "<group>"; };
75477547
5DBCD9D418F35D7500B32229 /* ReaderTopicService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReaderTopicService.m; sourceTree = "<group>"; };
7548-
5DE471B71B4C710E00665C44 /* ReaderPostContentProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ReaderPostContentProvider.h; sourceTree = "<group>"; };
75497548
5DE8A0401912D95B00B2FF59 /* ReaderPostServiceTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReaderPostServiceTest.m; sourceTree = "<group>"; };
75507549
5DED0E161B432E0400431FCD /* SourcePostAttribution.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SourcePostAttribution.h; sourceTree = "<group>"; };
75517550
5DED0E171B432E0400431FCD /* SourcePostAttribution.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SourcePostAttribution.m; sourceTree = "<group>"; };
@@ -11441,7 +11440,6 @@
1144111440
745A41AF2065405600299D75 /* ReaderPost+Searchable.swift */,
1144211441
4AD5656B28E3D0670054C676 /* ReaderPost+Helper.swift */,
1144311442
E6C09B3D1BF0FDEB003074CB /* ReaderCrossPostMeta.swift */,
11444-
5DE471B71B4C710E00665C44 /* ReaderPostContentProvider.h */,
1144511443
E6A3384A1BB08E3F00371587 /* ReaderGapMarker.h */,
1144611444
E6A3384B1BB08E3F00371587 /* ReaderGapMarker.m */,
1144711445
E61084B91B9B47BA008050C5 /* ReaderAbstractTopic.swift */,

0 commit comments

Comments
 (0)