From 6927587842565c60d57dc4ce9e999d1683cccb4e Mon Sep 17 00:00:00 2001 From: brave-builds Date: Tue, 29 Mar 2022 10:06:03 +0000 Subject: [PATCH] Uplift of #12748 (squashed) to beta --- .../public/cpp/ledger_client_mojo_bridge.cc | 40 +++++++++++++------ .../public/cpp/ledger_client_mojo_bridge.h | 26 ++++++++---- .../public/interfaces/bat_ledger.mojom | 21 ++++++---- 3 files changed, 60 insertions(+), 27 deletions(-) diff --git a/components/services/bat_ledger/public/cpp/ledger_client_mojo_bridge.cc b/components/services/bat_ledger/public/cpp/ledger_client_mojo_bridge.cc index dd71ca439b25..d78107ac9e11 100644 --- a/components/services/bat_ledger/public/cpp/ledger_client_mojo_bridge.cc +++ b/components/services/bat_ledger/public/cpp/ledger_client_mojo_bridge.cc @@ -132,67 +132,81 @@ void LedgerClientMojoBridge::PublisherListNormalized( } void LedgerClientMojoBridge::SetBooleanState(const std::string& name, - bool value) { + bool value, + SetBooleanStateCallback callback) { ledger_client_->SetBooleanState(name, value); + std::move(callback).Run(); } void LedgerClientMojoBridge::GetBooleanState(const std::string& name, - GetBooleanStateCallback callback) { + GetBooleanStateCallback callback) { std::move(callback).Run(ledger_client_->GetBooleanState(name)); } void LedgerClientMojoBridge::SetIntegerState(const std::string& name, - int value) { + int value, + SetIntegerStateCallback callback) { ledger_client_->SetIntegerState(name, value); + std::move(callback).Run(); } void LedgerClientMojoBridge::GetIntegerState(const std::string& name, - GetIntegerStateCallback callback) { + GetIntegerStateCallback callback) { std::move(callback).Run(ledger_client_->GetIntegerState(name)); } void LedgerClientMojoBridge::SetDoubleState(const std::string& name, - double value) { + double value, + SetDoubleStateCallback callback) { ledger_client_->SetDoubleState(name, value); + std::move(callback).Run(); } void LedgerClientMojoBridge::GetDoubleState(const std::string& name, - GetDoubleStateCallback callback) { + GetDoubleStateCallback callback) { std::move(callback).Run(ledger_client_->GetDoubleState(name)); } void LedgerClientMojoBridge::SetStringState(const std::string& name, - const std::string& value) { + const std::string& value, + SetStringStateCallback callback) { ledger_client_->SetStringState(name, value); + std::move(callback).Run(); } void LedgerClientMojoBridge::GetStringState(const std::string& name, - GetStringStateCallback callback) { + GetStringStateCallback callback) { std::move(callback).Run(ledger_client_->GetStringState(name)); } void LedgerClientMojoBridge::SetInt64State(const std::string& name, - int64_t value) { + int64_t value, + SetInt64StateCallback callback) { ledger_client_->SetInt64State(name, value); + std::move(callback).Run(); } void LedgerClientMojoBridge::GetInt64State(const std::string& name, - GetInt64StateCallback callback) { + GetInt64StateCallback callback) { std::move(callback).Run(ledger_client_->GetInt64State(name)); } void LedgerClientMojoBridge::SetUint64State(const std::string& name, - uint64_t value) { + uint64_t value, + SetUint64StateCallback callback) { ledger_client_->SetUint64State(name, value); + std::move(callback).Run(); } void LedgerClientMojoBridge::GetUint64State(const std::string& name, - GetUint64StateCallback callback) { + GetUint64StateCallback callback) { std::move(callback).Run(ledger_client_->GetUint64State(name)); } -void LedgerClientMojoBridge::ClearState(const std::string& name) { +void LedgerClientMojoBridge::ClearState(const std::string& name, + ClearStateCallback callback) { ledger_client_->ClearState(name); + std::move(callback).Run(); } void LedgerClientMojoBridge::GetBooleanOption( diff --git a/components/services/bat_ledger/public/cpp/ledger_client_mojo_bridge.h b/components/services/bat_ledger/public/cpp/ledger_client_mojo_bridge.h index 4b1727d9f57f..f9702512bc49 100644 --- a/components/services/bat_ledger/public/cpp/ledger_client_mojo_bridge.h +++ b/components/services/bat_ledger/public/cpp/ledger_client_mojo_bridge.h @@ -54,26 +54,38 @@ class LedgerClientMojoBridge : void PublisherListNormalized(ledger::type::PublisherInfoList list) override; - void SetBooleanState(const std::string& name, bool value) override; + void SetBooleanState(const std::string& name, + bool value, + SetBooleanStateCallback callback) override; void GetBooleanState(const std::string& name, GetBooleanStateCallback callback) override; - void SetIntegerState(const std::string& name, int value) override; + void SetIntegerState(const std::string& name, + int value, + SetIntegerStateCallback callback) override; void GetIntegerState(const std::string& name, GetIntegerStateCallback callback) override; - void SetDoubleState(const std::string& name, double value) override; + void SetDoubleState(const std::string& name, + double value, + SetDoubleStateCallback callback) override; void GetDoubleState(const std::string& name, GetDoubleStateCallback callback) override; void SetStringState(const std::string& name, - const std::string& value) override; + const std::string& value, + SetStringStateCallback callback) override; void GetStringState(const std::string& name, GetStringStateCallback callback) override; - void SetInt64State(const std::string& name, int64_t value) override; + void SetInt64State(const std::string& name, + int64_t value, + SetInt64StateCallback callback) override; void GetInt64State(const std::string& name, GetInt64StateCallback callback) override; - void SetUint64State(const std::string& name, uint64_t value) override; + void SetUint64State(const std::string& name, + uint64_t value, + SetUint64StateCallback callback) override; void GetUint64State(const std::string& name, GetUint64StateCallback callback) override; - void ClearState(const std::string& name) override; + void ClearState(const std::string& name, + ClearStateCallback callback) override; void GetBooleanOption( const std::string& name, diff --git a/components/services/bat_ledger/public/interfaces/bat_ledger.mojom b/components/services/bat_ledger/public/interfaces/bat_ledger.mojom index cc2da17b3977..33348c53c203 100644 --- a/components/services/bat_ledger/public/interfaces/bat_ledger.mojom +++ b/components/services/bat_ledger/public/interfaces/bat_ledger.mojom @@ -184,23 +184,30 @@ interface BatLedgerClient { [Sync] GetBooleanState(string name) => (bool value); - SetBooleanState(string name, bool value); + [Sync] + SetBooleanState(string name, bool value) => (); [Sync] GetIntegerState(string name) => (int32 value); - SetIntegerState(string name, int32 value); + [Sync] + SetIntegerState(string name, int32 value) => (); [Sync] GetDoubleState(string name) => (double value); - SetDoubleState(string name, double value); + [Sync] + SetDoubleState(string name, double value) => (); [Sync] GetStringState(string name) => (string value); - SetStringState(string name, string value); + [Sync] + SetStringState(string name, string value) => (); [Sync] GetInt64State(string name) => (int64 value); - SetInt64State(string name, int64 value); + [Sync] + SetInt64State(string name, int64 value) => (); [Sync] GetUint64State(string name) => (uint64 value); - SetUint64State(string name, uint64 value); - ClearState(string name); + [Sync] + SetUint64State(string name, uint64 value) => (); + [Sync] + ClearState(string name) => (); [Sync] GetBooleanOption(string name) => (bool value);