diff --git a/android/java/org/chromium/chrome/browser/app/BraveActivity.java b/android/java/org/chromium/chrome/browser/app/BraveActivity.java index 1da21571a34..8632d5ba7f3 100644 --- a/android/java/org/chromium/chrome/browser/app/BraveActivity.java +++ b/android/java/org/chromium/chrome/browser/app/BraveActivity.java @@ -204,13 +204,17 @@ public abstract class BraveActivity extends C public void onResumeWithNative() { super.onResumeWithNative(); BraveActivityJni.get().restartStatsUpdater(); - InAppPurchaseWrapper.getInstance().startBillingServiceConnection(BraveActivity.this); - BraveVpnNativeWorker.getInstance().addObserver(this); + if (BraveVpnUtils.isBraveVpnFeatureEnable()) { + InAppPurchaseWrapper.getInstance().startBillingServiceConnection(BraveActivity.this); + BraveVpnNativeWorker.getInstance().addObserver(this); + } } @Override public void onPauseWithNative() { - BraveVpnNativeWorker.getInstance().removeObserver(this); + if (BraveVpnUtils.isBraveVpnFeatureEnable()) { + BraveVpnNativeWorker.getInstance().removeObserver(this); + } super.onPauseWithNative(); } diff --git a/android/java/org/chromium/chrome/browser/settings/BraveVpnPreferences.java b/android/java/org/chromium/chrome/browser/settings/BraveVpnPreferences.java index fd46c17f7d8..ad4c001b506 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveVpnPreferences.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveVpnPreferences.java @@ -74,7 +74,9 @@ public class BraveVpnPreferences extends BravePreferenceFragment implements Brav getActivity().setTitle(R.string.brave_firewall_vpn); SettingsUtils.addPreferencesFromResource(this, R.xml.brave_vpn_preferences); - InAppPurchaseWrapper.getInstance().startBillingServiceConnection(getActivity()); + if (BraveVpnUtils.isBraveVpnFeatureEnable()) { + InAppPurchaseWrapper.getInstance().startBillingServiceConnection(getActivity()); + } mVpnSwitch = (ChromeSwitchPreference) findPreference(PREF_VPN_SWITCH); mVpnSwitch.setChecked(BraveVpnProfileUtils.getInstance().isVPNConnected(getActivity())); diff --git a/android/java/org/chromium/chrome/browser/vpn/BraveVpnParentActivity.java b/android/java/org/chromium/chrome/browser/vpn/BraveVpnParentActivity.java index ed2275069f3..e46d32f37ae 100644 --- a/android/java/org/chromium/chrome/browser/vpn/BraveVpnParentActivity.java +++ b/android/java/org/chromium/chrome/browser/vpn/BraveVpnParentActivity.java @@ -41,8 +41,10 @@ public abstract class BraveVpnParentActivity @Override public void finishNativeInitialization() { super.finishNativeInitialization(); - InAppPurchaseWrapper.getInstance().startBillingServiceConnection( - BraveVpnParentActivity.this); + if (BraveVpnUtils.isBraveVpnFeatureEnable()) { + InAppPurchaseWrapper.getInstance().startBillingServiceConnection( + BraveVpnParentActivity.this); + } } protected void verifySubscription() {