Update weaved to reflect the latest changes in libweave
A number of APIs have changed in libweave and weaved is updated to
work with the latest version of the library. Some public D-Bus APIs
have changed as well to reflect the underlying libweave interfaces:
- Command::Done/SetProgress are replaced with Command::Complete
- Command::Abort now takes error code and error messages
- Command::category is removed
- Command::status is renamed to Command::state
- Manager::GetCommand is removed (since weave::Command::ToJson is
no longer available)
Change-Id: Iebf0565467756e8a21be37163d750ff22c419672
diff --git a/buffet/shill_client.cc b/buffet/shill_client.cc
index ed80af2..e0babfc 100644
--- a/buffet/shill_client.cc
+++ b/buffet/shill_client.cc
@@ -65,7 +65,7 @@
if ((state.compare(shill::kStateReady) == 0) ||
(state.compare(shill::kStatePortal) == 0) ||
(state.compare(shill::kStateOnline) == 0)) {
- return Network::State::kConnected;
+ return Network::State::kOnline;
}
if ((state.compare(shill::kStateAssociation) == 0) ||
(state.compare(shill::kStateConfiguration) == 0)) {
@@ -74,7 +74,7 @@
if ((state.compare(shill::kStateFailure) == 0) ||
(state.compare(shill::kStateActivationFailure) == 0)) {
// TODO(wiley) Get error information off the service object.
- return Network::State::kFailure;
+ return Network::State::kError;
}
if ((state.compare(shill::kStateIdle) == 0) ||
(state.compare(shill::kStateOffline) == 0) ||
@@ -451,7 +451,7 @@
void ShillClient::OnStateChangeForConnectingService(const string& state) {
switch (ShillServiceStateToNetworkState(state)) {
- case Network::State::kConnected: {
+ case Network::State::kOnline: {
auto callback = connect_success_callback_;
CleanupConnectingService();
@@ -459,7 +459,7 @@
callback.Run();
break;
}
- case Network::State::kFailure: {
+ case Network::State::kError: {
ConnectToServiceError(connecting_service_);
break;
}
@@ -538,7 +538,7 @@
FROM_HERE,
base::Bind(&ShillClient::NotifyConnectivityListeners,
weak_factory_.GetWeakPtr(),
- GetConnectionState() == Network::State::kConnected));
+ GetConnectionState() == Network::State::kOnline));
}
void ShillClient::NotifyConnectivityListeners(bool am_online) {