From 5ff7c1ffa953de6dfc2424fc73da8a640b84bb21 Mon Sep 17 00:00:00 2001 From: Damontecres Date: Fri, 7 Nov 2025 18:23:14 -0500 Subject: [PATCH] Fix installing font --- .../github/damontecres/wholphin/MainActivity.kt | 3 +++ .../wholphin/util/AppUpgradeHandler.kt | 15 +++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/github/damontecres/wholphin/MainActivity.kt b/app/src/main/java/com/github/damontecres/wholphin/MainActivity.kt index 596168f8..8ca45aa3 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/MainActivity.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/MainActivity.kt @@ -73,6 +73,9 @@ class MainActivity : AppCompatActivity() { @OptIn(ExperimentalTvMaterial3Api::class) override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + if (savedInstanceState == null) { + appUpgradeHandler.copySubfont(false) + } Timber.i("MainActivity.onCreate") setContent { CoilConfig(okHttpClient, false) diff --git a/app/src/main/java/com/github/damontecres/wholphin/util/AppUpgradeHandler.kt b/app/src/main/java/com/github/damontecres/wholphin/util/AppUpgradeHandler.kt index 1615c60b..cd51e07a 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/util/AppUpgradeHandler.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/util/AppUpgradeHandler.kt @@ -47,7 +47,7 @@ class AppUpgradeHandler putLong(VERSION_CODE_CURRENT_KEY, newVersionCode) } try { - copySubfont() + copySubfont(true) upgradeApp( context, Version.fromString(previousVersion ?: "0.0.0"), @@ -60,14 +60,17 @@ class AppUpgradeHandler } } - private fun copySubfont() { + fun copySubfont(overwrite: Boolean) { try { - val fontFileName = "subfont.tff" + val fontFileName = "subfont.ttf" val outputFile = File(context.filesDir, fontFileName) - context.assets.open(fontFileName).use { input -> - outputFile.outputStream().use { output -> - input.copyTo(output) + if (!outputFile.exists() || overwrite) { + context.assets.open(fontFileName).use { input -> + outputFile.outputStream().use { output -> + input.copyTo(output) + } } + Timber.i("Wrote %s to local", fontFileName) } } catch (ex: Exception) { Timber.e(ex, "Exception copying subfont.tff")