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

Unverified Commit 2984629b authored by Rafael Tonholo's avatar Rafael Tonholo
Browse files

refactor(outbox): remove usages of LegacyAccount.outboxFolderId and LegacyAccountDto.outboxFolderId

parent a62c7474

core/android/account/src/main/kotlin/net/thunderbird/core/android/account/LegacyAccount.kt

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ data class LegacyAccount( 
    val importedArchiveFolder: String? = null,

    val importedSpamFolder: String? = null,

    val inboxFolderId: Long? = null,

    val outboxFolderId: Long? = null,

    val draftsFolderId: Long? = null,

    val sentFolderId: Long? = null,

    val trashFolderId: Long? = null,

core/android/account/src/main/kotlin/net/thunderbird/core/android/account/LegacyAccountDto.kt

+0 −4
Original line number Diff line number Diff line
@@ -163,10 +163,6 @@ open class LegacyAccountDto( 
    @set:Synchronized

    var inboxFolderId: Long? = null



    @get:Synchronized

    @set:Synchronized

    var outboxFolderId: Long? = null



    @get:Synchronized

    @set:Synchronized

    var draftsFolderId: Long? = null

core/android/account/src/test/kotlin/net/thunderbird/core/android/account/LegacyAccountWrapperTest.kt

+0 −1
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ class LegacyAccountWrapperTest { 
                importedArchiveFolder = null,

                importedSpamFolder = null,

                inboxFolderId = null,

                outboxFolderId = null,

                draftsFolderId = null,

                sentFolderId = null,

                trashFolderId = null,

feature/account/storage/legacy/src/main/kotlin/net/thunderbird/feature/account/storage/legacy/LegacyAccountStorageHandler.kt

+0 −2
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ class LegacyAccountStorageHandler( 
            importedSpamFolder = storage.getStringOrNull(keyGen.create("spamFolderName"))



            inboxFolderId = storage.getStringOrNull(keyGen.create("inboxFolderId"))?.toLongOrNull()

            outboxFolderId = storage.getStringOrNull(keyGen.create("outboxFolderId"))?.toLongOrNull()



            val draftsFolderId = storage.getStringOrNull(keyGen.create("draftsFolderId"))?.toLongOrNull()

            val draftsFolderSelection = getEnumStringPref<SpecialFolderSelection>(
@@ -349,7 +348,6 @@ class LegacyAccountStorageHandler( 
            editor.putString(keyGen.create("archiveFolderName"), importedArchiveFolder)

            editor.putString(keyGen.create("spamFolderName"), importedSpamFolder)

            editor.putString(keyGen.create("inboxFolderId"), inboxFolderId?.toString())

            editor.putString(keyGen.create("outboxFolderId"), outboxFolderId?.toString())

            editor.putString(keyGen.create("draftsFolderId"), draftsFolderId?.toString())

            editor.putString(keyGen.create("sentFolderId"), sentFolderId?.toString())

            editor.putString(keyGen.create("trashFolderId"), trashFolderId?.toString())

feature/account/storage/legacy/src/main/kotlin/net/thunderbird/feature/account/storage/legacy/mapper/DefaultLegacyAccountDataMapper.kt

+0 −2
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ internal class DefaultLegacyAccountDataMapper : LegacyAccountDataMapper { 
            importedArchiveFolder = dto.importedArchiveFolder,

            importedSpamFolder = dto.importedSpamFolder,

            inboxFolderId = dto.inboxFolderId,

            outboxFolderId = dto.outboxFolderId,

            draftsFolderId = dto.draftsFolderId,

            sentFolderId = dto.sentFolderId,

            trashFolderId = dto.trashFolderId,
@@ -149,7 +148,6 @@ internal class DefaultLegacyAccountDataMapper : LegacyAccountDataMapper { 
            importedArchiveFolder = domain.importedArchiveFolder

            importedSpamFolder = domain.importedSpamFolder

            inboxFolderId = domain.inboxFolderId

            outboxFolderId = domain.outboxFolderId

            draftsFolderId = domain.draftsFolderId

            sentFolderId = domain.sentFolderId

            trashFolderId = domain.trashFolderId