Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7a7bbfc authored by cketti's avatar cketti
Browse files

Extract strings

parent ab192ece

app/core/src/main/java/com/fsck/k9/notification/CoreKoinModule.kt

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ val coreNotificationModule = applicationContext { 
        NotificationChannelManager(

                get(),

                Executors.newSingleThreadExecutor(),

                get<Context>().getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager

                get<Context>().getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager,

                get()

        )

    }

    bean { CertificateErrorNotifications(get(), get(), get()) }

app/core/src/main/java/com/fsck/k9/notification/NotificationChannelManager.kt

+6 −7
Original line number Diff line number Diff line
@@ -13,7 +13,8 @@ import java.util.concurrent.Executor 
class NotificationChannelManager(

        private val preferences: Preferences,

        private val backgroundExecutor: Executor,

        private val notificationManager: NotificationManager

        private val notificationManager: NotificationManager,

        private val resourceProvider: NotificationResourceProvider

) {



    enum class ChannelType {
@@ -78,9 +79,8 @@ class NotificationChannelManager( 


    @RequiresApi(api = Build.VERSION_CODES.O)

    private fun getChannelMessages(account: Account): NotificationChannel {

        // TODO: Use String resource file to support language translations

        val channelName = "Messages"

        val channelDescription = "Notifications related to messages"

        val channelName = resourceProvider.messagesChannelName

        val channelDescription = resourceProvider.messagesChannelDescription

        val channelId = getChannelIdFor(account, ChannelType.MESSAGES)

        val importance = NotificationManager.IMPORTANCE_DEFAULT

        val channelGroupId = account.uuid
@@ -94,9 +94,8 @@ class NotificationChannelManager( 


    @RequiresApi(api = Build.VERSION_CODES.O)

    private fun getChannelMiscellaneous(account: Account): NotificationChannel {

        // TODO: Use String resource file to support language translations

        val channelName = "Miscellaneous"

        val channelDescription = "Miscellaneous notifications like errors etc."

        val channelName = resourceProvider.miscellaneousChannelName

        val channelDescription = resourceProvider.miscellaneousChannelDescription

        val channelId = getChannelIdFor(account, ChannelType.MISCELLANEOUS)

        val importance = NotificationManager.IMPORTANCE_DEFAULT

        val channelGroupId = account.uuid

app/core/src/main/java/com/fsck/k9/notification/NotificationResourceProvider.kt

+5 −0
Original line number Diff line number Diff line
@@ -14,6 +14,11 @@ interface NotificationResourceProvider { 
    val wearIconReplyAll: Int

    val wearIconMarkAsSpam: Int



    val messagesChannelName: String

    val messagesChannelDescription: String

    val miscellaneousChannelName: String

    val miscellaneousChannelDescription: String



    fun authenticationErrorTitle(): String

    fun authenticationErrorBody(accountName: String): String

app/core/src/test/java/com/fsck/k9/notification/TestNotificationResourceProvider.kt

+5 −0
Original line number Diff line number Diff line
@@ -14,6 +14,11 @@ class TestNotificationResourceProvider : NotificationResourceProvider { 
    override val wearIconReplyAll: Int = 11

    override val wearIconMarkAsSpam: Int = 12



    override val messagesChannelName = "Messages"

    override val messagesChannelDescription = "Notifications related to messages"

    override val miscellaneousChannelName = "Miscellaneous"

    override val miscellaneousChannelDescription = "Miscellaneous notifications like errors etc."



    override fun authenticationErrorTitle(): String = "Authentication failed"



    override fun authenticationErrorBody(accountName: String): String =

app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationResourceProvider.kt

+9 −0
Original line number Diff line number Diff line
@@ -17,6 +17,15 @@ class K9NotificationResourceProvider(private val context: Context) : Notificatio 
    override val wearIconReplyAll: Int = R.drawable.ic_reply_all_dark

    override val wearIconMarkAsSpam: Int = R.drawable.ic_alert_octagon_dark



    override val messagesChannelName: String

        get() = context.getString(R.string.notification_channel_messages_title)

    override val messagesChannelDescription: String

        get() = context.getString(R.string.notification_channel_messages_description)

    override val miscellaneousChannelName: String

        get() = context.getString(R.string.notification_channel_miscellaneous_title)

    override val miscellaneousChannelDescription: String

        get() = context.getString(R.string.notification_channel_miscellaneous_description)



    override fun authenticationErrorTitle(): String =

            context.getString(R.string.notification_authentication_error_title)