Skip to content

Add onClose callbacks after LCM clean() calls #1698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 2, 2021
Merged

Add onClose callbacks after LCM clean() calls #1698

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,7 @@ public void onReceived(RPCMessage message) {
msg.setCorrelationID(UNREGISTER_APP_INTERFACE_CORRELATION_ID);
sendRPCMessagePrivate(msg, true);
clean();
onClose("RPC spec version not supported: " + rpcSpecVersion.toString(), null, SdlDisconnectedReason.MINIMUM_RPC_VERSION_HIGHER_THAN_SUPPORTED);
return;
}
if (!didCheckSystemInfo && lifecycleListener != null) {
Expand All @@ -405,6 +406,7 @@ public void onReceived(RPCMessage message) {
msg.setCorrelationID(UNREGISTER_APP_INTERFACE_CORRELATION_ID);
sendRPCMessagePrivate(msg, true);
clean();
onClose("System not supported", null, SdlDisconnectedReason.DEFAULT);
return;
}
}
Expand Down Expand Up @@ -491,6 +493,7 @@ public void run() {
if (!onAppInterfaceUnregistered.getReason().equals(AppInterfaceUnregisteredReason.LANGUAGE_CHANGE)) {
DebugTool.logInfo(TAG, "on app interface unregistered");
clean();
onClose("OnAppInterfaceUnregistered received from head unit", null, SdlDisconnectedReason.APP_INTERFACE_UNREG);
} else {
DebugTool.logInfo(TAG, "re-registering for language change");
cycle(SdlDisconnectedReason.LANGUAGE_CHANGE);
Expand All @@ -499,6 +502,7 @@ public void run() {
case UNREGISTER_APP_INTERFACE:
DebugTool.logInfo(TAG, "unregister app interface");
clean();
onClose("UnregisterAppInterface response received from head unit", null, SdlDisconnectedReason.APP_INTERFACE_UNREG);
break;
}
}
Expand Down Expand Up @@ -936,6 +940,7 @@ public void onSessionStarted(int sessionID, Version version, SystemInfo systemIn
DebugTool.logWarning(TAG, String.format("Disconnecting from head unit, the configured minimum protocol version %s is greater than the supported protocol version %s", minimumProtocolVersion, getProtocolVersion()));
session.endService(SessionType.RPC);
clean();
onClose("Protocol version not supported: " + version, null, SdlDisconnectedReason.MINIMUM_PROTOCOL_VERSION_HIGHER_THAN_SUPPORTED);
return;
}

Expand All @@ -946,6 +951,7 @@ public void onSessionStarted(int sessionID, Version version, SystemInfo systemIn
DebugTool.logWarning(TAG, "Disconnecting from head unit, the system info was not accepted.");
session.endService(SessionType.RPC);
clean();
onClose("System not supported", null, SdlDisconnectedReason.DEFAULT);
return;
}
//If the vehicle is acceptable, init security lib
Expand Down