From 78b78923cf0bf652a0c6cea63907008f9f06e156 Mon Sep 17 00:00:00 2001 From: sspanak Date: Tue, 10 Jun 2025 13:28:52 +0300 Subject: [PATCH] fixed a NullPointerException when loading a dictionary from an update notification --- .../sspanak/tt9/db/words/DictionaryLoader.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/io/github/sspanak/tt9/db/words/DictionaryLoader.java b/app/src/main/java/io/github/sspanak/tt9/db/words/DictionaryLoader.java index 945480ea..cf634c7b 100644 --- a/app/src/main/java/io/github/sspanak/tt9/db/words/DictionaryLoader.java +++ b/app/src/main/java/io/github/sspanak/tt9/db/words/DictionaryLoader.java @@ -108,7 +108,7 @@ public class DictionaryLoader { public static void load(Context context, Language language) { - self.load(context, new ArrayList<>() {{ add(language); }}); + getInstance(context).load(context, new ArrayList<>() {{ add(language); }}); } @@ -125,7 +125,7 @@ public class DictionaryLoader { DataStore.getLastLanguageUpdateTime( (hash) -> { - self.lastAutoLoadAttemptTime.put(language.getId(), System.currentTimeMillis()); + getInstance(context).lastAutoLoadAttemptTime.put(language.getId(), System.currentTimeMillis()); // no words at all, load without confirmation if (hash.isEmpty()) { @@ -206,12 +206,12 @@ public class DictionaryLoader { } catch (DictionaryImportAbortedException e) { sqlite.failTransaction(); stop(); - self.lastAutoLoadAttemptTime.put(language.getId(), null); + lastAutoLoadAttemptTime.put(language.getId(), null); Logger.i(LOG_TAG, e.getMessage() + ". File '" + language.getDictionaryFile() + "' not imported."); } catch (DictionaryImportException e) { stop(); sqlite.failTransaction(); - self.lastAutoLoadAttemptTime.put(language.getId(), null); + lastAutoLoadAttemptTime.put(language.getId(), null); sendImportError(DictionaryImportException.class.getSimpleName(), language.getId(), e.line); Logger.e( @@ -226,9 +226,9 @@ public class DictionaryLoader { sendError(e.getClass().getSimpleName(), language.getId()); if (e instanceof UnknownHostException) { - self.lastAutoLoadAttemptTime.put(language.getId(), System.currentTimeMillis()); + lastAutoLoadAttemptTime.put(language.getId(), System.currentTimeMillis()); } else { - self.lastAutoLoadAttemptTime.put(language.getId(), null); + lastAutoLoadAttemptTime.put(language.getId(), null); } Logger.e(