Removes duplicated Loading of Relay Info

amethyst/src/main/java/com/vitorpamplona/amethyst/service/Nip11RelayInfoRetriever.kt

@@ -56,6 +56,8 @@ object Nip11CachedRetriever {
         class Empty(
             data: Nip11RelayInformation,
         ) : RetrieveResult(data, TimeUtils.now())
+
+        fun isValid() = time > TimeUtils.oneHourAgo()
     }
 
     private val relayInformationEmptyCache = LruCache<NormalizedRelayUrl, Nip11RelayInformation>(1000)
@@ -79,16 +81,18 @@ object Nip11CachedRetriever {
     fun getFromCache(relay: NormalizedRelayUrl): Nip11RelayInformation {
         val result = relayInformationDocumentCache.get(relay)
 
+        if (result == null) {
+            // resets the clock
+            val empty = getEmpty(relay)
+            relayInformationDocumentCache.put(relay, RetrieveResult.Empty(empty))
+            return empty
+        }
+
         return when (result) {
-            is RetrieveResult.Success -> return result.data
+            is RetrieveResult.Success -> result.data
-            is RetrieveResult.Error -> return result.data
+            is RetrieveResult.Error -> result.data
-            is RetrieveResult.Empty -> return result.data
+            is RetrieveResult.Empty -> result.data
-            is RetrieveResult.Loading -> return result.data
+            is RetrieveResult.Loading -> result.data
-            else -> {
-                val empty = getEmpty(relay)
-                relayInformationDocumentCache.put(relay, RetrieveResult.Empty(empty))
-                empty
-            }
         }
     }
 
@@ -100,23 +104,23 @@ object Nip11CachedRetriever {
     ) {
         val doc = relayInformationDocumentCache.get(relay)
         if (doc != null) {
-            if (doc is RetrieveResult.Success) {
+            when (doc) {
-                onInfo(doc.data)
+                is RetrieveResult.Success -> onInfo(doc.data)
-            } else if (doc is RetrieveResult.Loading) {
+                is RetrieveResult.Loading -> {
-                if (TimeUtils.now() - doc.time < TimeUtils.ONE_MINUTE) {
+                    if (doc.isValid()) {
-                    // just wait.
+                        // just wait.
-                } else {
+                    } else {
-                    retrieve(relay, okHttpClient, onInfo, onError)
+                        retrieve(relay, okHttpClient, onInfo, onError)
+                    }
                 }
-            } else if (doc is RetrieveResult.Error) {
+                is RetrieveResult.Error -> {
-                if (TimeUtils.now() - doc.time < TimeUtils.ONE_HOUR) {
+                    if (doc.isValid()) {
-                    onError(relay, doc.error, null)
+                        onError(relay, doc.error, null)
-                } else {
+                    } else {
-                    retrieve(relay, okHttpClient, onInfo, onError)
+                        retrieve(relay, okHttpClient, onInfo, onError)
+                    }
                 }
-            } else {
+                is RetrieveResult.Empty -> retrieve(relay, okHttpClient, onInfo, onError)
-                // Empty
-                retrieve(relay, okHttpClient, onInfo, onError)
             }
         } else {
             retrieve(relay, okHttpClient, onInfo, onError)
@@ -135,10 +139,12 @@ object Nip11CachedRetriever {
             okHttpClient = okHttpClient,
             onInfo = {
                 relayInformationDocumentCache.put(relay, RetrieveResult.Success(it))
+                relayInformationEmptyCache.remove(relay)
                 onInfo(it)
             },
             onError = { relay, code, errorMsg ->
                 relayInformationDocumentCache.put(relay, RetrieveResult.Error(getEmpty(relay), code, errorMsg))
+                relayInformationEmptyCache.remove(relay)
                 onError(relay, code, errorMsg)
             },
         )

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/common/BasicRelaySetupInfoDialog.kt

@@ -26,7 +26,6 @@ import com.vitorpamplona.amethyst.model.FeatureSetType
 import com.vitorpamplona.amethyst.ui.navigation.navs.INav
 import com.vitorpamplona.amethyst.ui.navigation.routes.Route
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.chats.publicChannels.ephemChat.header.loadRelayInfo
 
 @Composable
 fun BasicRelaySetupInfoDialog(
@@ -35,8 +34,6 @@ fun BasicRelaySetupInfoDialog(
     accountViewModel: AccountViewModel,
     nav: INav,
 ) {
-    val relayInfo by loadRelayInfo(item.relay, accountViewModel)
-
     BasicRelaySetupInfoClickableRow(
         item = item,
         loadProfilePicture = accountViewModel.settings.showProfilePictures.value,