Fixed example appsfeature/issue_1563_screen_manager_subscribe_buttons

Signed-off-by: NicoleYarroch <nicole@livio.io>

2 files changed, 8 insertions, 10 deletions

diff --git a/SmartDeviceLink_Example/SubscribeButtonManager.m b/SmartDeviceLink_Example/SubscribeButtonManager.m
index 038008003..80512a7b2 100644
--- a/SmartDeviceLink_Example/SubscribeButtonManager.m
+++ b/SmartDeviceLink_Example/SubscribeButtonManager.m
@@ -39,18 +39,16 @@ NS_ASSUME_NONNULL_BEGIN
     }
 
     for (SDLButtonName buttonName in [self.class sdlex_allPresetButtons]) {
-        [self.sdlManager.screenManager subscribeButton:buttonName withObserver:self selector:@selector(sdlex_buttonPressEventWithButtonName:error:buttonPress:buttonEvent:)];
+        [self.sdlManager.screenManager subscribeButton:buttonName withObserver:self selector:@selector(sdlex_buttonPressEventWithButtonName:error:buttonPress:)];
     }
 }
 
-- (void)sdlex_buttonPressEventWithButtonName:(SDLButtonName)buttonName error:(NSError *)error buttonPress:(SDLOnButtonPress *)buttonPress buttonEvent:(SDLOnButtonEvent *)buttonEvent {
+- (void)sdlex_buttonPressEventWithButtonName:(SDLButtonName)buttonName error:(NSError *)error buttonPress:(SDLOnButtonPress *)buttonPress {
     if (error != nil) {
         SDLLogE(@"There was an error subscribing to the preset button: %@",  error.localizedDescription);
         return;
     }
 
-    if (buttonPress == nil) { return; }
-
     NSString *alertMessage = nil;
     if ([buttonPress.buttonPressMode isEqualToEnum:SDLButtonPressModeShort]) {
         alertMessage = [NSString stringWithFormat:@"%@ short pressed", buttonName];
diff --git a/SmartDeviceLink_Example/SubscribeButtonManager.swift b/SmartDeviceLink_Example/SubscribeButtonManager.swift
index 2c59b469b..6567d9e64 100644
--- a/SmartDeviceLink_Example/SubscribeButtonManager.swift
+++ b/SmartDeviceLink_Example/SubscribeButtonManager.swift
@@ -26,13 +26,13 @@ class SubscribeButtonManager: NSObject {
         }
 
         presetButtons.forEach { buttonName in
-            sdlManager.screenManager.subscribeButton(buttonName, withObserver: self, selector: #selector(buttonPressEvent(buttonName:error:buttonPress:buttonEvent:)))
+            sdlManager.screenManager.subscribeButton(buttonName, withObserver: self, selector: #selector(buttonPressEvent(buttonName:error:buttonPress:)))
         }
     }
 
-    @objc private func buttonPressEvent(buttonName: SDLButtonName, error: Error?, buttonPress: SDLOnButtonPress?, buttonEvent: SDLOnButtonEvent?) {
-        guard error == nil else {
-            SDLLog.e("There was an error subscribing to the preset button: \(error!.localizedDescription)")
+    @objc private func buttonPressEvent(buttonName: SDLButtonName, error: Error?, buttonPress: SDLOnButtonPress?) {
+        if let error = error {
+            SDLLog.e("There was an error subscribing to the preset button: \(error)")
             return
         }
 
@@ -42,9 +42,9 @@ class SubscribeButtonManager: NSObject {
         let buttonNameString = buttonName.rawValue.rawValue
         switch buttonPress.buttonPressMode {
         case .short:
-            alert = AlertManager.alertWithMessageAndCloseButton("\(buttonName) short pressed")
+            alert = AlertManager.alertWithMessageAndCloseButton("\(buttonNameString) short pressed")
         case .long:
-            alert = AlertManager.alertWithMessageAndCloseButton("\(buttonName) long pressed")
+            alert = AlertManager.alertWithMessageAndCloseButton("\(buttonNameString) long pressed")
         default: fatalError()
         }