From 75b74cd8bb35fb0af3bc62b08ba3f355c563c6a9 Mon Sep 17 00:00:00 2001 From: Szilard Szaloki Date: Tue, 15 Nov 2022 10:12:34 -0500 Subject: [PATCH] Fixes `RewardsServiceObserver` on Android. --- .../chrome/browser/BraveRewardsNativeWorker.java | 6 +++--- .../android/brave_rewards_native_worker.cc | 12 ++++++------ .../android/brave_rewards_native_worker.h | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java b/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java index d8be4c83780..00338fcd60e 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java @@ -658,21 +658,21 @@ public class BraveRewardsNativeWorker { } @CalledByNative - public void ExternalWalletConnected() { + public void OnExternalWalletConnected() { for (BraveRewardsObserver observer : mObservers) { observer.OnExternalWalletConnected(); } } @CalledByNative - public void ExternalWalletLoggedOut() { + public void OnExternalWalletLoggedOut() { for (BraveRewardsObserver observer : mObservers) { observer.OnExternalWalletLoggedOut(); } } @CalledByNative - public void ExternalWalletReconnected() { + public void OnExternalWalletReconnected() { for (BraveRewardsObserver observer : mObservers) { observer.OnExternalWalletReconnected(); } diff --git a/browser/brave_rewards/android/brave_rewards_native_worker.cc b/browser/brave_rewards/android/brave_rewards_native_worker.cc index 5a63ef32fd3..c7a63ece11f 100644 --- a/browser/brave_rewards/android/brave_rewards_native_worker.cc +++ b/browser/brave_rewards/android/brave_rewards_native_worker.cc @@ -857,21 +857,21 @@ void BraveRewardsNativeWorker::DisconnectWallet(JNIEnv* env) { // TODO(zenparsing): Remove disconnect ability from Android UI. } -void BraveRewardsNativeWorker::ExternalWalletConnected() { +void BraveRewardsNativeWorker::OnExternalWalletConnected() { JNIEnv* env = base::android::AttachCurrentThread(); - Java_BraveRewardsNativeWorker_ExternalWalletConnected( + Java_BraveRewardsNativeWorker_OnExternalWalletConnected( env, weak_java_brave_rewards_native_worker_.get(env)); } -void BraveRewardsNativeWorker::ExternalWalletLoggedOut() { +void BraveRewardsNativeWorker::OnExternalWalletLoggedOut() { JNIEnv* env = base::android::AttachCurrentThread(); - Java_BraveRewardsNativeWorker_ExternalWalletLoggedOut( + Java_BraveRewardsNativeWorker_OnExternalWalletLoggedOut( env, weak_java_brave_rewards_native_worker_.get(env)); } -void BraveRewardsNativeWorker::ExternalWalletReconnected() { +void BraveRewardsNativeWorker::OnExternalWalletReconnected() { JNIEnv* env = base::android::AttachCurrentThread(); - Java_BraveRewardsNativeWorker_ExternalWalletReconnected( + Java_BraveRewardsNativeWorker_OnExternalWalletReconnected( env, weak_java_brave_rewards_native_worker_.get(env)); } diff --git a/browser/brave_rewards/android/brave_rewards_native_worker.h b/browser/brave_rewards/android/brave_rewards_native_worker.h index 510e897c143..60498f29d45 100644 --- a/browser/brave_rewards/android/brave_rewards_native_worker.h +++ b/browser/brave_rewards/android/brave_rewards_native_worker.h @@ -237,11 +237,11 @@ class BraveRewardsNativeWorker void OnOneTimeTip(ledger::mojom::Result result); - void ExternalWalletConnected() override; + void OnExternalWalletConnected() override; - void ExternalWalletLoggedOut() override; + void OnExternalWalletLoggedOut() override; - void ExternalWalletReconnected() override; + void OnExternalWalletReconnected() override; void OnRefreshPublisher(const ledger::mojom::PublisherStatus status, const std::string& publisher_key);