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

Jump to bottom

[Android] remove redirect for filter settings #20212

Merged
merged 1 commit into from
Sep 20, 2023
Merged

[Android] remove redirect for filter settings #20212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 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 @@ -152,7 +152,6 @@
import org.chromium.chrome.browser.settings.developer.BraveQAPreferences;
import org.chromium.chrome.browser.share.ShareDelegate;
import org.chromium.chrome.browser.share.ShareDelegate.ShareOrigin;
import org.chromium.chrome.browser.shields.ContentFilteringFragment;
import org.chromium.chrome.browser.site_settings.BraveWalletEthereumConnectedSites;
import org.chromium.chrome.browser.speedreader.BraveSpeedReaderUtils;
import org.chromium.chrome.browser.tab.Tab;
Expand Down Expand Up @@ -1350,10 +1349,12 @@ public void openBraveNewsSettings() {
settingsLauncher.launchSettingsActivity(this, BraveNewsPreferencesV2.class);
}

public void openBraveContentFilteringSettings() {
// TODO: Once we have a ready for https://github.com/brave/brave-browser/issues/33015, We'll use
// this code
/*public void openBraveContentFilteringSettings() {
SettingsLauncher settingsLauncher = new SettingsLauncherImpl();
settingsLauncher.launchSettingsActivity(this, ContentFilteringFragment.class);
}
}*/

public void openBraveWalletSettings() {
SettingsLauncher settingsLauncher = new SettingsLauncherImpl();
Expand Down
13 changes: 7 additions & 6 deletions android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
import android.content.Intent;

import org.chromium.base.ContextUtils;
import org.chromium.base.Log;
import org.chromium.chrome.browser.BraveWalletProvider;
import org.chromium.chrome.browser.app.BraveActivity;
import org.chromium.chrome.browser.privacy.settings.BravePrivacySettings;
import org.chromium.components.external_intents.ExternalNavigationDelegate;
import org.chromium.components.external_intents.ExternalNavigationHandler;
Expand All @@ -22,7 +20,7 @@
* Extends Chromium's ExternalNavigationHandler
*/
public class BraveExternalNavigationHandler extends ExternalNavigationHandler {
private static final String TAG = "BraveUrlHandler";
// private static final String TAG = "BraveUrlHandler";
private BraveWalletProvider mBraveWalletProvider;

public BraveExternalNavigationHandler(ExternalNavigationDelegate delegate) {
Expand All @@ -31,22 +29,25 @@ public BraveExternalNavigationHandler(ExternalNavigationDelegate delegate) {

@Override
public OverrideUrlLoadingResult shouldOverrideUrlLoading(ExternalNavigationParams params) {
String originalUrl = params.getUrl().getSpec();
if (isWalletProviderOverride(params)) {
String originalUrl = params.getUrl().getSpec();
String url = originalUrl.replaceFirst("^rewards://", "brave://rewards/");
GURL browserFallbackGURL = new GURL(url);
if (params.getRedirectHandler() != null) {
params.getRedirectHandler().setShouldNotOverrideUrlLoadingOnCurrentRedirectChain();
}
return OverrideUrlLoadingResult.forNavigateTab(browserFallbackGURL, params);
} else if (originalUrl.equalsIgnoreCase("chrome://adblock/")) {
}
// TODO: Once we have a ready for https://github.com/brave/brave-browser/issues/33015, We'll
// use this code
/*else if (originalUrl.equalsIgnoreCase("chrome://adblock/")) {
try {
BraveActivity.getBraveActivity().openBraveContentFilteringSettings();
} catch (BraveActivity.BraveActivityNotFoundException e) {
Log.e(TAG, "adblock url " + e);
}
return OverrideUrlLoadingResult.forExternalIntent();
}
}*/
return super.shouldOverrideUrlLoading(params);
}

Expand Down