Loading core/android/account/src/main/kotlin/net/thunderbird/core/android/account/AccountDefaultsProvider.kt +3 −0 Original line number Diff line number Diff line Loading @@ -53,5 +53,8 @@ interface AccountDefaultsProvider { const val NO_OPENPGP_KEY: Long = 0 const val UNASSIGNED_ACCOUNT_NUMBER = -1 // TODO : Remove once storage is migrated to new format const val COLOR = 0x0099CC } } feature/account/storage/legacy/src/main/kotlin/net/thunderbird/feature/account/storage/legacy/LegacyProfileDtoStorageHandler.kt +2 −4 Original line number Diff line number Diff line package net.thunderbird.feature.account.storage.legacy import net.thunderbird.core.android.account.AccountDefaultsProvider import net.thunderbird.core.android.account.LegacyAccount import net.thunderbird.core.preference.storage.Storage import net.thunderbird.core.preference.storage.StorageEditor Loading @@ -16,7 +17,7 @@ class LegacyProfileDtoStorageHandler( with(data) { name = storage.getStringOrNull(keyGen.create(KEY_NAME)) chipColor = storage.getInt(keyGen.create(KEY_COLOR), FALLBACK_ACCOUNT_COLOR) chipColor = storage.getInt(keyGen.create(KEY_COLOR), AccountDefaultsProvider.COLOR) } avatarDtoStorageHandler.load(data, storage) Loading Loading @@ -53,8 +54,5 @@ class LegacyProfileDtoStorageHandler( private companion object Companion { const val KEY_COLOR = "chipColor" const val KEY_NAME = "description" // TODO why? const val FALLBACK_ACCOUNT_COLOR = 0x0099CC } } Loading
core/android/account/src/main/kotlin/net/thunderbird/core/android/account/AccountDefaultsProvider.kt +3 −0 Original line number Diff line number Diff line Loading @@ -53,5 +53,8 @@ interface AccountDefaultsProvider { const val NO_OPENPGP_KEY: Long = 0 const val UNASSIGNED_ACCOUNT_NUMBER = -1 // TODO : Remove once storage is migrated to new format const val COLOR = 0x0099CC } }
feature/account/storage/legacy/src/main/kotlin/net/thunderbird/feature/account/storage/legacy/LegacyProfileDtoStorageHandler.kt +2 −4 Original line number Diff line number Diff line package net.thunderbird.feature.account.storage.legacy import net.thunderbird.core.android.account.AccountDefaultsProvider import net.thunderbird.core.android.account.LegacyAccount import net.thunderbird.core.preference.storage.Storage import net.thunderbird.core.preference.storage.StorageEditor Loading @@ -16,7 +17,7 @@ class LegacyProfileDtoStorageHandler( with(data) { name = storage.getStringOrNull(keyGen.create(KEY_NAME)) chipColor = storage.getInt(keyGen.create(KEY_COLOR), FALLBACK_ACCOUNT_COLOR) chipColor = storage.getInt(keyGen.create(KEY_COLOR), AccountDefaultsProvider.COLOR) } avatarDtoStorageHandler.load(data, storage) Loading Loading @@ -53,8 +54,5 @@ class LegacyProfileDtoStorageHandler( private companion object Companion { const val KEY_COLOR = "chipColor" const val KEY_NAME = "description" // TODO why? const val FALLBACK_ACCOUNT_COLOR = 0x0099CC } }