Push Notifications rewrite (#478)

Author: nzagorchev

.travis.yml

@@ -2,11 +2,11 @@
 if: (tag IS present) OR (type = pull_request)
 
 language: objective-c
-osx_image: xcode12.5
+osx_image: xcode13.1
 
 xcode_workspace: Leanplum.xcworkspace
 xcode_scheme: LeanplumSDKApp
-xcode_destination: platform=iOS Simulator,OS=14.5,name=iPhone 12
+xcode_destination: platform=iOS Simulator,OS=15.0,name=iPhone 12
 
 cache: cocoapods
 podfile: Podfile

LeanplumSDK/LeanplumSDK.xcodeproj/project.pbxproj

@@ -27,7 +27,6 @@
 #import <Foundation/Foundation.h>
 #import "LPContextualValues.h"
 #import <UserNotifications/UserNotifications.h>
-#import "LPPushNotificationsManager.h"
 #import "LPLocalNotificationsManager.h"
 
 NS_ASSUME_NONNULL_BEGIN

LeanplumSDK/LeanplumSDK/Classes/Features/Actions/LPActionManager.h

@@ -87,7 +87,6 @@ + (void)reset
 - (id)init
 {
     if (self = [super init]) {
-        [[LPLocalNotificationsManager sharedManager] listenForLocalNotifications];
         _sessionOccurrences = [NSMutableDictionary dictionary];
         _messageImpressionOccurrences = [NSMutableDictionary dictionary];
         _messageTriggerOccurrences = [NSMutableDictionary dictionary];

LeanplumSDK/LeanplumSDK/Classes/Features/Actions/LPActionManager.m

@@ -27,7 +27,6 @@
 #import "Leanplum.h"
 #import "LeanplumInternal.h"
 #import "LPVarCache.h"
-#import "LeanplumInternal.h"
 #import "LPAES.h"
 #import "LPKeychainWrapper.h"
 #import "LPFileManager.h"

LeanplumSDK/LeanplumSDK/Classes/Features/Inbox/LPInbox.m

@@ -133,6 +133,7 @@ OBJC_EXPORT NSString *LEANPLUM_DEFAULTS_APP_VERSION_KEY;
 OBJC_EXPORT NSString *LEANPLUM_DEFAULTS_VARS_JSON_KEY;
 OBJC_EXPORT NSString *LEANPLUM_DEFAULTS_VARS_SIGNATURE_KEY;
 OBJC_EXPORT NSString *LEANPLUM_DEFAULTS_LOCAL_CAPS_KEY;
+OBJC_EXPORT NSString *LEANPLUM_DEFAULTS_PUSH_IDS_KEY;
 
 OBJC_EXPORT NSString *LEANPLUM_SQLITE_NAME;
 

LeanplumSDK/LeanplumSDK/Classes/Internal/LPConstants.h

@@ -89,6 +89,7 @@ - (id)init {
 NSString *LEANPLUM_DEFAULTS_VARS_JSON_KEY = @"__leanplum_variables_json";
 NSString *LEANPLUM_DEFAULTS_VARS_SIGNATURE_KEY = @"__leanplum_variables_signature";
 NSString *LEANPLUM_DEFAULTS_LOCAL_CAPS_KEY = @"__leanplum_local_caps";
+NSString *LEANPLUM_DEFAULTS_PUSH_IDS_KEY = @"__leanplum_push_ids";
 
 NSString *LEANPLUM_SQLITE_NAME = @"__leanplum.sqlite";
 

LeanplumSDK/LeanplumSDK/Classes/Internal/LPConstants.m

@@ -35,6 +35,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @class LeanplumSocket;
 @class LPRegisterDevice;
+@class NotificationsManager;
 
 /**
  * Keys for the plist file name
@@ -56,6 +57,8 @@ typedef void (^LeanplumStartIssuedBlock)(void);
 typedef void (^LeanplumEventsChangedBlock)(void);
 typedef void (^LeanplumHandledBlock)(BOOL success);
 
++ (NotificationsManager*)notificationsManager;
+
 + (void)throwError:(NSString *)reason;
 
 + (void)onHasStartedAndRegisteredAsDeveloper;

LeanplumSDK/LeanplumSDK/Classes/Internal/Leanplum.m

@@ -41,7 +41,8 @@
 #import "LPConfirmMessageTemplate.h"
 #import "LPAppRatingMessageTemplate.h"
 #import "LPIconChangeMessageTemplate.h"
-#import "LPPushNotificationsManager.h"
+#import "LeanplumInternal.h"
+#import <Leanplum/Leanplum-Swift.h>
 
 #define APP_NAME (([[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"]) ?: \
     ([[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"]))
@@ -104,12 +105,12 @@ - (void)defineActions
 // refreshPushPermissions is called by [Leanplum start].
 - (void)refreshPushPermissions
 {
-    [[LPPushNotificationsManager sharedManager] refreshPushPermissions];
+    [[Leanplum notificationsManager] refreshPushPermissions];
 }
 
 - (void)disableAskToAsk
 {
-    [[LPPushNotificationsManager sharedManager] disableAskToAsk];
+    [Leanplum notificationsManager].isAskToAskDisabled = YES;
 }
 
 @end