Revert "Add nullability modifiers"

This reverts commit 5903404.

Author: kean

WordPress/Classes/Services/ReaderTopicService.h

@@ -1,8 +1,6 @@
 #import <Foundation/Foundation.h>
 #import "CoreDataStack.h"
 
-NS_ASSUME_NONNULL_BEGIN
-
 extern NSString * const ReaderTopicFreshlyPressedPathCommponent;
 
 @class ReaderAbstractTopic;
@@ -14,11 +12,11 @@ extern NSString * const ReaderTopicFreshlyPressedPathCommponent;
 
 @property (nonatomic, strong, readonly) id<CoreDataStack> coreDataStack;
 
-- (instancetype)initWithCoreDataStack:(id<CoreDataStack>)coreDataStack NS_DESIGNATED_INITIALIZER;
+- (nonnull instancetype)initWithCoreDataStack:(id<CoreDataStack>)coreDataStack NS_DESIGNATED_INITIALIZER;
 
 - (instancetype)init NS_UNAVAILABLE;
 
-- (nullable ReaderAbstractTopic *)currentTopicInContext:(NSManagedObjectContext *)context;
+- (ReaderAbstractTopic *)currentTopicInContext:(NSManagedObjectContext *)context;
 
 - (void)setCurrentTopic:(ReaderAbstractTopic *)topic;
 
@@ -28,7 +26,7 @@ extern NSString * const ReaderTopicFreshlyPressedPathCommponent;
  @param success block called on a successful fetch.
  @param failure block called if there is any error. `error` can be any underlying network error.
  */
-- (void)fetchReaderMenuWithSuccess:(void (^)(void))success failure:(void (^)(NSError * _Nullable error))failure;
+- (void)fetchReaderMenuWithSuccess:(void (^)(void))success failure:(void (^)(NSError *error))failure;
 
 /**
  Deletes all search topics from core data and saves the context.
@@ -63,7 +61,7 @@ extern NSString * const ReaderTopicFreshlyPressedPathCommponent;
  @param phrase: The search phrase.
  @param completion: A completion callback to receive the created ReaderSearchTopic instance.
  */
-- (void)createSearchTopicForSearchPhrase:(NSString *)phrase completion:(void (^)(NSManagedObjectID * _Nullable objectID))completion;
+- (void)createSearchTopicForSearchPhrase:(NSString *)phrase completion:(void (^)(NSManagedObjectID *))completion;
 
 /**
  Unfollows the specified topic
@@ -72,7 +70,7 @@ extern NSString * const ReaderTopicFreshlyPressedPathCommponent;
  @param success block called on a successful fetch.
  @param failure block called if there is any error. `error` can be any underlying network error.
  */
-- (void)unfollowTag:(ReaderTagTopic *)topic withSuccess:(void (^)(void))success failure:(void (^)(NSError * _Nullable error))failure;
+- (void)unfollowTag:(ReaderTagTopic *)topic withSuccess:(void (^)(void))success failure:(void (^)(NSError *error))failure;
 
 /**
  Follow the tag with the specified name
@@ -83,7 +81,7 @@ extern NSString * const ReaderTopicFreshlyPressedPathCommponent;
  */
 - (void)followTagNamed:(NSString *)tagName
            withSuccess:(void (^)(void))success
-               failure:(void (^)(NSError * _Nullable error))failure
+               failure:(void (^)(NSError *error))failure
                 source:(NSString *)source;
 
 /**
@@ -93,7 +91,7 @@ extern NSString * const ReaderTopicFreshlyPressedPathCommponent;
  @param success block called on a successful change.
  @param failure block called if there is any error. `error` can be any underlying network error.
  */
-- (void)toggleFollowingForTag:(ReaderTagTopic *)topic success:(void (^)(void))success failure:(void (^)(NSError * _Nullable error))failure;
+- (void)toggleFollowingForTag:(ReaderTagTopic *)topic success:(void (^)(void))success failure:(void (^)(NSError *error))failure;
 
 /**
  Toggle the following status of the site for the specified site topic
@@ -104,7 +102,7 @@ extern NSString * const ReaderTopicFreshlyPressedPathCommponent;
  */
 - (void)toggleFollowingForSite:(ReaderSiteTopic *)topic
                        success:(void (^)(BOOL follow))success
-                       failure:(void (^)(BOOL follow, NSError * _Nullable error))failure;
+                       failure:(void (^)(BOOL follow, NSError *error))failure;
 
 /**
  Fetch a tag topic for a tag with the specified slug.
@@ -114,8 +112,8 @@ extern NSString * const ReaderTopicFreshlyPressedPathCommponent;
  @param failure block called if there is any error. `error` can be any underlying network error.
  */
 - (void)tagTopicForTagWithSlug:(NSString *)slug
