Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@
DE7D18C627038249002D3A5D /* OneSignalOutcomes.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE7D188027037F43002D3A5D /* OneSignalOutcomes.framework */; };
DE7D18CD270385D0002D3A5D /* OSOutcomesRequests.m in Sources */ = {isa = PBXBuildFile; fileRef = DE7D18CB270385D0002D3A5D /* OSOutcomesRequests.m */; };
DE7D18CF270385E0002D3A5D /* OSOutcomesRequests.h in Headers */ = {isa = PBXBuildFile; fileRef = DE7D18CE270385E0002D3A5D /* OSOutcomesRequests.h */; };
DE7D18D1270389E1002D3A5D /* OSMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AE28B8725B8ADF400529100 /* OSMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
DE7D18D1270389E1002D3A5D /* OSMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AE28B8725B8ADF400529100 /* OSMacros.h */; settings = {ATTRIBUTES = (Private, ); }; };
DE7D18D22703ADE0002D3A5D /* OneSignalOutcomes.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE7D188027037F43002D3A5D /* OneSignalOutcomes.framework */; };
DE7D18D62703B103002D3A5D /* OSInAppMessageOutcome.m in Sources */ = {isa = PBXBuildFile; fileRef = 7A880F2A23FB45FB0081F5E8 /* OSInAppMessageOutcome.m */; };
DE7D18D72703B111002D3A5D /* OSInAppMessageOutcome.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A880F2923FB45CE0081F5E8 /* OSInAppMessageOutcome.h */; settings = {ATTRIBUTES = (Public, ); }; };
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ of this software and associated documentation files (the "Software"), to deal
#import <Foundation/Foundation.h>
#import "OneSignalAttachmentHandler.h"
#import "OneSignalNotificationCategoryController.h"
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"

