removing from OneSignal.m and .h

* Remove dead code from OneSignalFramework.h and OneSignal.m
* usesAutoPrompt was always false, so remove it

Author: nan-li

iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.h

@@ -31,7 +31,8 @@
 #import <UIKit/UIKit.h>
 #import <OneSignalFramework/OneSignalFramework.h>
 
-@interface AppDelegate : UIResponder <UIApplicationDelegate, OSPermissionObserver, OSSubscriptionObserver, OSInAppMessageLifecycleHandler>
+// TODO: Add subscription observer
+@interface AppDelegate : UIResponder <UIApplicationDelegate, OSPermissionObserver, OSInAppMessageLifecycleHandler>
 
 @property (strong, nonatomic) UIWindow *window;
 

iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.m

@@ -120,11 +120,12 @@ - (void) onOSPermissionChanged:(OSPermissionStateChanges*)stateChanges {
     NSLog(@"onOSPermissionChanged: %@", stateChanges);
 }
 
-- (void) onOSSubscriptionChanged:(OSSubscriptionStateChanges*)stateChanges {
-    NSLog(@"onOSSubscriptionChanged: %@", stateChanges);
-    ViewController* mainController = (ViewController*) self.window.rootViewController;
-    mainController.subscriptionSegmentedControl.selectedSegmentIndex = (NSInteger) stateChanges.to.isSubscribed;
-}
+// TODO: Add push sub observer
+//- (void) onOSSubscriptionChanged:(OSSubscriptionStateChanges*)stateChanges {
+//    NSLog(@"onOSSubscriptionChanged: %@", stateChanges);
+//    ViewController* mainController = (ViewController*) self.window.rootViewController;
+//    mainController.subscriptionSegmentedControl.selectedSegmentIndex = (NSInteger) stateChanges.to.isSubscribed;
+//}
 
 #pragma mark OSInAppMessageDelegate
 

iOS_SDK/OneSignalDevApp/OneSignalDevAppClip/AppDelegate.h

@@ -9,7 +9,8 @@
 #import <UIKit/UIKit.h>
 #import <OneSignalFramework/OneSignalFramework.h>
 
-@interface AppDelegate : UIResponder <UIApplicationDelegate, OSPermissionObserver, OSSubscriptionObserver>
+// TODO: Add subscription observer
+@interface AppDelegate : UIResponder <UIApplicationDelegate, OSPermissionObserver>
 
 @property (strong, nonatomic) UIWindow *window;
 

iOS_SDK/OneSignalDevApp/OneSignalDevAppClip/AppDelegate.m

@@ -116,11 +116,12 @@ - (void) onOSPermissionChanged:(OSPermissionStateChanges*)stateChanges {
     NSLog(@"onOSPermissionChanged: %@", stateChanges);
 }
 
-- (void) onOSSubscriptionChanged:(OSSubscriptionStateChanges*)stateChanges {
-    NSLog(@"onOSSubscriptionChanged: %@", stateChanges);
-    ViewController* mainController = (ViewController*) self.window.rootViewController;
-    mainController.subscriptionSegmentedControl.selectedSegmentIndex = (NSInteger) stateChanges.to.isSubscribed;
-}
+// TODO: Add push sub observer
+//- (void) onOSSubscriptionChanged:(OSSubscriptionStateChanges*)stateChanges {
+//    NSLog(@"onOSSubscriptionChanged: %@", stateChanges);
+//    ViewController* mainController = (ViewController*) self.window.rootViewController;
+//    mainController.subscriptionSegmentedControl.selectedSegmentIndex = (NSInteger) stateChanges.to.isSubscribed;
+//}
 
 - (void)applicationWillResignActive:(UIApplication *)application {
 }

iOS_SDK/OneSignalSDK/OneSignalNotifications/OSPermission.m