-                       success:(void(^)(NSManagedObjectID * _Nullable objectID))success
-                       failure:(void (^)(NSError * _Nullable error))failure;
+                       success:(void(^)(NSManagedObjectID *objectID))success
+                       failure:(void (^)(NSError *error))failure;
 
 /**
  Fetch a site topic for a site with the specified ID.
@@ -127,8 +125,8 @@ extern NSString * const ReaderTopicFreshlyPressedPathCommponent;
  */
 - (void)siteTopicForSiteWithID:(NSNumber *)siteID
                         isFeed:(BOOL)isFeed
-                       success:(void (^)(NSManagedObjectID * _Nullable objectID, BOOL isFollowing))success
-                       failure:(void (^)(NSError * _Nullable error))failure;
+                       success:(void (^)(NSManagedObjectID *objectID, BOOL isFollowing))success
+                       failure:(void (^)(NSError *error))failure;
 
 @end
 
@@ -138,5 +136,3 @@ extern NSString * const ReaderTopicFreshlyPressedPathCommponent;
 - (void)mergeMenuTopics:(NSArray *)topics isLoggedIn:(BOOL)isLoggedIn withSuccess:(void (^)(void))success;
 - (NSString *)formatTitle:(NSString *)str;
 @end
-
-NS_ASSUME_NONNULL_END

WordPress/Classes/ViewRelated/Reader/Controllers/ReaderStreamViewController.swift

@@ -435,21 +435,23 @@ import AutomatticTracks
         if isViewLoaded {
             displayLoadingStream()
         }
-        guard let tagSlug else {
-            return wpAssertionFailure("tag slug is missing")
-        }
+        assert(tagSlug != nil, "A tag slug is requred before fetching a tag topic")
         let service = ReaderTopicService(coreDataStack: ContextManager.shared)
-        service.tagTopicForTag(withSlug: tagSlug, success: { [weak self] objectID in
-            let context = ContextManager.shared.mainContext
-            guard let objectID, let topic = (try? context.existingObject(with: objectID)) as? ReaderAbstractTopic else {
-                DDLogError("Reader: Error retriving an existing tag topic by its objectID")
+        service.tagTopicForTag(withSlug: tagSlug,
+            success: { [weak self] (objectID: NSManagedObjectID?) in
+
+                let context = ContextManager.shared.mainContext
+                guard let objectID, let topic = (try? context.existingObject(with: objectID)) as? ReaderAbstractTopic else {
+                    DDLogError("Reader: Error retriving an existing tag topic by its objectID")
+                    self?.displayLoadingStreamFailed()
+                    return
+                }
+                self?.readerTopic = topic
+
+            },
+            failure: { [weak self] (error: Error?) in
                 self?.displayLoadingStreamFailed()
-                return
-            }
-            self?.readerTopic = topic
-        }, failure: { [weak self] _ in
-            self?.displayLoadingStreamFailed()
-        })
+            })
     }
 
     // MARK: - Setup

WordPress/Classes/ViewRelated/Reader/Manage/ReaderTagsTableViewModel.swift

