2 files changed, 24 insertions, 5 deletions
diff --git a/srcs/juloo.keyboard2/suggestions/CandidatesView.java b/srcs/juloo.keyboard2/suggestions/CandidatesView.java
index 259db35..b41177f 100644
--- a/srcs/juloo.keyboard2/suggestions/CandidatesView.java
+++ b/srcs/juloo.keyboard2/suggestions/CandidatesView.java
@@ -74,7 +74,7 @@ public class CandidatesView extends LinearLayout
     // The status message indicates whether the dictionaries should be
     // installed.
     _status_no_dict = inflate_and_show(_status_no_dict,
-        true,
+        (config.current_dictionary == null),
         R.layout.candidates_status_no_dict);
     set_height(config);
   }
diff --git a/srcs/juloo.keyboard2/suggestions/Suggestions.java b/srcs/juloo.keyboard2/suggestions/Suggestions.java
index 50c64e0..998d40d 100644
--- a/srcs/juloo.keyboard2/suggestions/Suggestions.java
+++ b/srcs/juloo.keyboard2/suggestions/Suggestions.java
@@ -2,28 +2,47 @@ package juloo.keyboard2.suggestions;
 
 import java.util.Arrays;
 import java.util.List;
+import juloo.cdict.Cdict;
+import juloo.keyboard2.dict.Dictionaries;
+import juloo.keyboard2.Config;
 
 /** Keep track of the word being typed and provide suggestions for
     [CandidatesView]. */
 public final class Suggestions
 {
   Callback _callback;
+  Config _config;
 
-  public Suggestions(Callback c)
+  public Suggestions(Callback c, Config conf)
   {
     _callback = c;
+    _config = conf;
   }
 
   public void currently_typed_word(String word)
   {
-    if (word.equals(""))
+    Cdict dict = _config.current_dictionary;
+    if (word.length() < 2 || dict == null)
     {
       _callback.set_suggestions(NO_SUGGESTIONS);
     }
     else
     {
-      // TODO
-      _callback.set_suggestions(Arrays.asList(word));
+      Cdict.Result r = dict.find(word);
+      String[] suggestions = new String[3];
+      int i = 0;
+      if (r.found)
+        suggestions[i++] = word;
+      int[] suffixes = dict.suffixes(r, 3);
+      int[] dist = dict.distance(word, 1, 3);
+      for (int j = 0; j < 3 && i < 3; j++)
+      {
+        if (suffixes.length > j)
+          suggestions[i++] = dict.word(suffixes[j]);
+        if (dist.length > j && i < 3)
+          suggestions[i++] = dict.word(dist[j]);
+      }
+      _callback.set_suggestions(Arrays.asList(suggestions));
     }
   }