Fixes the Account switching issue that was calling onDispose AFTER a new user composition was run and thus closing all connections on switching
This commit is contained in:
-4
@@ -98,10 +98,6 @@ class RelaySubscriptionsCoordinator(
|
|||||||
nwc,
|
nwc,
|
||||||
)
|
)
|
||||||
|
|
||||||
fun start() = all.forEach { it.start() }
|
|
||||||
|
|
||||||
fun stop() = all.forEach { it.stop() }
|
|
||||||
|
|
||||||
fun destroy() = all.forEach { it.destroy() }
|
fun destroy() = all.forEach { it.destroy() }
|
||||||
|
|
||||||
fun printCounters() = all.forEach { it.printStats() }
|
fun printCounters() = all.forEach { it.printStats() }
|
||||||
|
|||||||
-38
@@ -1,38 +0,0 @@
|
|||||||
/**
|
|
||||||
* Copyright (c) 2025 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.amethyst.service.relayClient.reqCommand
|
|
||||||
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.runtime.DisposableEffect
|
|
||||||
import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun RelaySubscriptionsCoordinatorSubscription(accountViewModel: AccountViewModel) = RelaySubscriptionsCoordinatorSubscription(accountViewModel.dataSources())
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun RelaySubscriptionsCoordinatorSubscription(dataSource: RelaySubscriptionsCoordinator) {
|
|
||||||
DisposableEffect(Unit) {
|
|
||||||
dataSource.start()
|
|
||||||
onDispose {
|
|
||||||
dataSource.stop()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -43,7 +43,6 @@ import com.vitorpamplona.amethyst.R
|
|||||||
import com.vitorpamplona.amethyst.model.AccountSettings
|
import com.vitorpamplona.amethyst.model.AccountSettings
|
||||||
import com.vitorpamplona.amethyst.service.notifications.PushNotificationUtils
|
import com.vitorpamplona.amethyst.service.notifications.PushNotificationUtils
|
||||||
import com.vitorpamplona.amethyst.service.relayClient.authCommand.compose.RelayAuthSubscription
|
import com.vitorpamplona.amethyst.service.relayClient.authCommand.compose.RelayAuthSubscription
|
||||||
import com.vitorpamplona.amethyst.service.relayClient.reqCommand.RelaySubscriptionsCoordinatorSubscription
|
|
||||||
import com.vitorpamplona.amethyst.service.relayClient.reqCommand.account.AccountFilterAssemblerSubscription
|
import com.vitorpamplona.amethyst.service.relayClient.reqCommand.account.AccountFilterAssemblerSubscription
|
||||||
import com.vitorpamplona.amethyst.ui.MainActivity
|
import com.vitorpamplona.amethyst.ui.MainActivity
|
||||||
import com.vitorpamplona.amethyst.ui.components.getActivity
|
import com.vitorpamplona.amethyst.ui.components.getActivity
|
||||||
@@ -98,9 +97,6 @@ fun LoggedInPage(
|
|||||||
VideoFilterAssemblerSubscription(accountViewModel)
|
VideoFilterAssemblerSubscription(accountViewModel)
|
||||||
DiscoveryFilterAssemblerSubscription(accountViewModel)
|
DiscoveryFilterAssemblerSubscription(accountViewModel)
|
||||||
|
|
||||||
// TODO: Is this needed?
|
|
||||||
RelaySubscriptionsCoordinatorSubscription(accountViewModel)
|
|
||||||
|
|
||||||
// Updates local cache of the anti-spam filter choice of this user.
|
// Updates local cache of the anti-spam filter choice of this user.
|
||||||
ObserveAntiSpamFilterSettings(accountViewModel)
|
ObserveAntiSpamFilterSettings(accountViewModel)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user