@@ -209,17 +209,15 @@ extension ReaderTagsTableViewModel {
     ///     - topic: The tag topic that is to be unfollowed.
     private func unfollow(_ topic: ReaderTagTopic) {
         let service = ReaderTopicService(coreDataStack: ContextManager.shared)
-        service.unfollowTag(topic, withSuccess: {
-            // Do nothing
-        }, failure: { error in
+        service.unfollowTag(topic, withSuccess: nil) { (error) in
             DDLogError("Could not unfollow topic \(topic), \(String(describing: error))")
 
             let title = NSLocalizedString("Could Not Remove Topic", comment: "Title of a prompt informing the user there was a probem unsubscribing from a topic in the reader.")
             let message = error?.localizedDescription
             let alert = UIAlertController(title: title, message: message, preferredStyle: .alert)
             alert.addCancelActionWithTitle(SharedStrings.Button.ok)
             alert.presentFromRootViewController()
-        })
+        }
     }
 
     /// Scrolls the tableView so the specified tag is in view and flashes that row

WordPress/WordPress-Swift.h

@@ -0,0 +1,7 @@
+/// Due to a known issue, the compiler produces warnings on the Swift code that an intent definition file generates.
+/// Ref: https://developer.apple.com/forums/thread/686448
+/// As a workaround, we ignore all multiple method declarations warnings when importing WordPress-Swift.h
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wduplicate-method-match"
+#import "WordPress-Swift-XcodeGenerated.h"
+#pragma clang diagnostic pop

WordPress/WordPress.xcodeproj/project.pbxproj

@@ -1450,6 +1450,7 @@
 		7EC9FE0A22C627DB00C5A888 /* PostEditorAnalyticsSessionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostEditorAnalyticsSessionTests.swift; sourceTree = "<group>"; };
 		7EF2EE9F210A67B60007A76B /* notifications-unapproved-comment.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "notifications-unapproved-comment.json"; sourceTree = "<group>"; };
 		801D951C291ADB7E0051993E /* OverlayFrequencyTrackerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OverlayFrequencyTrackerTests.swift; sourceTree = "<group>"; };
+		80293CF6284450AD0083F946 /* WordPress-Swift.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "WordPress-Swift.h"; sourceTree = "<group>"; };
 		80379C6D2A5C0D8F00D924AC /* PostTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostTests.swift; sourceTree = "<group>"; };
 		803BB99329667CF700B3F6D6 /* JetpackBrandingTextProviderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JetpackBrandingTextProviderTests.swift; sourceTree = "<group>"; };
 		803DE81828FFB7B5007D4E9C /* RemoteParameterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoteParameterTests.swift; sourceTree = "<group>"; };
@@ -2010,11 +2011,6 @@
 			path = Sources;
 			sourceTree = "<group>";
 		};
-		0C5A1A042D9B080900C25301 /* WordPressAuthenticatorTests */ = {
-			isa = PBXFileSystemSynchronizedRootGroup;
-			path = WordPressAuthenticatorTests;
-			sourceTree = "<group>";
-		};
 		0C5A3FAB2D9B1EF400C25301 /* Reader */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
 			exceptions = (
@@ -2023,6 +2019,11 @@
 			path = Reader;
 			sourceTree = "<group>";
 		};
+		0C5A1A042D9B080900C25301 /* WordPressAuthenticatorTests */ = {
+			isa = PBXFileSystemSynchronizedRootGroup;
+			path = WordPressAuthenticatorTests;
+			sourceTree = "<group>";
+		};
 		0C5C46FE2D98397A00F2CD55 /* Keystone */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
 			exceptions = (
@@ -2559,6 +2560,7 @@
 				8D1107310486CEB800E47090 /* Info.plist */,
 				931DF4D818D09A2F00540BDD /* InfoPlist.strings */,
 				E1D91454134A853D0089019C /* Localizable.strings */,
+				80293CF6284450AD0083F946 /* WordPress-Swift.h */,
 				4A690C142BA790BC00A8E0C5 /* PrivacyInfo.xcprivacy */,
 			);
 			name = Resources;
@@ -6845,6 +6847,7 @@
 				PRODUCT_NAME = WordPress;
 				PROVISIONING_PROFILE_SPECIFIER = "WordPress Development";
 				SWIFT_OBJC_BRIDGING_HEADER = "Classes/System/WordPress-Bridging-Header.h";
+				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift-XcodeGenerated.h";
 				SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -6900,6 +6903,7 @@
 				PRODUCT_NAME = WordPress;
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore org.wordpress";
 				SWIFT_OBJC_BRIDGING_HEADER = "Classes/System/WordPress-Bridging-Header.h";
+				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift-XcodeGenerated.h";
 				SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -8083,6 +8087,7 @@
 				PRODUCT_NAME = WordPress;
 				PROVISIONING_PROFILE_SPECIFIER = "match InHouse org.wordpress.alpha";
 				SWIFT_OBJC_BRIDGING_HEADER = "Classes/System/WordPress-Bridging-Header.h";
+				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift-XcodeGenerated.h";
 				SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -8651,6 +8656,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "Jetpack iOS Development";
 				SWIFT_OBJC_BRIDGING_HEADER = "Classes/System/WordPress-Bridging-Header.h";
+				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift-XcodeGenerated.h";
 				SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -8706,6 +8712,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.automattic.jetpack";
 				SWIFT_OBJC_BRIDGING_HEADER = "Classes/System/WordPress-Bridging-Header.h";
+				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift-XcodeGenerated.h";
 				SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -8757,6 +8764,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match InHouse com.jetpack.alpha";
 				SWIFT_OBJC_BRIDGING_HEADER = "Classes/System/WordPress-Bridging-Header.h";
+				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift-XcodeGenerated.h";
 				SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";