wzray/tt9
1
0
Fork 0
Code Activity

fixed uppercase uppercase or capitalized words sometimes not becoming top words, after being selected

Browse source
This commit is contained in:
sspanak 2024-02-20 09:56:16 +02:00 • committed by Dimo Karaivanov
parent ed9364d195
commit be62db3bfc
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/io/github/sspanak/tt9/db/WordStore.java
View file

@ -16,6 +16,7 @@ import io.github.sspanak.tt9.db.sqlite.SQLiteOpener;
import io.github.sspanak.tt9.db.sqlite.UpdateOps; import io.github.sspanak.tt9.db.sqlite.UpdateOps;
import io.github.sspanak.tt9.ime.TraditionalT9; import io.github.sspanak.tt9.ime.TraditionalT9;
import io.github.sspanak.tt9.languages.Language; import io.github.sspanak.tt9.languages.Language;
import io.github.sspanak.tt9.languages.Text;
import io.github.sspanak.tt9.preferences.SettingsStore; import io.github.sspanak.tt9.preferences.SettingsStore;
import io.github.sspanak.tt9.ui.AddWordAct; import io.github.sspanak.tt9.ui.AddWordAct;
@ -191,8 +192,8 @@ public class WordStore {
} }
int newTopFrequency = topWord.frequency + 1; int newTopFrequency = topWord.frequency + 1;
String wordFilter = word.length() == 1 ? word.toLowerCase(language.getLocale()) : null; Text wordFilter = new Text(language, word.length() == 1 ? word : null);
if (!UpdateOps.changeFrequency(sqlite.getDb(), language, wordFilter, wordPosition, newTopFrequency)) { if (!UpdateOps.changeFrequency(sqlite.getDb(), language, wordFilter, wordPosition, newTopFrequency)) {
throw new Exception("No such word"); throw new Exception("No such word");
} }

15
app/src/main/java/io/github/sspanak/tt9/db/sqlite/UpdateOps.java
View file

@ -7,6 +7,7 @@ import androidx.annotation.NonNull;
import io.github.sspanak.tt9.Logger; import io.github.sspanak.tt9.Logger;
import io.github.sspanak.tt9.languages.Language; import io.github.sspanak.tt9.languages.Language;
import io.github.sspanak.tt9.languages.Text;
import io.github.sspanak.tt9.preferences.SettingsStore; import io.github.sspanak.tt9.preferences.SettingsStore;
@ -14,21 +15,23 @@ public class UpdateOps {
private static final String LOG_TAG = UpdateOps.class.getSimpleName(); private static final String LOG_TAG = UpdateOps.class.getSimpleName();
public static boolean changeFrequency(@NonNull SQLiteDatabase db, @NonNull Language language, String word, int position, int frequency) { public static boolean changeFrequency(@NonNull SQLiteDatabase db, @NonNull Language language, Text wordFilter, int position, int frequency) {
String sql = "UPDATE " + Tables.getWords(language.getId()) + " SET frequency = ? WHERE position = ?"; String sql = "UPDATE " + Tables.getWords(language.getId()) + " SET frequency = ? WHERE position = ?";
if (word != null && !word.isEmpty()) { if (wordFilter != null && !wordFilter.isEmpty()) {
sql += " AND word = ?"; sql += " AND word IN(?, ?, ?)";
} }
SQLiteStatement query = CompiledQueryCache.get(db, sql); SQLiteStatement query = CompiledQueryCache.get(db, sql);
query.bindLong(1, frequency); query.bindLong(1, frequency);
query.bindLong(2, position); query.bindLong(2, position);
if (word != null && !word.isEmpty()) { if (wordFilter != null && !wordFilter.isEmpty()) {
query.bindString(3, word); query.bindString(3, wordFilter.capitalize());
query.bindString(4, wordFilter.toLowerCase());
query.bindString(5, wordFilter.toUpperCase());
} }
Logger.v(LOG_TAG, "Change frequency SQL: " + query + "; (" + frequency + ", " + position + ", " + word + ")"); Logger.v(LOG_TAG, "Change frequency SQL: " + query + "; (" + frequency + ", " + position + ", " + wordFilter + ")");
return query.executeUpdateDelete() > 0; return query.executeUpdateDelete() > 0;
} }