diff --git a/android/brave_java_resources.gni b/android/brave_java_resources.gni index 265084cd475..fef2672ec63 100644 --- a/android/brave_java_resources.gni +++ b/android/brave_java_resources.gni @@ -374,7 +374,6 @@ brave_java_resources = [ "java/res/drawable/brave_sync_top_rounded.xml", "java/res/drawable/brave_sync_top_rounded_light.xml", "java/res/drawable/card_bg.xml", - "java/res/drawable/checked_circle_filled.xml", "java/res/drawable/circular_progress.xml", "java/res/drawable/country_spinner_background.xml", "java/res/drawable/create_custom_filter_edit_bg.xml", diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags index 6c528aa72d8..b9687e06c81 100644 --- a/android/java/apk_for_test.flags +++ b/android/java/apk_for_test.flags @@ -516,7 +516,6 @@ } -keep class org.chromium.chrome.browser.notifications.permissions.NotificationPermissionRationaleDialogController { - *** wrapDialogDismissalCallback(...); public (...); } diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java b/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java index 1b38de41e43..c2496d4c68c 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java @@ -245,17 +245,8 @@ public class BraveRewardsHelper implements LargeIconBridge.LargeIconCallback { } } - /** we don't destroy sLargeIconBridge sisnce it's static */ - private void destroy() { - if (sLargeIconBridge != null) { - sLargeIconBridge.destroy(); - sLargeIconBridge = null; - } - mCallback = null; - } - public void detach() { - mCallback = null; + mCallback = null; } public void retrieveLargeIcon(String favIconURL, LargeIconReadyCallback callback) { diff --git a/android/java/org/chromium/chrome/browser/brave_news/CardBuilderFeedCard.java b/android/java/org/chromium/chrome/browser/brave_news/CardBuilderFeedCard.java index 0e9e0d4e667..4fbd92cb00e 100644 --- a/android/java/org/chromium/chrome/browser/brave_news/CardBuilderFeedCard.java +++ b/android/java/org/chromium/chrome/browser/brave_news/CardBuilderFeedCard.java @@ -10,7 +10,6 @@ import android.graphics.BitmapFactory; import android.graphics.Color; import android.graphics.Paint; import android.graphics.Typeface; -import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.GradientDrawable; import android.graphics.drawable.LayerDrawable; @@ -40,15 +39,11 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.Priority; import com.bumptech.glide.RequestManager; -import com.bumptech.glide.load.DataSource; import com.bumptech.glide.load.engine.DiskCacheStrategy; -import com.bumptech.glide.load.engine.GlideException; import com.bumptech.glide.load.resource.bitmap.CenterCrop; import com.bumptech.glide.load.resource.bitmap.GranularRoundedCorners; -import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.target.CustomTarget; -import com.bumptech.glide.request.target.Target; import com.bumptech.glide.request.transition.Transition; import org.chromium.base.ContextUtils; @@ -1425,39 +1420,6 @@ public class CardBuilderFeedCard { } } - // used for logging the Glide implementation - private RequestListener createLoggerListener(final String unused_name) { - return new RequestListener() { - @Override - public boolean onLoadFailed( - @Nullable GlideException e, - Object model, - Target target, - boolean isFirstResource) { - return false; - } - - @Override - public boolean onResourceReady( - Drawable resource, - Object model, - Target target, - DataSource dataSource, - boolean isFirstResource) { - if (resource instanceof BitmapDrawable) { - // Bitmap bitmap = ((BitmapDrawable) resource).getBitmap(); - // Log.d(TAG,String.format(Locale.getDefault(), "Ready %s bitmap %,d bytes, - // size: %d x %d", - // unused_name, - // bitmap.getByteCount(), - // bitmap.getWidth(), - // bitmap.getHeight())); - } - return false; - } - }; - } - private LayerDrawable makeRound(int type, int background, int radius) { float[] outerRadii = new float[] {radius, radius, radius, radius, radius, radius, radius, radius}; diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/presenters/Amount.java b/android/java/org/chromium/chrome/browser/crypto_wallet/presenters/Amount.java index 20912f50280..c66fb29f449 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/presenters/Amount.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/presenters/Amount.java @@ -69,10 +69,6 @@ public class Amount { return (value != null && value.mValue != null) ? value.mValue : BigDecimal.ZERO; } - private void safeInit() { - if (mValue == null) mValue = BigDecimal.ZERO; - } - public BigDecimal getValue() { return BigDecimal.valueOf(mValue.doubleValue()); } diff --git a/android/java/org/chromium/chrome/browser/custom_layout/popup_window_tooltip/PopupWindowTooltipUtils.java b/android/java/org/chromium/chrome/browser/custom_layout/popup_window_tooltip/PopupWindowTooltipUtils.java index 5277d813f11..c1732629608 100644 --- a/android/java/org/chromium/chrome/browser/custom_layout/popup_window_tooltip/PopupWindowTooltipUtils.java +++ b/android/java/org/chromium/chrome/browser/custom_layout/popup_window_tooltip/PopupWindowTooltipUtils.java @@ -58,19 +58,6 @@ public final class PopupWindowTooltipUtils { } } - private static ViewGroup.MarginLayoutParams getOrCreateMarginLayoutParams(View view) { - ViewGroup.LayoutParams lp = view.getLayoutParams(); - if (lp != null) { - if (lp instanceof ViewGroup.MarginLayoutParams) { - return (ViewGroup.MarginLayoutParams) lp; - } else { - return new ViewGroup.MarginLayoutParams(lp); - } - } else { - return new ViewGroup.MarginLayoutParams(view.getWidth(), view.getHeight()); - } - } - public static int getColor(Context context, @ColorRes int colorRes) { return context.getColor(colorRes); } diff --git a/android/java/org/chromium/chrome/browser/local_database/DatabaseHelper.java b/android/java/org/chromium/chrome/browser/local_database/DatabaseHelper.java index 07dbf8181f7..6b0817ed41b 100644 --- a/android/java/org/chromium/chrome/browser/local_database/DatabaseHelper.java +++ b/android/java/org/chromium/chrome/browser/local_database/DatabaseHelper.java @@ -255,32 +255,6 @@ public class DatabaseHelper extends SQLiteOpenHelper { // return -1; } - private boolean isAdsTrackerAlreadyAdded(BraveStatsTable braveStat) { - String sql = - "SELECT * FROM " - + BraveStatsTable.TABLE_NAME - + " WHERE " - + BraveStatsTable.COLUMN_STAT_SITE - + " = '" - + braveStat.getStatSite() - + "'" - + " AND " - + BraveStatsTable.COLUMN_URL - + " = '" - + braveStat.getUrl() - + "'"; - - Log.e("NTP", sql); - - SQLiteDatabase db = this.getReadableDatabase(); - Cursor cursor = db.rawQuery(sql, null); - - int count = cursor.getCount(); - cursor.close(); - - return count > 0; - } - @SuppressLint("Range") public List getAllStats() { List braveStats = new ArrayList<>(); diff --git a/android/java/org/chromium/chrome/browser/notifications/permissions/BraveNotificationPermissionRationaleDialogController.java b/android/java/org/chromium/chrome/browser/notifications/permissions/BraveNotificationPermissionRationaleDialogController.java index e23628f9018..308f01d8f85 100644 --- a/android/java/org/chromium/chrome/browser/notifications/permissions/BraveNotificationPermissionRationaleDialogController.java +++ b/android/java/org/chromium/chrome/browser/notifications/permissions/BraveNotificationPermissionRationaleDialogController.java @@ -24,10 +24,4 @@ public class BraveNotificationPermissionRationaleDialogController /** This is empty override method, to block default android 13 chromium dialog */ @Override public void showRationaleUi(Callback rationaleCallback) {} - - @SuppressWarnings("UnusedVariable") - private Callback wrapDialogDismissalCallback(Callback rationaleCallback) { - assert false : "wrapDialogDismissalCallback should be redirected to parent in bytecode!"; - return null; - } } diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java index c791ae2fab7..3f7775fa595 100644 --- a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java +++ b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java @@ -1485,22 +1485,6 @@ public class BraveNewTabPageLayout } } - private int getMaxRowsForMostVisitedTiles() { - try { - if (!ProfileManager.isInitialized() - || !UserPrefs.get(BraveActivity.getBraveActivity().getCurrentProfile()) - .getBoolean(BravePref.NEW_TAB_PAGE_SHOW_BACKGROUND_IMAGE)) { - return 2; - } else { - return 1; - } - } catch (BraveActivity.BraveActivityNotFoundException e) { - Log.e(TAG, "getMaxRowsForMostVisitedTiles ", e); - } - - return 2; - } - @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { if (mIsTablet) { diff --git a/android/java/org/chromium/chrome/browser/ntp_background_images/util/NTPImageUtil.java b/android/java/org/chromium/chrome/browser/ntp_background_images/util/NTPImageUtil.java index cc88b8c6c4d..257a0d91e5a 100644 --- a/android/java/org/chromium/chrome/browser/ntp_background_images/util/NTPImageUtil.java +++ b/android/java/org/chromium/chrome/browser/ntp_background_images/util/NTPImageUtil.java @@ -11,20 +11,13 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.net.Uri; import android.os.Build; -import android.text.SpannableString; -import android.text.Spanned; -import android.text.style.ForegroundColorSpan; import android.view.View; import org.chromium.base.ContextUtils; import org.chromium.base.Log; -import org.chromium.chrome.R; -import org.chromium.chrome.browser.BraveRewardsHelper; -import org.chromium.chrome.browser.app.ChromeActivity; import org.chromium.chrome.browser.ntp_background_images.NTPBackgroundImagesBridge; import org.chromium.chrome.browser.ntp_background_images.model.BackgroundImage; import org.chromium.chrome.browser.ntp_background_images.model.NTPImage; -import org.chromium.chrome.browser.ntp_background_images.model.SponsoredTab; import org.chromium.chrome.browser.ntp_background_images.model.Wallpaper; import org.chromium.chrome.browser.preferences.BravePref; import org.chromium.chrome.browser.profiles.Profile; @@ -47,61 +40,6 @@ public class NTPImageUtil { public static HashMap> imageCache = new HashMap>(); - // This function is not used, but removing it completely causes errors for unused resources: - // The resource R.string.earn_tokens_for_viewing appears to be unused [UnusedResources] - // The resource R.string.you_are_earning_tokens appears to be unused [UnusedResources] - // This is related to rewards, so I keep it till review - @SuppressWarnings("UnusedVariable") - private static SpannableString getBannerText( - ChromeActivity chromeActivity, - int ntpType, - View bannerLayout, - SponsoredTab sponsoredTab, - NewTabPageListener newTabPageListener) { - String bannerText = ""; - if (ntpType == SponsoredImageUtil.BR_ON_ADS_ON) { - bannerText = - String.format( - chromeActivity - .getResources() - .getString(R.string.you_are_earning_tokens), - chromeActivity.getResources().getString(R.string.learn_more)); - } else if (ntpType == SponsoredImageUtil.BR_ON_ADS_OFF) { - bannerText = - String.format( - chromeActivity - .getResources() - .getString(R.string.earn_tokens_for_viewing), - chromeActivity.getResources().getString(R.string.learn_more)); - } - int learnMoreIndex = - bannerText.indexOf(chromeActivity.getResources().getString(R.string.learn_more)); - Spanned learnMoreSpanned = BraveRewardsHelper.spannedFromHtmlString(bannerText); - SpannableString learnMoreTextSS = new SpannableString(learnMoreSpanned.toString()); - - ForegroundColorSpan brOffForegroundSpan = - new ForegroundColorSpan(chromeActivity.getColor(R.color.brave_theme_color)); - // setSpan gives us IndexOutOfBoundsException in case of end or start are > length and in - // some other cases. - int length = learnMoreTextSS.length(); - int endIndex = learnMoreIndex - + chromeActivity.getResources().getString(R.string.learn_more).length(); - if (endIndex < learnMoreIndex || learnMoreIndex >= length || endIndex >= length - || learnMoreIndex < 0 || endIndex < 0) { - return learnMoreTextSS; - } - try { - learnMoreTextSS.setSpan(brOffForegroundSpan, learnMoreIndex, endIndex, - Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); - } catch (IndexOutOfBoundsException e) { - Log.e(TAG, - "getBannerText: learnMoreIndex == " + learnMoreIndex - + ", endIndex == " + endIndex + ". Error: " + e.getMessage()); - } - - return learnMoreTextSS; - } - public static Bitmap getWallpaperBitmap(NTPImage ntpImage, int layoutWidth, int layoutHeight) { Context mContext = ContextUtils.getApplicationContext(); diff --git a/android/java/org/chromium/chrome/browser/playlist/PlaylistHostActivity.java b/android/java/org/chromium/chrome/browser/playlist/PlaylistHostActivity.java index 0ff6c591e34..5c7692ee577 100644 --- a/android/java/org/chromium/chrome/browser/playlist/PlaylistHostActivity.java +++ b/android/java/org/chromium/chrome/browser/playlist/PlaylistHostActivity.java @@ -432,29 +432,6 @@ public class PlaylistHostActivity extends AsyncInitializationActivity TabUtils.openUrlInNewTab(isIncognito, url); } - private void updatePlaylistItem(String playlistId, PlaylistItem playlistItem) { - if (mPlaylistViewModel == null) { - return; - } - PlaylistItemModel playlistItemModel = - new PlaylistItemModel( - playlistItem.id, - playlistId, - playlistItem.name, - playlistItem.pageSource.url, - playlistItem.mediaPath.url, - playlistItem.hlsMediaPath.url, - playlistItem.mediaSource.url, - playlistItem.thumbnailPath.url, - playlistItem.author, - playlistItem.duration, - playlistItem.lastPlayedPosition, - (long) playlistItem.mediaFileBytes, - playlistItem.cached, - false); - mPlaylistViewModel.updatePlaylistItem(playlistItemModel); - } - private void deleteHLSContent(String playlistItemId) { PostTask.postTask( TaskTraits.BEST_EFFORT_MAY_BLOCK, diff --git a/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java b/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java index 62f8a0ce935..40d734aea25 100644 --- a/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java +++ b/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java @@ -5,7 +5,6 @@ package org.chromium.chrome.browser.rewards; -import android.Manifest; import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; @@ -33,7 +32,6 @@ import android.widget.TextView; import androidx.appcompat.widget.AppCompatImageView; import androidx.cardview.widget.CardView; -import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; import androidx.core.content.res.ResourcesCompat; import androidx.viewpager.widget.ViewPager; @@ -43,7 +41,6 @@ import com.google.android.material.tabs.TabLayout; import org.json.JSONException; import org.chromium.base.BraveReflectionUtil; -import org.chromium.base.BuildInfo; import org.chromium.base.ContextUtils; import org.chromium.base.Log; import org.chromium.base.SysUtils; @@ -83,7 +80,6 @@ import org.chromium.ui.text.NoUnderlineClickableSpan; import org.chromium.ui.text.SpanApplier; import org.chromium.ui.text.SpanApplier.SpanInfo; -import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -188,9 +184,7 @@ public class BraveRewardsPanel private View mNotificationPermissionLayout; private boolean mNotificationShown; - private View mRewardsResponseModal; private View mConnectAccountModal; - private View mRewardsVbatExpireNoticeModal; private View mRewardsTosModal; private View mRewardsWalletBalance; @@ -296,7 +290,6 @@ public class BraveRewardsPanel mPopupView.findViewById(R.id.brave_rewards_panel_notification_layout_id); mNotificationPermissionLayout = mPopupView.findViewById(R.id.brave_rewards_notification_permission_id); - mRewardsResponseModal = mPopupView.findViewById(R.id.rewards_response_modal_id); mConnectAccountModal = mPopupView.findViewById(R.id.connect_account_layout_id); mBraveRewardsUnverifiedView = mPopupView.findViewById(R.id.brave_rewards_panel_unverified_layout_id); @@ -307,9 +300,6 @@ public class BraveRewardsPanel mPopupView.findViewById(R.id.brave_rewards_panel_payout_layout_id); mRewardsTipLayout = mPopupView.findViewById(R.id.brave_rewards_panel_tip_layout_id); - mRewardsVbatExpireNoticeModal = - mPopupView.findViewById(R.id.brave_rewards_vbat_expire_notice_modal_id); - mRewardsTosModal = mPopupView.findViewById(R.id.rewards_tos_layout_id); mRewardsWalletBalance = mPopupView.findViewById(R.id.wallet_balance_layout); @@ -827,32 +817,6 @@ public class BraveRewardsPanel } } - private void requestNotificationPermission() { - if (BravePermissionUtils.isBraveAdsNotificationPermissionBlocked(mAnchorView.getContext()) - || mActivity.shouldShowRequestPermissionRationale( - Manifest.permission.POST_NOTIFICATIONS) - || (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU - || !BuildInfo.targetsAtLeastT())) { - // other than android 13 redirect to - // setting page and for android 13 Last time don't allow selected in permission - // dialog, then enable through setting, this done through this dialog - showNotificationWarningDialog(); - } else { - // 1st time request permission - ActivityCompat.requestPermissions( - mActivity, new String[] {Manifest.permission.POST_NOTIFICATIONS}, 1); - } - } - - private void showNotificationWarningDialog() { - BraveNotificationWarningDialog notificationWarningDialog = - BraveNotificationWarningDialog.newInstance( - BraveNotificationWarningDialog.FROM_LAUNCHED_BRAVE_PANEL); - notificationWarningDialog.setCancelable(false); - notificationWarningDialog.show(mActivity.getSupportFragmentManager(), - BraveNotificationWarningDialog.NOTIFICATION_WARNING_DIALOG_TAG); - } - @Override public void onGetAdsAccountStatement( boolean success, @@ -1557,85 +1521,6 @@ public class BraveRewardsPanel } } - private void showVbatExpireNotice() { - if (mRewardsVbatExpireNoticeModal == null) { - return; - } - - panelShadow(true); - - mRewardsVbatExpireNoticeModal.setVisibility(View.VISIBLE); - TextView vBatModalTitle = mRewardsVbatExpireNoticeModal.findViewById(R.id.vbat_modal_title); - TextView vBatModalText = mRewardsVbatExpireNoticeModal.findViewById(R.id.vbat_modal_text); - FrameLayout vBatConnectButtonLayout = - mRewardsVbatExpireNoticeModal.findViewById(R.id.layout_vbat_connect_account); - vBatConnectButtonLayout.setVisibility( - mBraveRewardsNativeWorker.canConnectAccount() ? View.VISIBLE : View.GONE); - vBatConnectButtonLayout.setOnClickListener( - new View.OnClickListener() { - @Override - public void onClick(View v) { - TabUtils.openUrlInNewTab( - false, - BraveActivity.BRAVE_REWARDS_SETTINGS_WALLET_VERIFICATION_URL); - dismiss(); - } - }); - - Button vBatConnectButton = - mRewardsVbatExpireNoticeModal.findViewById(R.id.btn_vbat_connect_account); - vBatConnectButton.setOnClickListener( - new View.OnClickListener() { - @Override - public void onClick(View v) { - TabUtils.openUrlInNewTab( - false, - BraveActivity.BRAVE_REWARDS_SETTINGS_WALLET_VERIFICATION_URL); - dismiss(); - } - }); - - Button vBatLearnMoreButton = - mRewardsVbatExpireNoticeModal.findViewById(R.id.btn_vbat_learn_more); - vBatLearnMoreButton.setOnClickListener( - new View.OnClickListener() { - @Override - public void onClick(View v) { - CustomTabActivity.showInfoPage(mActivity, BRAVE_REWARDS_CHANGES_PAGE); - } - }); - AppCompatImageView vbatCloseBtn = - mRewardsVbatExpireNoticeModal.findViewById(R.id.vbat_modal_close); - vbatCloseBtn.setOnClickListener( - new View.OnClickListener() { - @Override - public void onClick(View v) { - if (mRewardsVbatExpireNoticeModal != null) { - mRewardsVbatExpireNoticeModal.setVisibility(View.GONE); - } - panelShadow(false); - } - }); - - String vbatModalTitleString = ""; - String vbatModalTextString = ""; - double dueDateInMillis = mBraveRewardsNativeWorker.getVbatDeadline(); - SimpleDateFormat sdf = new SimpleDateFormat("MMMM dd, yyyy h:mm a", Locale.getDefault()); - String dueDate = sdf.format(new Date((long) dueDateInMillis)); - if (mBraveRewardsNativeWorker.canConnectAccount()) { - vbatModalTitleString = mActivity.getString(R.string.vbat_supported_region_title); - vbatModalTextString = String.format( - mActivity.getString(R.string.vbat_supported_region_text), dueDate); - } else { - vbatModalTitleString = mActivity.getString(R.string.vbat_unsupported_region_title); - vbatModalTextString = - String.format(mActivity.getString(R.string.vbat_unsupported_region_text), - dueDate, mBraveRewardsNativeWorker.getCountryCode()); - } - vBatModalTitle.setText(vbatModalTitleString); - vBatModalText.setText(vbatModalTextString); - } - private void showConnectAccountModal() { if (mConnectAccountModal == null) { return; @@ -1715,74 +1600,6 @@ public class BraveRewardsPanel return ss; } - private void showRewardsResponseModal(boolean isSuccess, String errorMessage) { - if (mRewardsResponseModal == null) { - return; - } - mRewardsResponseModal.setVisibility(View.VISIBLE); - - TextView responseModalTitle = mRewardsResponseModal.findViewById(R.id.response_modal_title); - TextView responseModalText = mRewardsResponseModal.findViewById(R.id.response_modal_text); - TextView responseErrorText = mRewardsResponseModal.findViewById(R.id.response_error_text); - TextView responseRewardsBtn = mRewardsResponseModal.findViewById(R.id.response_action_btn); - AppCompatImageView responseCloseBtn = - mRewardsResponseModal.findViewById(R.id.response_modal_close); - if (isSuccess) { - responseModalTitle.setText(mActivity.getString(R.string.thank_you)); - responseModalTitle.setCompoundDrawablesWithIntrinsicBounds( - 0, R.drawable.checked_circle_filled, 0, 0); - responseModalText.setText( - String.format(mActivity.getString(R.string.declare_geo_success_response_text), - new Locale("", mBraveRewardsNativeWorker.getCountryCode()) - .getDisplayCountry())); - responseRewardsBtn.setText(mActivity.getString(R.string.close_text)); - } else { - String title = mActivity.getString(R.string.something_went_wrong_text); - String text = mActivity.getString(R.string.declare_geo_failed_response_text); - String actionText = mActivity.getString(R.string.retry_text); - if (errorMessage.equals(WALLET_GENERATION_DISABLED_ERROR)) { - title = mActivity.getString(R.string.wallet_generation_disabled_error_title); - text = - String.format( - mActivity.getString(R.string.wallet_generation_disabled_error_text), - mActivity.getResources().getString(R.string.learn_more)); - SpannableString spannableWithLearnMore = learnMoreSpannableString(text); - responseModalText.setMovementMethod(LinkMovementMethod.getInstance()); - responseModalText.setText(spannableWithLearnMore); - actionText = mActivity.getString(R.string.close_text); - } else { - responseModalText.setText(text); - } - responseModalTitle.setText(title); - responseModalTitle.setCompoundDrawablesWithIntrinsicBounds( - 0, R.drawable.ic_warning_circle_filled, 0, 0); - responseRewardsBtn.setText(actionText); - responseErrorText.setText(errorMessage); - } - - responseRewardsBtn.setOnClickListener( - new View.OnClickListener() { - @Override - public void onClick(View v) { - mRewardsResponseModal.setVisibility(View.GONE); - mRewardsMainLayout.setForeground(null); - panelShadow(false); - if (!isSuccess && !errorMessage.equals(WALLET_GENERATION_DISABLED_ERROR)) { - showOnBoarding(); - } - } - }); - - responseCloseBtn.setOnClickListener( - new View.OnClickListener() { - @Override - public void onClick(View v) { - mRewardsResponseModal.setVisibility(View.GONE); - mRewardsMainLayout.setForeground(null); - } - }); - } - @Override public void onGetPublishersVisitedCount(int count) { if (mPopupView != null) { @@ -2002,13 +1819,6 @@ public class BraveRewardsPanel } } - private void openBannerActivity() { - Intent intent = new Intent( - ContextUtils.getApplicationContext(), RewardsTippingBannerActivity.class); - intent.putExtra(RewardsTippingBannerActivity.TAB_ID_EXTRA, mCurrentTabId); - mActivity.startActivityForResult(intent, BraveConstants.MONTHLY_CONTRIBUTION_REQUEST_CODE); - } - private void updatePublisherStatus(int pubStatus) { TextView publisherVerified = mPopupView.findViewById(R.id.publisher_verified); publisherVerified.setAlpha(1f); diff --git a/android/java/org/chromium/chrome/browser/rewards/tipping/RewardsTippingPanelFragment.java b/android/java/org/chromium/chrome/browser/rewards/tipping/RewardsTippingPanelFragment.java index 771e93cafc7..8e65cd23a52 100644 --- a/android/java/org/chromium/chrome/browser/rewards/tipping/RewardsTippingPanelFragment.java +++ b/android/java/org/chromium/chrome/browser/rewards/tipping/RewardsTippingPanelFragment.java @@ -22,7 +22,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; import android.widget.EditText; -import android.widget.FrameLayout; import android.widget.ProgressBar; import android.widget.TextView; @@ -32,9 +31,6 @@ import androidx.appcompat.widget.SwitchCompat; import androidx.core.content.res.ResourcesCompat; import androidx.fragment.app.Fragment; -import com.google.android.material.bottomsheet.BottomSheetBehavior; -import com.google.android.material.bottomsheet.BottomSheetDialog; - import org.json.JSONException; import org.chromium.base.Log; @@ -168,17 +164,12 @@ public class RewardsTippingPanelFragment extends Fragment implements BraveReward private void setMonthlyInformationClick(View view) { View informationButton = view.findViewById(R.id.info_outline); - informationButton.setOnClickListener(v -> { - MonthlyContributionToolTip toolTip = new MonthlyContributionToolTip(view.getContext()); - toolTip.show(informationButton); - }); - } - - private void setupFullHeight(BottomSheetDialog bottomSheetDialog) { - FrameLayout bottomSheet = - (FrameLayout) bottomSheetDialog.findViewById(R.id.design_bottom_sheet); - BottomSheetBehavior behavior = BottomSheetBehavior.from(bottomSheet); - behavior.setState(BottomSheetBehavior.STATE_EXPANDED); + informationButton.setOnClickListener( + v -> { + MonthlyContributionToolTip toolTip = + new MonthlyContributionToolTip(view.getContext()); + toolTip.show(informationButton); + }); } private void updateTermsOfServicePlaceHolder(View view) { diff --git a/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java b/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java index a8947947624..c0610730f9a 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java @@ -6,12 +6,10 @@ package org.chromium.chrome.browser.settings; import android.content.Intent; -import android.content.res.Resources; import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.provider.Settings; -import android.util.DisplayMetrics; import androidx.preference.Preference; @@ -455,14 +453,6 @@ public abstract class BraveMainPreferencesBase extends BravePreferenceFragment } } - // TODO(simonhong): Make this static public with proper class. - private int dp2px(int dp) { - final float dpPerInchMdpi = 160f; - DisplayMetrics metrics = Resources.getSystem().getDisplayMetrics(); - float px = dp * (metrics.densityDpi / dpPerInchMdpi); - return Math.round(px); - } - @Override public boolean onPreferenceChange(Preference preference, Object newValue) { String key = preference.getKey(); diff --git a/android/java/org/chromium/chrome/browser/settings/BraveStatsPreferences.java b/android/java/org/chromium/chrome/browser/settings/BraveStatsPreferences.java index f745ff58661..fb4a578d165 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveStatsPreferences.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveStatsPreferences.java @@ -96,11 +96,6 @@ public class BraveStatsPreferences extends BravePreferenceFragment return mPageTitle; } - private void removePreferenceIfPresent(String key) { - Preference preference = getPreferenceScreen().findPreference(key); - if (preference != null) getPreferenceScreen().removePreference(preference); - } - @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); diff --git a/android/java/org/chromium/chrome/browser/settings/BraveSyncScreensPreference.java b/android/java/org/chromium/chrome/browser/settings/BraveSyncScreensPreference.java index 1c840838f1e..839523d00c0 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveSyncScreensPreference.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveSyncScreensPreference.java @@ -12,7 +12,6 @@ import android.content.ActivityNotFoundException; import android.content.ClipData; import android.content.ClipboardManager; import android.content.Context; -import android.content.ContextWrapper; import android.content.DialogInterface; import android.content.pm.PackageManager; import android.content.res.Configuration; @@ -56,7 +55,6 @@ import com.google.android.material.tabs.TabLayout; import org.json.JSONException; import org.json.JSONObject; -import org.chromium.base.ContextUtils; import org.chromium.base.Log; import org.chromium.base.ThreadUtils; import org.chromium.base.supplier.ObservableSupplier; @@ -903,38 +901,6 @@ public class BraveSyncScreensPreference extends BravePreferenceFragment getBraveSyncWorker().finalizeSyncSetup(); } - private void showMainSyncScrypt() { - if (null != mScrollViewSyncInitial) { - mScrollViewSyncInitial.setVisibility(View.VISIBLE); - } - if (null != mScrollViewAddMobileDevice) { - mScrollViewAddMobileDevice.setVisibility(View.GONE); - } - if (null != mScrollViewAddLaptop) { - mScrollViewAddLaptop.setVisibility(View.GONE); - } - if (null != mScrollViewSyncStartChain) { - mScrollViewSyncStartChain.setVisibility(View.GONE); - } - if (null != mScrollViewSyncChainCode) { - mScrollViewSyncChainCode.setVisibility(View.GONE); - } - if (null != mScrollViewEnterCodeWords) { - mScrollViewEnterCodeWords.setVisibility(View.GONE); - } - } - - // Handles the requesting of the camera permission. - private void requestCameraPermission() { - Log.w(TAG, "Camera permission is not granted. Requesting permission"); - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - final String[] permissions = new String[] {Manifest.permission.CAMERA}; - - requestPermissions(permissions, RC_HANDLE_CAMERA_PERM); - } - } - @SuppressLint("InlinedApi") private void createCameraSource(boolean autoFocus, boolean useFlash) { Context context = getActivity().getApplicationContext(); @@ -1594,15 +1560,6 @@ public class BraveSyncScreensPreference extends BravePreferenceFragment } } - private Context getBaseApplicationContext() { - Context context = ContextUtils.getApplicationContext(); - if (context instanceof ContextWrapper) { - return ((ContextWrapper) context).getBaseContext(); - } else { - return context; - } - } - // Handles 'Back' button. Returns true if it is handled, false otherwise. @Override public boolean onBackPressed() { diff --git a/android/java/org/chromium/chrome/browser/shields/BraveShieldsHandler.java b/android/java/org/chromium/chrome/browser/shields/BraveShieldsHandler.java index 3534f0882a6..84ee3af8e33 100644 --- a/android/java/org/chromium/chrome/browser/shields/BraveShieldsHandler.java +++ b/android/java/org/chromium/chrome/browser/shields/BraveShieldsHandler.java @@ -510,11 +510,6 @@ public class BraveShieldsHandler initWebcompatReporterService(); } - private void shareStats() { - View shareStatsLayout = BraveStatsUtil.getLayout(R.layout.brave_stats_share_layout); - BraveStatsUtil.updateBraveShareStatsLayoutAndShare(shareStatsLayout); - } - private void setToggleView(boolean shouldShow) { if (shouldShow) { mSecondaryLayout.setVisibility(View.VISIBLE); diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarMediator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarMediator.java index 3ce54005079..e9cf75ff382 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarMediator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarMediator.java @@ -5,7 +5,6 @@ package org.chromium.chrome.browser.toolbar.bottom; -import androidx.annotation.ColorInt; import org.chromium.chrome.browser.theme.ThemeColorProvider; import org.chromium.chrome.browser.theme.ThemeColorProvider.ThemeColorObserver; @@ -53,14 +52,4 @@ class BrowsingModeBottomToolbarMediator implements ThemeColorObserver { public void onThemeColorChanged(int primaryColor, boolean shouldAnimate) { mModel.set(BrowsingModeBottomToolbarModel.PRIMARY_COLOR, primaryColor); } - - /** - * Set the alpha for the color. - * @param baseColor The color which alpha will apply to. - * @param alpha The desired alpha for the color. The value should between 0 to 1. 0 means total - * transparency, 1 means total non-transparency. - */ - private @ColorInt int applyCustomAlphaToColor(@ColorInt int baseColor, float alpha) { - return (baseColor & 0x00FFFFFF) | ((int) (alpha * 255) << 24); - } } diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java index 6e517783ed2..5f6cec22aef 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java @@ -10,7 +10,6 @@ import static org.chromium.ui.base.ViewUtils.dpToPx; import android.animation.Animator; import android.animation.ObjectAnimator; import android.app.Activity; -import android.app.Dialog; import android.content.Context; import android.content.Intent; import android.content.res.ColorStateList; @@ -19,25 +18,17 @@ import android.content.res.Resources; import android.graphics.Canvas; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; -import android.text.SpannableString; -import android.text.Spanned; -import android.text.TextPaint; -import android.text.method.LinkMovementMethod; -import android.text.style.ClickableSpan; -import android.text.style.ForegroundColorSpan; import android.util.AttributeSet; import android.view.Gravity; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; -import android.view.Window; import android.widget.FrameLayout; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import androidx.annotation.NonNull; import androidx.core.content.ContextCompat; import androidx.core.content.res.ResourcesCompat; import androidx.core.widget.ImageViewCompat; @@ -67,7 +58,6 @@ import org.chromium.chrome.browser.app.BraveActivity; import org.chromium.chrome.browser.brave_stats.BraveStatsUtil; import org.chromium.chrome.browser.crypto_wallet.controller.DAppsWalletController; import org.chromium.chrome.browser.custom_layout.popup_window_tooltip.PopupWindowTooltip; -import org.chromium.chrome.browser.customtabs.CustomTabActivity; import org.chromium.chrome.browser.customtabs.features.toolbar.CustomTabToolbar; import org.chromium.chrome.browser.dialogs.BraveAdsSignupDialog; import org.chromium.chrome.browser.flags.ChromeFeatureList; @@ -962,109 +952,6 @@ public abstract class BraveToolbarLayoutImpl extends ToolbarLayout // TODO: show wallet panel } - private void showBraveRewardsOnboardingModal() { - Context context = getContext(); - final Dialog dialog = new Dialog(context); - dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); - dialog.setCancelable(false); - dialog.setContentView(R.layout.brave_rewards_onboarding_modal); - dialog.getWindow().setBackgroundDrawableResource(android.R.color.transparent); - - View braveRewardsOnboardingModalView = - dialog.findViewById(R.id.brave_rewards_onboarding_modal_layout); - - String tosText = - String.format(context.getResources().getString(R.string.brave_rewards_tos_text), - context.getResources().getString(R.string.terms_of_service), - context.getResources().getString(R.string.privacy_policy)); - int termsOfServiceIndex = - tosText.indexOf(context.getResources().getString(R.string.terms_of_service)); - Spanned tosTextSpanned = BraveRewardsHelper.spannedFromHtmlString(tosText); - SpannableString tosTextSS = new SpannableString(tosTextSpanned.toString()); - - ClickableSpan tosClickableSpan = new ClickableSpan() { - @Override - public void onClick(@NonNull View textView) { - CustomTabActivity.showInfoPage(context, BraveActivity.BRAVE_TERMS_PAGE); - } - @Override - public void updateDrawState(@NonNull TextPaint ds) { - super.updateDrawState(ds); - ds.setUnderlineText(false); - } - }; - - tosTextSS.setSpan( - tosClickableSpan, - termsOfServiceIndex, - termsOfServiceIndex - + context.getResources().getString(R.string.terms_of_service).length(), - Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); - tosTextSS.setSpan( - new ForegroundColorSpan(context.getColor(R.color.brave_rewards_modal_theme_color)), - termsOfServiceIndex, - termsOfServiceIndex - + context.getResources().getString(R.string.terms_of_service).length(), - Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); - - ClickableSpan privacyProtectionClickableSpan = new ClickableSpan() { - @Override - public void onClick(@NonNull View textView) { - CustomTabActivity.showInfoPage(context, BraveActivity.BRAVE_PRIVACY_POLICY); - } - @Override - public void updateDrawState(@NonNull TextPaint ds) { - super.updateDrawState(ds); - ds.setUnderlineText(false); - } - }; - - int privacyPolicyIndex = - tosText.indexOf(context.getResources().getString(R.string.privacy_policy)); - tosTextSS.setSpan(privacyProtectionClickableSpan, privacyPolicyIndex, - privacyPolicyIndex - + context.getResources().getString(R.string.privacy_policy).length(), - Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); - tosTextSS.setSpan( - new ForegroundColorSpan(context.getColor(R.color.brave_rewards_modal_theme_color)), - privacyPolicyIndex, - privacyPolicyIndex - + context.getResources().getString(R.string.privacy_policy).length(), - Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); - - TextView tosAndPpText = braveRewardsOnboardingModalView.findViewById( - R.id.brave_rewards_onboarding_modal_tos_pp_text); - tosAndPpText.setMovementMethod(LinkMovementMethod.getInstance()); - tosAndPpText.setText(tosTextSS); - BraveTouchUtils.ensureMinTouchTarget(tosAndPpText); - - TextView takeQuickTourButton = - braveRewardsOnboardingModalView.findViewById(R.id.take_quick_tour_button); - takeQuickTourButton.setOnClickListener( - new View.OnClickListener() { - @Override - public void onClick(View v) { - BraveRewardsHelper.setShowBraveRewardsOnboardingOnce(true); - openRewardsPanel(); - dialog.dismiss(); - } - }); - BraveTouchUtils.ensureMinTouchTarget(takeQuickTourButton); - TextView btnBraveRewards = - braveRewardsOnboardingModalView.findViewById(R.id.start_using_brave_rewards_text); - btnBraveRewards.setOnClickListener( - new View.OnClickListener() { - @Override - public void onClick(View v) { - BraveRewardsHelper.setShowDeclareGeoModal(true); - openRewardsPanel(); - dialog.dismiss(); - } - }); - - dialog.show(); - } - private void addSavedBandwidthToDb(long savings) { new AsyncTask() { @Override diff --git a/android/java/res/drawable/checked_circle_filled.xml b/android/java/res/drawable/checked_circle_filled.xml deleted file mode 100644 index 46844e26a34..00000000000 --- a/android/java/res/drawable/checked_circle_filled.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index 09c52220707..2f16afd2c72 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -717,14 +717,6 @@ public class BytecodeTest { true, String.class, Intent.class)); - Assert.assertTrue( - methodExists( - "org/chromium/chrome/browser/notifications/permissions/NotificationPermissionRationaleDialogController", - "wrapDialogDismissalCallback", - MethodModifier.REGULAR, - true, - Callback.class, - Callback.class)); Assert.assertTrue( methodExists( "org/chromium/chrome/browser/download/DownloadMessageUiControllerImpl", diff --git a/browser/ui/android/strings/android_brave_strings.grd b/browser/ui/android/strings/android_brave_strings.grd index 13db83161a5..cbcdbf8d6e6 100644 --- a/browser/ui/android/strings/android_brave_strings.grd +++ b/browser/ui/android/strings/android_brave_strings.grd @@ -1519,12 +1519,6 @@ Are you sure you want to do this? Maybe Later - - Earn tokens for viewing this image and pay it forward to creators. %1$s - - - You're earning tokens for viewing this image.\n%1$s - The payout for %1$s rewards will begin processing by %2$s. @@ -3418,9 +3412,6 @@ If you don't accept this request, VPN will not reconnect and your internet conne Select your country - - Your Brave Rewards region has been set to %1$s. - Unfortunately, there was an error while trying to set up Brave Rewards. Please try again. @@ -3619,18 +3610,6 @@ If you don't accept this request, VPN will not reconnect and your internet conne Test Networks - - Action required: Connect a custodial account or your vBAT will be lost - - - On %1$s, we will be discontinuing support for existing virtual BAT balances. Connect a custodial account before this date so we can transfer your earned balance to your custodial account, otherwise your balance will be lost. - - - You still have time to contribute your vBAT to your favorite creators - - - On %1$s, we will be discontinuing support for existing virtual BAT balances. Unfortunately, there are no available custodians in your region (%2$s) to withdraw your earnings. Until then, you can still contribute to your favorite creators. - View page with Speedreader? diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveNotificationPermissionRationaleDialogControllerClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveNotificationPermissionRationaleDialogControllerClassAdapter.java index 15580dc9e0f..9457970c9df 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveNotificationPermissionRationaleDialogControllerClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveNotificationPermissionRationaleDialogControllerClassAdapter.java @@ -18,7 +18,5 @@ public class BraveNotificationPermissionRationaleDialogControllerClassAdapter super(visitor); redirectConstructor(sContoller, sBraveContoller); - deleteMethod(sBraveContoller, "wrapDialogDismissalCallback"); - makePublicMethod(sContoller, "wrapDialogDismissalCallback"); } }