From 0ac5a6dbcab8f0b0b0179454f531a1fc960692cf Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Wed, 22 Apr 2020 14:16:50 -0500 Subject: [PATCH] Disable Twitter Extension Point for Developer Build. --- Shared/ExtensionPoints/ExtensionPoint.swift | 1 + Shared/ExtensionPoints/ExtensionPointManager.swift | 10 ++++++---- Shared/ExtensionPoints/SendToMarsEditCommand.swift | 1 + Shared/ExtensionPoints/SendToMicroBlogCommand.swift | 3 ++- .../TwitterFeedProvider-Extensions.swift | 1 + 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Shared/ExtensionPoints/ExtensionPoint.swift b/Shared/ExtensionPoints/ExtensionPoint.swift index 86a84557d..148b48485 100644 --- a/Shared/ExtensionPoints/ExtensionPoint.swift +++ b/Shared/ExtensionPoints/ExtensionPoint.swift @@ -16,6 +16,7 @@ import RSCore protocol ExtensionPoint { static var isSinglton: Bool { get } + static var isDeveloperBuildRestricted: Bool { get } static var title: String { get } static var templateImage: RSImage { get } static var description: NSAttributedString { get } diff --git a/Shared/ExtensionPoints/ExtensionPointManager.swift b/Shared/ExtensionPoints/ExtensionPointManager.swift index 723d3180c..aecb20ba3 100644 --- a/Shared/ExtensionPoints/ExtensionPointManager.swift +++ b/Shared/ExtensionPoints/ExtensionPointManager.swift @@ -26,12 +26,14 @@ final class ExtensionPointManager: FeedProviderManagerDelegate { let activeExtensionPointTypes = activeExtensionPoints.keys.compactMap({ ObjectIdentifier($0.extensionPointType) }) var available = [ExtensionPoint.Type]() for possibleExtensionPointType in possibleExtensionPointTypes { - if possibleExtensionPointType.isSinglton { - if !activeExtensionPointTypes.contains(ObjectIdentifier(possibleExtensionPointType)) { + if !(AppDefaults.isDeveloperBuild && possibleExtensionPointType.isDeveloperBuildRestricted) { + if possibleExtensionPointType.isSinglton { + if !activeExtensionPointTypes.contains(ObjectIdentifier(possibleExtensionPointType)) { + available.append(possibleExtensionPointType) + } + } else { available.append(possibleExtensionPointType) } - } else { - available.append(possibleExtensionPointType) } } diff --git a/Shared/ExtensionPoints/SendToMarsEditCommand.swift b/Shared/ExtensionPoints/SendToMarsEditCommand.swift index 3208ed8aa..7394bebea 100644 --- a/Shared/ExtensionPoints/SendToMarsEditCommand.swift +++ b/Shared/ExtensionPoints/SendToMarsEditCommand.swift @@ -13,6 +13,7 @@ import Articles final class SendToMarsEditCommand: ExtensionPoint, SendToCommand { static var isSinglton = true + static var isDeveloperBuildRestricted = false static var title = NSLocalizedString("MarsEdit", comment: "MarsEdit") static var templateImage = AppAssets.extensionPointMarsEdit static var description: NSAttributedString = { diff --git a/Shared/ExtensionPoints/SendToMicroBlogCommand.swift b/Shared/ExtensionPoints/SendToMicroBlogCommand.swift index b6149c58d..36f8326c7 100644 --- a/Shared/ExtensionPoints/SendToMicroBlogCommand.swift +++ b/Shared/ExtensionPoints/SendToMicroBlogCommand.swift @@ -14,7 +14,8 @@ import RSCore final class SendToMicroBlogCommand: ExtensionPoint, SendToCommand { - static var isSinglton: Bool = true + static var isSinglton = true + static var isDeveloperBuildRestricted = false static var title: String = NSLocalizedString("Micro.blog", comment: "Micro.blog") static var templateImage = AppAssets.extensionPointMicroblog static var description: NSAttributedString = { diff --git a/Shared/ExtensionPoints/TwitterFeedProvider-Extensions.swift b/Shared/ExtensionPoints/TwitterFeedProvider-Extensions.swift index 92bd77e20..50f3383f0 100644 --- a/Shared/ExtensionPoints/TwitterFeedProvider-Extensions.swift +++ b/Shared/ExtensionPoints/TwitterFeedProvider-Extensions.swift @@ -12,6 +12,7 @@ import Account extension TwitterFeedProvider: ExtensionPoint { static var isSinglton = false + static var isDeveloperBuildRestricted = true static var title = NSLocalizedString("Twitter", comment: "Twitter") static var templateImage = AppAssets.extensionPointTwitter static var description: NSAttributedString = {