Skip to content

Crash in rewards tipping banner #17116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/java/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" />

<activity android:name="org.chromium.chrome.browser.BraveRewardsSiteBannerActivity"
android:theme="@android:style/Theme.Translucent.NoTitleBar"
android:theme="@style/BraveTranslucent"
android:screenOrientation="sensorPortrait"
tools:ignore="LockedOrientationActivity" />

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
/* Copyright (c) 2023 The Brave Authors. All rights reserved.
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
* You can obtain one at https://mozilla.org/MPL/2.0/. */

package org.chromium.chrome.browser;

Expand All @@ -18,6 +19,7 @@
import org.chromium.base.Log;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.BraveRewardsNativeWorker;
import org.chromium.chrome.browser.init.AsyncInitializationActivity;
import org.chromium.chrome.browser.rewards.BraveRewardsAmountChangeListener;
import org.chromium.chrome.browser.rewards.BraveRewardsBannerInfo;
import org.chromium.chrome.browser.rewards.BraveRewardsCreatorPanelFragment;
Expand All @@ -26,9 +28,9 @@
import org.chromium.chrome.browser.rewards.BraveRewardsTipFailureFragment;
import org.chromium.chrome.browser.rewards.BraveRewardsTippingPanelFragment;

public class BraveRewardsSiteBannerActivity
extends FragmentActivity implements BraveRewardsTipConfirmationListener,
BraveRewardsAmountChangeListener, BraveRewardsObserver {
public class BraveRewardsSiteBannerActivity extends AsyncInitializationActivity
implements BraveRewardsTipConfirmationListener, BraveRewardsAmountChangeListener,
BraveRewardsObserver {
private ToggleButton radio_tip_amount[] = new ToggleButton[3];
public static final String TAB_ID_EXTRA = "currentTabId";
public static final String IS_MONTHLY_CONTRIBUTION = "is_monthly_contribution";
Expand Down Expand Up @@ -60,24 +62,32 @@ public class BraveRewardsSiteBannerActivity
private static final String TAG = "TippingBanner";

@Override
protected void onCreate(Bundle savedInstanceState) {

//inflate
super.onCreate(savedInstanceState);
protected void triggerLayoutInflation() {
// inflate
setContentView(R.layout.brave_rewards_site_banner);
mIsActivityIsActive = true;
mProgressBar = findViewById(R.id.progressBar);
mBraveRewardsNativeWorker = BraveRewardsNativeWorker.getInstance();
mBraveRewardsNativeWorker.AddObserver(this);

currentTabId_ = IntentUtils.safeGetIntExtra(getIntent(), TAB_ID_EXTRA, -1);
mIsMonthlyContribution =
IntentUtils.safeGetBooleanExtra(getIntent(), IS_MONTHLY_CONTRIBUTION, false);
if (savedInstanceState == null) {
mBraveRewardsNativeWorker.GetPublisherBanner(
mBraveRewardsNativeWorker.GetPublisherId(currentTabId_));
}

clickOnCloseButton();
onInitialLayoutInflationComplete();
}

@Override
public void finishNativeInitialization() {
super.finishNativeInitialization();
mBraveRewardsNativeWorker = BraveRewardsNativeWorker.getInstance();
mBraveRewardsNativeWorker.AddObserver(this);
mBraveRewardsNativeWorker.GetPublisherBanner(
mBraveRewardsNativeWorker.GetPublisherId(currentTabId_));
}

@Override
public boolean shouldStartGpuProcess() {
return true;
}

private void clickOnCloseButton() {
Expand Down
3 changes: 2 additions & 1 deletion android/java/res/layout/brave_rewards_tipping_panel.xml
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="@id/divider_line"
app:layout_constraintEnd_toEndOf="@id/divider_line"/>
app:layout_constraintEnd_toEndOf="@id/divider_line"
android:elevation="5dp"/>

<TextView
android:id="@+id/processing_fee"
Expand Down