From a4a865db6a9bb280ddce0119102dc602948bdb8c Mon Sep 17 00:00:00 2001 From: Sujit Acharya Date: Mon, 19 Sep 2022 14:35:23 +0530 Subject: [PATCH] code formatting --- .../rewards/BraveRewardsBannerInfo.java | 4 +- .../BraveRewardsCustomTipFragment.java | 9 ++-- .../BraveRewardsTippingPanelFragment.java | 3 +- .../android/brave_rewards_native_worker.cc | 46 +++++++++---------- 4 files changed, 30 insertions(+), 32 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/rewards/BraveRewardsBannerInfo.java b/android/java/org/chromium/chrome/browser/rewards/BraveRewardsBannerInfo.java index d101a3dc037..7f6d8119c6f 100644 --- a/android/java/org/chromium/chrome/browser/rewards/BraveRewardsBannerInfo.java +++ b/android/java/org/chromium/chrome/browser/rewards/BraveRewardsBannerInfo.java @@ -23,7 +23,6 @@ import java.lang.annotation.RetentionPolicy; import java.util.Arrays; import java.util.HashMap; - /** * BraveRewardsNativeWorker.GetPublisherBanner json response converted to this pojo class * */ @@ -127,7 +126,6 @@ public class BraveRewardsBannerInfo implements Parcelable { return mLogo; } - public String getProvider() { return mProvider; } @@ -152,7 +150,7 @@ public class BraveRewardsBannerInfo implements Parcelable { mDescription = jsonObj.getString(DESCRIPTION); mBackground = jsonObj.getString(BACKGROUND); mLogo = jsonObj.getString(LOGO); - + mProvider = jsonObj.getString(PROVIDER); JSONObject linksJsonObject = jsonObj.getJSONObject(LINKS); if (linksJsonObject != null) { diff --git a/android/java/org/chromium/chrome/browser/rewards/BraveRewardsCustomTipFragment.java b/android/java/org/chromium/chrome/browser/rewards/BraveRewardsCustomTipFragment.java index be0f0edd688..decc4a435b7 100644 --- a/android/java/org/chromium/chrome/browser/rewards/BraveRewardsCustomTipFragment.java +++ b/android/java/org/chromium/chrome/browser/rewards/BraveRewardsCustomTipFragment.java @@ -30,7 +30,6 @@ import org.chromium.chrome.browser.BraveRewardsSiteBannerActivity; import java.util.regex.Matcher; import java.util.regex.Pattern; - public class BraveRewardsCustomTipFragment extends Fragment { public static final int MAX_BAT_VALUE = 100; public static final double AMOUNT_STEP_BY = 0.25; @@ -62,7 +61,6 @@ public class BraveRewardsCustomTipFragment extends Fragment { return view; } - private void exchangeButtonClick(View view) { TextView currencyOneSubTextView = view.findViewById(R.id.currencyOneSubTextView); TextView currencyTwoSubTextView = view.findViewById(R.id.currencyTwoSubTextView); @@ -72,7 +70,7 @@ public class BraveRewardsCustomTipFragment extends Fragment { exchangeButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - isBatCurrencyMode = !isBatCurrencyMode; //toggle + isBatCurrencyMode = !isBatCurrencyMode; // toggle String currency1 = currencyOneEditText.getText().toString(); String currency2 = currencyTwoTextView.getText().toString(); @@ -114,8 +112,9 @@ public class BraveRewardsCustomTipFragment extends Fragment { currencyOneEditText.setFilters(new InputFilter[] {new DecimalDigitsInputFilter(5, 2)}); currencyOneEditText.addTextChangedListener(textChangeListener); mSelectedAmount = getArguments().getDouble(SELECTED_AMOUNT); - currencyOneEditText.setText(String.valueOf(mSelectedAmount)); //Default value - ((BraveRewardsSiteBannerActivity) getActivity()).onAmountChange(mSelectedAmount, mSelectedAmount*exchangeRate); + currencyOneEditText.setText(String.valueOf(mSelectedAmount)); // Default value + ((BraveRewardsSiteBannerActivity) getActivity()) + .onAmountChange(mSelectedAmount, mSelectedAmount * exchangeRate); } private TextWatcher textChangeListener = new TextWatcher() { diff --git a/android/java/org/chromium/chrome/browser/rewards/BraveRewardsTippingPanelFragment.java b/android/java/org/chromium/chrome/browser/rewards/BraveRewardsTippingPanelFragment.java index 73860c650cc..eca760794ec 100644 --- a/android/java/org/chromium/chrome/browser/rewards/BraveRewardsTippingPanelFragment.java +++ b/android/java/org/chromium/chrome/browser/rewards/BraveRewardsTippingPanelFragment.java @@ -164,7 +164,8 @@ public class BraveRewardsTippingPanelFragment extends Fragment implements BraveR FragmentManager fragmentManager = getParentFragmentManager(); fragmentManager.beginTransaction() .replace(R.id.conversionFragmentContainer, - BraveRewardsCustomTipFragment.newInstance(amount), "custom_tip_fragment") + BraveRewardsCustomTipFragment.newInstance(amount), + "custom_tip_fragment") .addToBackStack(null) .commit(); } diff --git a/browser/brave_rewards/android/brave_rewards_native_worker.cc b/browser/brave_rewards/android/brave_rewards_native_worker.cc index d46a250bdb2..a7fe8c4a371 100644 --- a/browser/brave_rewards/android/brave_rewards_native_worker.cc +++ b/browser/brave_rewards/android/brave_rewards_native_worker.cc @@ -749,32 +749,32 @@ void BraveRewardsNativeWorker::GetPublisherBanner( void BraveRewardsNativeWorker::onPublisherBanner( ledger::mojom::PublisherBannerPtr banner) { std::string json_banner_info; - if (!banner) { - json_banner_info = ""; - } else { - base::Value::Dict dict; - dict.Set("publisher_key", banner->publisher_key); - dict.Set("title", banner->title); + if (!banner) { + json_banner_info = ""; + } else { + base::Value::Dict dict; + dict.Set("publisher_key", banner->publisher_key); + dict.Set("title", banner->title); - dict.Set("name", banner->name); - dict.Set("description", banner->description); - dict.Set("background", banner->background); - dict.Set("logo", banner->logo); - dict.Set("provider", banner->provider); + dict.Set("name", banner->name); + dict.Set("description", banner->description); + dict.Set("background", banner->background); + dict.Set("logo", banner->logo); + dict.Set("provider", banner->provider); - base::Value::Dict links; - for (auto const& link : banner->links) { - links.Set(link.first, link.second); - } - dict.Set("links", std::move(links)); + base::Value::Dict links; + for (auto const& link : banner->links) { + links.Set(link.first, link.second); + } + dict.Set("links", std::move(links)); - dict.Set("status", static_cast(banner->status)); - base::JSONWriter::Write(dict, &json_banner_info); - } - JNIEnv* env = base::android::AttachCurrentThread(); - Java_BraveRewardsNativeWorker_onPublisherBanner( - env, weak_java_brave_rewards_native_worker_.get(env), - base::android::ConvertUTF8ToJavaString(env, json_banner_info)); + dict.Set("status", static_cast(banner->status)); + base::JSONWriter::Write(dict, &json_banner_info); + } + JNIEnv* env = base::android::AttachCurrentThread(); + Java_BraveRewardsNativeWorker_onPublisherBanner( + env, weak_java_brave_rewards_native_worker_.get(env), + base::android::ConvertUTF8ToJavaString(env, json_banner_info)); } void BraveRewardsNativeWorker::OnGetExternalWallet(