From 9c23e6c5f3459240a87898762cbfa90cef766ad7 Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Sat, 2 May 2026 19:32:21 +0200
Subject: Emoji suggestion (#1235)

Suggest an emoji in addition to the 3 suggested words when the
current word matches an alias in the emoji dictionary, if
available.---
 srcs/juloo.keyboard2/Keyboard2.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'srcs/juloo.keyboard2/Keyboard2.java')

diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java
index d0d6047..137103e 100644
--- a/srcs/juloo.keyboard2/Keyboard2.java
+++ b/srcs/juloo.keyboard2/Keyboard2.java
@@ -23,11 +23,12 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import juloo.cdict.Cdict;
 import juloo.keyboard2.dict.Dictionaries;
 import juloo.keyboard2.dict.DictionariesActivity;
 import juloo.keyboard2.prefs.LayoutsPreference;
 import juloo.keyboard2.suggestions.CandidatesView;
-import juloo.cdict.Cdict;
+import juloo.keyboard2.suggestions.Suggestions;
 
 public class Keyboard2 extends InputMethodService
   implements SharedPreferences.OnSharedPreferenceChangeListener
@@ -173,6 +174,7 @@ public class Keyboard2 extends InputMethodService
   private void refresh_current_dictionary()
   {
     _config.current_dictionary = null;
+    _config.emoji_dictionary = null;
     String current = _device_locales.default_.dictionary;
     if (current == null)
       return;
@@ -180,6 +182,7 @@ public class Keyboard2 extends InputMethodService
     if (dicts == null)
       return;
     _config.current_dictionary = Dictionaries.find_by_name(dicts, "main");
+    _config.emoji_dictionary = Dictionaries.find_by_name(dicts, "emoji");
   }
 
   private void refresh_candidates_view()
@@ -490,7 +493,7 @@ public class Keyboard2 extends InputMethodService
       return _handler;
     }
 
-    public void set_suggestions(List<String> suggestions)
+    public void set_suggestions(Suggestions suggestions)
     {
       _candidates_view.set_candidates(suggestions);
     }
-- 
cgit v1.2.3


From 7b07b14a80121a690ccbeb86462af1f93a03c343 Mon Sep 17 00:00:00 2001
From: Jon Musselwhite
Date: Tue, 5 May 2026 01:26:41 +0100
Subject: Fix missing null gate (#1273)

---
 srcs/juloo.keyboard2/Keyboard2.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'srcs/juloo.keyboard2/Keyboard2.java')

diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java
index 137103e..7493956 100644
--- a/srcs/juloo.keyboard2/Keyboard2.java
+++ b/srcs/juloo.keyboard2/Keyboard2.java
@@ -175,6 +175,8 @@ public class Keyboard2 extends InputMethodService
   {
     _config.current_dictionary = null;
     _config.emoji_dictionary = null;
+    if (_device_locales.default_ == null)
+      return;
     String current = _device_locales.default_.dictionary;
     if (current == null)
       return;
-- 
cgit v1.2.3