Update flow with desktop receipt

android/java/org/chromium/chrome/browser/app/BraveActivity.java

@@ -328,6 +328,33 @@ public abstract class BraveActivity<C extends ChromeActivityComponent> extends C
         } else if (id == R.id.request_brave_vpn_id || id == R.id.request_brave_vpn_check_id) {
             Log.e("BraveVPN",
                     "purchased user : " + BraveVpnNativeWorker.getInstance().isPurchasedUser());
+            if (!InternetConnection.isNetworkAvailable(BraveActivity.this)) {
+                Toast.makeText(BraveActivity.this, R.string.no_internet, Toast.LENGTH_SHORT).show();
+            } else {
+                if (BraveVpnProfileUtils.getInstance().isBraveVPNConnected(BraveActivity.this)) {
+                    BraveVpnUtils.showProgressDialog(BraveActivity.this,
+                            getResources().getString(R.string.vpn_disconnect_text));
+                    BraveVpnProfileUtils.getInstance().stopVpn(BraveActivity.this);
+                    BraveVpnUtils.dismissProgressDialog();
+                } else {
+                    if (BraveVpnNativeWorker.getInstance().isPurchasedUser()) {
+                        if (WireguardConfigUtils.isConfigExist(BraveActivity.this)) {
+                            BraveVpnProfileUtils.getInstance().startVpn(BraveActivity.this);
+                        } else {
+                            BraveVpnUtils.openBraveVpnProfileActivity(BraveActivity.this);
+                        }
+                    } else {
+                        BraveVpnUtils.showProgressDialog(BraveActivity.this,
+                                getResources().getString(R.string.vpn_connect_text));
+                        if (BraveVpnPrefUtils.isSubscriptionPurchase()) {
+                            verifySubscription();
+                        } else {
+                            BraveVpnUtils.dismissProgressDialog();
+                            BraveVpnUtils.openBraveVpnPlansActivity(BraveActivity.this);
+                        }
+                    }
+                }
+            }
             // if (!InternetConnection.isNetworkAvailable(BraveActivity.this)) {
             //     Toast.makeText(BraveActivity.this, R.string.no_internet,
             //     Toast.LENGTH_SHORT).show();

android/java/org/chromium/chrome/browser/settings/BraveVpnPreferences.java

@@ -104,13 +104,21 @@ public class BraveVpnPreferences extends BravePreferenceFragment implements Brav
                             getActivity(), getResources().getString(R.string.vpn_disconnect_text));
                     BraveVpnProfileUtils.getInstance().stopVpn(getActivity());
                 } else {
-                    BraveVpnUtils.showProgressDialog(
-                            getActivity(), getResources().getString(R.string.vpn_connect_text));
-                    if (BraveVpnPrefUtils.isSubscriptionPurchase()) {
-                        verifyPurchase(true);
+                    if (BraveVpnNativeWorker.getInstance().isPurchasedUser()) {
+                        if (WireguardConfigUtils.isConfigExist(getActivity())) {
+                            BraveVpnProfileUtils.getInstance().startVpn(getActivity());
+                        } else {
+                            BraveVpnUtils.openBraveVpnProfileActivity(getActivity());
+                        }
                     } else {
-                        BraveVpnUtils.openBraveVpnPlansActivity(getActivity());
-                        BraveVpnUtils.dismissProgressDialog();
+                        BraveVpnUtils.showProgressDialog(
+                                getActivity(), getResources().getString(R.string.vpn_connect_text));
+                        if (BraveVpnPrefUtils.isSubscriptionPurchase()) {
+                            verifyPurchase(true);
+                        } else {
+                            BraveVpnUtils.openBraveVpnPlansActivity(getActivity());
+                            BraveVpnUtils.dismissProgressDialog();
+                        }
                     }
                 }
                 return false;

android/java/org/chromium/chrome/browser/vpn/BraveVpnNativeWorker.java

@@ -181,6 +181,10 @@ public class BraveVpnNativeWorker {
         return BraveVpnNativeWorkerJni.get().isPurchasedUser(mNativeBraveVpnNativeWorker);
     }
 
+    public void getSubscriberCredentialV12() {
+        BraveVpnNativeWorkerJni.get().getSubscriberCredentialV12(mNativeBraveVpnNativeWorker);
+    }
+
     public void reportBackgroundP3A(long sessionStartTimeMs, long sessionEndTimeMs) {
         BraveVpnNativeWorkerJni.get().reportBackgroundP3A(
                 mNativeBraveVpnNativeWorker, sessionStartTimeMs, sessionEndTimeMs);
@@ -210,6 +214,7 @@ public class BraveVpnNativeWorker {
                 String productId, String productType, String packageName);
         void reloadPurchasedState(long nativeBraveVpnNativeWorker);
         boolean isPurchasedUser(long nativeBraveVpnNativeWorker);
+        void getSubscriberCredentialV12(long nativeBraveVpnNativeWorker);
         void reportBackgroundP3A(
                 long nativeBraveVpnNativeWorker, long sessionStartTimeMs, long sessionEndTimeMs);
         void reportForegroundP3A(long nativeBraveVpnNativeWorker);

android/java/org/chromium/chrome/browser/vpn/activities/BraveVpnParentActivity.java

@@ -136,6 +136,7 @@ public abstract class BraveVpnParentActivity
 
     @Override
     public void onGetSubscriberCredential(String subscriberCredential, boolean isSuccess) {
+        mBraveVpnPrefModel = new BraveVpnPrefModel();
         mBraveVpnPrefModel.setSubscriberCredential(subscriberCredential);
         BraveVpnApiResponseUtils.handleOnGetSubscriberCredential(
                 BraveVpnParentActivity.this, isSuccess);

android/java/org/chromium/chrome/browser/vpn/activities/BraveVpnProfileActivity.java

@@ -70,7 +70,11 @@ public class BraveVpnProfileActivity extends BraveVpnParentActivity {
             public void onClick(View v) {
                 BraveVpnUtils.showProgressDialog(BraveVpnProfileActivity.this,
                         getResources().getString(R.string.vpn_connect_text));
-                verifySubscription();
+                if (BraveVpnNativeWorker.getInstance().isPurchasedUser()) {
+                    BraveVpnNativeWorker.getInstance().getSubscriberCredentialV12();
+                } else {
+                    verifySubscription();
+                }
             }
         });
 

android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnApiResponseUtils.java

@@ -38,8 +38,8 @@ public class BraveVpnApiResponseUtils {
 
     public static void handleOnGetSubscriberCredential(Activity activity, boolean isSuccess) {
         if (isSuccess) {
-            InAppPurchaseWrapper.getInstance().processPurchases(
-                    activity, InAppPurchaseWrapper.getInstance().queryPurchases());
+            // InAppPurchaseWrapper.getInstance().processPurchases(
+            //         activity, InAppPurchaseWrapper.getInstance().queryPurchases());
             BraveVpnNativeWorker.getInstance().getTimezonesForRegions();
         } else {
             Toast.makeText(activity, R.string.vpn_profile_creation_failed, Toast.LENGTH_SHORT)

android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnUtils.java

@@ -50,6 +50,7 @@ public class BraveVpnUtils {
     public static final String SUBSCRIPTION_PARAM_TEXT = "subscription";
     public static final String IAP_ANDROID_PARAM_TEXT = "iap-android";
     public static final String VERIFY_CREDENTIALS_FAILED = "verify_credentials_failed";
+    public static final String DESKTOP_CREDENTIAL = "desktop_credential";
 
     public static boolean mIsServerLocationChanged;
     public static boolean mUpdateProfileAfterSplitTunnel;

android/java/org/chromium/chrome/browser/vpn/wireguard/TunnelModel.java

@@ -5,13 +5,13 @@
 
 package org.chromium.chrome.browser.vpn.wireguard;
 
-import android.util.Log;
-
 import androidx.annotation.NonNull;
 
 import com.wireguard.android.backend.Tunnel;
 import com.wireguard.config.Config;
 
+import org.chromium.base.Log;
+
 public class TunnelModel implements Tunnel {
     public static final String TUNNEL_NAME = "Brave";
     private final String name;