@@ -241,7 +241,7 @@ + (void)fireChangesObserver:(OSPermissionStateInternal*)state  {
 @implementation OSPermissionStateChanges
 
 - (NSString*)description {
-    static NSString* format = @"<OSSubscriptionStateChanges:\nfrom: %@,\nto:   %@\n>";
+    static NSString* format = @"<OSPermissionStateChanges:\nfrom: %@,\nto:   %@\n>";
     return [NSString stringWithFormat:format, _from, _to];
 }
 

iOS_SDK/OneSignalSDK/Source/OneSignal.m

@@ -96,10 +96,6 @@ @implementation OneSignal
 
 static NSString* mSDKType = @"native";
 
-static NSMutableArray* pendingSendTagCallbacks;
-static OSResultSuccessBlock pendingGetTagsSuccessBlock;
-static OSFailureBlock pendingGetTagsFailureBlock;
-
 // Has attempted to register for push notifications with Apple since app was installed.
 static BOOL registeredWithApple = NO;
 
@@ -126,14 +122,8 @@ + (DelayedConsentInitializationParameters *)delayedInitParameters {
 // Set when the app is launched
 static NSDate *sessionLaunchTime;
 
-NSString* emailToSet;
 static LanguageContext* languageContext;
 
-BOOL usesAutoPrompt = false;
-
-static BOOL performedOnSessionRequest = false;
-
-
 // static property def to add developer's OSPermissionStateChanges observers to.
 static ObservablePermissionStateChangesType* _permissionStateChangesObserver;
 + (ObservablePermissionStateChangesType*)permissionStateChangesObserver {
@@ -207,7 +197,6 @@ + (void)clearStatics {
     launchOptions = false;
     appSettings = nil;
     initDone = false;
-    usesAutoPrompt = false;
 
     [OSNotificationsManager clearStatics];
     registeredWithApple = false;
@@ -218,16 +207,13 @@ + (void)clearStatics {
     _didCallDownloadParameters = false;
 
     sessionLaunchTime = [NSDate date];
-    performedOnSessionRequest = false;
 
     [OSOutcomes clearStatics];
 
     [OSSessionManager resetSharedSessionManager];
 }
 
-#pragma mark User Model 🔥
-
-#pragma mark User Model - User Identity 🔥
+#pragma mark Namespaces
 
 + (id<OSUser>)User {
     return [OneSignalUserManagerImpl.sharedInstance User];
@@ -255,7 +241,6 @@ + (void)logout {
     [OneSignalUserManagerImpl.sharedInstance logout];
 }
 
-#pragma mark User Model - Notifications namespace 🔥
 + (Class<OSNotifications>)Notifications {
     return [OSNotificationsManager Notifications];
 }
@@ -272,6 +257,8 @@ + (void)logout {
     return [OneSignalLocation Location];
 }
 
+#pragma mark Initialization
+
 /*
  This is should be set from all OneSignal entry points.
  */
@@ -358,8 +345,6 @@ + (void)setProvidesNotificationSettingsView:(BOOL)providesView {
     }
 }
 
-#pragma mark Initialization
-
 + (BOOL)shouldStartNewSession {
     // return if the user has not granted privacy permissions
     if ([OSPrivacyConsentController shouldLogMissingPrivacyConsentErrorWithMethodName:nil])
@@ -654,7 +639,7 @@ + (void)downloadIOSParamsWithAppId:(NSString *)appId {
             OneSignalUserManagerImpl.sharedInstance.requiresUserAuth = [result[IOS_REQUIRES_USER_ID_AUTHENTICATION] boolValue];
         }
 
-        if (!usesAutoPrompt && result[IOS_USES_PROVISIONAL_AUTHORIZATION] != (id)[NSNull null]) {
+        if (result[IOS_USES_PROVISIONAL_AUTHORIZATION] != (id)[NSNull null]) {
             [OneSignalUserDefaults.initStandard saveBoolForKey:OSUD_USES_PROVISIONAL_PUSH_AUTHORIZATION withValue:[result[IOS_USES_PROVISIONAL_AUTHORIZATION] boolValue]];
 
             [OSNotificationsManager checkProvisionalAuthorizationStatus];

iOS_SDK/OneSignalSDK/Source/OneSignalFramework.h

@@ -55,29 +55,6 @@
 #pragma clang diagnostic ignored "-Wstrict-prototypes"
 #pragma clang diagnostic ignored "-Wnullability-completeness"
 
-// TODO: Need to remove these too for user model
-
-// Subscription Classes
-@interface OSSubscriptionState : NSObject
-
-@property (readonly, nonatomic) BOOL isSubscribed; // (yes only if userId, pushToken, and setSubscription exists / are true)
-@property (readonly, nonatomic) BOOL isPushDisabled; // returns value of disablePush.
-@property (readonly, nonatomic, nullable) NSString* userId;    // AKA OneSignal PlayerId
-@property (readonly, nonatomic, nullable) NSString* pushToken; // AKA Apple Device Token
-- (NSDictionary* _Nonnull)toDictionary;
-
-@end
-
-@interface OSSubscriptionStateChanges : NSObject
-@property (readonly, nonnull) OSSubscriptionState* to;
-@property (readonly, nonnull) OSSubscriptionState* from;
-- (NSDictionary* _Nonnull)toDictionary;
-@end
-
-@protocol OSSubscriptionObserver <NSObject>
-- (void)onOSSubscriptionChanged:(OSSubscriptionStateChanges* _Nonnull)stateChanges;
-@end
-
 typedef void (^OSWebOpenURLResultBlock)(BOOL shouldOpen);
 
 /*Block for generic results on success and errors on failure*/
@@ -94,16 +71,14 @@ typedef void (^OSFailureBlock)(NSError* error);
 // Only used for wrapping SDKs, such as Unity, Cordova, Xamarin, etc.
 + (void)setMSDKType:(NSString* _Nonnull)type;
 
-#pragma mark User Model 🔥
-
-#pragma mark User Model - User Identity 🔥
+#pragma mark User
 + (id<OSUser>)User NS_REFINED_FOR_SWIFT;
 + (void)login:(NSString * _Nonnull)externalId;
 + (void)login:(NSString * _Nonnull)externalId withToken:(NSString * _Nullable)token
 NS_SWIFT_NAME(login(externalId:token:));
 + (void)logout;
 
-#pragma mark User Model - Notifications namespace 🔥
+#pragma mark Notifications
 + (Class<OSNotifications>)Notifications NS_REFINED_FOR_SWIFT;
 
 #pragma mark Initialization

iOS_SDK/OneSignalSDK/Source/OneSignalInternal.h

@@ -39,19 +39,11 @@
 
 @interface OneSignal (OneSignalInternal)
 
-+ (BOOL)shouldPromptToShowURL;
-+ (void)setIsOnSessionSuccessfulForCurrentState:(BOOL)value;
-+ (BOOL)shouldRegisterNow;
-
 + (NSDate *_Nonnull)sessionLaunchTime;
 
 
 @property (class, readonly) BOOL didCallDownloadParameters;
 @property (class, readonly) BOOL downloadedParameters;
-//Indicates we have attempted to register the user and it has succeeded or failed
-@property (class, readonly) BOOL isRegisterUserFinished;
-//Indicates that registering the user was successful
-@property (class, readonly) BOOL isRegisterUserSuccessful;
 
 @property (class) AppEntryAction appEntryState;
 @property (class) OSSessionManager* _Nonnull sessionManager;