diff options
| author | Vitaly Buka <vitalybuka@google.com> | 2016-02-23 18:50:42 -0800 |
|---|---|---|
| committer | Vitaly Buka <vitalybuka@google.com> | 2016-02-24 18:13:14 +0000 |
| commit | ebde3c1e1e87202d6c81a7351921468703be7b6f (patch) | |
| tree | 335435626c63af0194fd9a00d4e525aa6b2ae32a /src/access_api_handler.cc | |
| parent | efbd66b690afb9c91ea95f91e216667901191746 (diff) | |
| download | libweave-ebde3c1e1e87202d6c81a7351921468703be7b6f.tar.gz | |
Rename *BlackList* into *Revocation*
This name matches better new trait and semantic.
BUG: 27313743
Change-Id: I0cbc7b40cf14b17cfbffb7f58572a7ea6d81c542
Reviewed-on: https://weave-review.googlesource.com/2730
Reviewed-by: Alex Vakulenko <avakulenko@google.com>
Diffstat (limited to 'src/access_api_handler.cc')
| -rw-r--r-- | src/access_api_handler.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/access_api_handler.cc b/src/access_api_handler.cc index ec22094..dcfae45 100644 --- a/src/access_api_handler.cc +++ b/src/access_api_handler.cc @@ -7,7 +7,7 @@ #include <base/bind.h> #include <weave/device.h> -#include "src/access_black_list_manager.h" +#include "src/access_revocation_manager.h" #include "src/commands/schema_constants.h" #include "src/data_encoding.h" #include "src/json_error_codes.h" @@ -24,7 +24,7 @@ const char kUserId[] = "userId"; const char kApplicationId[] = "applicationId"; const char kExpirationTime[] = "expirationTime"; const char kRevocationTimestamp[] = "revocationTimestamp"; -const char kBlackList[] = "revocationListEntries"; +const char kRevocationList[] = "revocationListEntries"; bool GetIds(const base::DictionaryValue& parameters, std::vector<uint8_t>* user_id_decoded, @@ -52,7 +52,7 @@ bool GetIds(const base::DictionaryValue& parameters, } // namespace AccessApiHandler::AccessApiHandler(Device* device, - AccessBlackListManager* manager) + AccessRevocationManager* manager) : device_{device}, manager_{manager} { device_->AddTraitDefinitionsFromJson(R"({ "_accessRevocationList": { @@ -155,9 +155,9 @@ void AccessApiHandler::Block(const std::weak_ptr<Command>& cmd) { return; } - manager_->Block(AccessBlackListManager::Entry{user_id, app_id, - FromJ2000Time(revocation_j2k), - FromJ2000Time(expiration_j2k)}, + manager_->Block(AccessRevocationManager::Entry{user_id, app_id, + FromJ2000Time(revocation_j2k), + FromJ2000Time(expiration_j2k)}, base::Bind(&AccessApiHandler::OnCommandDone, weak_ptr_factory_.GetWeakPtr(), cmd)); } @@ -180,7 +180,7 @@ void AccessApiHandler::List(const std::weak_ptr<Command>& cmd) { } base::DictionaryValue result; - result.Set(kBlackList, entries.release()); + result.Set(kRevocationList, entries.release()); command->Complete(result, nullptr); } |