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

Add link subscription menu

Browse Source
This commit is contained in:
deeppandya
2022-11-14 23:49:52 -05:00
parent 5e66cc73a5
commit 2c647d479b
5 changed files with 47 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/settings/BraveVpnPreferences.java
+17
View File
@@ -5,6 +5,7 @@
package org.chromium.chrome.browser.settings;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.net.ConnectivityManager;
@@ -26,7 +27,9 @@ import com.wireguard.crypto.KeyPair;
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.settings.BravePreferenceFragment;
import org.chromium.chrome.browser.vpn.BraveVpnNativeWorker;
@@ -56,6 +59,7 @@ public class BraveVpnPreferences extends BravePreferenceFragment implements Brav
private static final String TAG = "BraveVPN";
public static final String PREF_VPN_SWITCH = "vpn_switch";
public static final String PREF_SUBSCRIPTION_MANAGE = "subscription_manage";
public static final String PREF_LINK_SUBSCRIPTION = "link_subscription";
public static final String PREF_SUBSCRIPTION_STATUS = "subscription_status";
public static final String PREF_SUBSCRIPTION_EXPIRES = "subscription_expires";
public static final String PREF_SERVER_HOST = "server_host";
@@ -159,6 +163,19 @@ 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;
}
});
findPreference(PREF_SERVER_RESET_CONFIGURATION)
.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnPrefUtils.java
+11 -1
View File
@@ -39,7 +39,7 @@ public class BraveVpnPrefUtils {
public static final String PREF_BRAVE_VPN_AUTOMATIC = "automatic";
public static final String PREF_BRAVE_VPN_FEATURE = "brave_vpn_feature";
public static final String PREF_BRAVE_VPN_LINK_SUBSCRIPTION_ON_DEV =
"vpn_link_subscription_on_dev";
"brave_vpn_link_subscription_on_dev";
public static final String PREF_BRAVE_VPN_START = "brave_vpn_start";
public static final String PREF_BRAVE_VPN_API_AUTH_TOKEN = "brave_vpn_api_auth_token";
@@ -65,6 +65,16 @@ public class BraveVpnPrefUtils {
sharedPreferencesEditor.apply();
}
public static boolean isLinkSubscriptionOnDev() {
return mSharedPreferences.getBoolean(PREF_BRAVE_VPN_LINK_SUBSCRIPTION_ON_DEV, false);
}
public static void setLinkSubscriptionOnDev(boolean newValue) {
SharedPreferences.Editor sharedPreferencesEditor = mSharedPreferences.edit();
sharedPreferencesEditor.putBoolean(PREF_BRAVE_VPN_LINK_SUBSCRIPTION_ON_DEV, newValue);
sharedPreferencesEditor.apply();
}
public static boolean shouldShowCallout() {
return mSharedPreferences.getBoolean(PREF_BRAVE_VPN_CALLOUT, true);
}
android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnUtils.java
+8
View File
@@ -53,6 +53,9 @@ public class BraveVpnUtils {
public static final String VERIFY_CREDENTIALS_FAILED = "verify_credentials_failed";
public static final String DESKTOP_CREDENTIAL = "desktop_credential";
private static final String BRAVE_ACCOUNT_PROD_PAGE_URL = "https://account.brave.com";
private static final String BRAVE_ACCOUNT_DEV_PAGE_URL = "https://account.brave.software";
public static boolean mIsServerLocationChanged;
public static boolean mUpdateProfileAfterSplitTunnel;
public static String selectedServerRegion;
@@ -68,6 +71,11 @@ public class BraveVpnUtils {
return false;
}
public static String getBraveAccountUrl() {
return BraveVpnPrefUtils.isLinkSubscriptionOnDev() ? BRAVE_ACCOUNT_DEV_PAGE_URL
: BRAVE_ACCOUNT_PROD_PAGE_URL;
}
public static void openBraveVpnPlansActivity(Activity activity) {
Intent braveVpnPlanIntent = new Intent(activity, BraveVpnPlansActivity.class);
braveVpnPlanIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);