From 900dfa1b9c77e9886f9c816efc6d382b1a54e7c0 Mon Sep 17 00:00:00 2001 From: Helium314 Date: Tue, 20 May 2025 21:18:38 +0200 Subject: [PATCH] no need for special lock object --- .../keyboard/latin/DictionaryFacilitatorImpl.kt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/helium314/keyboard/latin/DictionaryFacilitatorImpl.kt b/app/src/main/java/helium314/keyboard/latin/DictionaryFacilitatorImpl.kt index 33c32a224..c742b6816 100644 --- a/app/src/main/java/helium314/keyboard/latin/DictionaryFacilitatorImpl.kt +++ b/app/src/main/java/helium314/keyboard/latin/DictionaryFacilitatorImpl.kt @@ -58,9 +58,6 @@ class DictionaryFacilitatorImpl : DictionaryFacilitator { @Volatile private var mLatchForWaitingLoadingMainDictionaries = CountDownLatch(0) - // To synchronize assigning mDictionaryGroup to ensure closing dictionaries. - private val mLock = Any() - // The library does not deal well with ngram history for auto-capitalized words, so we adjust // the ngram context to store next word suggestions for such cases. // todo: this is awful, find a better solution / workaround @@ -159,7 +156,7 @@ class DictionaryFacilitatorImpl : DictionaryFacilitator { // Replace Dictionaries. val oldDictionaryGroups: List - synchronized(mLock) { + synchronized(this) { oldDictionaryGroups = dictionaryGroups dictionaryGroups = newDictionaryGroups if (hasAtLeastOneUninitializedMainDictionary()) { @@ -252,7 +249,7 @@ class DictionaryFacilitatorImpl : DictionaryFacilitator { if (dictionaryGroup.getDict(Dictionary.TYPE_MAIN)?.isInitialized == true) null else dictionaryGroup to createMainDictionary(context, it) } - synchronized(mLock) { + synchronized(this) { dictGroupsWithNewMainDict.forEach { (dictGroup, mainDict) -> dictGroup.setMainDict(mainDict) } @@ -265,7 +262,7 @@ class DictionaryFacilitatorImpl : DictionaryFacilitator { override fun closeDictionaries() { val dictionaryGroupsToClose: List - synchronized(mLock) { + synchronized(this) { dictionaryGroupsToClose = dictionaryGroups dictionaryGroups = listOf(DictionaryGroup()) }