kopia lustrzana https://github.com/vitorpamplona/amethyst
Adds a check to make sure the NIP-96 uploader is a url before adding to the list.
Solves NPE on the model if they are not urlspull/967/head
rodzic
9ed1dbac72
commit
01816b0389
|
@ -23,11 +23,11 @@ package com.vitorpamplona.amethyst.ui.actions.mediaServers
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
import androidx.compose.foundation.layout.Row
|
import androidx.compose.foundation.layout.Row
|
||||||
import androidx.compose.material3.Button
|
import androidx.compose.material3.Button
|
||||||
import androidx.compose.material3.ButtonDefaults
|
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.material3.OutlinedTextField
|
import androidx.compose.material3.OutlinedTextField
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.runtime.derivedStateOf
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
import androidx.compose.runtime.mutableStateOf
|
import androidx.compose.runtime.mutableStateOf
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
|
@ -40,6 +40,7 @@ import com.vitorpamplona.amethyst.ui.stringRes
|
||||||
import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
|
import com.vitorpamplona.amethyst.ui.theme.ButtonBorder
|
||||||
import com.vitorpamplona.amethyst.ui.theme.Size10dp
|
import com.vitorpamplona.amethyst.ui.theme.Size10dp
|
||||||
import com.vitorpamplona.amethyst.ui.theme.placeholderText
|
import com.vitorpamplona.amethyst.ui.theme.placeholderText
|
||||||
|
import com.vitorpamplona.quartz.encoders.HttpUrlFormatter
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun MediaServerEditField(
|
fun MediaServerEditField(
|
||||||
|
@ -47,6 +48,12 @@ fun MediaServerEditField(
|
||||||
onAddServer: (String) -> Unit,
|
onAddServer: (String) -> Unit,
|
||||||
) {
|
) {
|
||||||
var url by remember { mutableStateOf("") }
|
var url by remember { mutableStateOf("") }
|
||||||
|
val validUrl by
|
||||||
|
remember {
|
||||||
|
derivedStateOf {
|
||||||
|
url.isNotBlank() && HttpUrlFormatter.isValidUrl(url)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Row(
|
Row(
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
|
@ -73,20 +80,12 @@ fun MediaServerEditField(
|
||||||
Button(
|
Button(
|
||||||
onClick = {
|
onClick = {
|
||||||
if (url.isNotBlank() && url != "/") {
|
if (url.isNotBlank() && url != "/") {
|
||||||
onAddServer(url)
|
onAddServer(HttpUrlFormatter.normalize(url))
|
||||||
url = ""
|
url = ""
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
shape = ButtonBorder,
|
shape = ButtonBorder,
|
||||||
colors =
|
enabled = validUrl,
|
||||||
ButtonDefaults.buttonColors(
|
|
||||||
containerColor =
|
|
||||||
if (url.isNotBlank()) {
|
|
||||||
MaterialTheme.colorScheme.primary
|
|
||||||
} else {
|
|
||||||
MaterialTheme.colorScheme.placeholderText
|
|
||||||
},
|
|
||||||
),
|
|
||||||
) {
|
) {
|
||||||
Text(text = stringRes(id = R.string.add), color = Color.White)
|
Text(text = stringRes(id = R.string.add), color = Color.White)
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
*/
|
*/
|
||||||
package com.vitorpamplona.amethyst.ui.actions.mediaServers
|
package com.vitorpamplona.amethyst.ui.actions.mediaServers
|
||||||
|
|
||||||
|
import android.util.Log
|
||||||
import androidx.lifecycle.ViewModel
|
import androidx.lifecycle.ViewModel
|
||||||
import androidx.lifecycle.viewModelScope
|
import androidx.lifecycle.viewModelScope
|
||||||
import com.vitorpamplona.amethyst.model.Account
|
import com.vitorpamplona.amethyst.model.Account
|
||||||
|
@ -47,12 +48,17 @@ class MediaServersViewModel : ViewModel() {
|
||||||
isModified = false
|
isModified = false
|
||||||
_fileServers.update {
|
_fileServers.update {
|
||||||
val obtainedFileServers = obtainFileServers() ?: emptyList()
|
val obtainedFileServers = obtainFileServers() ?: emptyList()
|
||||||
obtainedFileServers.map { serverUrl ->
|
obtainedFileServers.mapNotNull { serverUrl ->
|
||||||
Nip96MediaServers
|
try {
|
||||||
.ServerName(
|
Nip96MediaServers
|
||||||
URIReference.parse(serverUrl).host.value,
|
.ServerName(
|
||||||
serverUrl,
|
URIReference.parse(serverUrl).host.value,
|
||||||
)
|
serverUrl,
|
||||||
|
)
|
||||||
|
} catch (e: Exception) {
|
||||||
|
Log.d("MediaServersViewModel", "Invalid URL in NIP-96 server list")
|
||||||
|
null
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,69 @@
|
||||||
|
/**
|
||||||
|
* Copyright (c) 2024 Vitor Pamplona
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||||
|
* this software and associated documentation files (the "Software"), to deal in
|
||||||
|
* the Software without restriction, including without limitation the rights to use,
|
||||||
|
* copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
|
||||||
|
* Software, and to permit persons to whom the Software is furnished to do so,
|
||||||
|
* subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in all
|
||||||
|
* copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||||
|
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||||
|
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
||||||
|
* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
|
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
package com.vitorpamplona.quartz.encoders
|
||||||
|
|
||||||
|
import org.czeal.rfc3986.URIReference
|
||||||
|
|
||||||
|
class HttpUrlFormatter {
|
||||||
|
companion object {
|
||||||
|
fun displayHost(url: String): String =
|
||||||
|
url
|
||||||
|
.trim()
|
||||||
|
.removePrefix("https://")
|
||||||
|
.removePrefix("http://")
|
||||||
|
.removeSuffix("/")
|
||||||
|
|
||||||
|
fun displayUrl(url: String): String =
|
||||||
|
url
|
||||||
|
.trim()
|
||||||
|
.removePrefix("https://")
|
||||||
|
.removePrefix("http://")
|
||||||
|
.removeSuffix("/")
|
||||||
|
|
||||||
|
fun addSchemeIfNeeded(url: String): String =
|
||||||
|
if (!url.startsWith("https://") && !url.startsWith("http://")) {
|
||||||
|
// TODO: How to identify relays on the local network?
|
||||||
|
val isLocalHost = url.contains("127.0.0.1") || url.contains("localhost")
|
||||||
|
if (url.endsWith(".onion") || url.endsWith(".onion/") || isLocalHost) {
|
||||||
|
"http://${url.trim()}"
|
||||||
|
} else {
|
||||||
|
"https://${url.trim()}"
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
url.trim()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun normalize(url: String): String {
|
||||||
|
val newUrl = addSchemeIfNeeded(url)
|
||||||
|
|
||||||
|
return try {
|
||||||
|
URIReference.parse(newUrl).normalize().toString()
|
||||||
|
} catch (e: Exception) {
|
||||||
|
newUrl
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun isValidUrl(url: String): Boolean =
|
||||||
|
runCatching {
|
||||||
|
URIReference.parse(addSchemeIfNeeded(url))
|
||||||
|
}.isSuccess
|
||||||
|
}
|
||||||
|
}
|
Ładowanie…
Reference in New Issue