wzray/tt9
1
0
Fork 0
Code Activity

fixed crashing due to SuggestionOps is NULL sometimes; fixed a potential case of repeating text in apps that do not support composing

Browse source
This commit is contained in:
sspanak 2025-02-26 12:06:55 +02:00 • committed by Dimo Karaivanov
parent cd6b9b1c80
commit df5be2da57
3 changed files with 42 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,7 +32,7 @@ public abstract class TypingHandler extends KeyPadHandler {
@NonNull protected InputType inputType = new InputType(null, null);
@NonNull protected TextField textField = new TextField(null, null);
@NonNull protected TextSelection textSelection = new TextSelection(this,null);
protected SuggestionOps suggestionOps;
@NonNull protected SuggestionOps suggestionOps = new SuggestionOps(null, null, null, null, null);
// input
protected ArrayList<Integer> allowedInputModes = new ArrayList<>();
@ -90,7 +90,7 @@ public abstract class TypingHandler extends KeyPadHandler {
// changing the TextField and notifying all interested classes is an atomic operation
appHacks = new AppHacks(inputType, textField, textSelection);
suggestionOps.setTextField(connection == null || field == null ? null : textField);
suggestionOps.setTextField(textField);
}
@ -356,6 +356,7 @@ public abstract class TypingHandler extends KeyPadHandler {
}
@NonNull
@Override
public SuggestionOps getSuggestionOps() {
return suggestionOps;

63
app/src/main/java/io/github/sspanak/tt9/ime/helpers/SuggestionOps.java
View file

@ -16,68 +16,79 @@ import io.github.sspanak.tt9.util.ConsumerCompat;
public class SuggestionOps {
@NonNull private final Handler delayedAcceptHandler;
@NonNull private final ConsumerCompat<String> onDelayedAccept;
@NonNull protected final SuggestionsBar suggestionBar;
@Nullable private TextField textField;
@Nullable protected SuggestionsBar suggestionBar;
@NonNull private TextField textField;
public SuggestionOps(@NonNull SettingsStore settings, @NonNull ResizableMainView mainView, @Nullable TextField textField, @NonNull ConsumerCompat<String> onDelayedAccept, @NonNull Runnable onSuggestionClick) {
public SuggestionOps(@Nullable SettingsStore settings, @Nullable ResizableMainView mainView, @Nullable TextField textField, @Nullable ConsumerCompat<String> onDelayedAccept, @Nullable Runnable onSuggestionClick) {
delayedAcceptHandler = new Handler(Looper.getMainLooper());
this.onDelayedAccept = onDelayedAccept;
this.onDelayedAccept = onDelayedAccept != null ? onDelayedAccept : s -> {};
suggestionBar = new SuggestionsBar(settings, mainView, onSuggestionClick);
this.textField = textField;
this.textField = textField != null ? textField : new TextField(null, null);
if (settings != null && mainView != null && onSuggestionClick != null) {
suggestionBar = new SuggestionsBar(settings, mainView, onSuggestionClick);
}
}
public void setRTL(boolean yes) {
suggestionBar.setRTL(yes);
if (suggestionBar != null) {
suggestionBar.setRTL(yes);
}
}
public void setTextField(@Nullable TextField textField) {
public void setTextField(@NonNull TextField textField) {
this.textField = textField;
}
public boolean isEmpty() {
return suggestionBar.isEmpty();
return suggestionBar == null || suggestionBar.isEmpty();
}
public boolean containsStem() {
return suggestionBar.containsStem();
return suggestionBar != null && suggestionBar.containsStem();
}
@NonNull
public String get(int index) {
return suggestionBar.getSuggestion(index);
return suggestionBar != null ? suggestionBar.getSuggestion(index) : "";
}
public void clear() {
set(null);
if (textField != null) {
textField.setComposingText("");
textField.finishComposingText();
}
textField.setComposingText("");
textField.finishComposingText();
}
public void set(ArrayList<String> suggestions) {
suggestionBar.setSuggestions(suggestions, 0, false);
if (suggestionBar != null) {
suggestionBar.setSuggestions(suggestions, 0, false);
}
}
public void set(ArrayList<String> suggestions, boolean containsGenerated) {
suggestionBar.setSuggestions(suggestions, 0, containsGenerated);
if (suggestionBar != null) {
suggestionBar.setSuggestions(suggestions, 0, containsGenerated);
}
}
public void set(ArrayList<String> suggestions, int selectIndex, boolean containsGenerated) {
suggestionBar.setSuggestions(suggestions, selectIndex, containsGenerated);
if (suggestionBar != null) {
suggestionBar.setSuggestions(suggestions, selectIndex, containsGenerated);
}
}
public void scrollTo(int index) {
suggestionBar.scrollToSuggestion(index);
if (suggestionBar != null) {
suggestionBar.scrollToSuggestion(index);
}
}
@ -111,7 +122,7 @@ public class SuggestionOps {
public void commitCurrent(boolean entireSuggestion) {
if (textField != null && !suggestionBar.isEmpty()) {
if (!isEmpty()) {
if (entireSuggestion) {
textField.setComposingText(getCurrent());
}
@ -123,17 +134,17 @@ public class SuggestionOps {
public int getCurrentIndex() {
return suggestionBar.getCurrentIndex();
return suggestionBar != null ? suggestionBar.getCurrentIndex() : 0;
}
public String getCurrent() {
return get(suggestionBar.getCurrentIndex());
return get(getCurrentIndex());
}
public String getCurrent(int maxLength) {
if (maxLength == 0 || suggestionBar.isEmpty()) {
if (maxLength == 0 || isEmpty()) {
return "";
}
@ -149,7 +160,7 @@ public class SuggestionOps {
public boolean scheduleDelayedAccept(int delay) {
cancelDelayedAccept();
if (suggestionBar.isEmpty()) {
if (isEmpty()) {
return false;
}
@ -170,6 +181,8 @@ public class SuggestionOps {
public void setDarkTheme() {
suggestionBar.setDarkTheme();
if (suggestionBar != null) {
suggestionBar.setDarkTheme();
}
}
}

1
app/src/main/java/io/github/sspanak/tt9/ime/helpers/TextField.java
View file

@ -314,6 +314,7 @@ public class TextField extends InputField {
connection.finishComposingText();
} else {
connection.commitText(composingText, 1);
composingText = "";
}
}