Renamed Session type to OSSession to avoid cross-package conflicts

Author: rgomezp

iOS_SDK/OneSignalSDK/Source/OSIndirectInfluence.h

@@ -1,21 +1,21 @@
 /**
  Modified MIT License
- 
+
  Copyright 2019 OneSignal
- 
+
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+
  1. The above copyright notice and this permission notice shall be included in
  all copies or substantial portions of the Software.
- 
+
  2. All copies of substantial portions of the Software may only be used in connection
  with services provided by OneSignal.
- 
+
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

iOS_SDK/OneSignalSDK/Source/OSOutcomeEvent.h

@@ -32,7 +32,7 @@
 
 @interface OSOutcomeEvent () <OSJSONEncodable>
 
-- (id _Nonnull)initWithSession:(Session)session
+- (id _Nonnull)initWithSession:(OSSession)session
                notificationIds:(NSArray * _Nullable)notificationIds
                           name:(NSString * _Nonnull)name
                      timestamp:(NSNumber * _Nonnull)timestamp

iOS_SDK/OneSignalSDK/Source/OSOutcomeEvent.m

@@ -31,7 +31,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 @implementation OSOutcomeEvent
 
-- (id _Nonnull)initWithSession:(Session)influenceType
+- (id _Nonnull)initWithSession:(OSSession)influenceType
                notificationIds:(NSArray * _Nullable)notificationIds
                           name:(NSString * _Nonnull)name
                      timestamp:(NSNumber * _Nonnull)timestamp
@@ -52,7 +52,7 @@ - (id)initFromOutcomeEventParams:(OSOutcomeEventParams *)outcomeEventParams {
         OSOutcomeSource *source = outcomeEventParams.outcomeSource;
         Session influenceType = UNATTRIBUTED;
         NSArray *notificationId = nil;
-        
+
         if (source) {
             if (source.directBody && source.directBody.notificationIds && source.directBody.notificationIds.count > 0) {
                 influenceType = DIRECT;
@@ -62,7 +62,7 @@ - (id)initFromOutcomeEventParams:(OSOutcomeEventParams *)outcomeEventParams {
                 notificationId = source.indirectBody.notificationIds;
             }
         }
-        
+
         _session = influenceType;
         _notificationIds = notificationId;
         _name = outcomeEventParams.outcomeId;

iOS_SDK/OneSignalSDK/Source/OSOutcomesUtils.h

@@ -210,7 +210,7 @@ typedef NS_ENUM(NSUInteger, OSNotificationActionType)  {
 // Pass in nil means a notification will not display
 typedef void (^OSNotificationDisplayResponse)(OSNotification* _Nullable  notification);
 /* OneSignal Influence Types */
-typedef NS_ENUM(NSUInteger, Session) {
+typedef NS_ENUM(NSUInteger, OSSession) {
     DIRECT,
     INDIRECT,
     UNATTRIBUTED,
@@ -225,7 +225,7 @@ typedef NS_ENUM(NSUInteger, OSInfluenceChannel) {
 @interface OSOutcomeEvent : NSObject
 
 // Session enum (DIRECT, INDIRECT, UNATTRIBUTED, or DISABLED) to determine code route and request params
-@property (nonatomic) Session session;
+@property (nonatomic) OSSession session;
 
 // Notification ids for the current session
 @property (strong, nonatomic, nullable) NSArray *notificationIds;