Merge pull request #338 from tradingticket/os/#156885801/makeUiConfigOptional

Make UiConfig (Branding) optional at the SDK level

Author: oliver-was-here

ExampleApp/ExampleViewController.swift

@@ -13,12 +13,14 @@ class Action {
     init(
         label: String,
         action: @escaping () -> Void,
-        oAuthCallbackUrl: String = "tradeItExampleScheme://completeOAuth"
+        oAuthCallbackUrl: String = "tradeItExampleScheme://completeOAuth",
+        isUiConfigServiceEnabled: Bool = true
     ) {
         self.label = label
         self.action = {
             TradeItSDK.oAuthCallbackUrl = URL(string: oAuthCallbackUrl)!
             action()
+            TradeItSDK.uiConfigService.isEnabled = isUiConfigServiceEnabled
         }
     }
 }
@@ -27,12 +29,14 @@ class YahooAction: Action {
     override init(
         label: String,
         action: @escaping () -> Void,
-        oAuthCallbackUrl: String = "tradeItExampleScheme://completeYahooOAuth"
+        oAuthCallbackUrl: String = "tradeItExampleScheme://completeYahooOAuth",
+        isUiConfigServiceEnabled: Bool = false
     ) {
         super.init(
             label: label,
             action: action,
-            oAuthCallbackUrl: oAuthCallbackUrl
+            oAuthCallbackUrl: oAuthCallbackUrl,
+            isUiConfigServiceEnabled: isUiConfigServiceEnabled
         )
     }
 }

TradeItIosEmsApi/TradeItUiConfigResult.m

@@ -2,4 +2,13 @@
 
 @implementation TradeItUiConfigResult
 
+
+-(id)init {
+    if (self = [super init])  {
+        self.brokers = [NSArray<TradeItUiBrokerConfig> new];
+    }
+
+    return self;
+};
+
 @end

TradeItIosTicketSDK2/TradeItBrokerLogoService.swift

@@ -28,7 +28,7 @@ class TradeItBrokerLogoService {
                     return Promise(
                         error: TradeItErrorResult(
                             title: "Logo not found",
-                            message: "No logo is available for this broker."
+                            message: "No logo is enabled for this broker."
                         )
                     )
                 }

TradeItIosTicketSDK2/TradeItLauncher.swift

@@ -18,7 +18,9 @@ protocol OAuthCompletionListener {
     static var accountSelectionCallback: ((TradeItLinkedBrokerAccount) -> Void)? // Ew, gross. No other way to do this.
     static var accountSelectionTitle: String? // Ew, gross. No other way to do this.
 
-    override internal init() {}
+    override internal init() {
+        TradeItSDK.uiConfigService.isEnabled = true
+    }
 
     public func handleOAuthCallback(
         onTopmostViewController topMostViewController: UIViewController,

TradeItIosTicketSDK2/TradeItSelectionDetailCellTableViewCell.swift

@@ -13,36 +13,31 @@ class TradeItSelectionDetailCellTableViewCell: BrandedTableViewCell {
         detailPrimaryText: String?,
         detailSecondaryText: String?,
         altTitleText: String,
-        linkedBroker: TradeItLinkedBroker? = nil,
-        isBrandingEnabled: Bool = true
+        linkedBroker: TradeItLinkedBroker? = nil
     ) {
         self.detailPrimaryLabel.text = detailPrimaryText
         self.detailSecondaryLabel.text = detailSecondaryText
         setBrokerNameAsTextState(altTitleText: altTitleText)
-        if isBrandingEnabled {
-            TradeItSDK.brokerLogoService.loadLogo(
-                forBrokerId: linkedBroker?.brokerName,
-                withSize: .small,
-                onSuccess: { image in
-                    self.setBrokerNameAsLogoState(logo: image)
-                },
-                onFailure: { }
-            )
-        }
+        TradeItSDK.brokerLogoService.loadLogo(
+            forBrokerId: linkedBroker?.brokerName,
+            withSize: .small,
+            onSuccess: { image in
+                self.setBrokerNameAsLogoState(logo: image)
+            },
+            onFailure: { }
+        )
     }
 
     func configure(
         detailPrimaryText: String?,
         detailSecondaryText: String?,
-        linkedBroker: TradeItLinkedBroker? = nil,
-        isBrandingEnabled: Bool = true
+        linkedBroker: TradeItLinkedBroker? = nil
     ) {
         self.configure(
             detailPrimaryText: detailPrimaryText,
             detailSecondaryText: detailSecondaryText,
             altTitleText: linkedBroker?.brokerLongName ?? "Unknown broker",
-            linkedBroker: linkedBroker,
-            isBrandingEnabled: isBrandingEnabled
+            linkedBroker: linkedBroker
         )
     }
 }

TradeItIosTicketSDK2/TradeItUiConfigService.swift

@@ -3,12 +3,17 @@ import PromiseKit
 class TradeItUiConfigService: NSObject {
     private let connector: TradeItConnector
     private var uiConfigPromise: Promise<TradeItUiConfigResult>? = nil
+    var isEnabled = true
 
     init(connector: TradeItConnector) {
         self.connector = connector
     }
 
     func getUiConfigPromise() -> Promise<TradeItUiConfigResult> {
+        if !isEnabled {
+            return Promise(value: TradeItUiConfigResult())
+        }
+
         if let uiConfigPromise = self.uiConfigPromise { return uiConfigPromise }
 
         let uiConfigRequest = TradeItUiConfigRequest(apiKey: connector.apiKey)

TradeItIosTicketSDK2/TradeItYahooLauncher.swift

@@ -10,7 +10,9 @@ import SafariServices
     private let linkBrokerUIFlow = TradeItYahooLinkBrokerUIFlow()
     private let alertManager = TradeItAlertManager()
 
-    override internal init() {}
+    override internal init() {
+        TradeItSDK.uiConfigService.isEnabled = false
+    }
 
     public func launchOAuth(fromViewController viewController: UIViewController) {
         self.launchOAuth(

TradeItIosTicketSDK2/TradeItYahooTradingTicketViewController.swift

@@ -475,8 +475,7 @@ class TradeItYahooTradingTicketViewController: TradeItYahooViewController, UITab
             detailCell.configure(
                 detailPrimaryText: self.order.linkedBrokerAccount?.getFormattedAccountName(),
                 detailSecondaryText: accountSecondaryText(),
-                altTitleText: ticketRow.getTitle(forOrder: self.order),
-                isBrandingEnabled: false
+                altTitleText: ticketRow.getTitle(forOrder: self.order)
             )
         }