nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #825 from greenart7c3/onion_url

Browse Source 
add ws:// if not present in .onion urls
This commit is contained in:
Vitor Pamplona
2024-04-05 08:03:52 -04:00
committed by GitHub
parent 818ca7e39e 50c5845a11
commit 48f9045f1b
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewRelayListView.kt
+9 -1
View File
@@ -900,7 +900,15 @@ fun EditableServerConfig(
onClick = { onClick = {
if (url.isNotBlank() && url != "/") { if (url.isNotBlank() && url != "/") {
var addedWSS = var addedWSS =
if (!url.startsWith("wss://") && !url.startsWith("ws://")) "wss://$url" else url if (!url.startsWith("wss://") && !url.startsWith("ws://")) {
if (url.endsWith(".onion") || url.endsWith(".onion/")) {
"ws://$url"
} else {
"wss://$url"
}
} else {
url
}
if (url.endsWith("/")) addedWSS = addedWSS.dropLast(1) if (url.endsWith("/")) addedWSS = addedWSS.dropLast(1)
onNewRelay(RelaySetupInfo(addedWSS, read, write, feedTypes = FeedType.values().toSet())) onNewRelay(RelaySetupInfo(addedWSS, read, write, feedTypes = FeedType.values().toSet()))
url = "" url = ""