Skip to content

Commit 2032300

Browse files
author
Evan Greer
committed
removes diff merge code
1 parent 8e82234 commit 2032300

12 files changed

+26
-95
lines changed

‎swift-sdk/Constants.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ enum Const {
5656
static let deviceId = "itbl_device_id"
5757
static let sdkVersion = "itbl_sdk_version"
5858
static let offlineMode = "itbl_offline_mode"
59-
static let embeddedCurrentMessageIds = "itbl_embedded_current_messageIds"
6059

6160
static let attributionInfoExpiration = 24
6261
}
@@ -221,7 +220,6 @@ enum JsonKey {
221220
enum Embedded {
222221
static let packageName = "packageName"
223222
static let sdkVersion = "SDKVersion"
224-
static let currentMessageIds = "currentMessageIds"
225223
}
226224

227225
enum Header {

‎swift-sdk/Internal/ApiClient.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,8 @@ extension ApiClient: ApiClientProtocol {
219219

220220
// MARK: - Embedded Messaging
221221

222-
func getEmbeddedMessages(messages: [String]) -> Pending<PlacementsPayload, SendRequestError> {
223-
let result = createRequestCreator().flatMap { $0.createGetEmbeddedMessagesRequest(messages: messages)}
222+
func getEmbeddedMessages() -> Pending<PlacementsPayload, SendRequestError> {
223+
let result = createRequestCreator().flatMap { $0.createGetEmbeddedMessagesRequest() }
224224
return send(iterableRequestResult: result)
225225
}
226226

‎swift-sdk/Internal/ApiClientProtocol.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ protocol ApiClientProtocol: AnyObject {
4646

4747
func getRemoteConfiguration() -> Pending<RemoteConfiguration, SendRequestError>
4848

49-
func getEmbeddedMessages(messages: [String]) -> Pending<PlacementsPayload, SendRequestError>
49+
func getEmbeddedMessages() -> Pending<PlacementsPayload, SendRequestError>
5050

5151
@discardableResult func track(embeddedMessageReceived message: IterableEmbeddedMessage) -> Pending<SendRequestValue, SendRequestError>
5252

‎swift-sdk/Internal/DependencyContainerProtocol.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ extension DependencyContainerProtocol {
6262
urlDelegate: config.urlDelegate,
6363
customActionDelegate: config.customActionDelegate,
6464
urlOpener: urlOpener,
65-
allowedProtocols: config.allowedProtocols,
66-
localStorage: localStorage)
65+
allowedProtocols: config.allowedProtocols)
6766
}
6867

6968
func createRequestHandler(apiKey: String,

‎swift-sdk/Internal/IterableEmbeddedManager.swift

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,14 @@ class IterableEmbeddedManager: NSObject, IterableInternalEmbeddedManagerProtocol
1414
urlDelegate: IterableURLDelegate?,
1515
customActionDelegate: IterableCustomActionDelegate?,
1616
urlOpener: UrlOpenerProtocol,
17-
allowedProtocols: [String],
18-
localStorage: LocalStorageProtocol) {
17+
allowedProtocols: [String]) {
1918
ITBInfo()
2019

2120
self.apiClient = apiClient
2221
self.urlDelegate = urlDelegate
2322
self.customActionDelegate = customActionDelegate
2423
self.urlOpener = urlOpener
2524
self.allowedProtocols = allowedProtocols
26-
self.localStorage = localStorage
2725

2826
super.init()
2927
addForegroundObservers()
@@ -133,7 +131,6 @@ class IterableEmbeddedManager: NSObject, IterableInternalEmbeddedManagerProtocol
133131
private var messages: [Int: [IterableEmbeddedMessage]] = [:]
134132
private var listeners: NSHashTable<IterableEmbeddedUpdateDelegate> = NSHashTable(options: [.weakMemory])
135133
private var trackedMessageIds: Set<String> = Set()
136-
private var localStorage: LocalStorageProtocol
137134

138135
private func addForegroundObservers() {
139136
NotificationCenter.default.addObserver(self,
@@ -154,26 +151,16 @@ class IterableEmbeddedManager: NSObject, IterableInternalEmbeddedManagerProtocol
154151
}
155152

156153
private func retrieveEmbeddedMessages(completion: @escaping () -> Void) {
157-
apiClient.getEmbeddedMessages(messages: localStorage.embeddedCurrentMessageIds)
154+
apiClient.getEmbeddedMessages()
158155
.onCompletion(
159156
receiveValue: { embeddedMessagesPayload in
160157
let placements = embeddedMessagesPayload.placements
161-
var embeddedCurrentMessageIds: [String] = []
158+
162159
var fetchedMessagesDict: [Int: [IterableEmbeddedMessage]] = [:]
163160
for placement in placements {
164161
fetchedMessagesDict[placement.placementId!] = placement.embeddedMessages
165162
}
166163

167-
for placement in placements {
168-
if let placementId = placement.placementId {
169-
fetchedMessagesDict[placementId] = placement.embeddedMessages
170-
for embeddedMessage in placement.embeddedMessages {
171-
embeddedCurrentMessageIds.append(embeddedMessage.metadata.messageId)
172-
}
173-
}
174-
}
175-
176-
self.localStorage.embeddedCurrentMessageIds = embeddedCurrentMessageIds
177164
let processor = EmbeddedMessagingProcessor(currentMessages: self.messages,
178165
fetchedMessages: fetchedMessagesDict)
179166

‎swift-sdk/Internal/IterableUserDefaults.swift

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,6 @@ class IterableUserDefaults {
7070
}
7171
}
7272

73-
var embeddedCurrentMessageIds: [String]? {
74-
get {
75-
return userDefaults.stringArray(forKey: UserDefaultsKey.embeddedCurrentMessageIds.value)
76-
} set {
77-
save(strings: newValue, withKey: .embeddedCurrentMessageIds)
78-
}
79-
}
80-
8173
func getAttributionInfo(currentDate: Date) -> IterableAttributionInfo? {
8274
(try? codable(withKey: .attributionInfo, currentDate: currentDate)) ?? nil
8375
}
@@ -174,11 +166,7 @@ class IterableUserDefaults {
174166
private func save(string: String?, withKey key: UserDefaultsKey) {
175167
userDefaults.set(string, forKey: key.value)
176168
}
177-
178-
private func save(strings: [String]?, withKey key: UserDefaultsKey) {
179-
userDefaults.set(strings, forKey: key.value)
180-
}
181-
169+
182170
private func save(bool: Bool, withKey key: UserDefaultsKey) {
183171
userDefaults.set(bool, forKey: key.value)
184172
}
@@ -208,7 +196,6 @@ class IterableUserDefaults {
208196
static let deviceId = UserDefaultsKey(value: Const.UserDefault.deviceId)
209197
static let sdkVersion = UserDefaultsKey(value: Const.UserDefault.sdkVersion)
210198
static let offlineMode = UserDefaultsKey(value: Const.UserDefault.offlineMode)
211-
static let embeddedCurrentMessageIds = UserDefaultsKey(value: Const.UserDefault.embeddedCurrentMessageIds)
212199
}
213200

214201
private struct Envelope: Codable {

‎swift-sdk/Internal/LocalStorage.swift

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,4 @@ struct LocalStorage: LocalStorageProtocol {
120120
ITBInfo("UPDATED: migrated authToken from UserDefaults to IterableKeychain")
121121
}
122122
}
123-
124-
var embeddedCurrentMessageIds: [String] {
125-
get {
126-
iterableUserDefaults.embeddedCurrentMessageIds ?? []
127-
} set {
128-
iterableUserDefaults.embeddedCurrentMessageIds = newValue
129-
}
130-
}
131123
}

‎swift-sdk/Internal/LocalStorageProtocol.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ protocol LocalStorageProtocol {
2424
func save(attributionInfo: IterableAttributionInfo?, withExpiration expiration: Date?)
2525

2626
func upgrade()
27-
28-
var embeddedCurrentMessageIds: [String] { get set }
2927
}
3028

3129
extension LocalStorageProtocol {

‎swift-sdk/Internal/RequestCreator.swift

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ struct RequestCreator {
422422

423423
// MARK: - Embedded Messaging Request Calls
424424

425-
func createGetEmbeddedMessagesRequest(messages: [String]?) -> Result<IterableRequest, IterableError> {
425+
func createGetEmbeddedMessagesRequest() -> Result<IterableRequest, IterableError> {
426426
if case .none = auth.emailOrUserId {
427427
ITBError(Self.authMissingMessage)
428428
return .failure(IterableError.general(description: Self.authMissingMessage))
@@ -438,18 +438,7 @@ struct RequestCreator {
438438

439439
setCurrentUser(inDict: &args)
440440

441-
var urlComponents = URLComponents(string: Const.Path.getEmbeddedMessages)
442-
let messagesArray = messages ?? []
443-
let allQueryItems = args.map { URLQueryItem(name: "\($0.key)", value: "\($0.value)") }
444-
let messagesQueryItems = messagesArray.map { URLQueryItem(name: JsonKey.Embedded.currentMessageIds, value: $0) }
445-
446-
urlComponents?.queryItems = allQueryItems + messagesQueryItems
447-
448-
guard let urlString = urlComponents?.url?.absoluteString else {
449-
return .failure(IterableError.general(description: "Failed to create URL"))
450-
}
451-
452-
return .success(.get(createGetRequest(forPath: urlString, withArgs: args as! [String: String])))
441+
return .success(.get(createGetRequest(forPath: Const.Path.getEmbeddedMessages, withArgs: args as! [String: String])))
453442
}
454443

455444
func createEmbeddedMessageReceivedRequest(_ message: IterableEmbeddedMessage) -> Result<IterableRequest, IterableError> {

‎tests/common/MockLocalStorage.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import Foundation
77
@testable import IterableSDK
88

99
class MockLocalStorage: LocalStorageProtocol {
10-
var embeddedCurrentMessageIds: [String] = []
11-
1210
var userId: String? = nil
1311

1412
var email: String? = nil

0 commit comments

Comments
 (0)