From 0f731117d4c79ecea4b3339eef32242e32d2e834 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Fri, 20 Jan 2023 23:01:53 -0300
Subject: [PATCH] Seems to solve constant crashing when reconnecting after a
 failure related to this issue: https://github.com/square/okhttp/issues/7381

---
 .../java/com/vitorpamplona/amethyst/service/relays/Relay.kt     | 1 +
 .../vitorpamplona/amethyst/ui/actions/NewUserMetadataView.kt    | 2 +-
 .../vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt  | 2 --
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt
index 741ef1873..6aeef1e44 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt
@@ -88,6 +88,7 @@ class Relay(
             }
 
             override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
+                socket?.close(1000, "Normal close")
                 // Failures disconnect the relay. 
                 socket = null
                 //println("Relay onFailure ${url}, ${response?.message}")
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataView.kt
index 92a4e2f7b..c3c5d4a15 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataView.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewUserMetadataView.kt
@@ -35,7 +35,7 @@ fun NewUserMetadataView(onClose: () -> Unit, account: Account) {
     LaunchedEffect(Unit) {
         postViewModel.load(account)
     }
-    
+
     Dialog(
         onDismissRequest = { onClose() },
         properties = DialogProperties(
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 5df8b1e6a..3b2f19983 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
@@ -94,8 +94,6 @@ fun ProfileScreen(userId: String?, accountViewModel: AccountViewModel, navContro
         val userState by baseUser.live.observeAsState()
         val user = userState?.user ?: return
 
-        println("AAA Surface recompose")
-
         Surface(
             modifier = Modifier.fillMaxWidth(),
             color = MaterialTheme.colors.background