atridad/Mealient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Remove redundant trim from base URL VM

Browse Source
This commit is contained in:
Kirill Kamakin
2022-12-21 22:36:02 +01:00
parent e8077f460a
commit 04474c3055
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/gq/kirmanak/mealient/ui/baseurl/BaseURLViewModel.kt
View File

@@ -36,9 +36,9 @@ class BaseURLViewModel @Inject constructor(
val hasPrefix = ALLOWED_PREFIXES.any { baseURL.startsWith(it) } val hasPrefix = ALLOWED_PREFIXES.any { baseURL.startsWith(it) }
val urlWithPrefix = baseURL.takeIf { hasPrefix } ?: WITH_PREFIX_FORMAT.format(baseURL) val urlWithPrefix = baseURL.takeIf { hasPrefix } ?: WITH_PREFIX_FORMAT.format(baseURL)
val url = urlWithPrefix.trimStart().trimEnd { it == '/' || it.isWhitespace() } val url = urlWithPrefix.trimEnd { it == '/' }
logger.d { "checkBaseURL: Created URL = $url, with prefix = $urlWithPrefix" } logger.d { "checkBaseURL: Created URL = \"$url\", with prefix = \"$urlWithPrefix\"" }
if (url == serverInfoRepo.getUrl()) { if (url == serverInfoRepo.getUrl()) {
logger.d { "checkBaseURL: new URL matches current" } logger.d { "checkBaseURL: new URL matches current" }
_uiState.value = OperationUiState.fromResult(Result.success(Unit)) _uiState.value = OperationUiState.fromResult(Result.success(Unit))