Skip to content
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.

Sign up for GitHub

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

Fix ac amount react page android 1.19.x (Uplift to 1.19.x) #7421

Merged
merged 7 commits into from
Dec 14, 2020
Merged

Fix ac amount react page android 1.19.x (Uplift to 1.19.x) #7421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dc2bb3b
Fix crash for safetynet
deeppandya Dec 11, 2020
9d88cf1
Fix react page AC error
deeppandya Dec 11, 2020
9686463
Remove log file
deeppandya Dec 11, 2020
8fed3d7
Update onboarding behaviour
deeppandya Dec 11, 2020
4252411
Update formating
deeppandya Dec 11, 2020
0e4acd9
Remove unused files
deeppandya Dec 12, 2020
4564d17
Remove unused files
deeppandya Dec 12, 2020
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
53 changes: 27 additions & 26 deletions android/brave_java_resources.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,11 +597,17 @@ brave_java_resources = [
"java/res/drawable-xxxhdpi/wallet_add.png",
"java/res/drawable-xxxhdpi/wallet_withdraw.png",
"java/res/drawable-xxxhdpi/yandex.png",
"java/res/drawable/ac_radio_button_normal.xml",
"java/res/drawable/ac_radio_button_selected.xml",
"java/res/drawable/ac_radio_button_selector.xml",
"java/res/drawable/ac_radio_group_bg.xml",
"java/res/drawable/ac_text_selector.xml",
"java/res/drawable/bat_panel_gradient.xml",
"java/res/drawable/bat_rewards_summary_gradient.xml",
"java/res/drawable/binance_edittext.xml",
"java/res/drawable/binance_radio_button_selector.xml",
"java/res/drawable/blue_rounded_button.xml",
"java/res/drawable/blue_rounded_holo_button.xml",
"java/res/drawable/brave_badge_rewards_background_large.xml",
"java/res/drawable/brave_badge_rewards_background_small.xml",
"java/res/drawable/brave_badge_shields_background_large.xml",
Expand All @@ -611,17 +617,16 @@ brave_java_resources = [
"java/res/drawable/brave_rewards_circle.xml",
"java/res/drawable/brave_rewards_loader.xml",
"java/res/drawable/brave_rewards_not_verified_rectangle.xml",
"java/res/drawable/brave_rewards_onboarding_default.xml",
"java/res/drawable/brave_rewards_onboarding_selected.xml",
"java/res/drawable/brave_rewards_onboarding_selector.xml",
"java/res/drawable/brave_rewards_rectangle.xml",
"java/res/drawable/brave_rewards_welcome_bg.xml",
"java/res/drawable/brave_rewards_widget_gradient.xml",
"java/res/drawable/brave_stats_radio_button_normal.xml",
"java/res/drawable/brave_stats_radio_button_selected.xml",
"java/res/drawable/brave_stats_radio_button_selector.xml",
"java/res/drawable/brave_stats_radio_group_bg.xml",
"java/res/drawable/ac_radio_button_normal.xml",
"java/res/drawable/ac_radio_button_selected.xml",
"java/res/drawable/ac_radio_button_selector.xml",
"java/res/drawable/ac_radio_group_bg.xml",
"java/res/drawable/ac_text_selector.xml",
"java/res/drawable/brave_stats_rounded_bg.xml",
"java/res/drawable/brave_stats_ui_empty_bg.xml",
"java/res/drawable/brave_sync_btn.xml",
Expand All @@ -643,14 +648,22 @@ brave_java_resources = [
"java/res/drawable/ic_binance.xml",
"java/res/drawable/ic_brave_rewards_widget.xml",
"java/res/drawable/ic_btc.xml",
"java/res/drawable/ic_chevron_right.xml",
"java/res/drawable/ic_chevron_left.xml",
"java/res/drawable/ic_chevron_right.xml",
"java/res/drawable/ic_clock.xml",
"java/res/drawable/ic_ethereum.xml",
"java/res/drawable/ic_help.xml",
"java/res/drawable/ic_help_filled.xml",
"java/res/drawable/ic_icon_bat_eta.xml",
"java/res/drawable/ic_litecoin.xml",
"java/res/drawable/ic_more_horiz.xml",
"java/res/drawable/ic_onboarding_graphic_android_brave_ads.xml",
"java/res/drawable/ic_onboarding_graphic_auto_contribute.xml",
"java/res/drawable/ic_onboarding_graphic_bat_ecosystem.xml",
"java/res/drawable/ic_onboarding_graphic_bat_schedule.xml",
"java/res/drawable/ic_onboarding_graphic_cashback.xml",
"java/res/drawable/ic_onboarding_graphic_completed.xml",
"java/res/drawable/ic_onboarding_graphic_tipping.xml",
"java/res/drawable/ic_phone.xml",
"java/res/drawable/ic_polygon_1.xml",
"java/res/drawable/ic_shield_done_filled.xml",
Expand All @@ -659,6 +672,7 @@ brave_java_resources = [
"java/res/drawable/ic_thank_you.xml",
"java/res/drawable/ic_toggle_down.xml",
"java/res/drawable/ic_toggle_up.xml",
"java/res/drawable/ic_wallet_add.xml",
"java/res/drawable/ic_yahoo.xml",
"java/res/drawable/image_credit_rounded_shape.xml",
"java/res/drawable/indicator_selector.xml",
Expand Down Expand Up @@ -692,26 +706,8 @@ brave_java_resources = [
"java/res/drawable/transparent_bg_bordered.xml",
"java/res/drawable/wallet_disconnected_button.xml",
"java/res/drawable/wallet_verify_button.xml",
"java/res/drawable/ic_wallet_add.xml",
"java/res/drawable/ic_onboarding_graphic_android_brave_ads.xml",
"java/res/drawable/ic_onboarding_graphic_auto_contribute.xml",
"java/res/drawable/ic_onboarding_graphic_bat_ecosystem.xml",
"java/res/drawable/ic_onboarding_graphic_bat_schedule.xml",
"java/res/drawable/ic_onboarding_graphic_tipping.xml",
"java/res/drawable/ic_onboarding_graphic_cashback.xml",
"java/res/drawable/ic_onboarding_graphic_completed.xml",
"java/res/drawable/brave_rewards_onboarding_selector.xml",
"java/res/drawable/brave_rewards_onboarding_default.xml",
"java/res/drawable/brave_rewards_onboarding_selected.xml",
"java/res/drawable/brave_rewards_welcome_bg.xml",
"java/res/drawable/blue_rounded_holo_button.xml",
"java/res/layout-land/brave_rewards_site_banner.xml",
"java/res/layout-land/verify_wallet_activity.xml",
"java/res/layout/brave_rewards_onboarding_ac_layout.xml",
"java/res/layout/brave_rewards_onboarding_item_layout.xml",
"java/res/layout/brave_rewards_onboarding_layout.xml",
"java/res/layout/brave_rewards_welcome_layout.xml",
"java/res/layout/brave_rewards_opt_in_layout.xml",
"java/res/layout/activity_ntp_widget_stack.xml",
"java/res/layout/activity_onboarding.xml",
"java/res/layout/binance_deposit_item.xml",
Expand All @@ -724,7 +720,6 @@ brave_java_resources = [
"java/res/layout/bottom_toolbar_browsing.xml",
"java/res/layout/bottom_toolbar_menu_button.xml",
"java/res/layout/bottom_toolbar_tab_switcher.xml",
"java/res/layout/icon_row_menu_footer.xml",
"java/res/layout/brave_ads_existing_user_dialog_layout.xml",
"java/res/layout/brave_ads_new_user_dialog_layout.xml",
"java/res/layout/brave_bookmark_toolbar.xml",
Expand All @@ -734,14 +729,19 @@ brave_java_resources = [
"java/res/layout/brave_rewards_auto_contrib.xml",
"java/res/layout/brave_rewards_donation_sent.xml",
"java/res/layout/brave_rewards_grants_list_item.xml",
"java/res/layout/brave_rewards_onboarding_ac_layout.xml",
"java/res/layout/brave_rewards_onboarding_item_layout.xml",
"java/res/layout/brave_rewards_onboarding_layout.xml",
"java/res/layout/brave_rewards_onboarding_modal.xml",
"java/res/layout/brave_rewards_opt_in_layout.xml",
"java/res/layout/brave_rewards_panel.xml",
"java/res/layout/brave_rewards_panel_grant.xml",
"java/res/layout/brave_rewards_panel_header.xml",
"java/res/layout/brave_rewards_reset_tab_content.xml",
"java/res/layout/brave_rewards_site_banner.xml",
"java/res/layout/brave_rewards_spinnner_item.xml",
"java/res/layout/brave_rewards_spinnner_item_dropdown.xml",
"java/res/layout/brave_rewards_welcome_layout.xml",
"java/res/layout/brave_rewards_widget_layout.xml",
"java/res/layout/brave_set_default_browser_dialog.xml",
"java/res/layout/brave_shields_3rd_party_cookies_blocked_switcher.xml",
Expand Down Expand Up @@ -783,6 +783,7 @@ brave_java_resources = [
"java/res/layout/fragment_search_engine_onboarding.xml",
"java/res/layout/fragment_troubleshooting_onboarding.xml",
"java/res/layout/highlight_layout.xml",
"java/res/layout/icon_row_menu_footer.xml",
"java/res/layout/location_status_incognito_badge.xml",
"java/res/layout/menu_separator.xml",
"java/res/layout/new_tab_page_incognito.xml",
Expand Down Expand Up @@ -839,4 +840,4 @@ brave_java_resources = [
"java/res/xml/use_custom_tabs_brave_preference.xml",
]

brave_components_browser_ui_site_settings_android_java_resources = [ "//brave/components/browser_ui/site_settings/android/java/res/xml/brave_site_settings_preferences.xml" ]
brave_components_browser_ui_site_settings_android_java_resources = [ "//brave/components/browser_ui/site_settings/android/java/res/xml/brave_site_settings_preferences.xml" ]
28 changes: 8 additions & 20 deletions android/java/org/chromium/chrome/browser/BraveRewardsHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,13 @@

public class BraveRewardsHelper implements LargeIconBridge.LargeIconCallback{
private static final String PREF_BRAVE_REWARDS_APP_OPEN_COUNT = "brave_rewards_app_open_count";
private static final String PREF_SHOW_BRAVE_REWARDS_ONBOARDING_MODAL_ONCE =
"show_brave_rewards_onboarding_modal_once";
private static final String PREF_SHOW_BRAVE_REWARDS_ONBOARDING_MODAL =
"show_brave_rewards_onboarding_modal";
private static final String PREF_SHOW_BRAVE_REWARDS_ONBOARDING_ONCE =
"show_brave_rewards_onboarding_once";
private static final String PREF_SHOW_ONBOARDING_MINI_MODAL = "show_onboarding_mini_modal";
private static final String PREF_NEXT_REWARDS_ONBOARDING_MODAL_DATE =
"next_rewards_onboarding_modal_date";
private static final String PREF_SHOW_REWARDS_SETTINGS_ONBOARDING_MODAL =
"show_rewards_settings_onboarding_modal";
private static final String PREF_REWARDS_ENV_CHANGE = "rewards_env_change";
private static final String PREF_REWARDS_ONBOARDING_MODAL = "rewards_onboarding_modal";
private static final int FAVICON_CIRCLE_MEASUREMENTS = 70; // dp
Expand Down Expand Up @@ -112,7 +110,8 @@ public static boolean hasRewardsOnboardingModalShown() {
public static boolean shouldShowRewardsOnboardingModalOnDay4() {
if (!hasRewardsOnboardingModalShown()
&& (getNextRewardsOnboardingModalDate() > 0
&& System.currentTimeMillis() > getNextRewardsOnboardingModalDate())) {
&& System.currentTimeMillis() > getNextRewardsOnboardingModalDate())
&& shouldShowBraveRewardsOnboardingModal()) {
if (BraveAdsNativeHelper.nativeIsBraveAdsEnabled(Profile.getLastUsedRegularProfile())) {
setRewardsOnboardingModalShown(true);
return false;
Expand All @@ -135,17 +134,6 @@ public static void updateBraveRewardsAppOpenCount() {
sharedPreferencesEditor.apply();
}

public static boolean shouldShowBraveRewardsSettingsOnboardingModal() {
return ContextUtils.getAppSharedPreferences().getBoolean(
PREF_SHOW_REWARDS_SETTINGS_ONBOARDING_MODAL, true);
}

public static void setShowBraveRewardsSettingsOnboardingModal(boolean enabled) {
SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
sharedPreferencesEditor.putBoolean(PREF_SHOW_REWARDS_SETTINGS_ONBOARDING_MODAL, enabled);
sharedPreferencesEditor.apply();
}

public static boolean shouldShowMiniOnboardingModal() {
return ContextUtils.getAppSharedPreferences().getBoolean(
PREF_SHOW_ONBOARDING_MINI_MODAL, true);
Expand All @@ -158,15 +146,15 @@ public static void setShowMiniOnboardingModal(boolean enabled) {
sharedPreferencesEditor.apply();
}

public static boolean shouldShowBraveRewardsOnboardingModalOnce() {
public static boolean shouldShowBraveRewardsOnboardingModal() {
return ContextUtils.getAppSharedPreferences().getBoolean(
PREF_SHOW_BRAVE_REWARDS_ONBOARDING_MODAL_ONCE, false);
PREF_SHOW_BRAVE_REWARDS_ONBOARDING_MODAL, true);
}

public static void setShowBraveRewardsOnboardingModalOnce(boolean enabled) {
public static void setShowBraveRewardsOnboardingModal(boolean enabled) {
SharedPreferences.Editor sharedPreferencesEditor =
ContextUtils.getAppSharedPreferences().edit();
sharedPreferencesEditor.putBoolean(PREF_SHOW_BRAVE_REWARDS_ONBOARDING_MODAL_ONCE, enabled);
sharedPreferencesEditor.putBoolean(PREF_SHOW_BRAVE_REWARDS_ONBOARDING_MODAL, enabled);
sharedPreferencesEditor.apply();
}

Expand Down
33 changes: 15 additions & 18 deletions android/java/org/chromium/chrome/browser/BraveRewardsOnboardingPagerAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,23 +77,23 @@ public Object instantiateItem(ViewGroup collection, int position) {
RadioButton defaultRadioButton;
switch(adsPerHour) {
case 1:
defaultRadioButton = ((RadioButton)view.findViewById(R.id.hour_1_radio));
break;
defaultRadioButton = ((RadioButton) view.findViewById(R.id.hour_1_radio));
break;
case 2:
defaultRadioButton = ((RadioButton)view.findViewById(R.id.hour_2_radio));
break;
defaultRadioButton = ((RadioButton) view.findViewById(R.id.hour_2_radio));
break;
case 3:
defaultRadioButton = ((RadioButton)view.findViewById(R.id.hour_3_radio));
break;
defaultRadioButton = ((RadioButton) view.findViewById(R.id.hour_3_radio));
break;
case 4:
defaultRadioButton = ((RadioButton)view.findViewById(R.id.hour_4_radio));
break;
defaultRadioButton = ((RadioButton) view.findViewById(R.id.hour_4_radio));
break;
case 5:
defaultRadioButton = ((RadioButton)view.findViewById(R.id.hour_5_radio));
break;
defaultRadioButton = ((RadioButton) view.findViewById(R.id.hour_5_radio));
break;
default:
defaultRadioButton = ((RadioButton)view.findViewById(R.id.hour_1_radio));
break;
defaultRadioButton = ((RadioButton) view.findViewById(R.id.hour_1_radio));
break;
}
defaultRadioButton.setChecked(true);
hourRadioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
Expand All @@ -119,8 +119,8 @@ public void onCheckedChanged(RadioGroup radioGroup, int checkedId) {
});

RadioGroup contributeRadioGroup = view.findViewById(R.id.contribute_radio_group);
BraveRewardsNativeWorker.getInstance().SetAutoContributionAmount(15);
((RadioButton)view.findViewById(R.id.contribute_15_radio)).setChecked(true);
BraveRewardsNativeWorker.getInstance().SetAutoContributionAmount(5);
((RadioButton) view.findViewById(R.id.contribute_5_radio)).setChecked(true);
contributeRadioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(RadioGroup radioGroup, int checkedId) {
Expand All @@ -134,10 +134,7 @@ public void onCheckedChanged(RadioGroup radioGroup, int checkedId) {
} else if (checkedId == R.id.contribute_50_radio) {
contribute = 50;
}
if (BraveRewardsNativeWorker.getInstance().IsAutoContributeEnabled()) {
BraveRewardsNativeWorker.getInstance().SetAutoContributionAmount(
contribute);
}
BraveRewardsNativeWorker.getInstance().SetAutoContributionAmount(contribute);
}
});
} else {
Expand Down
18 changes: 7 additions & 11 deletions android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ private void showBraveRewardsWelcomeLayout(View root) {
Date currentTime = new Date();
cal.setTime(currentTime);
cal.add(Calendar.MONTH, 1);
cal.set(Calendar.DAY_OF_MONTH, 6);
cal.set(Calendar.DAY_OF_MONTH, 5);
payoutDateText.setText(dateFormat.format(cal.getTime()));
TextView btnQuickRefresherTour =
braveRewardsWelcomeView.findViewById(R.id.quick_refresher_tour_button);
Expand Down Expand Up @@ -850,21 +850,17 @@ public void showLikePopDownMenu() {
@Override
public void OnStartProcess() {
if (root != null && PackageUtils.isFirstInstall(mActivity)
&& !BraveAdsNativeHelper.nativeIsBraveAdsEnabled(
Profile.getLastUsedRegularProfile())
&& ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_REWARDS)) {
if (BraveRewardsHelper.shouldShowBraveRewardsOnboardingModalOnce()) {
showBraveRewardsOnboardingModal(root);
BraveRewardsHelper.setShowBraveRewardsOnboardingModalOnce(false);
BraveRewardsHelper.setShowBraveRewardsSettingsOnboardingModal(false);
BraveRewardsHelper.updateBraveRewardsAppOpenCount();
} else if (BraveRewardsHelper.shouldShowBraveRewardsOnboardingOnce()) {
if (BraveRewardsHelper.shouldShowBraveRewardsOnboardingOnce()) {
showBraveRewardsOnboarding(root, false);
BraveRewardsHelper.setShowBraveRewardsOnboardingOnce(false);
} else if ((BraveRewardsHelper.getBraveRewardsAppOpenCount() == 0)
&& !BraveAdsNativeHelper.nativeIsBraveAdsEnabled(
Profile.getLastUsedRegularProfile())) {
} else if (BraveRewardsHelper.getBraveRewardsAppOpenCount() == 0
&& BraveRewardsHelper.shouldShowBraveRewardsOnboardingModal()) {
showBraveRewardsOnboardingModal(root);
BraveRewardsHelper.updateBraveRewardsAppOpenCount();
BraveRewardsHelper.setShowBraveRewardsSettingsOnboardingModal(false);
BraveRewardsHelper.setShowBraveRewardsOnboardingModal(false);
} else if (SharedPreferencesManager.getInstance().readInt(
BravePreferenceKeys.BRAVE_APP_OPEN_COUNT)
> BraveRewardsHelper.getBraveRewardsAppOpenCount()
Expand Down
14 changes: 8 additions & 6 deletions android/java/org/chromium/chrome/browser/app/BraveActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,19 +347,21 @@ public void finishNativeInitialization() {
BraveRewardsHelper.setNextRewardsOnboardingModalDate(calender.getTimeInMillis());
}
if (BraveRewardsHelper.shouldShowRewardsOnboardingModalOnDay4()) {
BraveRewardsHelper.setShowBraveRewardsOnboardingModalOnce(true);
BraveRewardsHelper.setShowBraveRewardsOnboardingModal(true);
openRewardsPanel();
BraveRewardsHelper.setRewardsOnboardingModalShown(true);
}
}

private void checkForYandexSE() {
TemplateUrl yandexTemplateUrl =
BraveSearchEngineUtils.getTemplateUrlByShortName(OnboardingPrefManager.YANDEX);
String countryCode = Locale.getDefault().getCountry();
if (yandexRegions.contains(countryCode) && yandexTemplateUrl != null) {
BraveSearchEngineUtils.setDSEPrefs(yandexTemplateUrl, false);
BraveSearchEngineUtils.setDSEPrefs(yandexTemplateUrl, true);
if (yandexRegions.contains(countryCode)) {
TemplateUrl yandexTemplateUrl =
BraveSearchEngineUtils.getTemplateUrlByShortName(OnboardingPrefManager.YANDEX);
if (yandexTemplateUrl != null) {
BraveSearchEngineUtils.setDSEPrefs(yandexTemplateUrl, false);
BraveSearchEngineUtils.setDSEPrefs(yandexTemplateUrl, true);
}
}
}

Expand Down
8 changes: 7 additions & 1 deletion android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
import org.chromium.base.supplier.Supplier;
import org.chromium.base.task.AsyncTask;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.BraveAdsNativeHelper;
import org.chromium.chrome.browser.BraveRewardsHelper;
import org.chromium.chrome.browser.ChromeTabbedActivity;
import org.chromium.chrome.browser.InternetConnection;
Expand Down Expand Up @@ -605,7 +606,12 @@ public void onGlobalLayout() {

private void checkForNonDisruptiveBanner(NTPImage ntpImage) {
int brOption = NTPUtil.checkForNonDisruptiveBanner(ntpImage, sponsoredTab);
if (SponsoredImageUtil.BR_INVALID_OPTION != brOption && !NTPUtil.isReferralEnabled()) {
if (SponsoredImageUtil.BR_INVALID_OPTION != brOption && !NTPUtil.isReferralEnabled()
&& ((!BraveAdsNativeHelper.nativeIsBraveAdsEnabled(
Profile.getLastUsedRegularProfile())
&& BraveRewardsHelper.shouldShowBraveRewardsOnboardingModal())
|| BraveAdsNativeHelper.nativeIsBraveAdsEnabled(
Profile.getLastUsedRegularProfile()))) {
NTPUtil.showNonDisruptiveBanner((BraveActivity) mActivity, this, brOption,
sponsoredTab, newTabPageListener);
}
Expand Down
Loading