diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/accounts/addition/AddFeverAccountDialog.kt b/app/src/main/java/me/ash/reader/ui/page/settings/accounts/addition/AddFeverAccountDialog.kt index 19073ae4..b042dcd9 100644 --- a/app/src/main/java/me/ash/reader/ui/page/settings/accounts/addition/AddFeverAccountDialog.kt +++ b/app/src/main/java/me/ash/reader/ui/page/settings/accounts/addition/AddFeverAccountDialog.kt @@ -12,11 +12,8 @@ import androidx.compose.material.icons.rounded.RssFeed import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.material3.TextButton -import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.* import androidx.compose.runtime.saveable.rememberSaveable -import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalFocusManager @@ -115,9 +112,7 @@ fun AddFeverAccountDialog( type = AccountType.Fever, name = context.getString(R.string.fever), securityKey = FeverSecurityKey( - serverUrl = serverUrl - .takeIf { !it.endsWith("/") } - ?: serverUrl.trimEnd('/'), + serverUrl = serverUrl, username = username, password = password, ).toString(), diff --git a/app/src/main/java/me/ash/reader/ui/page/settings/accounts/connection/FeverConnection.kt b/app/src/main/java/me/ash/reader/ui/page/settings/accounts/connection/FeverConnection.kt index 6598a233..c1dd8385 100644 --- a/app/src/main/java/me/ash/reader/ui/page/settings/accounts/connection/FeverConnection.kt +++ b/app/src/main/java/me/ash/reader/ui/page/settings/accounts/connection/FeverConnection.kt @@ -71,8 +71,6 @@ fun LazyItemScope.FeverConnection( onConfirm = { if (securityKey.serverUrl?.isNotBlank() == true) { securityKey.serverUrl = serverUrlValue - ?.takeIf { !it.endsWith("/") } - ?: serverUrlValue?.trimEnd('/') save(account, viewModel, securityKey) serverUrlDialogVisible = false }