feat(account): support PNG avatars with OpenDocument picker

Author: mcbaumwolle

app-k9mail/src/main/kotlin/app/k9mail/feature/FeatureModule.kt

@@ -1,13 +1,13 @@
 package app.k9mail.feature
 
+import app.k9mail.feature.funding.api.FundingSettings
+import app.k9mail.feature.funding.featureFundingModule
 import app.k9mail.feature.migration.launcher.featureMigrationModule
 import app.k9mail.feature.onboarding.migration.onboardingMigrationModule
 import app.k9mail.feature.telemetry.telemetryModule
 import com.fsck.k9.BuildConfig
 import net.thunderbird.android.feature.mail.message.reader.api.css.DefaultCssClassNameProvider
 import net.thunderbird.feature.account.settings.featureAccountSettingsModule
-import net.thunderbird.feature.funding.api.FundingSettings
-import net.thunderbird.feature.funding.featureFundingModule
 import net.thunderbird.feature.mail.message.list.internal.featureMessageListModule
 import net.thunderbird.feature.mail.message.reader.api.css.CssClassNameProvider
 import org.koin.dsl.module

app-k9mail/src/main/kotlin/app/k9mail/feature/K9FundingSettings.kt

@@ -1,7 +1,7 @@
 package app.k9mail.feature
 
+import app.k9mail.feature.funding.api.FundingSettings
 import com.fsck.k9.K9
