Skip to content

Commit b59b360

Browse files
committed
[nits] privatize internal methods
* No need to be on protocol nor exposed
1 parent 7aa7ad3 commit b59b360

File tree

4 files changed

+19
-22
lines changed

4 files changed

+19
-22
lines changed

iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSOperationExecutor.swift

-3
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,8 @@ import OneSignalCore
3232
*/
3333
public protocol OSOperationExecutor {
3434
var supportedDeltas: [String] { get }
35-
var deltaQueue: [OSDelta] { get }
3635

3736
func enqueueDelta(_ delta: OSDelta)
3837
func cacheDeltaQueue()
3938
func processDeltaQueue(inBackground: Bool)
40-
41-
func processRequestQueue(inBackground: Bool)
4239
}

iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSIdentityOperationExecutor.swift

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ import OneSignalCore
3030

3131
class OSIdentityOperationExecutor: OSOperationExecutor {
3232
var supportedDeltas: [String] = [OS_ADD_ALIAS_DELTA, OS_REMOVE_ALIAS_DELTA]
33-
var deltaQueue: [OSDelta] = []
33+
private var deltaQueue: [OSDelta] = []
3434
// To simplify uncaching, we maintain separate request queues for each type
35-
var addRequestQueue: [OSRequestAddAliases] = []
36-
var removeRequestQueue: [OSRequestRemoveAlias] = []
37-
let newRecordsState: OSNewRecordsState
35+
private var addRequestQueue: [OSRequestAddAliases] = []
36+
private var removeRequestQueue: [OSRequestRemoveAlias] = []
37+
private let newRecordsState: OSNewRecordsState
3838

3939
// The Identity executor dispatch queue, serial. This synchronizes access to the delta and request queues.
4040
private let dispatchQueue = DispatchQueue(label: "OneSignal.OSIdentityOperationExecutor", target: .global())
@@ -168,7 +168,7 @@ class OSIdentityOperationExecutor: OSOperationExecutor {
168168
}
169169

170170
/// This method is called by `processDeltaQueue` only and does not need to be added to the dispatchQueue.
171-
func processRequestQueue(inBackground: Bool) {
171+
private func processRequestQueue(inBackground: Bool) {
172172
let requestQueue: [OneSignalRequest] = addRequestQueue + removeRequestQueue
173173

174174
if requestQueue.isEmpty {

iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSPropertyOperationExecutor.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ private struct OSCombinedProperties {
6262

6363
class OSPropertyOperationExecutor: OSOperationExecutor {
6464
var supportedDeltas: [String] = [OS_UPDATE_PROPERTIES_DELTA]
65-
var deltaQueue: [OSDelta] = []
66-
var updateRequestQueue: [OSRequestUpdateProperties] = []
67-
let newRecordsState: OSNewRecordsState
65+
private var deltaQueue: [OSDelta] = []
66+
private var updateRequestQueue: [OSRequestUpdateProperties] = []
67+
private let newRecordsState: OSNewRecordsState
6868

6969
// The property executor dispatch queue, serial. This synchronizes access to `deltaQueue` and `updateRequestQueue`.
7070
private let dispatchQueue = DispatchQueue(label: "OneSignal.OSPropertyOperationExecutor", target: .global())
@@ -221,7 +221,7 @@ class OSPropertyOperationExecutor: OSOperationExecutor {
221221
}
222222

223223
/// This method is called by `processDeltaQueue` only and does not need to be added to the dispatchQueue.
224-
func processRequestQueue(inBackground: Bool) {
224+
private func processRequestQueue(inBackground: Bool) {
225225
if updateRequestQueue.isEmpty {
226226
return
227227
}

iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSSubscriptionOperationExecutor.swift

+10-10
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ import OneSignalCore
3030

3131
class OSSubscriptionOperationExecutor: OSOperationExecutor {
3232
var supportedDeltas: [String] = [OS_ADD_SUBSCRIPTION_DELTA, OS_REMOVE_SUBSCRIPTION_DELTA, OS_UPDATE_SUBSCRIPTION_DELTA]
33-
var deltaQueue: [OSDelta] = []
33+
private var deltaQueue: [OSDelta] = []
3434
// To simplify uncaching, we maintain separate request queues for each type
35-
var addRequestQueue: [OSRequestCreateSubscription] = []
36-
var removeRequestQueue: [OSRequestDeleteSubscription] = []
37-
var updateRequestQueue: [OSRequestUpdateSubscription] = []
38-
var subscriptionModels: [String: OSSubscriptionModel] = [:]
39-
let newRecordsState: OSNewRecordsState
35+
private var addRequestQueue: [OSRequestCreateSubscription] = []
36+
private var removeRequestQueue: [OSRequestDeleteSubscription] = []
37+
private var updateRequestQueue: [OSRequestUpdateSubscription] = []
38+
private var subscriptionModels: [String: OSSubscriptionModel] = [:]
39+
private let newRecordsState: OSNewRecordsState
4040

4141
// The Subscription executor dispatch queue, serial. This synchronizes access to the delta and request queues.
4242
private let dispatchQueue = DispatchQueue(label: "OneSignal.OSSubscriptionOperationExecutor", target: .global())
@@ -157,7 +157,7 @@ class OSSubscriptionOperationExecutor: OSOperationExecutor {
157157
/**
158158
Since there are 2 subscription stores, we need to check both stores for the model with a particular `modelId`.
159159
*/
160-
func getSubscriptionModelFromStores(modelId: String) -> OSSubscriptionModel? {
160+
private func getSubscriptionModelFromStores(modelId: String) -> OSSubscriptionModel? {
161161
if let modelInStore = OneSignalUserManagerImpl.sharedInstance.pushSubscriptionModelStore.getModel(modelId: modelId) {
162162
return modelInStore
163163
}
@@ -246,7 +246,7 @@ class OSSubscriptionOperationExecutor: OSOperationExecutor {
246246
}
247247

248248
/// This method is called by `processDeltaQueue` only and does not need to be added to the dispatchQueue.
249-
func processRequestQueue(inBackground: Bool) {
249+
private func processRequestQueue(inBackground: Bool) {
250250
let requestQueue: [OneSignalRequest] = addRequestQueue + removeRequestQueue + updateRequestQueue
251251

252252
if requestQueue.isEmpty {
@@ -269,7 +269,7 @@ class OSSubscriptionOperationExecutor: OSOperationExecutor {
269269
}
270270
}
271271

272-
func executeCreateSubscriptionRequest(_ request: OSRequestCreateSubscription, inBackground: Bool) {
272+
private func executeCreateSubscriptionRequest(_ request: OSRequestCreateSubscription, inBackground: Bool) {
273273
guard !request.sentToClient else {
274274
return
275275
}
@@ -391,7 +391,7 @@ class OSSubscriptionOperationExecutor: OSOperationExecutor {
391391
}
392392
}
393393

394-
func executeUpdateSubscriptionRequest(_ request: OSRequestUpdateSubscription, inBackground: Bool) {
394+
private func executeUpdateSubscriptionRequest(_ request: OSRequestUpdateSubscription, inBackground: Bool) {
395395
guard !request.sentToClient else {
396396
return
397397
}

0 commit comments

Comments
 (0)