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

Revert "Merge pull request #8257 from brave/ipfs-android"

Browse Source 
This reverts commit 534a1e122d, reversing
changes made to 103be2b8c1.
This commit is contained in:
Jocelyn Liu
2021-03-18 14:02:59 -07:00
parent 5bdae034f1
commit 25a3c5c48d
27 changed files with 28 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java
-8
View File
@@ -34,13 +34,6 @@ public class BravePrefServiceBridge {
BravePrefServiceBridgeJni.get().setHTTPSEEnabled(enabled);
}
/**
* @param whether the IPFS gateway should be enabled.
*/
public void setIpfsGatewayEnabled(boolean enabled) {
BravePrefServiceBridgeJni.get().setIpfsGatewayEnabled(enabled);
}
/**
* @param whether google login is enabled on third party sites.
*/
@@ -205,7 +198,6 @@ public class BravePrefServiceBridge {
@NativeMethods
interface Natives {
void setHTTPSEEnabled(boolean enabled);
void setIpfsGatewayEnabled(boolean enabled);
void setAdBlockEnabled(boolean enabled);
void setFingerprintingProtectionEnabled(boolean enabled);
android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java
-8
View File
@@ -28,7 +28,6 @@ import org.chromium.components.user_prefs.UserPrefs;
public class BravePrivacySettings extends PrivacySettings {
private static final String PREF_HTTPSE = "httpse";
private static final String PREF_IPFS_GATEWAY = "ipfs_gateway";
private static final String PREF_AD_BLOCK = "ad_block";
private static final String PREF_FINGERPRINTING_PROTECTION = "fingerprinting_protection";
private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
@@ -51,7 +50,6 @@ public class BravePrivacySettings extends PrivacySettings {
private ChromeSwitchPreference mAutocompleteTopSites;
private ChromeSwitchPreference mAutocompleteBraveSuggestedSites;
private ChromeBaseCheckBoxPreference mHttpsePref;
private ChromeBaseCheckBoxPreference mIpfsGatewayPref;
private ChromeBaseCheckBoxPreference mAdBlockPref;
private ChromeBaseCheckBoxPreference mFingerprintingProtectionPref;
private ChromeBaseCheckBoxPreference mCloseTabsOnExitPref;
@@ -71,9 +69,6 @@ public class BravePrivacySettings extends PrivacySettings {
mHttpsePref = (ChromeBaseCheckBoxPreference) findPreference(PREF_HTTPSE);
mHttpsePref.setOnPreferenceChangeListener(this);
mIpfsGatewayPref = (ChromeBaseCheckBoxPreference) findPreference(PREF_IPFS_GATEWAY);
mIpfsGatewayPref.setOnPreferenceChangeListener(this);
mAdBlockPref = (ChromeBaseCheckBoxPreference) findPreference(PREF_AD_BLOCK);
mAdBlockPref.setOnPreferenceChangeListener(this);
@@ -124,8 +119,6 @@ public class BravePrivacySettings extends PrivacySettings {
String key = preference.getKey();
if (PREF_HTTPSE.equals(key)) {
BravePrefServiceBridge.getInstance().setHTTPSEEnabled((boolean) newValue);
} else if (PREF_IPFS_GATEWAY.equals(key)) {
BravePrefServiceBridge.getInstance().setIpfsGatewayEnabled((boolean) newValue);
} else if (PREF_AD_BLOCK.equals(key)) {
BravePrefServiceBridge.getInstance().setAdBlockEnabled((boolean) newValue);
} else if (PREF_FINGERPRINTING_PROTECTION.equals(key)) {
@@ -180,7 +173,6 @@ public class BravePrivacySettings extends PrivacySettings {
getPreferenceScreen().removePreference(mSendP3A);
}
mHttpsePref.setOrder(++order);
mIpfsGatewayPref.setOrder(++order);
mAdBlockPref.setOrder(++order);
mFingerprintingProtectionPref.setOrder(++order);
mSearchSuggestions.setOrder(++order);
android/java/res/xml/brave_privacy_preferences.xml
-5
View File
@@ -21,11 +21,6 @@
android:title="@string/httpse_title"
android:summary="@string/httpse_summary"
android:defaultValue="true" />
<org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference
android:key="ipfs_gateway"
android:title="@string/ipfs_gateway_title"
android:summary="@string/ipfs_gateway_summary"
android:defaultValue="true" />
<org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference
android:key="ad_block"
android:title="@string/ad_block_title"