Merge pull request #1459 from smartdevicelink/bugfix/issue-1456-examp…

…le-app-warning-alert-template-change Change example app resultCode check to the success bool instead
smartdevicelink · Oct 23, 2019 · 89af6b7 · 89af6b7
2 parents 1572861 + 3d38f08
commit 89af6b7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Example Apps/Example ObjC/MenuManager.m b/Example Apps/Example ObjC/MenuManager.m
@@ -99,7 +99,7 @@ + (SDLMenuCell *)sdlex_menuCellChangeTemplateWithManager:(SDLManager *)manager {
     SDLMenuCell *cell = [[SDLMenuCell alloc] initWithTitle:@"Non - Media (Default)" icon:nil voiceCommands:nil handler:^(SDLTriggerSource  _Nonnull triggerSource) {
         SDLSetDisplayLayout* display = [[SDLSetDisplayLayout alloc] initWithPredefinedLayout:SDLPredefinedLayoutNonMedia];
         [manager sendRequest:display withResponseHandler:^(SDLRPCRequest *request, SDLRPCResponse *response, NSError *error) {
-            if (![response.resultCode isEqualToEnum:SDLResultSuccess]) {
+            if (!response.success) {
                 [manager sendRequest:[AlertManager alertWithMessageAndCloseButton:errorMessage textField2:nil iconName:nil]];
             }
         }];
@@ -110,7 +110,7 @@ + (SDLMenuCell *)sdlex_menuCellChangeTemplateWithManager:(SDLManager *)manager {
     SDLMenuCell *cell2 = [[SDLMenuCell alloc] initWithTitle:@"Graphic With Text" icon:nil voiceCommands:nil handler:^(SDLTriggerSource  _Nonnull triggerSource) {
         SDLSetDisplayLayout* display = [[SDLSetDisplayLayout alloc] initWithPredefinedLayout:SDLPredefinedLayoutGraphicWithText];
         [manager sendRequest:display withResponseHandler:^(SDLRPCRequest *request, SDLRPCResponse *response, NSError *error) {
-            if (![response.resultCode isEqualToEnum:SDLResultSuccess]) {
+            if (!response.success) {
                 [manager sendRequest:[AlertManager alertWithMessageAndCloseButton:errorMessage textField2:nil iconName:nil]];
             }
         }];

diff --git a/Example Apps/Example Swift/MenuManager.swift b/Example Apps/Example Swift/MenuManager.swift
@@ -132,7 +132,7 @@ private extension MenuManager {
         submenuItems.append(SDLMenuCell(title: submenuTitleNonMedia, icon: nil, voiceCommands: nil, handler: { (triggerSource) in
             let display = SDLSetDisplayLayout(predefinedLayout: .nonMedia)
             manager.send(request: display) { (request, response, error) in
-                guard response?.resultCode == .success else {
+                guard response?.success.boolValue == .some(true) else {
                     manager.send(AlertManager.alertWithMessageAndCloseButton(errorMessage))
                     return
                 }
@@ -144,7 +144,7 @@ private extension MenuManager {
         submenuItems.append(SDLMenuCell(title: submenuTitleGraphicText, icon: nil, voiceCommands: nil, handler: { (triggerSource) in
             let display = SDLSetDisplayLayout(predefinedLayout: .graphicWithText)
             manager.send(request: display) { (request, response, error) in
-                guard response?.resultCode == .success else {
+                guard response?.success.boolValue == .some(true) else {
                     manager.send(AlertManager.alertWithMessageAndCloseButton(errorMessage))
                     return
                 }