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

Disabled Brave Rewards for android x86 devices

Browse Source
This commit is contained in:
samartnik
2020-01-11 07:45:16 -05:00
parent b4b383d52f
commit c0140c4be4
5 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/appmenu/BraveAppMenuPropertiesDelegateImpl.java
+7 -1
View File
@@ -15,10 +15,13 @@ import org.chromium.base.Log;
import org.chromium.base.ObservableSupplier;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.ActivityTabProvider;
import org.chromium.chrome.browser.BraveFeatureList;
import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
import org.chromium.chrome.browser.ChromeFeatureList;
import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
import org.chromium.chrome.browser.multiwindow.MultiWindowModeStateDispatcher;
import org.chromium.chrome.browser.notifications.BraveSetDefaultBrowserNotificationService;
import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
import org.chromium.chrome.browser.tabmodel.TabModelSelector;
import org.chromium.chrome.browser.toolbar.ToolbarManager;
@@ -51,7 +54,10 @@ public class BraveAppMenuPropertiesDelegateImpl extends AppMenuPropertiesDelegat
menu.findItem(R.id.help_id).setVisible(false).setEnabled(false);
menu.add(Menu.NONE, R.id.set_default_browser, 0, R.string.menu_set_default_browser);
menu.add(Menu.NONE, R.id.brave_rewards_id, 0, R.string.menu_brave_rewards);
if (ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_REWARDS) &&
!BravePrefServiceBridge.getInstance().getSafetynetCheckFailed()) {
menu.add(Menu.NONE, R.id.brave_rewards_id, 0, R.string.menu_brave_rewards);
}
menu.add(Menu.NONE, R.id.exit_id, 0, R.string.menu_exit);
if (BraveSetDefaultBrowserNotificationService.isBraveSetAsDefaultBrowser(mContext)) {
android/java/org/chromium/chrome/browser/preferences/BraveMainPreferencesBase.java
+8
View File
@@ -18,7 +18,10 @@ import android.util.DisplayMetrics;
import android.widget.TextView;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.BraveFeatureList;
import org.chromium.chrome.browser.ChromeFeatureList;
import org.chromium.chrome.browser.onboarding.OnboardingPrefManager;
import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
import org.chromium.chrome.browser.preferences.privacy.BravePrivacyPreferences;
import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
import org.chromium.components.search_engines.TemplateUrl;
@@ -83,6 +86,11 @@ public class BraveMainPreferencesBase extends PreferenceFragmentCompat {
updateControlSectionPreferences();
rearrangePreferenceOrders();
if (!ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_REWARDS) ||
BravePrefServiceBridge.getInstance().getSafetynetCheckFailed()) {
removePreferenceIfPresent(PREF_BRAVE_REWARDS);
}
}
/**
android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java
+5
View File
@@ -109,6 +109,10 @@ public class BravePrefServiceBridge {
BravePrefServiceBridgeJni.get().setSafetynetCheckFailed(value);
}
public boolean getSafetynetCheckFailed() {
return BravePrefServiceBridgeJni.get().getSafetynetCheckFailed();
}
@NativeMethods
interface Natives {
void setHTTPSEEnabled(boolean enabled);
@@ -137,5 +141,6 @@ public class BravePrefServiceBridge {
String getSyncSeed();
void setSafetynetCheckFailed(boolean value);
boolean getSafetynetCheckFailed();
}
}