Release 17.10.0 (#3049)

* Themed delete button and back button

* Add flag stub and fix comment

* Conform to CustomStringConvertible for easier debugging

* Add the flag

* Remove mysterious newline

* Add additional tests

* Backport implementation

* Update CHANGELOG

* Bump version to 17.10.0

* Add xcbeautify

* Fix preference center test

---------

Co-authored-by: crow <david.crow@airship.com>
Co-authored-by: Ryan Lepinski <ryan.lepinski@airship.com>

Airship.podspec

@@ -1,4 +1,4 @@
-AIRSHIP_VERSION="17.9.1"
+AIRSHIP_VERSION="17.10.0"
 
 Pod::Spec.new do |s|
    s.version                    = AIRSHIP_VERSION

Airship/AirshipConfig.xcconfig

@@ -1,6 +1,6 @@
 //* Copyright Airship and Contributors */
 
-CURRENT_PROJECT_VERSION = 17.9.1
+CURRENT_PROJECT_VERSION = 17.10.0
 
 // Uncomment to include the preview build warning
 // OTHER_CFLAGS = $(inherited) -DUA_PREVIEW=1

Airship/AirshipCore/Source/AirshipInstance.swift

@@ -62,7 +62,8 @@ class AirshipInstance: AirshipInstanceProtocol {
         self.config = RuntimeConfig(config: config, dataStore: dataStore, requestSession: requestSession)
         self.privacyManager = AirshipPrivacyManager(
             dataStore: dataStore,
-            defaultEnabledFeatures: config.enabledFeatures
+            defaultEnabledFeatures: config.enabledFeatures,
+            resetEnabledFeatures: config.resetEnabledFeatures
         )
         self.actionRegistry = ActionRegistry()
         self.urlAllowList = URLAllowList.allowListWithConfig(self.config)

Airship/AirshipCore/Source/AirshipVersion.swift

@@ -4,7 +4,7 @@ import Foundation
 
 @objc(UAirshipVersion)
 public class AirshipVersion: NSObject {
-    public static let version = "17.9.1"
+    public static let version = "17.10.0"
 
     @objc
     public class func get() -> String {

Airship/AirshipCore/Source/Config.swift

@@ -50,6 +50,11 @@ public class AirshipConfig: NSObject, NSCopying {
     /// Defaults to `all`.
     public var enabledFeatures: AirshipFeature = .all
 
+    /// Allows resetting enabled features to match the runtime config defaults on each takeOff
+    /// Defaults to `false`
+    @objc
+    public var resetEnabledFeatures: Bool = false
+
     /// :nodoc:
     @objc(enabledFeatures)
     public var _objc_enabledFeatures: _UAFeatures {
@@ -413,6 +418,7 @@ public class AirshipConfig: NSObject, NSCopying {
         developmentLogLevel = config.developmentLogLevel
         productionLogLevel = config.productionLogLevel
         enabledFeatures = config.enabledFeatures
+        resetEnabledFeatures = config.resetEnabledFeatures
         requestAuthorizationToUseNotifications =
             config.requestAuthorizationToUseNotifications
         requireInitialRemoteConfigEnabled =
@@ -480,7 +486,8 @@ public class AirshipConfig: NSObject, NSCopying {
                 Default Message Center Style Config File: %@\n\
                 Use iTunes ID: %@\n\
                 Site:  %ld\n\
-                Enabled features  %ld\n
+                Enabled features:  %ld\n\
+                Reset enabled features:  %ld\n\
                 Use user preferred locale: %d\n
                 """,
             inProduction,
@@ -517,6 +524,7 @@ public class AirshipConfig: NSObject, NSCopying {
             itunesID ?? "",
             site.rawValue,
             enabledFeatures.rawValue,
+            resetEnabledFeatures ? "YES" : "NO",
             useUserPreferredLocale
         )
     }

Airship/AirshipCore/Source/RuntimeConfig.swift

@@ -152,6 +152,11 @@ public final class RuntimeConfig: NSObject, @unchecked Sendable {
     /// Defaults to FeaturesAll.
     public let enabledFeatures: AirshipFeature
 
+    /// Allows resetting enabled features to match the runtime config defaults on each takeOff
+    /// Defaults to false.
+    @objc
+    public let resetEnabledFeatures: Bool
+
     /// If set to `true`, the SDK will use the preferred locale. Otherwise it will use the current locale.
     ///
     /// Defaults to `false`.
@@ -301,6 +306,7 @@ public final class RuntimeConfig: NSObject, @unchecked Sendable {
         self.messageCenterStyleConfig = config.messageCenterStyleConfig
         self.itunesID = config.itunesID
         self.enabledFeatures = config.enabledFeatures
+        self.resetEnabledFeatures = config.resetEnabledFeatures
         self.site = config.site
         self.autoPauseInAppAutomationOnLaunch = config.autoPauseInAppAutomationOnLaunch
         self.defaultAnalyticsURL = config.analyticsURL?.normalizeURLString()

Airship/AirshipCore/Source/UAPrivacyManager.swift

@@ -73,11 +73,14 @@ public final class AirshipPrivacyManager: NSObject, Sendable {
     /*
      * - Note: For internal use only. :nodoc:
      */
-    @objc(privacyManagerWithDataStore:defaultEnabledFeatures:)
+    @objc(privacyManagerWithDataStore:defaultEnabledFeatures:resetEnabledFeatures:)
     public static func _objc_factory(
         dataStore: PreferenceDataStore,
-        defaultEnabledFeatures: _UAFeatures) -> AirshipPrivacyManager {
-        return AirshipPrivacyManager(dataStore: dataStore, defaultEnabledFeatures: defaultEnabledFeatures.toSwift)
+        defaultEnabledFeatures: _UAFeatures,
+        resetEnabledFeatures: Bool) -> AirshipPrivacyManager {
+            return AirshipPrivacyManager(dataStore: dataStore,
+                                         defaultEnabledFeatures: defaultEnabledFeatures.toSwift,
+                                         resetEnabledFeatures: resetEnabledFeatures)
     }
 
     /*
@@ -86,13 +89,15 @@ public final class AirshipPrivacyManager: NSObject, Sendable {
     public init(
         dataStore: PreferenceDataStore,
         defaultEnabledFeatures: AirshipFeature,
+        resetEnabledFeatures: Bool,
         notificationCenter: AirshipNotificationCenter = AirshipNotificationCenter.shared
     ) {
 
         self.dataStore = dataStore
         self.notificationCenter = notificationCenter
 
-        if self.dataStore.keyExists(AirshipPrivacyManager.enabledFeaturesKey),
+        if !resetEnabledFeatures,
+           self.dataStore.keyExists(AirshipPrivacyManager.enabledFeaturesKey),
            let value = self.dataStore.unsignedInteger(forKey: AirshipPrivacyManager.enabledFeaturesKey) {
             self.currentEnabledFeatures.value = AirshipFeature(rawValue:(value & AirshipFeature.all.rawValue))
         } else {

Airship/AirshipCore/Tests/AirshipConfigTest.swift

@@ -198,6 +198,8 @@ final class AirshipConfigTest: XCTestCase {
 
         XCTAssert(config.enabledFeatures.contains(.push))
         XCTAssert(config.enabledFeatures.contains(.inAppAutomation))
+
+        XCTAssertTrue(config.resetEnabledFeatures, "resetEnabledFeatures was improperly loaded.")
     }
 
     func testNeXTStepPlistParsing() {
@@ -284,6 +286,8 @@ final class AirshipConfigTest: XCTestCase {
         XCTAssertTrue(copy.itunesID == config.itunesID)
         XCTAssertTrue(copy.requestAuthorizationToUseNotifications == config.requestAuthorizationToUseNotifications)
         XCTAssertTrue(copy.requireInitialRemoteConfigEnabled == config.requireInitialRemoteConfigEnabled)
+        XCTAssertTrue(copy.resetEnabledFeatures == config.resetEnabledFeatures)
+
         XCTAssertEqual(copy.enabledFeatures, config.enabledFeatures)
     }
 
@@ -310,5 +314,6 @@ final class AirshipConfigTest: XCTestCase {
         XCTAssertFalse(config.isExtendedBroadcastsEnabled)
         XCTAssertTrue(config.requestAuthorizationToUseNotifications)
         XCTAssertTrue(config.requireInitialRemoteConfigEnabled)
+        XCTAssertFalse(config.resetEnabledFeatures)
     }
 }

Airship/AirshipCore/Tests/AirshipContactTest.swift

@@ -25,6 +25,7 @@ class AirshipContactTest: XCTestCase {
         self.privacyManager = AirshipPrivacyManager(
             dataStore: self.dataStore,
             defaultEnabledFeatures: .all,
+            resetEnabledFeatures: false,
             notificationCenter: self.notificationCenter
         )
 

Airship/AirshipCore/Tests/AirshipMeteredUsageTest.swift

@@ -10,7 +10,8 @@ final class AirshipMeteredUsageTest: XCTestCase {
     private let channel: AirshipChannelProtocol = TestChannel()
     private let privacyManager = AirshipPrivacyManager(
         dataStore: PreferenceDataStore(appKey: UUID().uuidString),
-        defaultEnabledFeatures: [])
+        defaultEnabledFeatures: [],
+        resetEnabledFeatures: false)
     private let apiClient: MeteredUsageAPIClientProtocol = MeteredTestApiClient()
     private let storage = MeteredUsageStore(appKey: "test.app.key", inMemory: true)
     private let workManager = TestWorkManager()

Airship/AirshipCore/Tests/AnalyticsTest.swift

@@ -28,6 +28,7 @@ class AnalyticsTest: XCTestCase {
         self.privacyManager = AirshipPrivacyManager(
             dataStore: dataStore,
             defaultEnabledFeatures: .all,
+            resetEnabledFeatures: false,
             notificationCenter: notificationCenter
         )
 

Airship/AirshipCore/Tests/ApplicationMetricsTest.swift

@@ -18,6 +18,7 @@ final class ApplicationMetricsTest: XCTestCase {
         self.privacyManager = AirshipPrivacyManager(
             dataStore: dataStore,
             defaultEnabledFeatures: .all,
+            resetEnabledFeatures: false,
             notificationCenter: notificationCenter
         )
 

Airship/AirshipCore/Tests/ChannelAudienceManagerTest.swift

@@ -22,6 +22,7 @@ class ChannelAudienceManagerTest: XCTestCase {
         self.privacyManager = AirshipPrivacyManager(
             dataStore: self.dataStore,
             defaultEnabledFeatures: .all,
+            resetEnabledFeatures: false,
             notificationCenter: self.notificationCenter
         )
 

Airship/AirshipCore/Tests/ChannelTest.swift

@@ -21,6 +21,7 @@ class ChannelTest: XCTestCase {
         self.privacyManager = AirshipPrivacyManager(
             dataStore: self.dataStore,
             defaultEnabledFeatures: [],
+            resetEnabledFeatures: false,
             notificationCenter: self.notificationCenter
         )
 

Airship/AirshipCore/Tests/PushTest.swift

@@ -28,6 +28,7 @@ class PushTest: XCTestCase {
         self.privacyManager = AirshipPrivacyManager(
             dataStore: dataStore,
             defaultEnabledFeatures: AirshipFeature.all,
+            resetEnabledFeatures: false,
             notificationCenter: notificationCenter
         )
         self.push = await createPush()

Airship/AirshipCore/Tests/RemoteConfigManagerTest.swift

@@ -19,10 +19,10 @@ class RemoteConfigManagerTest: XCTestCase {
             dataStore: dataStore
         )
 
-
         self.privacyManager = AirshipPrivacyManager(
             dataStore: self.dataStore,
             defaultEnabledFeatures: .all,
+            resetEnabledFeatures: false,
             notificationCenter: self.notificationCenter
         )
 

Airship/AirshipCore/Tests/RemoteDataTest.swift

@@ -21,7 +21,7 @@ final class RemoteDataTest: AirshipBaseTest {
     private let testWorkManager: TestWorkManager = TestWorkManager()
     private var remoteData: RemoteData!
     lazy var privacyManager: AirshipPrivacyManager = {
-        AirshipPrivacyManager(dataStore: self.dataStore, defaultEnabledFeatures: .all)
+        AirshipPrivacyManager(dataStore: self.dataStore, defaultEnabledFeatures: .all, resetEnabledFeatures: false)
     }()
 
     override func setUp() async throws {

Airship/AirshipCore/Tests/Support/AirshipConfig-Valid.plist

@@ -39,6 +39,8 @@
 	<string>ValidUAMessageCenterDefaultStyle</string>
 	<key>site</key>
 	<string>EU</string>
+	<key>resetEnabledFeatures</key>
+	<true/>
 	<key>enabledFeatures</key>
 	<array>
 		<string>in_app_automation</string>

Airship/AirshipCore/Tests/UAInAppAutomationTest.m

@@ -51,7 +51,7 @@ - (void)setUp {
     [super setUp];
 
 
-    self.privacyManager = [UAPrivacyManager privacyManagerWithDataStore:self.dataStore defaultEnabledFeatures:UAFeaturesAll];
+    self.privacyManager = [UAPrivacyManager privacyManagerWithDataStore:self.dataStore defaultEnabledFeatures:UAFeaturesAll resetEnabledFeatures:NO];
 
     self.mockAutomationEngine = [self mockForClass:[UAAutomationEngine class]];
     self.mockInAppCoreSwiftBridge = [self mockForClass:[UAInAppCoreSwiftBridge class]];

Airship/AirshipCore/Tests/UAPrivacyManagerTest.m

@@ -13,18 +13,18 @@ @interface UAPrivacyManagerTest : UAAirshipBaseTest
 @implementation UAPrivacyManagerTest
 
 - (void)setUp {
-    self.privacyManager = [UAPrivacyManager privacyManagerWithDataStore:self.dataStore defaultEnabledFeatures:UAFeaturesAll];
+    self.privacyManager = [UAPrivacyManager privacyManagerWithDataStore:self.dataStore defaultEnabledFeatures:UAFeaturesAll resetEnabledFeatures:NO];
 }
 
 - (void)testDefaultFeatures {
     XCTAssertEqual(self.privacyManager.enabledFeatures, UAFeaturesAll);
 
-    self.privacyManager = [UAPrivacyManager privacyManagerWithDataStore:self.dataStore defaultEnabledFeatures:UAFeaturesNone];
+    self.privacyManager = [UAPrivacyManager privacyManagerWithDataStore:self.dataStore defaultEnabledFeatures:UAFeaturesNone resetEnabledFeatures:NO];
     XCTAssertEqual(self.privacyManager.enabledFeatures, UAFeaturesNone);
 }
 
 - (void)testEnableFeatures {
-    self.privacyManager = [UAPrivacyManager privacyManagerWithDataStore:self.dataStore defaultEnabledFeatures:UAFeaturesNone];
+    self.privacyManager = [UAPrivacyManager privacyManagerWithDataStore:self.dataStore defaultEnabledFeatures:UAFeaturesNone resetEnabledFeatures:NO];
 
     XCTAssertEqual(self.privacyManager.enabledFeatures, UAFeaturesNone);
 
@@ -50,7 +50,7 @@ - (void)testDisableFeatures {
 }
 
 - (void)testIsEnabled {
-    self.privacyManager = [UAPrivacyManager privacyManagerWithDataStore:self.dataStore defaultEnabledFeatures:UAFeaturesNone];
+    self.privacyManager = [UAPrivacyManager privacyManagerWithDataStore:self.dataStore defaultEnabledFeatures:UAFeaturesNone resetEnabledFeatures:NO];
 
     XCTAssertFalse([self.privacyManager isEnabled:UAFeaturesAnalytics]);
 

Airship/AirshipMessageCenter/Source/theme/MessageCenterTheme.swift

@@ -15,7 +15,7 @@ public enum SeparatorStyle {
 
 /// Model object representing a custom theme to be applied to the default message center.
 ///
-/// To customise the message center theme:
+/// To customize the message center theme:
 ///
 ///     MessageCenterView(
 ///         controller: messageCenterController

Airship/AirshipMessageCenter/Source/theme/MessageCenterThemeLoader.swift

@@ -204,7 +204,7 @@ extension MessageCenterThemeLoader.Config {
         if let placeholderIcon = self.placeholderIcon {
             theme.placeholderIcon = Image(placeholderIcon)
         }
-        theme.cellTitleFont = try self.cellTitleFont?.toFont()
+        theme.cellTitleFont = try? self.cellTitleFont?.toFont()
         theme.cellDateFont = try? self.cellDateFont?.toFont()
         theme.cellColor = self.cellColor?.toColor(bundle)
         theme.cellColorDark = self.cellColorDark?.toColor(bundle)

Airship/AirshipMessageCenter/Source/views/MessageCenterMessageView.swift

@@ -284,6 +284,9 @@ private struct MessageCenterMessageContentView: View {
     @Environment(\.presentationMode)
     private var presentationMode: Binding<PresentationMode>
 
+    @Environment(\.colorScheme)
+    private var colorScheme
+
     @Environment(\.airshipMessageCenterTheme)
     private var theme
 
@@ -421,21 +424,44 @@ private struct MessageCenterMessageContentView: View {
         .navigationTitle(
             Text(title ?? self.message?.title ?? "")
         )
+        .navigationBarBackButtonHidden(true) // Hide the default back button
         .toolbar {
-            if theme.hideDeleteButton != true {
-                Button("ua_delete_message".messageCenterlocalizedString) {
-                    Task {
-                        await MessageCenter.shared.inbox.delete(
-                            messageIDs: [self.messageID]
-                        )
-                    }
-                    dismiss()
-                }
+            ToolbarItem(placement: .navigationBarLeading) {
+                backButton
             }
         }
+        .toolbar {
+            deleteButton
+        }
         .navigationBarTitleDisplayMode(.inline)
     }
-
+
+    @ViewBuilder
+    private var deleteButton: some View {
+        if theme.hideDeleteButton != true {
+            Button("ua_delete_message".messageCenterlocalizedString) {
+                Task {
+                    await MessageCenter.shared.inbox.delete(
+                        messageIDs: [self.messageID]
+                    )
+                }
+                dismiss()
+            }.foregroundColor(theme.deleteButtonTitleColor?.adaptiveColor(for: colorScheme, darkVariation: theme.deleteButtonTitleColorDark))
+        }
+    }
+
+    @ViewBuilder
+    private var backButton: some View {
+        Button(action: {
+            self.dismiss()
+        }) {
+            Image(systemName: "chevron.backward")
+                .scaleEffect(0.68)
+                .font(Font.title.weight(.medium))
+                .foregroundColor(theme.backButtonColor?.adaptiveColor(for: colorScheme, darkVariation: theme.backButtonColorDark))
+        }
+    }
+
     private func dismiss() {
         if let dismissAction = self.dismissAction {
             dismissAction()

Airship/AirshipPreferenceCenter/Tests/PreferenceCenterTest.swift

@@ -15,7 +15,8 @@ class PreferenceCenterTest: XCTestCase {
     override func setUp() {
         self.privacyManager = AirshipPrivacyManager(
             dataStore: self.dataStore,
-            defaultEnabledFeatures: .all
+            defaultEnabledFeatures: .all,
+            resetEnabledFeatures: false
         )
 
         self.preferenceCenter = PreferenceCenter(

AirshipContentExtension.podspec

@@ -1,4 +1,4 @@
-AIRSHIP_VERSION="17.9.1"
+AIRSHIP_VERSION="17.10.0"
 
 Pod::Spec.new do |s|
     s.version                 = AIRSHIP_VERSION

AirshipDebug.podspec

@@ -1,4 +1,4 @@
-AIRSHIP_VERSION="17.9.1"
+AIRSHIP_VERSION="17.10.0"
 
 Pod::Spec.new do |s|
    s.version                 = AIRSHIP_VERSION

AirshipServiceExtension.podspec

@@ -1,4 +1,4 @@
-AIRSHIP_VERSION="17.9.1"
+AIRSHIP_VERSION="17.10.0"
 
 Pod::Spec.new do |s|
     s.version                 = AIRSHIP_VERSION