Skip to content

Commit 1c8f185

Browse files
committed
[nits] rename Background Task Delegate to Handler
* Rename `OSBackgroundTaskManagerDelegate` -> `OSBackgroundTaskHandler` because it is not truly a delegate, but is a concrete implementation that is injected
1 parent be65c89 commit 1c8f185

File tree

5 files changed

+25
-25
lines changed

5 files changed

+25
-25
lines changed

iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@
7070
3C2D8A5928B4C4E300BE41F6 /* OSDelta.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2D8A5828B4C4E300BE41F6 /* OSDelta.swift */; };
7171
3C44673E296D099D0039A49E /* OneSignalMobileProvision.m in Sources */ = {isa = PBXBuildFile; fileRef = 912411FD1E73342200E41FD7 /* OneSignalMobileProvision.m */; };
7272
3C44673F296D09CC0039A49E /* OneSignalMobileProvision.h in Headers */ = {isa = PBXBuildFile; fileRef = 912411FC1E73342200E41FD7 /* OneSignalMobileProvision.h */; settings = {ATTRIBUTES = (Public, ); }; };
73-
3C448B9D2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C448B9B2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.h */; };
74-
3C448B9E2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C448B9C2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.m */; };
75-
3C448B9F2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C448B9C2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.m */; };
76-
3C448BA02936ADFD002F96BC /* OSBackgroundTaskManagerImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C448B9C2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.m */; };
73+
3C448B9D2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C448B9B2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.h */; };
74+
3C448B9E2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C448B9C2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m */; };
75+
3C448B9F2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C448B9C2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m */; };
76+
3C448BA02936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C448B9C2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m */; };
7777
3C448BA22936B474002F96BC /* OSBackgroundTaskManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C448BA12936B474002F96BC /* OSBackgroundTaskManager.swift */; };
7878
3C47A974292642B100312125 /* OneSignalConfigManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C47A972292642B100312125 /* OneSignalConfigManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
7979
3C47A975292642B100312125 /* OneSignalConfigManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C47A973292642B100312125 /* OneSignalConfigManager.m */; };
@@ -732,8 +732,8 @@
732732
3C2C7DC5288E00AA0020F9AE /* UserModelObjcTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UserModelObjcTests.m; sourceTree = "<group>"; };
733733
3C2C7DC7288F3C020020F9AE /* OSSubscriptionModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSSubscriptionModel.swift; sourceTree = "<group>"; };
734734
3C2D8A5828B4C4E300BE41F6 /* OSDelta.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSDelta.swift; sourceTree = "<group>"; };
735-
3C448B9B2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OSBackgroundTaskManagerImpl.h; sourceTree = "<group>"; };
736-
3C448B9C2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OSBackgroundTaskManagerImpl.m; sourceTree = "<group>"; };
735+
3C448B9B2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OSBackgroundTaskHandlerImpl.h; sourceTree = "<group>"; };
736+
3C448B9C2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OSBackgroundTaskHandlerImpl.m; sourceTree = "<group>"; };
737737
3C448BA12936B474002F96BC /* OSBackgroundTaskManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSBackgroundTaskManager.swift; sourceTree = "<group>"; };
738738
3C47A972292642B100312125 /* OneSignalConfigManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OneSignalConfigManager.h; sourceTree = "<group>"; };
739739
3C47A973292642B100312125 /* OneSignalConfigManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OneSignalConfigManager.m; sourceTree = "<group>"; };
@@ -1539,8 +1539,8 @@
15391539
912412051E73342200E41FD7 /* OneSignalTrackIAP.m */,
15401540
7A93269225AF4E6700BBEC27 /* OSPendingCallbacks.h */,
15411541
7A93269B25AF4F0200BBEC27 /* OSPendingCallbacks.m */,
1542-
3C448B9B2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.h */,
1543-
3C448B9C2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.m */,
1542+
3C448B9B2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.h */,
1543+
3C448B9C2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m */,
15441544
DEC08AFF2947D4E900C81DA3 /* OneSignalSwiftInterface.swift */,
15451545
);
15461546
path = Source;
@@ -2105,7 +2105,7 @@
21052105
7AECE59C23675F5700537907 /* OSFocusTimeProcessorFactory.h in Headers */,
21062106
7AECE59A23674ADC00537907 /* OSUnattributedFocusTimeProcessor.h in Headers */,
21072107
9124121D1E73342200E41FD7 /* OneSignalJailbreakDetection.h in Headers */,
2108-
3C448B9D2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.h in Headers */,
2108+
3C448B9D2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.h in Headers */,
21092109
912412151E73342200E41FD7 /* OneSignalHelper.h in Headers */,
21102110
91C7725E1E7CCE1000D612D0 /* OneSignalInternal.h in Headers */,
21112111
);
@@ -2768,7 +2768,7 @@
27682768
7A93269C25AF4F0200BBEC27 /* OSPendingCallbacks.m in Sources */,
27692769
DE20425E24E21C2C00350E4F /* UIApplication+OneSignal.m in Sources */,
27702770
7AECE59623674AB700537907 /* OSUnattributedFocusTimeProcessor.m in Sources */,
2771-
3C448B9E2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.m in Sources */,
2771+
3C448B9E2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m in Sources */,
27722772
7AECE59023674A9700537907 /* OSAttributedFocusTimeProcessor.m in Sources */,
27732773
912412361E73342200E41FD7 /* OneSignalTrackIAP.m in Sources */,
27742774
CA1A6E6A20DC2E31001C41B9 /* OneSignalDialogController.m in Sources */,
@@ -2815,7 +2815,7 @@
28152815
7AFE856C2368DDB80091D6A5 /* OSFocusCallParams.m in Sources */,
28162816
7A93269D25AF4F0200BBEC27 /* OSPendingCallbacks.m in Sources */,
28172817
DE20425F24E21C2C00350E4F /* UIApplication+OneSignal.m in Sources */,
2818-
3C448B9F2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.m in Sources */,
2818+
3C448B9F2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m in Sources */,
28192819
912412371E73342200E41FD7 /* OneSignalTrackIAP.m in Sources */,
28202820
7AECE59123674A9700537907 /* OSAttributedFocusTimeProcessor.m in Sources */,
28212821
CA1A6E6B20DC2E31001C41B9 /* OneSignalDialogController.m in Sources */,
@@ -2847,7 +2847,7 @@
28472847
DE16C17024D3989A00670EFA /* OneSignalLifecycleObserver.m in Sources */,
28482848
CAAE0DFD2195216900A57402 /* OneSignalOverrider.m in Sources */,
28492849
CA8E190B2194FE0B009DA223 /* OSMessagingControllerOverrider.m in Sources */,
2850-
3C448BA02936ADFD002F96BC /* OSBackgroundTaskManagerImpl.m in Sources */,
2850+
3C448BA02936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m in Sources */,
28512851
7A123295235DFE3B002B6CE3 /* OutcomeTests.m in Sources */,
28522852
7A4274A425D1C99600EE75FC /* SMSTests.m in Sources */,
28532853
CAA4ED0120646762005BD59B /* BadgeTests.m in Sources */,

iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSBackgroundTaskManager.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import Foundation
2929
import OneSignalCore
3030

3131
@objc
32-
public protocol OSBackgroundTaskManagerDelegate {
32+
public protocol OSBackgroundTaskHandler {
3333
func beginBackgroundTask(_ taskIdentifier: String)
3434
func endBackgroundTask(_ taskIdentifier: String)
3535
func setTaskInvalid(_ taskIdentifier: String)
@@ -40,30 +40,30 @@ public protocol OSBackgroundTaskManagerDelegate {
4040
// check if Core needs to use this, then ok to live here
4141
@objc
4242
public class OSBackgroundTaskManager: NSObject {
43-
@objc public static var delegate: OSBackgroundTaskManagerDelegate? // TODO: This used to be weak, is that still necessary
43+
@objc public static var taskHandler: OSBackgroundTaskHandler?
4444

4545
@objc
4646
public static func beginBackgroundTask(_ taskIdentifier: String) {
47-
guard let delegate = delegate else {
48-
OneSignalLog.onesignalLog(.LL_ERROR, message: "OSBackgroundTaskManager:beginBackgroundTask \(taskIdentifier) cannot be executed due to no delegate.")
47+
guard let delegate = taskHandler else {
48+
OneSignalLog.onesignalLog(.LL_ERROR, message: "OSBackgroundTaskManager:beginBackgroundTask \(taskIdentifier) cannot be executed due to no task handler.")
4949
return
5050
}
5151
delegate.beginBackgroundTask(taskIdentifier)
5252
}
5353

5454
@objc
5555
public static func endBackgroundTask(_ taskIdentifier: String) {
56-
guard let delegate = delegate else {
57-
OneSignalLog.onesignalLog(.LL_ERROR, message: "OSBackgroundTaskManager:endBackgroundTask \(taskIdentifier) cannot be executed due to no delegate.")
56+
guard let delegate = taskHandler else {
57+
OneSignalLog.onesignalLog(.LL_ERROR, message: "OSBackgroundTaskManager:endBackgroundTask \(taskIdentifier) cannot be executed due to no task handler.")
5858
return
5959
}
6060
delegate.endBackgroundTask(taskIdentifier)
6161
}
6262

6363
@objc
6464
public static func setTaskInvalid(_ taskIdentifier: String) {
65-
guard let delegate = delegate else {
66-
OneSignalLog.onesignalLog(.LL_ERROR, message: "OSBackgroundTaskManager:setTaskInvalid \(taskIdentifier) cannot be executed due to no delegate.")
65+
guard let delegate = taskHandler else {
66+
OneSignalLog.onesignalLog(.LL_ERROR, message: "OSBackgroundTaskManager:setTaskInvalid \(taskIdentifier) cannot be executed due to no task handler.")
6767
// But not necessarily an error because this task won't exist
6868
// Can be called in initialization of services before delegate is set
6969
return

iOS_SDK/OneSignalSDK/Source/OSBackgroundTaskManagerImpl.h renamed to iOS_SDK/OneSignalSDK/Source/OSBackgroundTaskHandlerImpl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828
#import <Foundation/Foundation.h>
2929
#import <OneSignalOSCore/OneSignalOSCore-Swift.h>
3030

31-
@interface OSBackgroundTaskManagerImpl : NSObject <OSBackgroundTaskManagerDelegate>
31+
@interface OSBackgroundTaskHandlerImpl : NSObject <OSBackgroundTaskHandler>
3232

3333
@end

iOS_SDK/OneSignalSDK/Source/OSBackgroundTaskManagerImpl.m renamed to iOS_SDK/OneSignalSDK/Source/OSBackgroundTaskHandlerImpl.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ of this software and associated documentation files (the "Software"), to deal
2525
THE SOFTWARE.
2626
*/
2727

28-
#import "OSBackgroundTaskManagerImpl.h"
28+
#import "OSBackgroundTaskHandlerImpl.h"
2929
#import <OneSignalOSCore/OneSignalOSCore-Swift.h>
3030
#import <OneSignalCore/OneSignalCore.h>
3131
#import <UIKit/UIKit.h>
3232

33-
@implementation OSBackgroundTaskManagerImpl
33+
@implementation OSBackgroundTaskHandlerImpl
3434

3535
NSMutableDictionary<NSString*, NSNumber*> *tasks;
3636

iOS_SDK/OneSignalSDK/Source/OneSignal.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#import "UIApplicationDelegate+OneSignal.h"
3939
#import "OSNotification+Internal.h"
4040
#import "OSMigrationController.h"
41-
#import "OSBackgroundTaskManagerImpl.h"
41+
#import "OSBackgroundTaskHandlerImpl.h"
4242
#import "OSFocusCallParams.h"
4343

4444
#import <OneSignalNotifications/OneSignalNotifications.h>
@@ -481,7 +481,7 @@ + (void)init {
481481

482482
[[OSMigrationController new] migrate];
483483

484-
OSBackgroundTaskManager.delegate = [OSBackgroundTaskManagerImpl new];
484+
OSBackgroundTaskManager.taskHandler = [OSBackgroundTaskHandlerImpl new];
485485

486486
[self registerForAPNsToken];
487487

0 commit comments

Comments
 (0)