Release v1.8.197 — route DictionaryManager logging through Flog + DICTIONARY topic (F39)

Convert 9 android.util.Log calls (no @Suppress present) to flog*/flogError/flogInfo
under a new LogTopic.DICTIONARY (0x00_08_00_00u), so dictionary diagnostics use the
project's Flog topic filtering + tag formatting like every other subsystem. The two
critical paths (encrypted store unavailable after recreation; migration failed ->
restoring plaintext) are flogError; the rest stay warnings. Drop the now-unused Log
import + TAG. Dictionary test package green.

Author: SysAdminDoc

CHANGELOG.md

@@ -2,6 +2,36 @@
 
 All SwiftFloris release history is consolidated here. This replaces the former root-level `RELEASE_NOTES_v*.md` file-per-release pattern.
 
+<a id="v1.8.197"></a>
+## v1.8.197
+
+Released: 2026-05-28
+
+### Route DictionaryManager logging through Flog + a DICTIONARY topic (RESEARCH_FEATURE_PLAN.md F39)
+
+`DictionaryManager` logged via `android.util.Log` (a private `TAG`), bypassing the project's `Flog` infrastructure that every other subsystem uses. The audit found 9 such calls (8 `Log.w` + 1 `Log.i`) and — contrary to the second-pass estimate — **no** `@Suppress` annotations to triage. Each call sits on a legitimate failure path (encrypted-store open/recreate failure, plaintext→SQLCipher migration read/stage/restore failures, backup-file delete/rename failures), so the catches stay; only the logging channel changes.
+
+All 9 are converted to `flogWarning` / `flogError` / `flogInfo` under a new `LogTopic.DICTIONARY` (`0x00_08_00_00u`), so dictionary diagnostics participate in Flog's topic filtering and consistent tag formatting. The two critical paths (encrypted store unavailable *after* recreation; migration failed → restoring plaintext) are promoted to `flogError`; the rest stay warnings; the successful-migration line stays info. The now-unused `android.util.Log` import and `TAG` constant are removed.
+
+### Changes
+
+- **`lib/devtools/LogTopic.kt`** — add `DICTIONARY = 0x00_08_00_00u` (next 2^n after `EXT_INDEXING`).
+- **`ime/dictionary/DictionaryManager.kt`** — 9 `Log.*` → `flog*(LogTopic.DICTIONARY)`; drop the `Log` import and `TAG`.
+
+### Verification
+
+- `grep` confirms no residual `Log.` / `TAG` / `android.util.Log` in the file.
+- `./gradlew :app:testDebugUnitTest --tests "dev.patrickgold.florisboard.ime.dictionary.*"` → green (main recompiled clean).
+
+### Files Touched
+
+- `app/src/main/kotlin/dev/patrickgold/florisboard/lib/devtools/LogTopic.kt`
+- `app/src/main/kotlin/dev/patrickgold/florisboard/ime/dictionary/DictionaryManager.kt`
+- `fastlane/metadata/android/en-US/changelogs/1997.txt` (new)
+- `gradle.properties` (versionCode 1996→1997, versionName 1.8.196→1.8.197)
+- `README.md` (version badge)
+- `TODO.md` (F39 ticked)
+
 <a id="v1.8.196"></a>
 ## v1.8.196
 

README.md

@@ -1,6 +1,6 @@
 # SwiftFloris
 
