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

Add fetaure flag for android UI

Browse Source 
Resolve CI error
This commit is contained in:
deeppandya
2022-11-14 23:49:52 -05:00
parent 6c9f9cf4c7
commit 974413b1aa
7 changed files with 41 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/base/BraveFeatureList.java
+2
View File
@@ -16,4 +16,6 @@ public abstract class BraveFeatureList {
public static final String BRAVE_BACKGROUND_VIDEO_PLAYBACK = "BraveBackgroundVideoPlayback";
public static final String BRAVE_BACKGROUND_VIDEO_PLAYBACK_INTERNAL =
"brave-background-video-playback";
public static final String BRAVE_VPN_LINK_SUBSCRIPTION_ANDROID_UI =
"BraveVPNLinkSubscriptionAndroidUI";
}
android/java/org/chromium/chrome/browser/app/BraveActivity.java
+2 -1
View File
@@ -967,7 +967,8 @@ public abstract class BraveActivity<C extends ChromeActivityComponent> extends C
BraveVpnUtils.SUBSCRIPTION_PARAM_TEXT, getPackageName());
}
}
if (BraveVpnPrefUtils.isSubscriptionPurchase()
if (ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_VPN_LINK_SUBSCRIPTION_ANDROID_UI)
&& BraveVpnPrefUtils.isSubscriptionPurchase()
&& !BraveVpnPrefUtils.isLinkSubscriptionDialogShown()) {
showLinkVpnSubscriptionDialog();
}
android/java/org/chromium/chrome/browser/settings/BraveVpnPreferences.java
+29 -15
View File
@@ -25,12 +25,14 @@ import com.android.billingclient.api.Purchase;
import com.wireguard.android.backend.GoBackend;
import com.wireguard.crypto.KeyPair;
import org.chromium.base.BraveFeatureList;
import org.chromium.base.Log;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.ChromeTabbedActivity;
import org.chromium.chrome.browser.InternetConnection;
import org.chromium.chrome.browser.app.BraveActivity;
import org.chromium.chrome.browser.customtabs.CustomTabActivity;
import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.chrome.browser.settings.BravePreferenceFragment;
import org.chromium.chrome.browser.vpn.BraveVpnNativeWorker;
import org.chromium.chrome.browser.vpn.BraveVpnObserver;
@@ -163,19 +165,21 @@ public class BraveVpnPreferences extends BravePreferenceFragment implements Brav
return true;
}
});
findPreference(PREF_LINK_SUBSCRIPTION)
.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
// BraveVpnUtils.getBraveAccountUrl();
Intent intent = new Intent(getActivity(), ChromeTabbedActivity.class);
intent.putExtra(BraveActivity.OPEN_URL, BraveVpnUtils.getBraveAccountUrl());
intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
getActivity().finish();
startActivity(intent);
return true;
}
});
if (findPreference(PREF_LINK_SUBSCRIPTION) != null) {
findPreference(PREF_LINK_SUBSCRIPTION)
.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
Intent intent = new Intent(getActivity(), ChromeTabbedActivity.class);
intent.putExtra(
BraveActivity.OPEN_URL, BraveVpnUtils.getBraveAccountUrl());
intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
getActivity().finish();
startActivity(intent);
return true;
}
});
}
findPreference(PREF_SERVER_RESET_CONFIGURATION)
.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@@ -194,6 +198,14 @@ public class BraveVpnPreferences extends BravePreferenceFragment implements Brav
return true;
}
});
if (!ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_VPN_LINK_SUBSCRIPTION_ANDROID_UI)) {
removePreferenceIfPresent(PREF_LINK_SUBSCRIPTION);
}
}
private void removePreferenceIfPresent(String key) {
Preference preference = getPreferenceScreen().findPreference(key);
if (preference != null) getPreferenceScreen().removePreference(preference);
}
@Override
@@ -308,8 +320,10 @@ public class BraveVpnPreferences extends BravePreferenceFragment implements Brav
}
}
}.start();
findPreference(PREF_LINK_SUBSCRIPTION)
.setEnabled(BraveVpnPrefUtils.isSubscriptionPurchase());
if (findPreference(PREF_LINK_SUBSCRIPTION) != null) {
findPreference(PREF_LINK_SUBSCRIPTION)
.setEnabled(BraveVpnPrefUtils.isSubscriptionPurchase());
}
BraveVpnUtils.dismissProgressDialog();
}