@interface DirectDownloadDelegate : NSObject <NSURLSessionDataDelegate> {
NSError* error;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ of this software and associated documentation files (the "Software"), to deal

#import <Foundation/Foundation.h>
#import "OneSignalExtensionRequests.h"
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"

@implementation OSRequestReceiveReceipts

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*/

#import <OneSignalCore/OneSignalCore.h>
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"
#import <OneSignalOutcomes/OneSignalOutcomes.h>
#import "OneSignalNotificationServiceExtensionHandler.h"
#import "OneSignalExtensionBadgeHandler.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#import <Foundation/Foundation.h>
#import "OneSignalReceiveReceiptsController.h"
#import <OneSignalCore/OneSignalCore.h>
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"
#import "OneSignalExtensionRequests.h"

@implementation OneSignalReceiveReceiptsController
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#import "OneSignalCommonDefines.h"
#import "OSMessagingController.h"
#import <OneSignalOutcomes/OneSignalOutcomes.h>
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"
#import "OSSessionManager.h"

@interface OSDynamicTriggerController ()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#import "OSInAppMessageController.h"
#import <OneSignalCore/OneSignalCore.h>
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"
#import <OneSignalUser/OneSignalUser.h>
#import "OSInAppMessagingDefines.h"
#import "OSInAppMessagingRequests.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ of this software and associated documentation files (the "Software"), to deal
#import "OSInAppMessageMigrationController.h"
#import "OSInAppMessagingDefines.h"
#import "OSInAppMessageInternal.h"
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"

@implementation OSInAppMessageMigrationController

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#import "UIApplication+OneSignal.h"
#import "NSDateFormatter+OneSignal.h"
#import <OneSignalCore/OneSignalCore.h>
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"
#import "OSInAppMessageClickResult.h"
#import "OSInAppMessageClickEvent.h"
#import "OSInAppMessageController.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#import "OSTriggerController.h"
#import "OSInAppMessagingDefines.h"
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"

@interface OSTriggerController ()
@property (strong, nonatomic, nonnull) NSMutableDictionary<NSString *, id> *triggers;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#import "OSInAppMessageBridgeEvent.h"
#import "OSInAppMessageClickResult.h"
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"

@implementation OSInAppMessageBridgeEvent

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@


#import "OSInAppMessageClickEvent.h"
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"

@implementation OSInAppMessageClickEvent

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#import "OSInAppMessageClickResult.h"
#import "OSInAppMessagePushPrompt.h"
#import "OSInAppMessageLocationPrompt.h"
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"

@implementation OSInAppMessageClickResult

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*/

#import "OSInAppMessageDisplayStats.h"
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"

@interface OSInAppMessageDisplayStats ()
@property (nonatomic, readwrite) BOOL redisplayEnabled;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#import "OSInAppMessageInternal.h"
#import "NSDateFormatter+OneSignal.h"
#import "OneSignalCommonDefines.h"
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"

@implementation OSInAppMessage

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#import "OSInAppMessageLocationPrompt.h"
#import <OneSignalLocation/OneSignalLocationManager.h>
#import <OneSignalCore/OneSignalLog.h>
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"

//@interface OneSignalLocation ()
//
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#import "OSInAppMessagePushPrompt.h"
#import "OneSignalInAppMessages.h"
#import <OneSignalNotifications/OneSignalNotifications.h>
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"

@implementation OSInAppMessagePushPrompt

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*/

#import "OSInAppMessageTag.h"
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"

@implementation OSInAppMessageTag

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*/

#import "OSTrigger.h"
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"

@implementation OSTrigger

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ of this software and associated documentation files (the "Software"), to deal
*/
#import <Foundation/Foundation.h>
#import "OSInAppMessagingRequests.h"
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"

@implementation OSRequestGetInAppMessages
- (NSString *)description {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#import <WebKit/WebKit.h>
#import "OSInAppMessageClickResult.h"
#import <OneSignalUser/OneSignalUser.h>
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"

@interface OSInAppMessageView () <UIScrollViewDelegate, WKUIDelegate, WKNavigationDelegate>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#import "OSInAppMessageController.h"
#import "OSInAppMessageBridgeEvent.h"
#import <OneSignalOutcomes/OneSignalOutcomes.h>
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"
#import "OSSessionManager.h"

#define HIGHEST_CONSTRAINT_PRIORITY 999.0f
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#import <UIKit/UIKit.h>
#import "OneSignalWebView.h"
#import <OneSignalCore/OneSignalCore.h>
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"

@implementation OneSignalWebView

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#import <CoreLocation/CoreLocation.h>
#import "OneSignalLocationManager.h"
#import <OneSignalCore/OneSignalCore.h>
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"
#import <OneSignalUser/OneSignalUser-Swift.h>

@implementation OneSignalLocationManager
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#import "SwizzlingForwarder.h"
#import "OSNotificationsManager.h"
#import <objc/runtime.h>
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"

// This class hooks into the UIApplicationDelegate selectors to receive iOS 9 and older events.
// - UNUserNotificationCenter is used for iOS 10
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#import "UIApplicationDelegate+OneSignalNotifications.h"
#import "OSNotificationsManager.h"
#import <OneSignalCore/OneSignalCore.h>
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"
#import <objc/runtime.h>
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wundeclared-selector"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#import "OneSignalCommonDefines.h"
#import "OSNotificationsManager.h"
#import <OneSignalCore/OSDeviceUtils.h>
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"
#import <OneSignalCore/OneSignalCoreHelper.h>

@interface OneSignalNotificationSettings ()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ of this software and associated documentation files (the "Software"), to deal

#import "OSNotificationsManager.h"
#import <OneSignalCore/OneSignalCore.h>
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"
#import <UIKit/UIKit.h>
#import <UserNotifications/UserNotifications.h>
#import "OSNotification+OneSignal.h"
Expand Down
2 changes: 1 addition & 1 deletion iOS_SDK/OneSignalSDK/OneSignalNotifications/OSPermission.m
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#import "OSPermission.h"
#import <OneSignalCore/OneSignalCore.h>
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"
#import "OSNotificationsManager.h"

@implementation OSPermissionStateInternal
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*/

#import "OSInAppMessageOutcome.h"
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"

@implementation OSInAppMessageOutcome

Expand Down
2 changes: 1 addition & 1 deletion iOS_SDK/OneSignalSDK/OneSignalOutcomes/OSOutcomes.m
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ of this software and associated documentation files (the "Software"), to deal
*/
#import "OneSignalOutcomes.h"
#import <OneSignalCore/OneSignalCore.h>
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"

@implementation OSOutcomes

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ of this software and associated documentation files (the "Software"), to deal

#import <Foundation/Foundation.h>
#import <OneSignalCore/OneSignalCore.h>
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"
#import "OSChannelTracker.h"
#import "OSIndirectInfluence.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ of this software and associated documentation files (the "Software"), to deal
#import "OSIndirectInfluence.h"
#import "OSInAppMessageTracker.h"
#import <OneSignalCore/OneSignalCore.h>
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"

@interface OSChannelTracker ()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ of this software and associated documentation files (the "Software"), to deal
#import <Foundation/Foundation.h>
#import "OSIndirectInfluence.h"
#import <OneSignalCore/OneSignalCore.h>
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"

@interface OSIndirectInfluence ()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ of this software and associated documentation files (the "Software"), to deal

#import "OSOutcomeEvent.h"
#import <OneSignalCore/OneSignalCore.h>
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"

@implementation OSOutcomeEvent

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ of this software and associated documentation files (the "Software"), to deal
#import <Foundation/Foundation.h>
#import "OSCachedUniqueOutcome.h"
#import "OSOutcomeEventsRepository.h"
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"

@implementation OSOutcomeEventsRepository

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ of this software and associated documentation files (the "Software"), to deal
*/

#import "OSOutcomesRequests.h"
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"

@implementation OSRequestSendOutcomesV1ToServer
NSString * const APP_ID = @"app_id";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*/
#import <UIKit/UIKit.h>
#import <OneSignalCore/OneSignalCore.h>
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"
#import "OneSignalFramework.h"
#import "OSAttributedFocusTimeProcessor.h"
#import <OneSignalUser/OneSignalUser.h>
Expand Down
2 changes: 1 addition & 1 deletion iOS_SDK/OneSignalSDK/Source/OSFocusRequests.m
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#import <Foundation/Foundation.h>
#import "OSFocusRequests.h"
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"

@implementation OSRequestOnFocus

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#import <UIKit/UIKit.h>
#import <OneSignalCore/OneSignalCore.h>
#import <OneSignalOSCore/OneSignalOSCore.h>
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"
#import "OSUnattributedFocusTimeProcessor.h"
#import <OneSignalUser/OneSignalUser.h>

Expand Down
2 changes: 1 addition & 1 deletion iOS_SDK/OneSignalSDK/Source/OneSignalLifecycleObserver.m
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ of this software and associated documentation files (the "Software"), to deal
#import "OneSignalCommonDefines.h"
#import "OneSignalTracker.h"
#import <OneSignalLocation/OneSignalLocationManager.h>
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"

@implementation OneSignalLifecycleObserver

Expand Down
2 changes: 1 addition & 1 deletion iOS_SDK/OneSignalSDK/Source/OneSignalTracker.m
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#import "OneSignalTracker.h"
#import "OneSignalWebView.h"
#import <OneSignalCore/OneSignalCore.h>
#import <OneSignalCore/OSMacros.h>
#import "OSMacros.h"
#import <OneSignalOutcomes/OneSignalOutcomes.h>
#import "OSFocusTimeProcessorFactory.h"
#import "OSFocusCallParams.h"
Expand Down
Loading