Refine history retention and release build setup

Author: pluja

app/build.gradle.kts

@@ -42,6 +42,7 @@ android {
         release {
             signingConfig = signingConfigs.getByName("debug")
             isMinifyEnabled = true
+            isShrinkResources = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
@@ -106,8 +107,8 @@ dependencies {
     implementation(libs.retrofit)
     implementation(libs.retrofit.converter.gson)
     implementation(libs.okhttp)
-    implementation(libs.okhttp.logging)
     implementation(libs.gson)
+    debugImplementation(libs.okhttp.logging)
 
     // DataStore
     implementation(libs.datastore.preferences)

app/src/debug/java/com/sasayaki/di/OkHttpDebugLogging.kt

@@ -0,0 +1,12 @@
+package com.sasayaki.di
+
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
+
+internal fun OkHttpClient.Builder.applyDebugLogging(): OkHttpClient.Builder {
+    return addInterceptor(
+        HttpLoggingInterceptor().apply {
+            level = HttpLoggingInterceptor.Level.BASIC
+        }
+    )
+}

app/src/main/java/com/sasayaki/SasayakiApp.kt

@@ -1,7 +1,24 @@
 package com.sasayaki
 
 import android.app.Application
+import com.sasayaki.data.preferences.PreferencesDataStore
 import dagger.hilt.android.HiltAndroidApp
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.launch
+import javax.inject.Inject
 
 @HiltAndroidApp
-class SasayakiApp : Application()
+class SasayakiApp : Application() {
+    @Inject lateinit var preferencesDataStore: PreferencesDataStore
+
+    private val startupScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+
+    override fun onCreate() {
+        super.onCreate()
+        startupScope.launch {
+            preferencesDataStore.runStartupMigrations()
+        }
+    }
+}

app/src/main/java/com/sasayaki/data/db/dao/DictationDao.kt

@@ -19,10 +19,10 @@ interface DictationDao {
     suspend fun getRawText(id: Long): String?
 
     @Query("UPDATE dictations SET text = '', rawText = '', sourceApp = NULL, historyVisible = 0 WHERE id = :id")
-    suspend fun delete(id: Long)
+    suspend fun removeFromHistory(id: Long)
 
     @Query("UPDATE dictations SET text = '', rawText = '', sourceApp = NULL, historyVisible = 0 WHERE historyVisible = 1")
-    suspend fun clearHistory()
+    suspend fun removeAllFromHistory()
 
     @Query("DELETE FROM dictations WHERE id NOT IN (SELECT id FROM dictations ORDER BY timestamp DESC LIMIT :keep)")
     suspend fun pruneOldEntries(keep: Int)

app/src/main/java/com/sasayaki/data/preferences/PreferencesDataStore.kt

@@ -16,6 +16,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import java.io.IOException
 import javax.inject.Inject
@@ -56,8 +57,6 @@ class PreferencesDataStore @Inject constructor(
             }
         }
         .map { prefs ->
-        migrateLegacySecretsIfNeeded(prefs)
-
         UserPreferences(
             asrBaseUrl = prefs[Keys.ASR_BASE_URL] ?: "",
             asrApiKey = securePreferencesStore.getAsrApiKey(),
@@ -142,6 +141,10 @@ class PreferencesDataStore @Inject constructor(
         }
     }
 
+    suspend fun runStartupMigrations() {
+        migrateLegacySecretsIfNeeded(context.dataStore.data.first())
+    }
+
     private fun resolveActiveLanguage(prefs: Preferences): String? {
         val preferred = parsePreferredLanguages(prefs)
         val active = prefs[Keys.ACTIVE_LANGUAGE]

app/src/main/java/com/sasayaki/di/NetworkModule.kt

@@ -1,13 +1,11 @@
 package com.sasayaki.di
 
-import com.sasayaki.BuildConfig
 import com.sasayaki.data.api.ApiClientFactory
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import okhttp3.OkHttpClient
-import okhttp3.logging.HttpLoggingInterceptor
 import java.util.concurrent.TimeUnit
 import javax.inject.Singleton
 
@@ -21,15 +19,7 @@ object NetworkModule {
             .connectTimeout(30, TimeUnit.SECONDS)
             .readTimeout(60, TimeUnit.SECONDS)
             .writeTimeout(60, TimeUnit.SECONDS)
-            .apply {
-                if (BuildConfig.DEBUG) {
-                    addInterceptor(
-                        HttpLoggingInterceptor().apply {
-                            level = HttpLoggingInterceptor.Level.BASIC
-                        }
-                    )
-                }
-            }
+            .applyDebugLogging()
             .build()
     }
 

app/src/main/java/com/sasayaki/service/FanMenuController.kt

@@ -113,7 +113,7 @@ class FanMenuController(
                     active = prefs.llmEnabled
                 ),
                 FanMenuItem(
-                    label = "HIST",
+                    label = "SAVE",
                     active = prefs.historyEnabled
                 )
             )

app/src/main/java/com/sasayaki/ui/history/HistoryScreen.kt

@@ -105,7 +105,7 @@ fun HistoryScreen(
                         HistoryCard(
                             dictation = dictation,
                             onCopy = { copyToClipboard(context, dictation.text) },
-                            onDelete = { viewModel.delete(dictation.id) },
+                            onDelete = { viewModel.removeFromHistory(dictation.id) },
                             onLoadRawText = { viewModel.getRawText(dictation.id) }
                         )
                     }
@@ -122,7 +122,7 @@ fun HistoryScreen(
             confirmButton = {
                 TextButton(
                     onClick = {
-                        viewModel.clearHistory()
+                        viewModel.removeAllFromHistory()
                         showClearHistoryDialog = false
                     }
                 ) {

app/src/main/java/com/sasayaki/ui/history/HistoryViewModel.kt

@@ -48,15 +48,15 @@ class HistoryViewModel @Inject constructor(
             }
     }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), emptyList())
 
-    fun delete(id: Long) {
+    fun removeFromHistory(id: Long) {
         viewModelScope.launch {
-            dictationDao.delete(id)
+            dictationDao.removeFromHistory(id)
         }
     }
 
-    fun clearHistory() {
+    fun removeAllFromHistory() {
         viewModelScope.launch {
-            dictationDao.clearHistory()
+            dictationDao.removeAllFromHistory()
         }
     }
 

app/src/release/java/com/sasayaki/di/OkHttpDebugLogging.kt

@@ -0,0 +1,5 @@
+package com.sasayaki.di
+
+import okhttp3.OkHttpClient
+
+internal fun OkHttpClient.Builder.applyDebugLogging(): OkHttpClient.Builder = this