[SDK-41] register for push (#396)

* Refactor push templates

* Refactor register for push action

* RegisterForPush to use same view logic as PushAskToAsk

* Use LPLog

Author: nzagorchev

Leanplum-SDK/Classes/MessageTemplates/LPPushAskToAskMessageTemplate.h

@@ -7,12 +7,11 @@
 //
 
 #import "LPMessageTemplateProtocol.h"
+#import "LPPushMessageTemplate.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface LPPushAskToAskMessageTemplate : NSObject <LPMessageTemplateProtocol>
-
-- (void)enableSystemPush;
+@interface LPPushAskToAskMessageTemplate : LPPushMessageTemplate <LPMessageTemplateProtocol>
 
 @end
 

Leanplum-SDK/Classes/MessageTemplates/LPPushAskToAskMessageTemplate.m

@@ -7,7 +7,7 @@
 //
 
 #import "LPPushAskToAskMessageTemplate.h"
-#import "LPActionManager.h"
+#import "LPPushMessageTemplate.h"
 
 @implementation LPPushAskToAskMessageTemplate
 
@@ -56,20 +56,11 @@ +(void)defineAction
         @try {            
             LPPushAskToAskMessageTemplate *template = [[LPPushAskToAskMessageTemplate alloc] init];
             template.context = context;
-
-            if ([Leanplum isPreLeanplumInstall]) {
-                LPLog(LPDebug, @"'Ask to ask' conservatively falls back to just 'ask' for pre-Leanplum installs");
-                [template showPushMessage];
-                return NO;
-            } else if ([template isPushEnabled]) {
-                LPLog(LPDebug, @"Pushes already enabled");
-                return NO;
-            } else if ([template hasDisabledAskToAsk]) {
-                LPLog(LPDebug, @" Already asked to push");
-                return NO;
-            } else {
+            if ([template shouldShowPushMessage]) {
                 [template showPrePushMessage];
                 return YES;
+            } else {
+                return NO;
             }
         } @catch (NSException *exception) {
             LPLog(LPError, @"PushAskToAsk: %@\n%@", exception, [exception callStackSymbols]);
@@ -86,36 +77,16 @@ - (LPPopupViewController *)viewControllerWithContext:(LPActionContext *)context
     __strong __typeof__(self) strongSelf = self;
     viewController.pushAskToAskCompletionBlock = ^{
         __typeof__(self) weakSelf = strongSelf;
-        [weakSelf enableSystemPush];
+        [weakSelf showNativePushPrompt];
     };
     return viewController;
 }
 
--(void)showPushMessage
-{
-    [self enableSystemPush];
-}
-
 -(void)showPrePushMessage
 {
     UIViewController *viewController = [self viewControllerWithContext:self.context];
 
     [LPMessageTemplateUtilities presentOverVisible:viewController];
 }
 
-- (BOOL)isPushEnabled
-{
-    return [[LPPushNotificationsManager sharedManager] isPushEnabled];
-}
-
-- (void)enableSystemPush
-{
-    [[LPPushNotificationsManager sharedManager] enableSystemPush];
-}
-
-- (BOOL)hasDisabledAskToAsk
-{
-    return [[LPPushNotificationsManager sharedManager] hasDisabledAskToAsk];
-}
-
 @end

Leanplum-SDK/Classes/MessageTemplates/LPPushMessageTemplate.h

@@ -0,0 +1,24 @@
+//
+//  LPPushMessageTemplate.h
+//  Leanplum-iOS-SDK
+//
+//  Created by Nikola Zagorchev on 19.08.20.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface LPPushMessageTemplate : NSObject
+
+- (BOOL)shouldShowPushMessage;
+
+- (void)showNativePushPrompt;
+
+- (BOOL)isPushEnabled;
+
+- (BOOL)hasDisabledAskToAsk;
+
+@end
+
+NS_ASSUME_NONNULL_END

Leanplum-SDK/Classes/MessageTemplates/LPPushMessageTemplate.m

@@ -0,0 +1,46 @@
+//
+//  LPPushMessageTemplate.m
+//  Leanplum-iOS-SDK
+//
+//  Created by Nikola Zagorchev on 19.08.20.
+//
+
+#import "LPPushMessageTemplate.h"
+#import "LPActionManager.h"
+#import "LPLogManager.h"
+
+@implementation LPPushMessageTemplate
+
+-(BOOL)shouldShowPushMessage
+{
+    if ([Leanplum isPreLeanplumInstall]) {
+        LPLog(LPDebug, @"'Ask to ask' conservatively falls back to just 'ask' for pre-Leanplum installs");
+        [self showNativePushPrompt];
+        return NO;
+    } else if ([self isPushEnabled]) {
+        LPLog(LPDebug, @"Pushes already enabled");
+        return NO;
+    } else if ([self hasDisabledAskToAsk]) {
+        LPLog(LPDebug, @" Already asked to push");
+        return NO;
+    } else {
+        return YES;
+    }
+}
+
+-(void)showNativePushPrompt
+{
+    [[LPPushNotificationsManager sharedManager] enableSystemPush];
+}
+
+- (BOOL)isPushEnabled
+{
+    return [[LPPushNotificationsManager sharedManager] isPushEnabled];
+}
+
+- (BOOL)hasDisabledAskToAsk
+{
+    return [[LPPushNotificationsManager sharedManager] hasDisabledAskToAsk];
+}
+
+@end

Leanplum-SDK/Classes/MessageTemplates/LPRegisterForPushMessageTemplate.h

@@ -7,10 +7,11 @@
 //
 
 #import "LPMessageTemplateProtocol.h"
+#import "LPPushMessageTemplate.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface LPRegisterForPushMessageTemplate : NSObject <LPMessageTemplateProtocol>
+@interface LPRegisterForPushMessageTemplate : LPPushMessageTemplate <LPMessageTemplateProtocol>
 
 @end
 

Leanplum-SDK/Classes/MessageTemplates/LPRegisterForPushMessageTemplate.m

@@ -7,7 +7,7 @@
 //
 
 #import "LPRegisterForPushMessageTemplate.h"
-#import "LPPushAskToAskMessageTemplate.h"
+#import "LPPushMessageTemplate.h"
 
 @implementation LPRegisterForPushMessageTemplate
 
@@ -18,11 +18,16 @@ +(void)defineAction
              withArguments:@[]
              withResponder:^BOOL(LPActionContext *context) {
 
-        // TODO: when push check is moved away from templates, refactor to call it.
-        LPPushAskToAskMessageTemplate* template = [[LPPushAskToAskMessageTemplate alloc] init];
-        template.context = context;
-
-        [template enableSystemPush];
+        LPRegisterForPushMessageTemplate *template = [[LPRegisterForPushMessageTemplate alloc] init];
+        
+        if ([template shouldShowPushMessage]) {
+            [template showNativePushPrompt];
+            // Will count View event
+            return YES;
+        } else {
+            return NO;
+        }
+        
         return YES;
     }];
 }