From de4d4010388ff8cb278a242cfc59f3101a47a934 Mon Sep 17 00:00:00 2001
From: Keisuke Kuroyanagi <ksk@google.com>
Date: Tue, 22 Apr 2014 16:24:22 -0700
Subject: [PATCH] Fix: Reporting wrong main dictionary availability.

Bug: 13965806
Change-Id: Ida2234ab8cb7785ec5efd433a58949bf21c44351
---
 .../latin/DictionaryFacilitatorForSuggest.java            | 8 ++++----
 1 file 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();
             }