Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #22950 from brave/update_tos_dialog_reset_behaviour

Browse Source 
Update tos dialog reset behaviour
This commit is contained in:
Deep Pandya
2024-04-05 15:10:08 -04:00
committed by GitHub
parent 892e79cf8d 6aea0ca2ff
commit 36517e5633
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java
+3 -1
View File
@@ -113,6 +113,7 @@ public class BraveRewardsPanel
private static final String SUPPORT_URL = "https://support.brave.com";
private static final String BRAVE_REWARDS_PAGE = "https://brave.com/rewards";
private static final String BRAVE_REWARDS_CHANGES_PAGE = "https://brave.com/rewards-changes";
private static final String BRAVE_REWARDS_RESET_PAGE = "brave://rewards#reset";
private static final String TAG = "BraveRewards";
private static final int UPDATE_BALANCE_INTERVAL = 60000; // In milliseconds
@@ -1162,7 +1163,8 @@ public class BraveRewardsPanel
mActivity,
R.color.rewards_panel_notification_secondary_text_color,
(textView) -> {
mBraveRewardsNativeWorker.resetTheWholeState();
TabUtils.openUrlInNewTab(false, BRAVE_REWARDS_RESET_PAGE);
dismiss();
});
NoUnderlineClickableSpan tosClickableSpan =
new NoUnderlineClickableSpan(
android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java
-6
View File
@@ -58,7 +58,6 @@ import org.chromium.base.MathUtils;
import org.chromium.base.ThreadUtils;
import org.chromium.base.task.AsyncTask;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.BraveRelaunchUtils;
import org.chromium.chrome.browser.BraveRewardsHelper;
import org.chromium.chrome.browser.BraveRewardsNativeWorker;
import org.chromium.chrome.browser.BraveRewardsObserver;
@@ -1390,11 +1389,6 @@ public abstract class BraveToolbarLayoutImpl extends ToolbarLayout
public void onCompleteReset(boolean success) {
if (success) {
BraveRewardsHelper.resetRewards();
try {
BraveRelaunchUtils.askForRelaunch(BraveActivity.getBraveActivity());
} catch (BraveActivity.BraveActivityNotFoundException e) {
Log.e(TAG, "onCompleteReset " + e);
}
}
}