Rename session type (#766)

* Renamed Session type to OSSession to avoid cross-package conflicts

* Updating influences to use OSSesstion

* removing blank files

Co-authored-by: Rodrigo <[email protected]>

Author: emawby

iOS_SDK/OneSignalSDK/Source/OSChannelTracker.h

@@ -33,7 +33,7 @@ THE SOFTWARE.
 
 @interface OSChannelTracker : NSObject
 
-@property (nonatomic, readwrite) Session influenceType;
+@property (nonatomic, readwrite) OSSession influenceType;
 @property (strong, nonatomic, readwrite, nullable) NSString *directId;
 @property (strong, nonatomic, readwrite, nullable) NSArray *indirectIds;
 @property (strong, nonatomic, readonly, nonnull) OSInfluenceDataRepository *dataRepository;

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/OSInfluence.h

@@ -33,15 +33,15 @@ THE SOFTWARE.
 @interface OSInfluenceBuilder : NSObject
 
 @property (nonatomic) OSInfluenceChannel influenceChannel;
-@property (nonatomic) Session influenceType;
+@property (nonatomic) OSSession influenceType;
 @property (nonatomic, copy) NSArray * _Nullable ids;
 
 @end
 
 @interface OSInfluence : NSObject
 
 @property (nonatomic, readonly) OSInfluenceChannel influenceChannel;
-@property (nonatomic, readonly) Session influenceType;
+@property (nonatomic, readonly) OSSession influenceType;
 @property (nonatomic, readwrite) NSArray * _Nullable ids;
 
 - (id _Nonnull)initWithBuilder:(OSInfluenceBuilder * _Nonnull)builder;

iOS_SDK/OneSignalSDK/Source/OSInfluence.m

@@ -40,7 +40,7 @@ - (instancetype)init
 
 @implementation OSInfluence
 
-- (id)initWithInfluenceType:(Session)influenceType
+- (id)initWithInfluenceType:(OSSession)influenceType
         forInfluenceChannel:(OSInfluenceChannel)influenceChannel
                     withIds:(NSArray *)ids {
     if (self = [super init]) {

iOS_SDK/OneSignalSDK/Source/OSInfluenceDataRepository.h

@@ -32,11 +32,11 @@ THE SOFTWARE.
 
 @interface OSInfluenceDataRepository : NSObject
 
-- (void)cacheNotificationInfluenceType:(Session) influenceType;
-- (Session)notificationCachedInfluenceType;
+- (void)cacheNotificationInfluenceType:(OSSession) influenceType;
+- (OSSession)notificationCachedInfluenceType;
 
-- (void)cacheIAMInfluenceType:(Session) influenceType;
-- (Session)iamCachedInfluenceType;
+- (void)cacheIAMInfluenceType:(OSSession) influenceType;
+- (OSSession)iamCachedInfluenceType;
 
 - (void)cacheNotificationOpenId:(NSString * _Nullable)notificationId;
 - (NSString * _Nullable)cachedNotificationOpenId;

iOS_SDK/OneSignalSDK/Source/OSInfluenceDataRepository.m

@@ -33,20 +33,20 @@ of this software and associated documentation files (the "Software"), to deal
 
 @implementation OSInfluenceDataRepository
 
-- (void)cacheNotificationInfluenceType:(Session) influenceType {
+- (void)cacheNotificationInfluenceType:(OSSession) influenceType {
     [OneSignalUserDefaults.initShared saveStringForKey:OSUD_CACHED_NOTIFICATION_INFLUENCE withValue:OS_INFLUENCE_TYPE_TO_STRING(influenceType)];
 }
 
-- (Session)notificationCachedInfluenceType {
+- (OSSession)notificationCachedInfluenceType {
     NSString *sessionString = [OneSignalUserDefaults.initShared getSavedStringForKey:OSUD_CACHED_NOTIFICATION_INFLUENCE defaultValue:OS_INFLUENCE_TYPE_TO_STRING(UNATTRIBUTED)];
     return OS_INFLUENCE_TYPE_FROM_STRING(sessionString);
 }
 
-- (void)cacheIAMInfluenceType:(Session) influenceType {
+- (void)cacheIAMInfluenceType:(OSSession) influenceType {
     [OneSignalUserDefaults.initShared saveStringForKey:OSUD_CACHED_IAM_INFLUENCE withValue:OS_INFLUENCE_TYPE_TO_STRING(influenceType)];
 }
 
-- (Session)iamCachedInfluenceType {
+- (OSSession)iamCachedInfluenceType {
     NSString *sessionString = [OneSignalUserDefaults.initShared getSavedStringForKey:OSUD_CACHED_IAM_INFLUENCE defaultValue:OS_INFLUENCE_TYPE_TO_STRING(UNATTRIBUTED)];
     return OS_INFLUENCE_TYPE_FROM_STRING(sessionString);
 }

iOS_SDK/OneSignalSDK/Source/OSNotificationTracker.m

@@ -66,7 +66,7 @@ - (void)saveChannelObjects:(NSArray * _Nonnull)channelObjects {
 }
 
 - (void)initInfluencedTypeFromCache {
-    Session influenceType = [self.dataRepository notificationCachedInfluenceType];
+    OSSession influenceType = [self.dataRepository notificationCachedInfluenceType];
     self.influenceType = influenceType;
 
     if (influenceType == INDIRECT)

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
@@ -50,9 +50,9 @@ - (id _Nonnull)initWithSession:(Session)influenceType
 - (id)initFromOutcomeEventParams:(OSOutcomeEventParams *)outcomeEventParams {
     if (self = [super init]) {
         OSOutcomeSource *source = outcomeEventParams.outcomeSource;
-        Session influenceType = UNATTRIBUTED;
+        OSSession 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/OSSessionManager.m

@@ -196,7 +196,7 @@ - (void)attemptSessionUpgrade:(AppEntryAction)entryAction withDirectId:(NSString
 /*
  Called when the session for the app changes, caches the state, and broadcasts the session that just ended
  */
-- (BOOL)setSessionForChannel:(OSChannelTracker *)channelTracker withInfluenceType:(Session)influenceType directId:(NSString *)directId indirectIds:(NSArray *)indirectIds {
+- (BOOL)setSessionForChannel:(OSChannelTracker *)channelTracker withInfluenceType:(OSSession)influenceType directId:(NSString *)directId indirectIds:(NSArray *)indirectIds {
     if (![self willChangeSessionForChannel:channelTracker withInfluenceType:influenceType directId:directId indirectIds:indirectIds])
         return NO;
 
@@ -226,7 +226,7 @@ - (BOOL)setSessionForChannel:(OSChannelTracker *)channelTracker withInfluenceTyp
     2. Is DIRECT session data different from incoming DIRECT session data?
     3. Is INDIRECT session data different from incoming INDIRECT session data?
  */
-- (BOOL)willChangeSessionForChannel:(OSChannelTracker *)channelTracker withInfluenceType:(Session)influenceType directId:(NSString *)directId indirectIds:(NSArray *)indirectIds {
+- (BOOL)willChangeSessionForChannel:(OSChannelTracker *)channelTracker withInfluenceType:(OSSession)influenceType directId:(NSString *)directId indirectIds:(NSArray *)indirectIds {
     if (channelTracker.influenceType != influenceType)
         return true;