Update WP ToS url

Author: ravishanker

WordPress/src/main/java/org/wordpress/android/ui/about/UnifiedAboutViewModel.kt

@@ -57,7 +57,7 @@ class UnifiedAboutViewModel @Inject constructor(
                     )
             ),
             legalConfig = LegalConfig(
-                    tosUrl = wpUrlUtils.buildTermsOfServiceUrl(contextProvider.getContext()),
+                    tosUrl = termsOfServiceUrl(),
                     privacyPolicyUrl = if (buildConfig.isJetpackApp) Constants.URL_PRIVACY_POLICY else WP_PRIVACY_URL,
                     acknowledgementsUrl = LICENSES_FILE_URL
             ),
@@ -118,6 +118,12 @@ class UnifiedAboutViewModel @Inject constructor(
         null
     }
 
+    private fun termsOfServiceUrl() = if (buildConfig.isJetpackApp) {
+        wpUrlUtils.buildTermsOfServiceUrl(contextProvider.getContext())
+    } else {
+        wpUrlUtils.buildPatchedUrl(contextProvider.getContext(), WP_TOS_URL)
+    }
+
     companion object {
         private const val BLOG_ITEM_NAME = "blog"
         private const val LICENSES_FILE_URL = "file:///android_asset/licenses.html"
@@ -127,6 +133,7 @@ class UnifiedAboutViewModel @Inject constructor(
         private const val WP_BLOG_URL = "https://wordpress.org/news/"
         private const val WP_CONTRIBUTE_URL = "https://make.wordpress.org/mobile/handbook/"
         private const val WP_PRIVACY_URL = "https://wordpress.org/about/privacy/"
+        private const val WP_TOS_URL = "https://wordpress.org/about"
 
         private const val JP_SOCIAL_HANDLE = "jetpack"
         private const val JP_APPS_URL = "https://jetpack.com/app"

WordPress/src/main/java/org/wordpress/android/util/WPUrlUtils.java

@@ -52,4 +52,8 @@ public static boolean isGravatar(URL url) {
     public static String buildTermsOfServiceUrl(Context context) {
         return Constants.URL_TOS + "?locale=" + LanguageUtils.getPatchedCurrentDeviceLanguage(context);
     }
+
+    public static String buildPatchedUrl(Context context, String url) {
+        return url + "?locale=" + LanguageUtils.getPatchedCurrentDeviceLanguage(context);
+    }
 }

WordPress/src/main/java/org/wordpress/android/util/WpUrlUtilsWrapper.kt

@@ -6,4 +6,5 @@ import javax.inject.Inject
 class WpUrlUtilsWrapper @Inject constructor() {
     fun isWordPressCom(interceptedUri: String?) = WPUrlUtils.isWordPressCom(interceptedUri)
     fun buildTermsOfServiceUrl(context: Context): String = WPUrlUtils.buildTermsOfServiceUrl(context)
+    fun buildPatchedUrl(context: Context, url: String): String = WPUrlUtils.buildPatchedUrl(context, url)
 }