1 files changed, 10 insertions, 8 deletions
diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index 16a92ef..18e9fe7 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -8,6 +8,8 @@ import android.util.TypedValue;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import juloo.cdict.Cdict;
+import juloo.keyboard2.dict.Dictionaries;
 import juloo.keyboard2.prefs.CustomExtraKeysPreference;
 import juloo.keyboard2.prefs.ExtraKeysPreference;
 import juloo.keyboard2.prefs.LayoutsPreference;
@@ -80,8 +82,8 @@ public final class Config
   public ExtraKeys extra_keys_subtype;
   public Map<KeyValue, KeyboardData.PreferredPos> extra_keys_param;
   public Map<KeyValue, KeyboardData.PreferredPos> extra_keys_custom;
-
-  public final IKeyEventHandler handler;
+  public Cdict current_dictionary = null; // Might be 'null'.
+  public IKeyEventHandler handler;
   public boolean orientation_landscape = false;
   public boolean foldable_unfolded = false;
   public boolean wide_screen = false;
@@ -90,7 +92,8 @@ public final class Config
   int current_layout_narrow;
   int current_layout_wide;
 
-  private Config(SharedPreferences prefs, Resources res, IKeyEventHandler h, Boolean foldableUnfolded)
+  private Config(SharedPreferences prefs, Resources res,
+      Boolean foldableUnfolded, Dictionaries dicts)
   {
     _prefs = prefs;
     editor_config = new EditorConfig();
@@ -100,17 +103,16 @@ public final class Config
     labelTextSize = 0.33f;
     sublabelTextSize = 0.22f;
     // from prefs
-    refresh(res, foldableUnfolded);
+    refresh(res, foldableUnfolded, dicts);
     // initialized later
     shouldOfferVoiceTyping = false;
     extra_keys_subtype = null;
-    handler = h;
   }
 
   /*
    ** Reload prefs
    */
-  public void refresh(Resources res, Boolean foldableUnfolded)
+  public void refresh(Resources res, Boolean foldableUnfolded, Dictionaries dicts)
   {
     DisplayMetrics dm = res.getDisplayMetrics();
     orientation_landscape = res.getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE;
@@ -289,10 +291,10 @@ public final class Config
   private static Config _globalConfig = null;
 
   public static void initGlobalConfig(SharedPreferences prefs, Resources res,
-      IKeyEventHandler handler, Boolean foldableUnfolded)
+      Boolean foldableUnfolded, Dictionaries dicts)
   {
     migrate(prefs);
-    _globalConfig = new Config(prefs, res, handler, foldableUnfolded);
+    _globalConfig = new Config(prefs, res, foldableUnfolded, dicts);
     LayoutModifier.init(_globalConfig, res);
   }