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

Unverified Commit b9a15d91 authored by Stephen King's avatar Stephen King
Browse files

Merge remote-tracking branch 'origin/beta' into release

parents e6a83cbe 1f6b67c8

.github/workflows/shippable_builds.yml

+2 −2
Original line number Diff line number Diff line
@@ -285,10 +285,10 @@ jobs: 
            NEW_VERSION_CODE=$(($OLD_VERSION_CODE + 1))

            if [[ "$APP_NAME" = "thunderbird" ]]; then

                # Estimated max version code to get through 2025 is "30"

                MAX_VERSION_CODE="30"

                MAX_VERSION_CODE="52"

            else

                # Estimated max version code to get through 2025 is "39037"

                MAX_VERSION_CODE="39037"

                MAX_VERSION_CODE="39059"

            fi

          elif [[ "$RELEASE_TYPE" = "daily" ]]; then

            NEW_VERSION_CODE=$(date_version_code "$RELEASE_DATE")

app-metadata/net.thunderbird.android.beta/en-US/changelogs/31.txt

0 → 100644
+3 −0
Original line number Diff line number Diff line 
Thunderbird for Android version 13.0b5, based on K-9 Mail. Changes include:

- Reverted word-wrapping change that broke HTML and table rendering

- Application crashed when opening placeholder folder
 
 No newline at end of file

feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/domain/entity/MailDisplayFolder.kt

+2 −2
Original line number Diff line number Diff line
@@ -4,14 +4,14 @@ import net.thunderbird.feature.mail.folder.api.Folder 
import net.thunderbird.feature.mail.folder.api.FolderPathDelimiter



internal data class MailDisplayFolder(

    val accountId: String,

    val accountId: String?,

    val folder: Folder,

    val isInTopGroup: Boolean,

    override val unreadMessageCount: Int,

    override val starredMessageCount: Int,

    override val pathDelimiter: FolderPathDelimiter,

) : DisplayFolder {

    override val id: String = createMailDisplayAccountFolderId(accountId, folder.id)

    override val id: String = createMailDisplayAccountFolderId(accountId.orEmpty(), folder.id)

}



fun createMailDisplayAccountFolderId(accountId: String, folderId: Long): String {

feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/domain/usecase/GetDisplayTreeFolder.kt

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ internal class GetDisplayTreeFolder( 
    private fun createPlaceholderFolder(name: String, pathDelimiter: FolderPathDelimiter): MailDisplayFolder {

        placeholderCounter += 1

        return MailDisplayFolder(

            accountId = "placeholder",

            accountId = null,

            folder = Folder(

                id = placeholderCounter,

                name = name,

feature/navigation/drawer/dropdown/src/main/kotlin/net/thunderbird/feature/navigation/drawer/dropdown/ui/DrawerViewModel.kt

+8 −6
Original line number Diff line number Diff line
@@ -240,12 +240,14 @@ internal class DrawerViewModel( 
        selectFolder(folder.id)



        if (folder is MailDisplayFolder) {

            if (folder.accountId != null) {

                emitEffect(

                    Effect.OpenFolder(

                        accountId = folder.accountId,

                        folderId = folder.folder.id,

                    ),

                )

            }

        } else if (folder is UnifiedDisplayFolder) {

            emitEffect(Effect.OpenUnifiedFolder)

        }