regression: fixed word frequencies not updating

sspanak · Oct 30, 2024 · 03d5145 · 03d5145
1 parent 1a1222f
commit 03d5145
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/app/src/main/java/io/github/sspanak/tt9/db/sqlite/ReadOps.java b/app/src/main/java/io/github/sspanak/tt9/db/sqlite/ReadOps.java
@@ -8,6 +8,7 @@
 import android.os.OperationCanceledException;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
 
@@ -120,14 +121,14 @@ public String getWords(@NonNull SQLiteDatabase db, Language language, boolean cu
 
 
 	@NonNull
-	public WordList getWords(@NonNull SQLiteDatabase db, CancellationSignal cancel, @NonNull Language language, @NonNull String positions, String filter, int maximumWords, boolean fullOutput) {
+	public WordList getWords(@NonNull SQLiteDatabase db, @Nullable CancellationSignal cancel, @NonNull Language language, @NonNull String positions, String filter, int maximumWords, boolean fullOutput) {
 		if (positions.isEmpty()) {
 			Logger.d(LOG_TAG, "No word positions. Not searching words.");
 			return new WordList();
 		}
 
 		String wordsQuery = getWordsQuery(language, positions, filter, maximumWords, fullOutput);
-		if (wordsQuery.isEmpty() || cancel.isCanceled()) {
+		if (wordsQuery.isEmpty() || (cancel != null && cancel.isCanceled())) {
 			return new WordList();
 		}
 
@@ -161,8 +162,8 @@ public String getSimilarWordPositions(@NonNull SQLiteDatabase db, @NonNull Cance
 
 
 	@NonNull
-	public String getWordPositions(@NonNull SQLiteDatabase db, CancellationSignal cancel, @NonNull Language language, @NonNull String sequence, int generations, int minPositions, String wordFilter) {
-		if (sequence.length() == 1 || cancel.isCanceled()) {
+	public String getWordPositions(@NonNull SQLiteDatabase db, @Nullable CancellationSignal cancel, @NonNull Language language, @NonNull String sequence, int generations, int minPositions, String wordFilter) {
+		if (sequence.length() == 1 || (cancel != null && cancel.isCanceled())) {
 			return sequence;
 		}