summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicoleYarroch <nicole@livio.io>2020-07-02 11:07:53 -0400
committerNicoleYarroch <nicole@livio.io>2020-07-02 11:07:53 -0400
commit689d8b2681b57d45fde8785498fd2b5fad04ab17 (patch)
treead440dd0048aaba6b46683b5da7983ae885860c1
parent9b67b4fba404c7ec216aff7880322abe57a4416e (diff)
downloadsdl_ios-689d8b2681b57d45fde8785498fd2b5fad04ab17.tar.gz
Fixed Proxy Manager in ex. apps
Signed-off-by: NicoleYarroch <nicole@livio.io>
-rw-r--r--Example Apps/Example ObjC/ProxyManager.m3
-rw-r--r--Example Apps/Example Swift/ProxyManager.swift8
2 files changed, 4 insertions, 7 deletions
diff --git a/Example Apps/Example ObjC/ProxyManager.m b/Example Apps/Example ObjC/ProxyManager.m
index 1f624a6e7..95ce48013 100644
--- a/Example Apps/Example ObjC/ProxyManager.m
+++ b/Example Apps/Example ObjC/ProxyManager.m
@@ -245,7 +245,7 @@ NS_ASSUME_NONNULL_BEGIN
// This is our first time in a non-NONE state
self.firstHMILevel = newLevel;
- // Send static menu items. Menu related RPCs can be sent at all `hmiLevel`s except `NONE`
+ // Send static menu items.
[self sdlex_createMenus];
// Subscribe to vehicle data.
@@ -260,7 +260,6 @@ NS_ASSUME_NONNULL_BEGIN
// An active NAV or MEDIA SDL app is in the background
} else if ([newLevel isEqualToEnum:SDLHMILevelBackground]) {
// The SDL app is not in the foreground
- [self.subscribeButtonManager unsubscribeToPresetButtons];
} else if ([newLevel isEqualToEnum:SDLHMILevelNone]) {
// The SDL app is not yet running
}
diff --git a/Example Apps/Example Swift/ProxyManager.swift b/Example Apps/Example Swift/ProxyManager.swift
index 3f4844bce..176d7af05 100644
--- a/Example Apps/Example Swift/ProxyManager.swift
+++ b/Example Apps/Example Swift/ProxyManager.swift
@@ -152,9 +152,7 @@ private extension ProxyManager {
extension ProxyManager: SDLManagerDelegate {
/// Called when the connection beween this app and the module has closed.
- func managerDidDisconnect() {
- subscribeButtonManager.unsubscribeToPresetButtons()
-
+ func managerDidDisconnect() {
if delegate?.proxyState != .some(.stopped) {
delegate?.didChangeProxyState(ProxyState.searching)
}
@@ -172,7 +170,7 @@ extension ProxyManager: SDLManagerDelegate {
// This is our first time in a non-NONE state
firstHMILevelState = newLevel
- // Send static menu items. Menu related RPCs can be sent at all `hmiLevel`s except `NONE`
+ // Send static menu items.
createMenuAndGlobalVoiceCommands()
// Subscribe to vehicle data.
@@ -189,7 +187,7 @@ extension ProxyManager: SDLManagerDelegate {
break
case .background:
// The SDL app is not in the foreground
- subscribeButtonManager.unsubscribeToPresetButtons()
+ break
case .none:
// The SDL app is not yet running
break