diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt index 7c6bd9542..f13e41f1a 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt @@ -219,7 +219,6 @@ class Account( // Observers line up here. val live: AccountLiveData = AccountLiveData(this) - val liveLanguages: AccountLiveData = AccountLiveData(this) val saveable: AccountLiveData = AccountLiveData(this) @Immutable @@ -2831,21 +2830,16 @@ class Account( fun updateLocalRelayServers(servers: Set) { localRelayServers = servers - liveLanguages.invalidateData() saveable.invalidateData() } fun addDontTranslateFrom(languageCode: String) { dontTranslateFrom = dontTranslateFrom.plus(languageCode) - liveLanguages.invalidateData() - saveable.invalidateData() } fun updateTranslateTo(languageCode: String) { translateTo = languageCode - liveLanguages.invalidateData() - saveable.invalidateData() } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt index 24d3eca53..0ef47d1fa 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt @@ -148,7 +148,6 @@ class AccountViewModel( ) : ViewModel(), Dao { val accountLiveData: LiveData = account.live.map { it } - val accountLanguagesLiveData: LiveData = account.liveLanguages.map { it } // TODO: contact lists are not notes yet // val kind3Relays: StateFlow = observeByAuthor(ContactListEvent.KIND, account.signer.pubKey) diff --git a/amethyst/src/play/java/com/vitorpamplona/amethyst/ui/components/TranslatableRichTextViewer.kt b/amethyst/src/play/java/com/vitorpamplona/amethyst/ui/components/TranslatableRichTextViewer.kt index f177477b5..063ad9473 100644 --- a/amethyst/src/play/java/com/vitorpamplona/amethyst/ui/components/TranslatableRichTextViewer.kt +++ b/amethyst/src/play/java/com/vitorpamplona/amethyst/ui/components/TranslatableRichTextViewer.kt @@ -42,7 +42,6 @@ import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.MutableState import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue -import androidx.compose.runtime.livedata.observeAsState import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope @@ -366,9 +365,10 @@ fun TranslateAndWatchLanguageChanges( accountViewModel: AccountViewModel, onTranslated: (TranslationConfig) -> Unit, ) { - val accountState by accountViewModel.accountLanguagesLiveData.observeAsState() + // Don't automatically update translations. + // val accountState by accountViewModel.accountLanguagesLiveData.observeAsState() - LaunchedEffect(accountState) { + LaunchedEffect(Unit) { // This takes some time. Launches as a Composition scope to make sure this gets cancel if this // item gets out of view. withContext(Dispatchers.IO) {