-import net.thunderbird.feature.funding.api.FundingSettings
 
 internal class K9FundingSettings : FundingSettings {
     override fun getReminderReferenceTimestamp(): Long = K9.fundingReminderReferenceTimestamp

app-thunderbird/src/main/kotlin/net/thunderbird/android/feature/FeatureModule.kt

@@ -1,13 +1,13 @@
 package net.thunderbird.android.feature
 
+import app.k9mail.feature.funding.api.FundingSettings
+import app.k9mail.feature.funding.featureFundingModule
 import app.k9mail.feature.migration.launcher.featureMigrationModule
 import app.k9mail.feature.onboarding.migration.onboardingMigrationModule
 import app.k9mail.feature.telemetry.telemetryModule
 import net.thunderbird.android.BuildConfig
 import net.thunderbird.android.feature.mail.message.reader.api.css.DefaultCssClassNameProvider
 import net.thunderbird.feature.account.settings.featureAccountSettingsModule
-import net.thunderbird.feature.funding.api.FundingSettings
-import net.thunderbird.feature.funding.featureFundingModule
 import net.thunderbird.feature.mail.message.list.internal.featureMessageListModule
 import net.thunderbird.feature.mail.message.reader.api.css.CssClassNameProvider
 import org.koin.dsl.module

app-thunderbird/src/main/kotlin/net/thunderbird/android/feature/TbFundingSettings.kt

@@ -1,7 +1,7 @@
 package net.thunderbird.android.feature
 
+import app.k9mail.feature.funding.api.FundingSettings
 import com.fsck.k9.K9
-import net.thunderbird.feature.funding.api.FundingSettings
 
 internal class TbFundingSettings : FundingSettings {
     override fun getReminderReferenceTimestamp(): Long = K9.fundingReminderReferenceTimestamp

core/configstore/api/src/commonMain/kotlin/net/thunderbird/core/configstore/Config.kt

@@ -3,20 +3,14 @@ package net.thunderbird.core.configstore
 /**
  * A configuration holds key-value pairs of [ConfigKey] and their corresponding values.
  *
- * This is used to store and retrieve configuration settings in a type-safe manner.
+ * It is used to store and retrieve configuration settings in a type-safe manner.
  */
 class Config(
     private val entries: MutableMap<ConfigKey<*>, Any?> = mutableMapOf(),
 ) {
-    /**
-     * Returns the value associated with the given [ConfigKey], or null if the key is not present.
-     */
     @Suppress("UNCHECKED_CAST")
     operator fun <T> get(key: ConfigKey<T>): T? = entries[key] as? T
 
-    /**
-     * Sets the value for the given [ConfigKey]. The value must be of the correct type corresponding to the key.
-     */
     operator fun <T> set(key: ConfigKey<T>, value: T) {
         entries[key] = value
     }
@@ -25,9 +19,4 @@ class Config(
      * Returns a map representation of the configuration.
      */
     fun toMap(): Map<ConfigKey<*>, Any?> = entries.toMap()
-
-    /**
-     * Returns a copy of the configuration.
-     */
-    fun copy(): Config = Config(entries.toMutableMap())
 }

core/configstore/api/src/commonMain/kotlin/net/thunderbird/core/configstore/ConfigKey.kt

@@ -16,19 +16,4 @@ sealed class ConfigKey<T>(val name: String) {
     class LongKey(name: String) : ConfigKey<Long>(name)
     class FloatKey(name: String) : ConfigKey<Float>(name)
     class DoubleKey(name: String) : ConfigKey<Double>(name)
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other == null || this::class != other::class) return false
-        other as ConfigKey<*>
-        return name == other.name
-    }
-
-    override fun hashCode(): Int {
-        return name.hashCode() + 31 * this::class.hashCode()
-    }
-
-    override fun toString(): String {
-        return "${this::class.simpleName}(name='$name')"
-    }
 }

core/configstore/api/src/commonTest/kotlin/net/thunderbird/core/configstore/ConfigKeyTest.kt

@@ -3,7 +3,6 @@ package net.thunderbird.core.configstore
 import assertk.assertThat
 import assertk.assertions.isEqualTo
 import assertk.assertions.isInstanceOf
-import assertk.assertions.isNotEqualTo
 import kotlin.test.Test
 
 class ConfigKeyTest {
@@ -85,36 +84,4 @@ class ConfigKeyTest {
         assertThat(key.name).isEqualTo(name)
         assertThat(key).isInstanceOf(ConfigKey.DoubleKey::class)
     }
-
-    @Test
-    fun `equals should return true for same key type and same name`() {
-        val key1 = ConfigKey.StringKey("test")
-        val key2 = ConfigKey.StringKey("test")
-
-        assertThat(key1).isEqualTo(key2)
-        assertThat(key1.hashCode()).isEqualTo(key2.hashCode())
-    }
-
-    @Test
-    fun `equals should return false for different key type and same name`() {
-        val key1 = ConfigKey.StringKey("test")
-        val key2 = ConfigKey.IntKey("test")
-
-        assertThat(key1).isNotEqualTo(key2)
-    }
-
-    @Test
-    fun `equals should return false for same key type and different name`() {
-        val key1 = ConfigKey.StringKey("test1")
-        val key2 = ConfigKey.StringKey("test2")
-
-        assertThat(key1).isNotEqualTo(key2)
-    }
-
-    @Test
-    fun `toString should return correct representation`() {
-        val key = ConfigKey.IntKey("myKey")
-
-        assertThat(key.toString()).isEqualTo("IntKey(name='myKey')")
-    }
 }

core/configstore/api/src/commonTest/kotlin/net/thunderbird/core/configstore/ConfigTest.kt

@@ -2,7 +2,6 @@ package net.thunderbird.core.configstore
 
 import assertk.assertThat
 import assertk.assertions.isEqualTo
-import assertk.assertions.isNotSameInstanceAs
 import assertk.assertions.isNull
 import kotlin.test.Test
 
@@ -98,19 +97,4 @@ class ConfigTest {
         assertThat(map[key1]).isEqualTo("value1")
         assertThat(map[key2]).isEqualTo(2)
     }
-
-    @Test
-    fun `copy should return a new instance with the same entries`() {
-        // Arrange
-        val config = Config()
-        val key = ConfigKey.StringKey("key")
-        config[key] = "value"
-
-        // Act
-        val copy = config.copy()
-
-        // Assert
-        assertThat(copy).isNotSameInstanceAs(config)
-        assertThat(copy[key]).isEqualTo("value")
-    }
 }