diff options
Diffstat (limited to 'cast/standalone_sender/looping_file_cast_agent.cc')
| -rw-r--r-- | cast/standalone_sender/looping_file_cast_agent.cc | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/cast/standalone_sender/looping_file_cast_agent.cc b/cast/standalone_sender/looping_file_cast_agent.cc index 5477c155..e26d4f5e 100644 --- a/cast/standalone_sender/looping_file_cast_agent.cc +++ b/cast/standalone_sender/looping_file_cast_agent.cc @@ -132,8 +132,7 @@ void LoopingFileCastAgent::OnMessage(VirtualConnectionRouter* router, HandleReceiverStatus(payload.value()); } else if (HasType(payload.value(), CastMessageType::kLaunchError)) { std::string reason; - if (!json::ParseAndValidateString(payload.value()[kMessageKeyReason], - &reason)) { + if (!json::TryParseString(payload.value()[kMessageKeyReason], &reason)) { reason = "UNKNOWN"; } OSP_LOG_ERROR @@ -142,8 +141,7 @@ void LoopingFileCastAgent::OnMessage(VirtualConnectionRouter* router, Shutdown(); } else if (HasType(payload.value(), CastMessageType::kInvalidRequest)) { std::string reason; - if (!json::ParseAndValidateString(payload.value()[kMessageKeyReason], - &reason)) { + if (!json::TryParseString(payload.value()[kMessageKeyReason], &reason)) { reason = "UNKNOWN"; } OSP_LOG_ERROR << "Cast Receiver thinks our request is invalid: " @@ -167,8 +165,7 @@ void LoopingFileCastAgent::HandleReceiverStatus(const Json::Value& status) { : Json::Value(); std::string running_app_id; - if (!json::ParseAndValidateString(details[kMessageKeyAppId], - &running_app_id) || + if (!json::TryParseString(details[kMessageKeyAppId], &running_app_id) || running_app_id != GetMirroringAppId()) { // The mirroring app is not running. If it was just stopped, Shutdown() will // tear everything down. If it has been stopped already, Shutdown() is a @@ -178,8 +175,7 @@ void LoopingFileCastAgent::HandleReceiverStatus(const Json::Value& status) { } std::string session_id; - if (!json::ParseAndValidateString(details[kMessageKeySessionId], - &session_id) || + if (!json::TryParseString(details[kMessageKeySessionId], &session_id) || session_id.empty()) { OSP_LOG_ERROR << "Cannot continue: Cast Receiver did not provide a session ID for " @@ -207,8 +203,8 @@ void LoopingFileCastAgent::HandleReceiverStatus(const Json::Value& status) { } std::string message_destination_id; - if (!json::ParseAndValidateString(details[kMessageKeyTransportId], - &message_destination_id) || + if (!json::TryParseString(details[kMessageKeyTransportId], + &message_destination_id) || message_destination_id.empty()) { OSP_LOG_ERROR << "Cannot continue: Cast Receiver did not provide a transport ID for " |