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

Commit a59f9b37 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge tag `6.307` into 690-Update_to_upstream_6_307

parents 1df1bada f0bdda63

app/core/src/main/java/com/fsck/k9/mailstore/NotifierMessageStore.kt

+5 −0
Original line number Diff line number Diff line
@@ -58,6 +58,11 @@ class NotifierMessageStore( 
        notifyChange()

    }



    override fun setMoreMessages(folderId: Long, moreMessages: MoreMessages) {

        messageStore.setMoreMessages(folderId, moreMessages)

        notifyChange()

    }



    private fun notifyChange() {

        localStore.notifyChange()

    }

app/k9mail/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ android { 
        applicationId "foundation.e.mail"

        testApplicationId "foundation.e.mail.tests"



        versionCode 33006

        versionName '6.306'

        versionCode 33007

        versionName '6.307'



        // Keep in sync with the resource string array 'supported_languages'

        resConfigs "in", "br", "ca", "cs", "cy", "da", "de", "et", "en", "en_GB", "es", "eo", "eu", "fr", "gd", "gl",

app/k9mail/src/main/java/com/fsck/k9/external/MessageInfoHolder.java

+2 −1
Original line number Diff line number Diff line 
package com.fsck.k9.external;





import java.util.Date;



import android.content.Context;
@@ -7,13 +8,13 @@ import android.text.SpannableStringBuilder; 


import com.fsck.k9.Account;

import com.fsck.k9.K9;

import com.fsck.k9.R;

import com.fsck.k9.helper.Contacts;

import com.fsck.k9.helper.MessageHelper;

import com.fsck.k9.mail.Address;

import com.fsck.k9.mail.Flag;

import com.fsck.k9.mail.Message.RecipientType;

import com.fsck.k9.mailstore.LocalMessage;

import com.fsck.k9.ui.R;



class MessageInfoHolder {

    public Date compareDate;

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

+1 −1
Original line number Diff line number Diff line 
package com.fsck.k9.notification



import android.content.Context

import com.fsck.k9.R

import com.fsck.k9.ui.R



class K9NotificationResourceProvider(private val context: Context) : NotificationResourceProvider {

    override val iconWarning: Int = R.drawable.notification_icon_warning

app/k9mail/src/main/java/com/fsck/k9/resources/K9AutocryptStringProvider.kt

+1 −1
Original line number Diff line number Diff line 
package com.fsck.k9.resources



import android.content.Context

import com.fsck.k9.R

import com.fsck.k9.autocrypt.AutocryptStringProvider

import com.fsck.k9.ui.R



class K9AutocryptStringProvider(private val context: Context) : AutocryptStringProvider {

    override fun transferMessageSubject(): String = context.getString(R.string.ac_transfer_msg_subject)