added a setting to raise the word import limits (#942)

sspanak · sspanak · commit f3e3addf91ba · 2026-01-30T17:31:18.000+02:00
diff --git a/app/src/main/java/io/github/sspanak/tt9/db/customWords/CustomWordsImporter.java b/app/src/main/java/io/github/sspanak/tt9/db/customWords/CustomWordsImporter.java
@@ -31,6 +31,8 @@ public class CustomWordsImporter extends AbstractFileProcessor {
 	private SQLiteOpener sqlite;
 
 	private long lastProgressUpdate = 0;
+	private int maxFileLines;
+	private int maxWords;
 
 
 	public static CustomWordsImporter getInstance(Context context) {
@@ -91,8 +93,10 @@ private void sendFailure(String errorMessage) {
 	}
 
 
-	public void run(@NonNull Activity activity, @NonNull CustomWordFile file) {
+	public void run(@NonNull Activity activity, @NonNull SettingsStore settings, @NonNull CustomWordFile file) {
 		this.file = file;
+		this.maxFileLines = settings.getImportWordsMaxFileLines();
+		this.maxWords = settings.getImportWordsMaxWords();
 		super.run(activity);
 	}
 
@@ -102,7 +106,7 @@ protected void runSync(Activity activity) {
 		Timer.start(getClass().getSimpleName());
 
 		sendStart(resources.getString(R.string.dictionary_import_running));
-		if (isFileValid() && isThereRoomForMoreWords(activity) && insertWords()) {
+		if (isFileValid() && isThereRoomForMoreWords(activity) && isLineCountValid() && insertWords()) {
 			sendSuccess();
 			Logger.i(getClass().getSimpleName(), "Imported " + file.getName() + " in " + Timer.get(getClass().getSimpleName()) + " ms");
 		} else {
@@ -132,11 +136,6 @@ private boolean insertWords() {
 			sqlite.beginTransaction();
 
 			for (String line; (line = reader.readLine()) != null; lineCount++) {
-				if (!isLineCountValid(lineCount)) {
-					sqlite.failTransaction();
-					return false;
-				}
-
 				CustomWord customWord = createCustomWord(line, lineCount);
 				if (customWord == null) {
 					sqlite.failTransaction();
@@ -189,7 +188,7 @@ private boolean isThereRoomForMoreWords(Context context) {
 			return false;
 		}
 
-		if ((new ReadOps()).countCustomWords(sqlite.getDb()) > SettingsStore.CUSTOM_WORDS_MAX) {
+		if ((new ReadOps()).countCustomWords(sqlite.getDb()) > maxWords) {
 			sendFailure(resources.getString(R.string.dictionary_import_error_too_many_words));
 			return false;
 		}
@@ -198,13 +197,23 @@ private boolean isThereRoomForMoreWords(Context context) {
 	}
 
 
-	private boolean isLineCountValid(int lineCount) {
-		if (lineCount <= SettingsStore.CUSTOM_WORDS_IMPORT_MAX_LINES) {
-			return true;
+	private boolean isLineCountValid() {
+		int lineCount = 0;
+
+		try (BufferedReader reader = file.getReader()) {
+			while (reader.readLine() != null) {
+				if (++lineCount > maxFileLines) {
+					sendFailure(resources.getString(R.string.dictionary_import_error_file_too_long, maxFileLines));
+					return false;
+				}
+			}
+		} catch (IOException e) {
+			Logger.e(getClass().getSimpleName(), "Error opening the file. " + e.getMessage());
+			sendFailure(resources.getString(R.string.dictionary_import_error_cannot_read_file));
+			return false;
 		}
 
-		sendFailure(resources.getString(R.string.dictionary_import_error_file_too_long, SettingsStore.CUSTOM_WORDS_IMPORT_MAX_LINES));
-		return false;
+		return true;
 	}
 
 
diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/ItemImportCustomWords.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/ItemImportCustomWords.java
@@ -46,12 +46,12 @@ protected boolean onClick(Preference p) {
 	@Override
 	protected boolean onStartProcessing() {
 		lastError = "";
-		lastProgress = -1;
+		lastProgress = 0;
 		return false;
 	}
 
 	private void onProgress(float progress) {
-		final String formattedProgress = (lastProgress - progress) < 2 ? String.format(Locale.getDefault(), "%1.3f%%", progress) : progress + "%";
+		final String formattedProgress = (progress - lastProgress) < 2 ? String.format(Locale.getDefault(), "%1.3f%%", progress) : progress + "%";
 		final String loadingMsg = activity.getString(R.string.dictionary_import_progress, formattedProgress);
 		lastProgress = progress;
 
@@ -128,6 +128,6 @@ void onFileSelected(ActivityResult result) {
 			return;
 		}
 
-		getProcessor().run(activity, file);
+		getProcessor().run(activity, activity.getSettings(), file);
 	}
 }
diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/SwitchAddWordsWithoutConfirmation.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/SwitchAddWordsWithoutConfirmation.java
@@ -10,25 +10,25 @@
 import io.github.sspanak.tt9.R;
 import io.github.sspanak.tt9.preferences.settings.SettingsStore;
 
-public class AddWordsWithoutConfirmationSwitch extends SwitchPreferenceCompat {
+public class SwitchAddWordsWithoutConfirmation extends SwitchPreferenceCompat {
 	public static final String NAME = "add_word_no_confirmation";
 
-	public AddWordsWithoutConfirmationSwitch(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+	public SwitchAddWordsWithoutConfirmation(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
 		super(context, attrs, defStyleAttr, defStyleRes);
 		init(context);
 	}
 
-	public AddWordsWithoutConfirmationSwitch(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+	public SwitchAddWordsWithoutConfirmation(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
 		super(context, attrs, defStyleAttr);
 		init(context);
 	}
 
-	public AddWordsWithoutConfirmationSwitch(@NonNull Context context, @Nullable AttributeSet attrs) {
+	public SwitchAddWordsWithoutConfirmation(@NonNull Context context, @Nullable AttributeSet attrs) {
 		super(context, attrs);
 		init(context);
 	}
 
-	public AddWordsWithoutConfirmationSwitch(@NonNull Context context) {
+	public SwitchAddWordsWithoutConfirmation(@NonNull Context context) {
 		super(context);
 		init(context);
 	}
diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/SwitchRaiseImportLimits.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/languages/SwitchRaiseImportLimits.java
@@ -0,0 +1,34 @@
+package io.github.sspanak.tt9.preferences.screens.languages;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.preference.SwitchPreferenceCompat;
+
+import io.github.sspanak.tt9.R;
+import io.github.sspanak.tt9.preferences.settings.SettingsAddedWords;
+
+public class SwitchRaiseImportLimits extends SwitchPreferenceCompat {
+	public static final String NAME = "pref_raise_custom_words_import_limits";
+	public static boolean DEFAULT = false;
+
+	public SwitchRaiseImportLimits(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); init(context); }
+	public SwitchRaiseImportLimits(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); init(context); }
+	public SwitchRaiseImportLimits(@NonNull Context context, @Nullable AttributeSet attrs) { super(context, attrs); init(context); }
+	public SwitchRaiseImportLimits(@NonNull Context context) { super(context); init(context); }
+
+	private void init(@NonNull Context context) {
+		setKey(NAME);
+		setDefaultValue(DEFAULT);
+		setTitle(R.string.dictionary_import_raise_import_limits);
+		setSummary(context.getString(
+			R.string.dictionary_import_raise_import_limits_summary,
+			SettingsAddedWords.IMPORT_DEFAULT_MAX_FILE_LINES,
+			SettingsAddedWords.IMPORT_RAISED_MAX_FILE_LINES,
+			SettingsAddedWords.IMPORT_DEFAULT_MAX_WORDS,
+			SettingsAddedWords.IMPORT_RAISED_MAX_WORDS
+		));
+	}
+}
diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsAddedWords.java b/app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsAddedWords.java
@@ -0,0 +1,33 @@
+package io.github.sspanak.tt9.preferences.settings;
+
+import android.content.Context;
+
+import io.github.sspanak.tt9.preferences.screens.languages.SwitchAddWordsWithoutConfirmation;
+import io.github.sspanak.tt9.preferences.screens.languages.SwitchRaiseImportLimits;
+
+public class SettingsAddedWords extends BaseSettings {
+	public final static int IMPORT_DEFAULT_MAX_FILE_LINES = 250;
+	public final static int IMPORT_DEFAULT_MAX_WORDS = 1000;
+	public final static int IMPORT_RAISED_MAX_FILE_LINES = 10_000;
+	public final static int IMPORT_RAISED_MAX_WORDS = 100_000;
+
+	SettingsAddedWords(Context context) {
+		super(context);
+	}
+
+	public boolean getAddWordsNoConfirmation() {
+		return prefs.getBoolean(SwitchAddWordsWithoutConfirmation.NAME, false);
+	}
+
+	public boolean getRaiseImportLimits() {
+		return prefs.getBoolean(SwitchRaiseImportLimits.NAME, SwitchRaiseImportLimits.DEFAULT);
+	}
+
+	public int getImportWordsMaxFileLines() {
+		return getRaiseImportLimits() ? IMPORT_RAISED_MAX_FILE_LINES : IMPORT_DEFAULT_MAX_FILE_LINES;
+	}
+
+	public int getImportWordsMaxWords() {
+		return getRaiseImportLimits() ? IMPORT_RAISED_MAX_WORDS : IMPORT_DEFAULT_MAX_WORDS;
+	}
+}
diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsHacks.java b/app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsHacks.java
@@ -8,7 +8,7 @@
 import io.github.sspanak.tt9.util.Logger;
 import io.github.sspanak.tt9.util.sys.DeviceInfo;
 
-class SettingsHacks extends BaseSettings {
+class SettingsHacks extends SettingsAddedWords {
 	public static final int COMPOSING_TEXT_RESTART_THRESHOLD = 150; // ms
 
 	private boolean demoMode = false;
diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsStatic.java b/app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsStatic.java
@@ -10,8 +10,6 @@ public class SettingsStatic extends SettingsColors {
 	public static final int BACKSPACE_ACCELERATION_MAX_CHARS_NO_SPACE = 4; // maximum chars to be deleted at once for languages with no spaces
 	public static final int BACKSPACE_ACCELERATION_REPEAT_DEBOUNCE = 5;
 	public final static int CLIPBOARD_PREVIEW_LENGTH = 20;
-	public final static int CUSTOM_WORDS_IMPORT_MAX_LINES = 250;
-	public final static int CUSTOM_WORDS_MAX = 1000;
 	public final static int CUSTOM_WORDS_SEARCH_RESULTS_MAX = 50;
 	public final static int DICTIONARY_AUTO_LOAD_COOLDOWN_TIME = 1200000; // 20 minutes in ms
 	public final static int DICTIONARY_DOWNLOAD_CONNECTION_TIMEOUT = 10000; // ms
diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsUI.java b/app/src/main/java/io/github/sspanak/tt9/preferences/settings/SettingsUI.java
@@ -14,7 +14,6 @@
 import io.github.sspanak.tt9.preferences.screens.appearance.SwitchDoubleTapResize;
 import io.github.sspanak.tt9.preferences.screens.appearance.SwitchDragResize;
 import io.github.sspanak.tt9.preferences.screens.appearance.SwitchKeyShadows;
-import io.github.sspanak.tt9.preferences.screens.languages.AddWordsWithoutConfirmationSwitch;
 import io.github.sspanak.tt9.util.Logger;
 import io.github.sspanak.tt9.util.sys.DeviceInfo;
 
@@ -53,10 +52,6 @@ public class SettingsUI extends SettingsTyping {
 		}
 	}
 
-	public boolean getAddWordsNoConfirmation() {
-		return prefs.getBoolean(AddWordsWithoutConfirmationSwitch.NAME, false);
-	}
-
 	public boolean getNotificationsApproved() {
 		return !DeviceInfo.AT_LEAST_ANDROID_13 || getStringifiedInt("pref_asked_for_notifications_version", 0) == Integer.MAX_VALUE;
 	}
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
@@ -79,6 +79,7 @@
 	<string name="dictionary_import_error_malformed_line">Неочакван формат на дума: „%1$s“ на ред %2$d.</string>
 	<string name="dictionary_import_error_too_many_words">Хранилището за добавени думи е пълно. Не можете да импортирате повече думи.</string>
 	<string name="delete">Изтрий</string>
+	<string name="dictionary_import_raise_import_limits_summary">Увеличаване на максималния брой думи на файл от %1$d на %2$d и общия брой думи от %3$d на %4$d.\nВнимание! Импортирането на твърде много думи може да забави писането.</string>
 	<string name="delete_words_link_summary">Намери и изтрий на неправилно написани или ненужни думи.</string>
 	<string name="search_results">Намерени думи</string>
 	<string name="search_results_void">Няма резултати.</string>
@@ -269,4 +270,5 @@
 	<string name="pref_auto_trim_trailing_space">Автоматично премахване на крайните интервали</string>
 	<string name="edit_word_invalid_characters">Не може да се редактира „%1$s“, когато езикът е „%2$s“.</string>
 	<string name="edit_word_not_available_in_language">Редактирането на думи не е възможно за този език.</string>
+	<string name="dictionary_import_raise_import_limits">Повишаване на ограниченията за импорт</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -133,6 +133,7 @@
 	<string name="dictionary_import_error_malformed_line">Unerwartetes Wortformat: \"%1$s\" in Zeile %2$d.</string>
 	<string name="dictionary_import_error_too_many_words">Der Speicher für hinzugefügte Wörter ist voll. Sie können keine weiteren Wörter importieren.</string>
 	<string name="delete">Löschen</string>
+	<string name="dictionary_import_raise_import_limits_summary">Maximale Anzahl von Wörtern pro Datei von %1$d auf %2$d und die Gesamtzahl der Wörter von %3$d auf %4$d erhöhen.\nWarnung! Das Importieren zu vieler Wörter kann die Eingabe verlangsamen.</string>
 	<string name="delete_words_link_summary">Finde und lösche falsch geschriebene oder überflüssige Wörter.</string>
 	<string name="search_results">Suchergebnisse</string>
 	<string name="search_results_void">Keine Ergebnisse.</string>
@@ -271,4 +272,5 @@
 	<string name="pref_auto_trim_trailing_space">Nachfolgende Leerzeichen automatisch entfernen</string>
 	<string name="edit_word_invalid_characters">„%1$s“ kann nicht bearbeitet werden, wenn die Sprache „%2$s“ ist.</string>
 	<string name="edit_word_not_available_in_language">Das Bearbeiten von Wörtern ist in dieser Sprache nicht möglich.</string>
+	<string name="dictionary_import_raise_import_limits">Importbeschränkungen erhöhen</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -152,6 +152,7 @@
 	<string name="dictionary_import_error_malformed_line">Formato de palabra inesperado: \"%1$s\" en la línea %2$d.</string>
 	<string name="dictionary_import_error_too_many_words">El almacenamiento de palabras añadidas está lleno. No puede importar más palabras.</string>
 	<string name="delete">Eliminar</string>
+	<string name="dictionary_import_raise_import_limits_summary">Aumentar el número máximo de palabras por archivo de %1$d a %2$d y el número total de palabras de %3$d a %4$d.\nAdvertencia: importar demasiadas palabras puede ralentizar la escritura.</string>
 	<string name="delete_words_link_summary">Buscar y eliminar palabras mal escritas o innecesarias.</string>
 	<string name="search_results">Palabras encontradas</string>
 	<string name="search_results_void">Sin resultados.</string>
@@ -269,4 +270,5 @@
 	<string name="pref_auto_trim_trailing_space">Eliminar automáticamente los espacios finales</string>
 	<string name="edit_word_invalid_characters">No se puede editar \"%1$s\" cuando el idioma es \"%2$s\".</string>
 	<string name="edit_word_not_available_in_language">No es posible editar palabras en este idioma.</string>
+	<string name="dictionary_import_raise_import_limits">Aumentar restricciones de importación</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -152,6 +152,7 @@
 	<string name="dictionary_import_error_malformed_line">Format de mot inattendu : « %1$s » à la ligne %2$d.</string>
 	<string name="dictionary_import_error_too_many_words">Le stockage des mots ajoutés est plein. Vous ne pouvez plus importer de mots.</string>
 	<string name="delete">Supprimer</string>
+	<string name="dictionary_import_raise_import_limits_summary">Augmenter le nombre maximal de mots par fichier de %1$d à %2$d et le nombre total de mots de %3$d à %4$d.\nAttention ! L’importation d’un trop grand nombre de mots peut ralentir la saisie.</string>
 	<string name="delete_words_link_summary">Trouver et supprimer des mots mal orthographiés ou inutiles.</string>
 	<string name="search_results">Mots trouvés</string>
 	<string name="search_results_void">Aucun résultat.</string>
@@ -269,4 +270,5 @@
 	<string name="pref_auto_trim_trailing_space">Supprimer automatiquement les espaces de fin</string>
 	<string name="edit_word_invalid_characters">Impossible de modifier « %1$s » lorsque la langue est « %2$s ».</string>
 	<string name="edit_word_not_available_in_language">La modification des mots n’est pas possible dans cette langue.</string>
+	<string name="dictionary_import_raise_import_limits">Augmenter les restrictions d’importation</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -134,6 +134,7 @@
 	<string name="dictionary_import_error_malformed_line">Formato di parola imprevisto: \"%1$s\" alla linea %2$d.</string>
 	<string name="dictionary_import_error_too_many_words">Lo spazio di archiviazione delle parole aggiunte è pieno. Non è possibile importare altre parole.</string>
 	<string name="delete">Elimina</string>
+	<string name="dictionary_import_raise_import_limits_summary">Aumentare il numero massimo di parole per file da %1$d a %2$d e il numero totale di parole da %3$d a %4$d.\nAttenzione! L’importazione di troppe parole può rallentare la digitazione.</string>
 	<string name="delete_words_link_summary">Trova ed elimina parole errate o non necessarie.</string>
 	<string name="search_results">Parole trovate</string>
 	<string name="search_results_void">Nessun risultato.</string>
@@ -272,5 +273,6 @@
 	<string name="pref_auto_trim_trailing_space">Rimuovere automaticamente gli spazi finali</string>
 	<string name="edit_word_invalid_characters">Impossibile modificare \"%1$s\" quando la lingua è \"%2$s\".</string>
 	<string name="edit_word_not_available_in_language">La modifica delle parole non è possibile in questa lingua.</string>
+	<string name="dictionary_import_raise_import_limits">Aumentare le restrizioni di importazione</string>
 </resources>
 
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
@@ -151,6 +151,7 @@
 	<string name="dictionary_import_error_malformed_line">תבנית מילה בלתי צפויה: \"%1$s\" בשורה %2$d.</string>
 	<string name="dictionary_import_error_too_many_words">אחסון המילים שהתווספו מלא. אינך יכול לייבא עוד מילים.</string>
 	<string name="delete">מחיקה</string>
+	<string name="dictionary_import_raise_import_limits_summary">הגדלת מספר המילים המרבי לכל קובץ מ־%1$d ל־%2$d ואת מספר המילים הכולל מ־%3$d ל־%4$d.\nאזהרה! ייבוא של יותר מדי מילים עלול לגרום להאטה בהקלדה.</string>
 	<string name="delete_words_link_summary">מצא ומחק מילים שכתובות בטעות או שאינן נדרשות.</string>
 	<string name="search_results">תוצאות חיפוש</string>
 	<string name="search_results_void">אין תוצאות.</string>
@@ -276,4 +277,5 @@
 	<string name="pref_auto_trim_trailing_space">הסרה אוטומטית של רווחים בסוף</string>
 	<string name="edit_word_invalid_characters">לא ניתן לערוך \"%1$s\" כאשר השפה היא \"%2$s\".</string>
 	<string name="edit_word_not_available_in_language">עריכת מילים אינה אפשרית בשפה זו.</string>
+	<string name="dictionary_import_raise_import_limits">הגדלת מגבלות הייבוא</string>
 </resources>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
@@ -170,6 +170,7 @@
 	<string name="dictionary_import_error_malformed_line">Nenumatytas žodžio formatas: „%1$s“ eilutėje %2$d.</string>
 	<string name="dictionary_import_error_too_many_words">Pridėtų žodžių saugykla yra pilna. Daugiau žodžių importuoti negalite.</string>
 	<string name="delete">Ištrinti</string>
+	<string name="dictionary_import_raise_import_limits_summary">Padidinti maksimalų žodžių skaičių faile nuo %1$d iki %2$d ir bendrą žodžių skaičių nuo %3$d iki %4$d.\nĮspėjimas! Importavus per daug žodžių, gali sulėtėti rašymas.</string>
 	<string name="delete_words_link_summary">Raskite ir ištrinkite neteisingai parašytus arba nereikalingus žodžius.</string>
 	<string name="search_results">Paieškos rezultatai</string>
 	<string name="search_results_void">Jokių rezultatų.</string>
@@ -278,4 +279,5 @@
 	<string name="pref_auto_trim_trailing_space">Automatiškai šalinti pabaigos tarpus</string>
 	<string name="edit_word_invalid_characters">Negalima redaguoti „%1$s“, kai kalba yra „%2$s“.</string>
 	<string name="edit_word_not_available_in_language">Žodžių redagavimas šia kalba negalimas.</string>
+	<string name="dictionary_import_raise_import_limits">Padidinti importo apribojimus</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
diff --git a/app/src/main/res/xml/prefs_screen_languages.xml b/app/src/main/res/xml/prefs_screen_languages.xml

Original file line number	Diff line number	Diff line change
`@@ -46,12 +46,12 @@ protected boolean onClick(Preference p) {`
`46`	`46`	`@Override`
`47`	`47`	`protected boolean onStartProcessing() {`
`48`	`48`	`lastError = "";`
`49`		`- lastProgress = -1;`
	`49`	`+ lastProgress = 0;`
`50`	`50`	`return false;`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`private void onProgress(float progress) {`
`54`		`- final String formattedProgress = (lastProgress - progress) < 2 ? String.format(Locale.getDefault(), "%1.3f%%", progress) : progress + "%";`
	`54`	`+ final String formattedProgress = (progress - lastProgress) < 2 ? String.format(Locale.getDefault(), "%1.3f%%", progress) : progress + "%";`
`55`	`55`	`final String loadingMsg = activity.getString(R.string.dictionary_import_progress, formattedProgress);`
`56`	`56`	`lastProgress = progress;`
`57`	`57`
`@@ -128,6 +128,6 @@ void onFileSelected(ActivityResult result) {`
`128`	`128`	`return;`
`129`	`129`	`}`
`130`	`130`
`131`		`- getProcessor().run(activity, file);`
	`131`	`+ getProcessor().run(activity, activity.getSettings(), file);`
`132`	`132`	`}`
`133`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@`
`14`	`14`	`import io.github.sspanak.tt9.preferences.screens.appearance.SwitchDoubleTapResize;`
`15`	`15`	`import io.github.sspanak.tt9.preferences.screens.appearance.SwitchDragResize;`
`16`	`16`	`import io.github.sspanak.tt9.preferences.screens.appearance.SwitchKeyShadows;`
`17`		`-import io.github.sspanak.tt9.preferences.screens.languages.AddWordsWithoutConfirmationSwitch;`
`18`	`17`	`import io.github.sspanak.tt9.util.Logger;`
`19`	`18`	`import io.github.sspanak.tt9.util.sys.DeviceInfo;`
`20`	`19`
`@@ -53,10 +52,6 @@ public class SettingsUI extends SettingsTyping {`
`53`	`52`	`}`
`54`	`53`	`}`
`55`	`54`
`56`		`- public boolean getAddWordsNoConfirmation() {`
`57`		`- return prefs.getBoolean(AddWordsWithoutConfirmationSwitch.NAME, false);`
`58`		`- }`
`59`		`-`
`60`	`55`	`public boolean getNotificationsApproved() {`
`61`	`56`	`return !DeviceInfo.AT_LEAST_ANDROID_13 \|\| getStringifiedInt("pref_asked_for_notifications_version", 0) == Integer.MAX_VALUE;`
`62`	`57`	`}`