highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-03-28 18:51:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Formatting

Browse Source
This commit is contained in:
Vitor Pamplona 2024-06-18 18:21:27 -04:00
parent 548dd9e34f
commit a23cbd1a38
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt
View File

@ -87,9 +87,7 @@ class Relay(
listeners = listeners.minus(listener) listeners = listeners.minus(listener)
} }
fun isConnected(): Boolean { fun isConnected(): Boolean = socket != null
return socket != null
}
fun connect() { fun connect() {
connectAndRun { connectAndRun {
@ -123,7 +121,8 @@ class Relay(
lastConnectTentative = TimeUtils.now() lastConnectTentative = TimeUtils.now()
val request = val request =
Request.Builder() Request
.Builder()
.header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}") .header("User-Agent", "Amethyst/${BuildConfig.VERSION_NAME}")
.url(url.trim()) .url(url.trim())
.build() .build()
@ -141,7 +140,9 @@ class Relay(
} }
} }
inner class RelayListener(val onConnected: (Relay) -> Unit) : WebSocketListener() { inner class RelayListener(
val onConnected: (Relay) -> Unit,
) : WebSocketListener() {
override fun onOpen( override fun onOpen(
webSocket: WebSocket, webSocket: WebSocket,
response: Response, response: Response,
@ -524,12 +525,11 @@ class Relay(
writeToSocket("""["CLOSE","$subscriptionId"]""") writeToSocket("""["CLOSE","$subscriptionId"]""")
} }
fun isSameRelayConfig(other: RelaySetupInfo): Boolean { fun isSameRelayConfig(other: RelaySetupInfo): Boolean =
return url == other.url && url == other.url &&
write == other.write && write == other.write &&
read == other.read && read == other.read &&
activeTypes == other.feedTypes activeTypes == other.feedTypes
}
enum class StateType { enum class StateType {
// Websocket connected // Websocket connected