Move sanitiseUrl inside UrlUtils to provide better usage context

Author: JorgeMucientes

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginActivity.kt

@@ -65,7 +65,6 @@ import com.woocommerce.android.util.ActivityUtils
 import com.woocommerce.android.util.ChromeCustomTabUtils
 import com.woocommerce.android.util.UrlUtils
 import com.woocommerce.android.util.WooLog
-import com.woocommerce.android.util.sanitiseUrl
 import dagger.android.AndroidInjector
 import dagger.android.DispatchingAndroidInjector
 import dagger.android.HasAndroidInjector
@@ -547,7 +546,7 @@ class LoginActivity :
     override fun gotConnectedSiteInfo(siteAddress: String, redirectUrl: String?, hasJetpack: Boolean) {
         // If the redirect url is available, use that as the preferred url. Pass this url to the other fragments
         // with the protocol since it is needed for initiating forgot password flow etc in the login process.
-        val inputSiteAddress = (redirectUrl ?: siteAddress).sanitiseUrl()
+        val inputSiteAddress = urlUtils.sanitiseUrl(redirectUrl ?: siteAddress)
 
         // Save site address to app prefs so it's available to MainActivity regardless of how the user
         // logs into the app. Strip the protocol from this url string prior to saving to AppPrefs since it's

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/sitepicker/sitediscovery/SitePickerSiteDiscoveryViewModel.kt

@@ -13,7 +13,7 @@ import com.woocommerce.android.experiment.JetpackInstallationExperiment
 import com.woocommerce.android.experiment.JetpackInstallationExperiment.JetpackInstallationVariant
 import com.woocommerce.android.ui.login.AccountRepository
 import com.woocommerce.android.ui.sitepicker.SitePickerRepository
-import com.woocommerce.android.util.sanitiseUrl
+import com.woocommerce.android.util.UrlUtils
 import com.woocommerce.android.viewmodel.MultiLiveEvent
 import com.woocommerce.android.viewmodel.MultiLiveEvent.Event.Exit
 import com.woocommerce.android.viewmodel.MultiLiveEvent.Event.ExitWithResult
@@ -46,7 +46,8 @@ class SitePickerSiteDiscoveryViewModel @Inject constructor(
     private val accountRepository: AccountRepository,
     private val resourceProvider: ResourceProvider,
     private val analyticsTracker: AnalyticsTrackerWrapper,
-    private val jetpackInstallationExperiment: JetpackInstallationExperiment
+    private val jetpackInstallationExperiment: JetpackInstallationExperiment,
+    private val urlUtils: UrlUtils
 ) : ScopedViewModel(savedStateHandle) {
     companion object {
         private const val FETCHED_URL_KEY = "fetched_url"
@@ -173,7 +174,7 @@ class SitePickerSiteDiscoveryViewModel @Inject constructor(
 
         sitePickRepository.fetchSiteInfo(siteAddressFlow.value).fold(
             onSuccess = {
-                val siteAddress = (it.urlAfterRedirects ?: it.url).sanitiseUrl()
+                val siteAddress = urlUtils.sanitiseUrl(it.urlAfterRedirects ?: it.url)
                 // Remove protocol prefix
                 val protocolRegex = Regex("^(http[s]?://)", IGNORE_CASE)
                 fetchedSiteUrl = siteAddress.replaceFirst(protocolRegex, "")

WooCommerce/src/main/kotlin/com/woocommerce/android/util/UrlUtils.kt

@@ -15,20 +15,21 @@ class UrlUtils @Inject constructor(
     val tosUrlWithLocale by lazy {
         "${AppUrls.AUTOMATTIC_TOS}?locale=${LanguageUtils.getPatchedCurrentDeviceLanguage(context)}"
     }
-}
 
-/**
- * Basic sanitization of the URL based on the same logic we use in the XMLRPC discovery
- * see: https://github.com/wordpress-mobile/WordPress-FluxC-Android/blob/94601a5d4c1c98068adde0352ecc25e6d0046f35/fluxc/src/main/java/org/wordpress/android/fluxc/network/discovery/SelfHostedEndpointFinder.java#L292
- */
-fun String.sanitiseUrl(): String {
-    return trim()
-        .trimEnd('/')
-        .let {
-            // Convert IDN names to punycode if necessary
-            UrlUtils.convertUrlToPunycodeIfNeeded(it)
-        }.let {
-            // Strip url from known usual trailing paths
-            DiscoveryUtils.stripKnownPaths(it)
-        }
+    /**
+     * Basic sanitization of the URL based on the same logic we use in the XMLRPC discovery
+     * see: https://github.com/wordpress-mobile/WordPress-FluxC-Android/blob/94601a5d4c1c98068adde0352ecc25e6d0046f35/fluxc/src/main/java/org/wordpress/android/fluxc/network/discovery/SelfHostedEndpointFinder.java#L292
+     */
+    fun sanitiseUrl(url: String): String {
+        return url
+            .trim()
+            .trimEnd('/')
+            .let {
+                // Convert IDN names to punycode if necessary
+                UrlUtils.convertUrlToPunycodeIfNeeded(it)
+            }.let {
+                // Strip url from known usual trailing paths
+                DiscoveryUtils.stripKnownPaths(it)
+            }
+    }
 }