GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2024-11-25 14:50:39 +03:00
parent 299f10a1f6
commit 486f9a6c34
3 changed files with 31 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/com/tangem/tap/MainActivity.kt
View file

@ -89,6 +89,7 @@ import kotlinx.coroutines.flow.*
import timber.log.Timber
import javax.inject.Inject
import kotlin.coroutines.CoroutineContext
import kotlin.time.Duration.Companion.seconds
lateinit var tangemSdkManager: TangemSdkManager
lateinit var backupService: BackupService
@ -314,7 +315,11 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
private fun installAppTheme() {
appThemeModeFlow = createAppThemeModeFlow()
val mode = runBlocking { appThemeModeFlow.first() }
val mode = runBlocking {
withTimeoutOrNull(APP_THEME_LOAD_TIMEOUT.seconds) {
appThemeModeFlow.first()
} ?: AppThemeMode.DEFAULT
}
updateAppTheme(mode)
}
@ -581,4 +586,8 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
.onRight { Timber.d("Submitting hashes succeeded") }
}
}
companion object {
private const val APP_THEME_LOAD_TIMEOUT = 2
}
}

3
core/datasource/src/main/java/com/tangem/datasource/local/preferences/PreferencesDataStore.kt
View file

@ -10,6 +10,8 @@ import androidx.datastore.preferences.core.Preferences
import androidx.datastore.preferences.core.emptyPreferences
import androidx.datastore.preferences.preferencesDataStoreFile
import com.tangem.datasource.local.preferences.PreferencesDataStore.INSTANCE
import com.tangem.datasource.local.preferences.PreferencesKeys.APP_LOGS_KEY
import com.tangem.datasource.local.preferences.utils.CleanupKeyMigration
import com.tangem.datasource.local.preferences.utils.SharedPreferencesKeyMigration
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.SupervisorJob
@ -77,6 +79,7 @@ internal object PreferencesDataStore {
legacyKeyName = LEGACY_DEFAULT_KEY_NAME,
keyName = PreferencesKeys.BALANCE_HIDING_SETTINGS_KEY.name,
),
CleanupKeyMigration(key = APP_LOGS_KEY),
)
}
}

18
core/datasource/src/main/java/com/tangem/datasource/local/preferences/utils/CleanupKeyMigration.kt Normal file
View file

@ -0,0 +1,18 @@
package com.tangem.datasource.local.preferences.utils
import androidx.datastore.core.DataMigration
import androidx.datastore.preferences.core.Preferences
internal class CleanupKeyMigration<T>(private val key: Preferences.Key<T>) : DataMigration<Preferences> {
override suspend fun cleanUp() {
// do nothing
}
override suspend fun shouldMigrate(currentData: Preferences): Boolean = currentData.contains(key)
override suspend fun migrate(currentData: Preferences): Preferences {
currentData.toMutablePreferences().remove(key)
return currentData
}
}