fixed Korean

Author: sspanak

app/src/main/java/io/github/sspanak/tt9/db/mindReading/MindReader.java

@@ -62,6 +62,7 @@ public MindReader(@Nullable SettingsStore settings, @Nullable ExecutorService ex
 
 
 	public void clearContext() {
+		// @todo: probably, always do this when the input field resets, and the language is transcribed or uses no spaces
 		if (!isOff() && wordContext.setText("")) {
 			words.clear();
 			Logger.d(LOG_TAG, "Mind reader context cleared");
@@ -88,7 +89,7 @@ public void guessNext(@NonNull InputMode inputMode, @NonNull Language language,
 
 		loadingId = 0;
 
-		// @todo: Korean does not work
+		// @todo: In Korean count space as the last word character
 		// @todo: this fails for ABC. Fix it!
 		if (setContextSync(inputMode, language, surroundingText, lastWord)) {
 			runInThread(() -> {
@@ -163,7 +164,7 @@ private boolean setContextSync(@Nullable InputMode inputMode, @NonNull Language
 				&& Character.isWhitespace(lastWord.codePointAt(0))
 				&& wordContext.setText(surroundingText[0])
 				&& wordContext.appendText(lastWord, false);
-		} else if (LanguageKind.usesSpaceAsPunctuation(language)) {
+		} else if (LanguageKind.usesSpaceAsPunctuation(language) && !LanguageKind.isKorean(language)) {
 			return wordContext.appendText(lastWord, true);
 		} else {
 			return wordContext.setText(surroundingText[0]);

app/src/main/java/io/github/sspanak/tt9/db/mindReading/MindReaderContext.java

@@ -9,6 +9,7 @@
 import io.github.sspanak.tt9.ime.modes.InputMode;
 import io.github.sspanak.tt9.ime.modes.InputModeKind;
 import io.github.sspanak.tt9.languages.Language;
+import io.github.sspanak.tt9.languages.LanguageKind;
 import io.github.sspanak.tt9.languages.exceptions.InvalidLanguageCharactersException;
 import io.github.sspanak.tt9.util.Logger;
 import io.github.sspanak.tt9.util.TextTools;
@@ -125,7 +126,7 @@ boolean setText(@NonNull String beforeCursor) {
 		}
 
 		raw.setLength(0);
-		raw.append(beforeCursor.trim());
+		raw.append(LanguageKind.usesSpaceAsPunctuation(language) ? beforeCursor : beforeCursor.trim());
 		lastAppendedWord = null;
 		tokens = new String[0];
 

app/src/main/java/io/github/sspanak/tt9/ime/SuggestionHandler.java

@@ -234,22 +234,33 @@ protected void setGuessesTextCase(int textCase) {
 
 
 	@Override
-	protected void guessOnNumber(double loadingId, @NonNull String[] surroundingText, @Nullable String lastWord, int number, int useTextCase) {
-		if (number == 0 && mLanguage.hasLettersOnAllKeys()) {
+	protected void guessOnNumber(double loadingId, @NonNull String[] surroundingText, @Nullable String lastWord, int number) {
+		if (mLanguage.hasLettersOnAllKeys()) {
 			return;
 		}
 
-		if (!mLanguage.hasSpaceBetweenWords()) {
-			if (lastWord != null) {
-				if (!mInputMode.isTyping()) {
-					guessNextWord(surroundingText, lastWord);
-				} else if (mInputMode.getSequenceLength() == 1) {
-					guessCurrentWord(loadingId, surroundingText, number);
-				}
-			}
+		if (mLanguage.hasSpaceBetweenWords()) {
+			guessOnNumberRegularLanguage(loadingId, surroundingText, lastWord, number);
+		} else {
+			guessOnNumberNoSpaceLanguage(loadingId, surroundingText, lastWord, number);
+		}
+	}
+
+
+	private void guessOnNumberNoSpaceLanguage(double loadingId, @NonNull String[] surroundingText, @Nullable String lastWord, int number) {
+		if (lastWord == null) {
 			return;
 		}
 
+		if (!mInputMode.isTyping()) {
+			guessNextWord(surroundingText, lastWord);
+		} else if (mInputMode.getSequenceLength() == 1) {
+			guessCurrentWord(loadingId, surroundingText, number);
+		}
+	}
+
+
+	private void guessOnNumberRegularLanguage(double loadingId, @NonNull String[] surroundingText, @Nullable String lastWord, int number) {
 		if (mInputMode.getSequenceLength() != 1 || new Text(mLanguage, surroundingText[1]).startsWithWord()) {
 			clearGuessingContext();
 			return;

app/src/main/java/io/github/sspanak/tt9/ime/TypingHandler.java

@@ -48,7 +48,7 @@ public abstract class TypingHandler extends KeyPadHandler {
 	abstract protected void onAcceptSuggestionsDelayed(String s);
 	abstract protected void getSuggestions(double loadingId, @Nullable String currentWord, @Nullable Runnable onComplete);
 
-	protected abstract void guessOnNumber(double loadingId, @NonNull String[] surroundingChars, @Nullable String lastWord, int number, int useTextCase);
+	protected abstract void guessOnNumber(double loadingId, @NonNull String[] surroundingChars, @Nullable String lastWord, int number);
 	abstract protected void guessNextWord(@NonNull String[] surroundingText, @Nullable String lastWord);
 	abstract protected void clearGuessingContext();
 	abstract protected void setGuessingContext(@NonNull String[] surroundingText);
@@ -221,7 +221,7 @@ protected boolean onNumber(int key, boolean hold, int repeat) {
 			suggestionOps.scheduleDelayedAccept(mInputMode.getAutoAcceptTimeout());
 		} else {
 			final double loadingId = Math.random();
-			guessOnNumber(loadingId, surroundingChars, lastWord, key, mInputMode.getTextCase());
+			guessOnNumber(loadingId, surroundingChars, lastWord, key);
 			getSuggestions(loadingId, null, null);
 		}