diff --git a/components/brave_rewards/browser/rewards_service_impl.cc b/components/brave_rewards/browser/rewards_service_impl.cc index 355ef70d7b0b..2d5370cda1d8 100644 --- a/components/brave_rewards/browser/rewards_service_impl.cc +++ b/components/brave_rewards/browser/rewards_service_impl.cc @@ -965,38 +965,6 @@ void RewardsServiceImpl::OnLedgerStateSaved( : ledger::Result::NO_LEDGER_STATE); } -void RewardsServiceImpl::SavePublisherState( - const std::string& publisher_state, - ledger::ResultCallback callback) { - if (reset_states_) { - return; - } - base::ImportantFileWriter writer(publisher_state_path_, file_task_runner_); - - writer.RegisterOnNextWriteCallbacks( - base::Closure(), - base::Bind( - &PostWriteCallback, - base::Bind( - &RewardsServiceImpl::OnPublisherStateSaved, - AsWeakPtr(), - callback), - base::SequencedTaskRunnerHandle::Get())); - - writer.WriteNow(std::make_unique(publisher_state)); -} - -void RewardsServiceImpl::OnPublisherStateSaved( - ledger::ResultCallback callback, - bool success) { - if (!Connected()) - return; - - callback(success - ? ledger::Result::LEDGER_OK - : ledger::Result::LEDGER_ERROR); -} - void RewardsServiceImpl::LoadNicewareList( ledger::GetNicewareListCallback callback) { if (!Connected()) diff --git a/components/brave_rewards/browser/rewards_service_impl.h b/components/brave_rewards/browser/rewards_service_impl.h index 2e25551584ac..e0aa402b791b 100644 --- a/components/brave_rewards/browser/rewards_service_impl.h +++ b/components/brave_rewards/browser/rewards_service_impl.h @@ -337,9 +337,6 @@ class RewardsServiceImpl : public RewardsService, void OnLedgerStateLoaded(ledger::OnLoadCallback callback, std::pair data); void LoadNicewareList(ledger::GetNicewareListCallback callback) override; - void OnPublisherStateSaved( - ledger::ResultCallback callback, - bool success); void OnPublisherStateLoaded(ledger::OnLoadCallback callback, const std::string& data); void OnFetchWalletProperties(const ledger::Result result, @@ -489,9 +486,6 @@ class RewardsServiceImpl : public RewardsService, void SaveLedgerState( const std::string& ledger_state, ledger::ResultCallback callback) override; - void SavePublisherState( - const std::string& publisher_state, - ledger::ResultCallback callback) override; void SetTimer(uint64_t time_offset, uint32_t* timer_id) override; void LoadURL(const std::string& url, const std::vector& headers, diff --git a/components/services/bat_ledger/bat_ledger_client_mojo_proxy.cc b/components/services/bat_ledger/bat_ledger_client_mojo_proxy.cc index d7601472d9c1..bdad00aa64e6 100644 --- a/components/services/bat_ledger/bat_ledger_client_mojo_proxy.cc +++ b/components/services/bat_ledger/bat_ledger_client_mojo_proxy.cc @@ -168,27 +168,6 @@ void BatLedgerClientMojoProxy::SaveLedgerState( base::BindOnce(&OnSaveLedgerState, std::move(callback))); } -void BatLedgerClientMojoProxy::OnSavePublisherState( - ledger::ResultCallback callback, - const ledger::Result result) { - callback(result); -} - -void BatLedgerClientMojoProxy::SavePublisherState( - const std::string& publisher_state, - ledger::ResultCallback callback) { - if (!Connected()) { - callback(ledger::Result::LEDGER_ERROR); - return; - } - - bat_ledger_client_->SavePublisherState( - publisher_state, - base::BindOnce(&BatLedgerClientMojoProxy::OnSavePublisherState, - AsWeakPtr(), - callback)); -} - void BatLedgerClientMojoProxy::SetTimer(uint64_t time_offset, uint32_t* timer_id) { if (!Connected()) { diff --git a/components/services/bat_ledger/bat_ledger_client_mojo_proxy.h b/components/services/bat_ledger/bat_ledger_client_mojo_proxy.h index 4216003fdfc3..ff6fdde18f04 100644 --- a/components/services/bat_ledger/bat_ledger_client_mojo_proxy.h +++ b/components/services/bat_ledger/bat_ledger_client_mojo_proxy.h @@ -39,9 +39,6 @@ class BatLedgerClientMojoProxy : public ledger::LedgerClient, void SaveLedgerState( const std::string& ledger_state, ledger::ResultCallback callback) override; - void SavePublisherState( - const std::string& publisher_state, - ledger::ResultCallback callback) override; void SetTimer(uint64_t time_offset, uint32_t* timer_id) override; void KillTimer(const uint32_t timer_id) override; @@ -155,9 +152,6 @@ class BatLedgerClientMojoProxy : public ledger::LedgerClient, const ledger::Result result, const std::string& data); void OnLoadPublisherState(ledger::OnLoadCallback callback, const ledger::Result result, const std::string& data); - void OnSavePublisherState( - ledger::ResultCallback callback, - const ledger::Result result); DISALLOW_COPY_AND_ASSIGN(BatLedgerClientMojoProxy); }; diff --git a/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.cc b/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.cc index 3052fc71e27b..116ebc7af111 100644 --- a/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.cc +++ b/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.cc @@ -94,29 +94,6 @@ void LedgerClientMojoProxy::SaveLedgerState( _1)); } -// static -void LedgerClientMojoProxy::OnSavePublisherState( - CallbackHolder* holder, - const ledger::Result result) { - DCHECK(holder); - if (holder->is_valid()) { - std::move(holder->get()).Run(result); - } - delete holder; -} - -void LedgerClientMojoProxy::SavePublisherState( - const std::string& publisher_state, - SavePublisherStateCallback callback) { - auto* holder = new CallbackHolder( - AsWeakPtr(), std::move(callback)); - ledger_client_->SavePublisherState( - publisher_state, - std::bind(LedgerClientMojoProxy::OnSavePublisherState, - holder, - _1)); -} - void LedgerClientMojoProxy::OnReconcileComplete( const ledger::Result result, const std::string& contribution_id, diff --git a/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.h b/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.h index e429741f7393..6f60c79a2b14 100644 --- a/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.h +++ b/components/services/bat_ledger/public/cpp/ledger_client_mojo_proxy.h @@ -38,9 +38,6 @@ class LedgerClientMojoProxy : public mojom::BatLedgerClient, void LoadPublisherState(LoadPublisherStateCallback callback) override; void SaveLedgerState(const std::string& ledger_state, SaveLedgerStateCallback callback) override; - void SavePublisherState( - const std::string& publisher_state, - SavePublisherStateCallback callback) override; void FetchFavIcon(const std::string& url, const std::string& favicon_key, FetchFavIconCallback callback) override; @@ -185,10 +182,6 @@ class LedgerClientMojoProxy : public mojom::BatLedgerClient, Callback callback_; }; - static void OnSavePublisherState( - CallbackHolder* holder, - const ledger::Result result); - static void OnSaveLedgerState( CallbackHolder* holder, const ledger::Result result); diff --git a/components/services/bat_ledger/public/interfaces/bat_ledger.mojom b/components/services/bat_ledger/public/interfaces/bat_ledger.mojom index 8e3a65d0a271..31ce49a35841 100644 --- a/components/services/bat_ledger/public/interfaces/bat_ledger.mojom +++ b/components/services/bat_ledger/public/interfaces/bat_ledger.mojom @@ -163,7 +163,6 @@ interface BatLedgerClient { LoadLedgerState() => (ledger.mojom.Result result, string data); LoadPublisherState() => (ledger.mojom.Result result, string data); SaveLedgerState(string ledger_state) => (ledger.mojom.Result result); - SavePublisherState(string publisher_state) => (ledger.mojom.Result result); OnWalletProperties(ledger.mojom.Result result, ledger.mojom.WalletProperties? properties); OnReconcileComplete(ledger.mojom.Result result, string viewing_id, diff --git a/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_client_mock.h b/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_client_mock.h index 436c2b0d002c..d28d1e1ea428 100644 --- a/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_client_mock.h +++ b/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_client_mock.h @@ -48,10 +48,6 @@ class ConfirmationsClientMock : public ConfirmationsClient { MOCK_METHOD1(LoadPublisherState, void( ledger::OnLoadCallback callback)); - MOCK_METHOD2(SavePublisherState, void( - const std::string& publisher_state, - ledger::ResultCallback callback)); - MOCK_METHOD1(LoadNicewareList, void( ledger::GetNicewareListCallback callback)); diff --git a/vendor/bat-native-ledger/include/bat/ledger/ledger_client.h b/vendor/bat-native-ledger/include/bat/ledger/ledger_client.h index 97ea59dd66f9..a30fe0edbe99 100644 --- a/vendor/bat-native-ledger/include/bat/ledger/ledger_client.h +++ b/vendor/bat-native-ledger/include/bat/ledger/ledger_client.h @@ -90,10 +90,6 @@ class LEDGER_EXPORT LedgerClient { virtual void LoadPublisherState(OnLoadCallback callback) = 0; - virtual void SavePublisherState( - const std::string& publisher_state, - ResultCallback callback) = 0; - virtual void LoadNicewareList(ledger::GetNicewareListCallback callback) = 0; virtual void OnPanelPublisherInfo(Result result, diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_client_mock.h b/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_client_mock.h index ba7b8502c665..d6e83069759a 100644 --- a/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_client_mock.h +++ b/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_client_mock.h @@ -43,10 +43,6 @@ class MockLedgerClient : public LedgerClient { MOCK_METHOD1(LoadPublisherState, void( ledger::OnLoadCallback callback)); - MOCK_METHOD2(SavePublisherState, void( - const std::string& publisher_state, - ledger::ResultCallback callback)); - MOCK_METHOD1(LoadNicewareList, void( ledger::GetNicewareListCallback callback)); diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_impl.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_impl.cc index b0e1845ac294..32459b6a8103 100644 --- a/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_impl.cc +++ b/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_impl.cc @@ -491,12 +491,6 @@ void LedgerImpl::SaveLedgerState( ledger_client_->SaveLedgerState(data, callback); } -void LedgerImpl::SavePublisherState( - const std::string& data, - ledger::ResultCallback callback) { - ledger_client_->SavePublisherState(data, callback); -} - void LedgerImpl::LoadURL( const std::string& url, const std::vector& headers, diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_impl.h b/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_impl.h index 115a2e9666df..a1449f22d2bb 100644 --- a/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_impl.h +++ b/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_impl.h @@ -186,10 +186,6 @@ class LedgerImpl : public ledger::Ledger { const std::string& data, ledger::ResultCallback callback); - void SavePublisherState( - const std::string& data, - ledger::ResultCallback callback); - void LoadNicewareList(ledger::GetNicewareListCallback callback); void SetConfirmationsWalletInfo( diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_impl_mock.h b/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_impl_mock.h index 0570725ceda0..809b174bfcd7 100644 --- a/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_impl_mock.h +++ b/vendor/bat-native-ledger/src/bat/ledger/internal/ledger_impl_mock.h @@ -119,10 +119,6 @@ class MockLedgerImpl : public LedgerImpl { MOCK_METHOD1(SaveLedgerState, void(const std::string&)); - MOCK_METHOD2(SavePublisherState, void( - const std::string&, - ledger::ResultCallback)); - MOCK_METHOD1(LoadNicewareList, void(ledger::GetNicewareListCallback)); MOCK_METHOD1(SetConfirmationsWalletInfo, diff --git a/vendor/brave-ios/Ledger/BATBraveLedger.mm b/vendor/brave-ios/Ledger/BATBraveLedger.mm index 15dd4a8b0c95..2eacb8e3e39a 100644 --- a/vendor/brave-ios/Ledger/BATBraveLedger.mm +++ b/vendor/brave-ios/Ledger/BATBraveLedger.mm @@ -1750,12 +1750,6 @@ - (void)loadPublisherState:(ledger::OnLoadCallback)callback } } -- (void)savePublisherState:(const std::string &)publisher_state callback:(ledger::ResultCallback)callback -{ - const auto result = [self.commonOps saveContents:publisher_state name:"publisher_state.json"]; - callback(result ? ledger::Result::LEDGER_OK : ledger::Result::LEDGER_ERROR); -} - - (void)loadState:(const std::string &)name callback:(ledger::OnLoadCallback)callback { const auto key = [NSString stringWithUTF8String:name.c_str()]; diff --git a/vendor/brave-ios/Ledger/Generated/NativeLedgerClient.h b/vendor/brave-ios/Ledger/Generated/NativeLedgerClient.h index cd7c6ea0830a..bb1a00cd024f 100644 --- a/vendor/brave-ios/Ledger/Generated/NativeLedgerClient.h +++ b/vendor/brave-ios/Ledger/Generated/NativeLedgerClient.h @@ -30,7 +30,6 @@ class NativeLedgerClient : public ledger::LedgerClient { void ResetState(const std::string & name, ledger::ResultCallback callback) override; void SaveLedgerState(const std::string & ledger_state, ledger::ResultCallback callback) override; void PublisherListNormalized(ledger::PublisherInfoList list) override; - void SavePublisherState(const std::string & publisher_state, ledger::ResultCallback callback) override; void SaveState(const std::string & name, const std::string & value, ledger::ResultCallback callback) override; void SetConfirmationsIsReady(const bool is_ready) override; void SetTimer(uint64_t time_offset, uint32_t * timer_id) override; diff --git a/vendor/brave-ios/Ledger/Generated/NativeLedgerClient.mm b/vendor/brave-ios/Ledger/Generated/NativeLedgerClient.mm index f90de25f227c..d024169ce78f 100644 --- a/vendor/brave-ios/Ledger/Generated/NativeLedgerClient.mm +++ b/vendor/brave-ios/Ledger/Generated/NativeLedgerClient.mm @@ -56,9 +56,6 @@ void NativeLedgerClient::PublisherListNormalized(ledger::PublisherInfoList list) { [bridge_ publisherListNormalized:std::move(list)]; } -void NativeLedgerClient::SavePublisherState(const std::string & publisher_state, ledger::ResultCallback callback) { - [bridge_ savePublisherState:publisher_state callback:callback]; -} void NativeLedgerClient::SaveState(const std::string & name, const std::string & value, ledger::ResultCallback callback) { [bridge_ saveState:name value:value callback:callback]; } diff --git a/vendor/brave-ios/Ledger/Generated/NativeLedgerClientBridge.h b/vendor/brave-ios/Ledger/Generated/NativeLedgerClientBridge.h index 7faa32352e54..3f649fea0d20 100644 --- a/vendor/brave-ios/Ledger/Generated/NativeLedgerClientBridge.h +++ b/vendor/brave-ios/Ledger/Generated/NativeLedgerClientBridge.h @@ -23,7 +23,6 @@ - (void)resetState:(const std::string &)name callback:(ledger::ResultCallback)callback; - (void)saveLedgerState:(const std::string &)ledger_state callback:(ledger::ResultCallback)callback; - (void)publisherListNormalized:(ledger::PublisherInfoList)list; -- (void)savePublisherState:(const std::string &)publisher_state callback:(ledger::ResultCallback)callback; - (void)saveState:(const std::string &)name value:(const std::string &)value callback:(ledger::ResultCallback)callback; - (void)setConfirmationsIsReady:(const bool)is_ready; - (void)setTimer:(uint64_t)time_offset timerId:(uint32_t *)timer_id;