This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/WordPress/Classes/System/WordPressAppDelegate+openURL.swift b/WordPress/Classes/System/WordPressAppDelegate+openURL.swift | |
index 9634ed5983..503854cd86 100644 | |
--- a/WordPress/Classes/System/WordPressAppDelegate+openURL.swift | |
+++ b/WordPress/Classes/System/WordPressAppDelegate+openURL.swift | |
@@ -11,6 +11,11 @@ import AutomatticTracks | |
return true | |
} | |
+ if UniversalLinkRouter.shared.canHandle(url: url) { | |
+ UniversalLinkRouter.shared.handle(url: url, shouldTrack: true) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/WordPress/Classes/ViewRelated/Post/Categories/PostCategoriesViewController.swift b/WordPress/Classes/ViewRelated/Post/Categories/PostCategoriesViewController.swift | |
index 7883b61e18..a6944041c9 100644 | |
--- a/WordPress/Classes/ViewRelated/Post/Categories/PostCategoriesViewController.swift | |
+++ b/WordPress/Classes/ViewRelated/Post/Categories/PostCategoriesViewController.swift | |
@@ -13,13 +13,17 @@ import Foundation | |
@objc class PostCategoriesViewController: UITableViewController { | |
@objc var delegate: PostCategoriesViewControllerDelegate? | |
- private var selectionMode: CategoriesSelectionMode | |
+ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationsViewController.swift b/WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationsViewController.swift | |
index b1349b9cf4..0e0f233fba 100644 | |
--- a/WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationsViewController.swift | |
+++ b/WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationsViewController.swift | |
@@ -115,8 +115,8 @@ class NotificationsViewController: UITableViewController, UIViewControllerRestor | |
setupNavigationBar() | |
setupTableView() | |
- setupTableHeaderView() | |
setupTableFooterView() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/WordPress/Classes/ViewRelated/Post/AuthorFilterViewController.swift b/WordPress/Classes/ViewRelated/Post/AuthorFilterViewController.swift | |
index 157eeaad3e..40cf9b1844 100644 | |
--- a/WordPress/Classes/ViewRelated/Post/AuthorFilterViewController.swift | |
+++ b/WordPress/Classes/ViewRelated/Post/AuthorFilterViewController.swift | |
@@ -45,7 +45,7 @@ class AuthorFilterViewController: UITableViewController { | |
tableView.rowHeight = Metrics.rowHeight | |
tableView.separatorInset = .zero | |
- tableView.separatorColor = .neutral(.shade10) | |
+ tableView.separatorColor = .clear |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/WordPress/Classes/Utility/InteractiveNotificationsManager.swift b/WordPress/Classes/Utility/InteractiveNotificationsManager.swift | |
index 4a6e95a02d..2d6b80f9a4 100644 | |
--- a/WordPress/Classes/Utility/InteractiveNotificationsManager.swift | |
+++ b/WordPress/Classes/Utility/InteractiveNotificationsManager.swift | |
@@ -441,6 +441,11 @@ extension InteractiveNotificationsManager: UNUserNotificationCenterDelegate { | |
func userNotificationCenter(_ center: UNUserNotificationCenter, | |
willPresent notification: UNNotification, | |
withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Swift.Void) { | |
+ if notification.request.content.categoryIdentifier == NotificationRemindersHelper.RequestKeys.category { | |
+ completionHandler(.alert) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/WordPress/Classes/Stores/NoticeStore.swift b/WordPress/Classes/Stores/NoticeStore.swift | |
index 42dcb72422..58ec7a000b 100644 | |
--- a/WordPress/Classes/Stores/NoticeStore.swift | |
+++ b/WordPress/Classes/Stores/NoticeStore.swift | |
@@ -22,7 +22,7 @@ struct Notice { | |
/// Style used to configure visual style when displayed | |
/// | |
- let style: Style | |
+ let style: NoticeStyle |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/WordPress/Classes/ViewRelated/Reader/ReaderStreamViewController.swift b/WordPress/Classes/ViewRelated/Reader/ReaderStreamViewController.swift | |
index 6b051320c6..a656ae6f9a 100644 | |
--- a/WordPress/Classes/ViewRelated/Reader/ReaderStreamViewController.swift | |
+++ b/WordPress/Classes/ViewRelated/Reader/ReaderStreamViewController.swift | |
@@ -384,16 +384,27 @@ import WordPressFlux | |
// MARK: - Handling Loading and No Results | |
+ private func setStatusViewTitle(_ title: String, message: String) { | |
+ // Potential fix for a crash where it seems we attempted to update the status view |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/WordPress/Classes/ViewRelated/Blog/QuickStartTourGuide.swift b/WordPress/Classes/ViewRelated/Blog/QuickStartTourGuide.swift | |
index 814fd8fac4..cbd95ec6a9 100644 | |
--- a/WordPress/Classes/ViewRelated/Blog/QuickStartTourGuide.swift | |
+++ b/WordPress/Classes/ViewRelated/Blog/QuickStartTourGuide.swift | |
@@ -24,10 +24,6 @@ open class QuickStartTourGuide: NSObject, UINavigationControllerDelegate { | |
} | |
func dismissTestQuickStartNotice() { | |
- guard let presenter = findNoticePresenter() else { | |
- return |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Simplenote/Classes/SPAboutViewController.swift b/Simplenote/Classes/SPAboutViewController.swift | |
index 93a9e68..78bb4e0 100644 | |
--- a/Simplenote/Classes/SPAboutViewController.swift | |
+++ b/Simplenote/Classes/SPAboutViewController.swift | |
@@ -33,68 +33,146 @@ class SPAboutViewController: UIViewController, UITableViewDataSource, UITableVie | |
private let headerView = UIView() | |
private let footerView = UIView() | |
private let tableView = UITableView() | |
+ private let containerView = UIStackView() | |
private let doneButton = UIButton(type: UIButtonType.custom) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/WordPress/Classes/Services/MediaService.m b/WordPress/Classes/Services/MediaService.m | |
index 14db01070a..3a16b3c4d0 100644 | |
--- a/WordPress/Classes/Services/MediaService.m | |
+++ b/WordPress/Classes/Services/MediaService.m | |
@@ -566,14 +566,12 @@ - (void)syncMediaLibraryForBlog:(Blog *)blog | |
{ | |
id<MediaServiceRemote> remote = [self remoteForBlog:blog]; | |
NSManagedObjectID *blogObjectID = [blog objectID]; | |
- [self.managedObjectContext performBlock:^{ | |
- Blog *blogInContext = (Blog *)[self.managedObjectContext objectWithID:blogObjectID]; |
NewerOlder