am 7de3d0ee: Merge "Fix: Reporting wrong main dictionary availability."

* commit '7de3d0eed7c0a42e9f0c6c9fde9707eddc4a8ab6':
  Fix: Reporting wrong main dictionary availability.

1 files changed, 4 insertions, 4 deletions

diff --git a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
index 0b6258a7f..331384fa5 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
+++ b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
@@ -217,9 +217,6 @@ public class DictionaryFacilitatorForSuggest {
         // Replace Dictionaries.
         final Dictionaries newDictionaries = new Dictionaries(newLocale, newMainDict,
                 newContactsDict,  newUserDictionary, newUserHistoryDict, newPersonalizationDict);
-        if (listener != null) {
-            listener.onUpdateMainDictionaryAvailability(newDictionaries.hasMainDict());
-        }
         final Dictionaries oldDictionaries;
         synchronized (mLock) {
             oldDictionaries = mDictionaries;
@@ -228,6 +225,9 @@ public class DictionaryFacilitatorForSuggest {
                 asyncReloadMainDictionary(context, newLocale, listener);
             }
         }
+        if (listener != null) {
+            listener.onUpdateMainDictionaryAvailability(hasInitializedMainDictionary());
+        }
 
         // Clean up old dictionaries.
         oldDictionaries.mDictMap.clear();
@@ -266,7 +266,7 @@ public class DictionaryFacilitatorForSuggest {
                     }
                 }
                 if (listener != null) {
-                    listener.onUpdateMainDictionaryAvailability(mDictionaries.hasMainDict());
+                    listener.onUpdateMainDictionaryAvailability(hasInitializedMainDictionary());
                 }
                 latchForWaitingLoadingMainDictionary.countDown();
             }