From 09919e99b9d9a6717979a93c6d8e396b18c64b50 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Thu, 9 Feb 2023 15:25:32 -0500 Subject: [PATCH] Fixes: https://github.com/vitorpamplona/amethyst/issues/91 --- .../com/vitorpamplona/amethyst/ui/actions/NewRelayListView.kt | 2 +- .../vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewRelayListView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewRelayListView.kt index 5dba88ac5..3cc6e2577 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewRelayListView.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewRelayListView.kt @@ -409,7 +409,7 @@ fun EditableServerConfig(relayToAdd: String, onNewRelay: (RelaySetupInfo) -> Uni Button( onClick = { if (url.isNotBlank() && url != "/") { - var addedWSS = if (!url.startsWith("wss://")) "wss://$url" else url + var addedWSS = if (!url.startsWith("wss://") && !url.startsWith("ws://")) "wss://$url" else url if (url.endsWith("/")) addedWSS = addedWSS.dropLast(1) onNewRelay(RelaySetupInfo(addedWSS, read, write, feedTypes = FeedType.values().toSet())) url = "" diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt index 46f0901ac..dac3962b9 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt @@ -313,7 +313,6 @@ private fun DrawAdditionalInfo(baseUser: User) { val user = userState?.user ?: return val uri = LocalUriHandler.current - val context = LocalContext.current Text( user.bestDisplayName() ?: "",