Merge "Add personalization dictionary helper"

java/src/com/android/inputmethod/latin/LatinIME.java

@@ -75,6 +75,7 @@ import com.android.inputmethod.keyboard.KeyboardSwitcher;
 import com.android.inputmethod.keyboard.MainKeyboardView;
 import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
 import com.android.inputmethod.latin.define.ProductionFlag;
+import com.android.inputmethod.latin.personalization.PersonalizationDictionaryHelper;
 import com.android.inputmethod.latin.personalization.UserHistoryDictionary;
 import com.android.inputmethod.latin.settings.Settings;
 import com.android.inputmethod.latin.settings.SettingsActivity;
@@ -563,7 +564,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
         resetContactsDictionary(oldContactsDictionary);
 
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        mUserHistoryDictionary = UserHistoryDictionary.getInstance(this, localeStr, prefs);
+        mUserHistoryDictionary =
+                PersonalizationDictionaryHelper.getUserHistoryDictionary(this, localeStr, prefs);
         mSuggest.setUserHistoryDictionary(mUserHistoryDictionary);
     }
 

java/src/com/android/inputmethod/latin/personalization/PersonalizationDictionaryHelper.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.inputmethod.latin.personalization;
+
+import com.android.inputmethod.latin.utils.CollectionUtils;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.util.Log;
+
+import java.lang.ref.SoftReference;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class PersonalizationDictionaryHelper {
+    private static final String TAG = PersonalizationDictionaryHelper.class.getSimpleName();
+    private static final boolean DEBUG = false;
+
+    private static final ConcurrentHashMap<String, SoftReference<UserHistoryDictionary>>
+            sLangDictCache = CollectionUtils.newConcurrentHashMap();
+
+    public static UserHistoryDictionary getUserHistoryDictionary(
+            final Context context, final String locale, final SharedPreferences sp) {
+        synchronized (sLangDictCache) {
+            if (sLangDictCache.containsKey(locale)) {
+                final SoftReference<UserHistoryDictionary> ref = sLangDictCache.get(locale);
+                final UserHistoryDictionary dict = ref == null ? null : ref.get();
+                if (dict != null) {
+                    if (DEBUG) {
+                        Log.w(TAG, "Use cached UserHistoryDictionary for " + locale);
+                    }
+                    return dict;
+                }
+            }
+            final UserHistoryDictionary dict = new UserHistoryDictionary(context, locale, sp);
+            sLangDictCache.put(locale, new SoftReference<UserHistoryDictionary>(dict));
+            return dict;
+        }
+    }
+}

java/src/com/android/inputmethod/latin/personalization/UserHistoryDictionary.java

@@ -27,12 +27,11 @@ import com.android.inputmethod.latin.Constants;
 import com.android.inputmethod.latin.Dictionary;
 import com.android.inputmethod.latin.ExpandableDictionary;
 import com.android.inputmethod.latin.LatinImeLogger;
-import com.android.inputmethod.latin.WordComposer;
 import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
+import com.android.inputmethod.latin.WordComposer;
 import com.android.inputmethod.latin.makedict.FormatSpec.FormatOptions;
 import com.android.inputmethod.latin.settings.Settings;
 import com.android.inputmethod.latin.utils.ByteArrayWrapper;
-import com.android.inputmethod.latin.utils.CollectionUtils;
 import com.android.inputmethod.latin.utils.UserHistoryDictIOUtils;
 import com.android.inputmethod.latin.utils.UserHistoryDictIOUtils.BigramDictionaryInterface;
 import com.android.inputmethod.latin.utils.UserHistoryDictIOUtils.OnAddWordListener;
@@ -44,9 +43,7 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.lang.ref.SoftReference;
 import java.util.ArrayList;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantLock;
 
 /**
@@ -88,28 +85,7 @@ public class UserHistoryDictionary extends ExpandableDictionary {
     // Should always be false except when we use this class for test
     @UsedForTesting boolean isTest = false;
 
-    private static final ConcurrentHashMap<String, SoftReference<UserHistoryDictionary>>
+    /* package */ UserHistoryDictionary(final Context context, final String locale,
-            sLangDictCache = CollectionUtils.newConcurrentHashMap();
-
-    public static synchronized UserHistoryDictionary getInstance(
-            final Context context, final String locale, final SharedPreferences sp) {
-        if (sLangDictCache.containsKey(locale)) {
-            final SoftReference<UserHistoryDictionary> ref = sLangDictCache.get(locale);
-            final UserHistoryDictionary dict = ref == null ? null : ref.get();
-            if (dict != null) {
-                if (PROFILE_SAVE_RESTORE) {
-                    Log.w(TAG, "Use cached UserHistoryDictionary for " + locale);
-                }
-                return dict;
-            }
-        }
-        final UserHistoryDictionary dict =
-                new UserHistoryDictionary(context, locale, sp);
-        sLangDictCache.put(locale, new SoftReference<UserHistoryDictionary>(dict));
-        return dict;
-    }
-
-    private UserHistoryDictionary(final Context context, final String locale,
             final SharedPreferences sp) {
         super(context, Dictionary.TYPE_USER_HISTORY);
         mLocale = locale;