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

remove redirect for filter settings android

Browse Source
This commit is contained in:
tapanmodh
2023-09-19 11:42:32 +05:30
parent 52dd340a26
commit a7294d0921
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/app/BraveActivity.java
+4 -3
View File
@@ -152,7 +152,6 @@ import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
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;
@@ -1350,10 +1349,12 @@ public abstract class BraveActivity extends ChromeActivity
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();
android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java
+7 -6
View File
@@ -8,9 +8,7 @@ package org.chromium.chrome.browser.externalnav;
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;
@@ -22,7 +20,7 @@ import org.chromium.url.GURL;
* 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) {
@@ -31,22 +29,25 @@ public class BraveExternalNavigationHandler extends ExternalNavigationHandler {
@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);
}