cerence: xt9: Add special case for an invalid input (as reported by xt9)

If the xt9 selection list build fails due to ET9STATUS_INVALID_INPUT,
remove the symbol and select preferred candidate from the previous
selection list. After this, start new input sequence using the rejected
symbol as initial symbol.

Pick-to: 6.2
Change-Id: Ib55d7391045c8d9c1db109e3ecd3855c71f45449
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>

1 files changed, 2 insertions, 3 deletions

diff --git a/src/plugins/cerence/xt9/xt9common/xt9cpime.cpp b/src/plugins/cerence/xt9/xt9common/xt9cpime.cpp
index 17ae0526..69efa6bc 100644
--- a/src/plugins/cerence/xt9/xt9common/xt9cpime.cpp
+++ b/src/plugins/cerence/xt9/xt9common/xt9cpime.cpp
@@ -147,7 +147,7 @@ QString Xt9CpIme::exactWord(int *wordCompLen)
     ET9CPPhrase phrase;
     ET9CPSpell spell;
     ET9U8 selSymbCount = 0;
-    if (!ET9CPGetSelection(&sLingInfo, &phrase, &spell, &selSymbCount) && selSymbCount)
+    if (!XT9_API(ET9CPGetSelection, &sLingInfo, &phrase, &spell, &selSymbCount) && selSymbCount)
         exactWord.remove(0, static_cast<int>(selSymbCount));
 
     replaceSpecialSymbol(exactWord);
@@ -202,9 +202,8 @@ QString Xt9CpIme::spell()
     return result;
 }
 
-QStringList Xt9CpIme::buildSelectionList(int *defaultListIndex, ET9U16 *gestureValue)
+QStringList Xt9CpIme::buildSelectionList(int *defaultListIndex, ET9U16 *gestureValue, ET9STATUS &eStatus)
 {
-    ET9STATUS eStatus;
     ET9U16 totalWords;
 
     eStatus = XT9_API(ET9CPBuildSelectionList, &sLingInfo, gestureValue);