mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-24 10:25:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

keeping the http:// schema in the server selection input field

Browse source 
- helps to highlight a non secture connection, for https we strip the prefix
This commit is contained in:
Adam Brown 2022-03-31 13:01:04 +01:00
parent 7f90dda96f
commit 985dbfe97d
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
vector/src/main/java/im/vector/app/core/extensions/UrlExtensions.kt
View file

@ -19,8 +19,8 @@ package im.vector.app.core.extensions
/** /**
* Ex: "https://matrix.org/" -> "matrix.org" * Ex: "https://matrix.org/" -> "matrix.org"
*/ */
fun String?.toReducedUrl(): String { fun String?.toReducedUrl(keepSchema: Boolean = false): String {
return (this ?: "") return (this ?: "")
.substringAfter("://") .run { if (keepSchema) this else substringAfter("://") }
.trim { it == '/' } .trim { it == '/' }
} }

5
vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedServerSelectionFragment.kt
View file

@ -49,6 +49,9 @@ class FtueAuthCombinedServerSelectionFragment @Inject constructor() : AbstractSS
} }
override fun updateWithState(state: OnboardingViewState) { override fun updateWithState(state: OnboardingViewState) {
views.chooseServerInput.editText().setText(state.serverSelectionState.userUrlInput.toReducedUrl()) val userUrlInput = state.serverSelectionState.userUrlInput?.toReducedUrlKeepingSchemaIfInsecure()
views.chooseServerInput.editText().setText(userUrlInput)
} }
private fun String.toReducedUrlKeepingSchemaIfInsecure() = toReducedUrl(keepSchema = this.startsWith("http://"))
} }