-![Version](https://img.shields.io/badge/version-v1.8.196-blue) ![License](https://img.shields.io/badge/license-Apache%202.0-green) ![Platform](https://img.shields.io/badge/platform-Android%208.0+-orange) ![Network](https://img.shields.io/badge/network-none-lightgrey) ![SwiftKey migration](https://img.shields.io/badge/SwiftKey%20migration-window%20closes%202026--05--31-red)
+![Version](https://img.shields.io/badge/version-v1.8.197-blue) ![License](https://img.shields.io/badge/license-Apache%202.0-green) ![Platform](https://img.shields.io/badge/platform-Android%208.0+-orange) ![Network](https://img.shields.io/badge/network-none-lightgrey) ![SwiftKey migration](https://img.shields.io/badge/SwiftKey%20migration-window%20closes%202026--05--31-red)
 
 **SwiftFloris** is a privacy-first Android keyboard, forked from FlorisBoard and pushed toward SwiftKey-class multilingual typing without the cloud. It ships under Apache-2.0, holds no `INTERNET` permission, and binds zero accounts.
 

TODO.md

@@ -84,8 +84,9 @@ the maintainer's other VM). Auto-commit-and-push per logical change.
   `internal object`s targeted by the engine-named tests; providers are the
   stateful public classes. Architecture correct — added a clarifying doc note.
   **Shipped v1.8.196 (2026-05-28).**
-- [ ] **F39** (P2) — `DictionaryManager.kt` Log.w/Log.e + `@Suppress` audit; convert
-  silent swallows to `flog*` with context (v1.8.184 convention) or justify each.
+- [x] **F39** (P2) — `DictionaryManager.kt` logging audit: 9 `Log.*` calls (no
+  `@Suppress` found) routed through `flog*` under a new `LogTopic.DICTIONARY`;
+  critical paths promoted to `flogError`. **Shipped v1.8.197 (2026-05-28).**
 - [ ] **EI1** (P2) — Partition `AppPrefs.kt` (~1,301 LOC) by feature area
   (`app/prefs/*Prefs.kt`), re-exporting the merged `AppPrefs`. Golden test: same key
   set + defaults before/after. Datastore keys MUST NOT change.

app/src/main/kotlin/dev/patrickgold/florisboard/ime/dictionary/DictionaryManager.kt

@@ -17,20 +17,22 @@
 package dev.patrickgold.florisboard.ime.dictionary
 
 import android.content.Context
-import android.util.Log
 import androidx.room.Room
 import dev.patrickgold.florisboard.app.FlorisPreferenceStore
 import dev.patrickgold.florisboard.ime.nlp.SuggestionCandidate
 import dev.patrickgold.florisboard.ime.nlp.WordSuggestionCandidate
 import dev.patrickgold.florisboard.lib.FlorisLocale
+import dev.patrickgold.florisboard.lib.devtools.LogTopic
+import dev.patrickgold.florisboard.lib.devtools.flogError
+import dev.patrickgold.florisboard.lib.devtools.flogInfo
+import dev.patrickgold.florisboard.lib.devtools.flogWarning
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import java.io.File
 import java.lang.ref.WeakReference
 
-private const val TAG = "DictionaryManager"
 private const val FLORIS_USER_DICTIONARY_SOURCE_PRIORITY = 0
 private const val SYSTEM_USER_DICTIONARY_SOURCE_PRIORITY = 1
 private const val SHORTCUT_MATCH_PRIORITY = 0
@@ -365,15 +367,15 @@ class DictionaryManager private constructor(context: Context) {
             database.userDictionaryDao().queryLanguageList()
             database
         }.getOrElse { error ->
-            Log.w(TAG, "Encrypted user dictionary could not be opened; recreating empty store: ${error.message}")
+            flogWarning(LogTopic.DICTIONARY) { "Encrypted user dictionary could not be opened; recreating empty store: ${error.message}" }
             database.close()
             deleteFlorisUserDictionaryDatabaseFiles(context)
             val replacement = buildEncryptedFlorisUserDictionary(context) ?: return null
             runCatching {
                 replacement.userDictionaryDao().queryLanguageList()
                 replacement
             }.getOrElse { replacementError ->
-                Log.w(TAG, "Encrypted user dictionary unavailable after recreation: ${replacementError.message}")
+                flogError(LogTopic.DICTIONARY) { "Encrypted user dictionary unavailable after recreation: ${replacementError.message}" }
                 replacement.close()
                 null
             }
@@ -406,14 +408,14 @@ class DictionaryManager private constructor(context: Context) {
                 plaintextDatabase.close()
             }
         }.getOrElse { error ->
-            Log.w(TAG, "Unable to read plaintext user dictionary for encryption migration: ${error.message}")
+            flogWarning(LogTopic.DICTIONARY) { "Unable to read plaintext user dictionary for encryption migration: ${error.message}" }
             return false
         }
 
         val backups = runCatching {
             moveFlorisUserDictionaryDatabaseFilesAside(context)
         }.getOrElse { error ->
-            Log.w(TAG, "Unable to stage plaintext user dictionary for encryption migration: ${error.message}")
+            flogWarning(LogTopic.DICTIONARY) { "Unable to stage plaintext user dictionary for encryption migration: ${error.message}" }
             return false
         }
 
@@ -430,10 +432,10 @@ class DictionaryManager private constructor(context: Context) {
             }
             encryptedDatabase.close()
             deleteBackedUpFlorisUserDictionaryDatabaseFiles(backups)
-            Log.i(TAG, "Migrated ${entries.size} user dictionary entries to encrypted SQLCipher storage")
+            flogInfo(LogTopic.DICTIONARY) { "Migrated ${entries.size} user dictionary entries to encrypted SQLCipher storage" }
             true
         }.getOrElse { error ->
-            Log.w(TAG, "Encrypted user dictionary migration failed; restoring plaintext store: ${error.message}")
+            flogError(LogTopic.DICTIONARY) { "Encrypted user dictionary migration failed; restoring plaintext store: ${error.message}" }
             encryptedDatabase.close()
             deleteFlorisUserDictionaryDatabaseFiles(context)
             restoreFlorisUserDictionaryDatabaseFiles(backups)
@@ -485,12 +487,12 @@ class DictionaryManager private constructor(context: Context) {
         var restored = true
         for ((original, backup) in backups) {
             if (original.exists() && !original.delete()) {
-                Log.w(TAG, "Could not delete ${original.name} before restoring ${backup.name}")
+                flogWarning(LogTopic.DICTIONARY) { "Could not delete ${original.name} before restoring ${backup.name}" }
                 restored = false
             }
             if (backup.exists()) {
                 if (!backup.renameTo(original)) {
-                    Log.w(TAG, "Could not restore ${backup.name} to ${original.name}")
+                    flogWarning(LogTopic.DICTIONARY) { "Could not restore ${backup.name} to ${original.name}" }
                     restored = false
                 }
             }
@@ -501,7 +503,7 @@ class DictionaryManager private constructor(context: Context) {
     private fun deleteBackedUpFlorisUserDictionaryDatabaseFiles(backups: List<DatabaseFileBackup>) {
         for ((_, backup) in backups) {
             if (backup.exists() && !backup.delete()) {
-                Log.w(TAG, "Could not delete migrated plaintext user dictionary backup ${backup.name}")
+                flogWarning(LogTopic.DICTIONARY) { "Could not delete migrated plaintext user dictionary backup ${backup.name}" }
             }
         }
     }

app/src/main/kotlin/dev/patrickgold/florisboard/lib/devtools/LogTopic.kt

@@ -49,4 +49,5 @@ object LogTopic {
     const val FILE_IO: FlogTopic =              0x00_01_00_00u
     const val EXT_MANAGER: FlogTopic =          0x00_02_00_00u
     const val EXT_INDEXING: FlogTopic =         0x00_04_00_00u
+    const val DICTIONARY: FlogTopic =           0x00_08_00_00u
 }

fastlane/metadata/android/en-US/changelogs/1997.txt

@@ -0,0 +1,3 @@
+v1.8.197 — logging consistency.
+
+Routes the personal-dictionary manager's diagnostics through the app's standard Flog system under a new "dictionary" topic, instead of raw Android logging. Failure paths (encrypted-store open/recreate, plaintext→encrypted migration, backup restore) now log with consistent formatting and topic filtering. No user-facing change.

gradle.properties

@@ -15,5 +15,5 @@ projectMinSdk=26
 projectTargetSdk=36
 projectCompileSdk=36
 
-projectVersionCode=1996
-projectVersionName=1.8.196
+projectVersionCode=1997
+projectVersionName=1.8.197