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

Commit af667131 authored by cketti's avatar cketti
Browse files

Remove folderServerId from MessageListItem

parent 7e958abb

app/ui/src/main/java/com/fsck/k9/activity/MessageList.java

+1 −1
Original line number Diff line number Diff line
@@ -1364,7 +1364,7 @@ public class MessageList extends K9Activity implements MessageListFragmentListen 
    }



    @Override

    public void showThread(Account account, String folderServerId, long threadRootId) {

    public void showThread(Account account, long threadRootId) {

        showMessageViewPlaceHolder();



        LocalSearch tmpSearch = new LocalSearch();

app/ui/src/main/java/com/fsck/k9/fragment/MessageListFragment.java

+2 −3
Original line number Diff line number Diff line
@@ -266,11 +266,10 @@ public class MessageListFragment extends Fragment implements OnItemClickListener 
        } else {

            if (showingThreadedList && messageListItem.getThreadCount() > 1) {

                Account account = messageListItem.getAccount();

                String folderServerId = messageListItem.getFolderServerId();



                // If threading is enabled and this item represents a thread, display the thread contents.

                long rootId = messageListItem.getThreadRoot();

                fragmentListener.showThread(account, folderServerId, rootId);

                fragmentListener.showThread(account, rootId);

            } else {

                // This item represents a message; just display the message.

                openMessageAtPosition(adapterPosition);
@@ -1960,7 +1959,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener 


        void setMessageListProgressEnabled(boolean enable);

        void setMessageListProgress(int level);

        void showThread(Account account, String folderServerId, long rootId);

        void showThread(Account account, long rootId);

        void openMessage(MessageReference messageReference);

        void setMessageListTitle(String title);

        void onCompose(Account account);

app/ui/src/main/java/com/fsck/k9/ui/messagelist/MessageListExtractor.kt

+23 −25
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ class MessageListExtractor( 
        val previewText = getPreviewText(previewType, cursor)

        val uniqueId = cursor.getLong(uniqueIdColumn)

        val folderId = cursor.getLong(MLFProjectionInfo.FOLDER_ID_COLUMN)

        val folderServerId = cursor.getString(MLFProjectionInfo.FOLDER_SERVER_ID_COLUMN)

        val messageUid = cursor.getString(MLFProjectionInfo.UID_COLUMN)

        val databaseId = cursor.getLong(MLFProjectionInfo.ID_COLUMN)

        val senderAddress = fromAddresses.getOrNull(0)?.address
@@ -75,7 +74,6 @@ class MessageListExtractor( 
            hasAttachments,

            uniqueId,

            folderId,

                folderServerId,

            messageUid,

            databaseId,

            senderAddress,

app/ui/src/main/java/com/fsck/k9/ui/messagelist/MessageListItem.kt

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ data class MessageListItem( 
    val hasAttachments: Boolean,

    val uniqueId: Long,

    val folderId: Long,

    val folderServerId: String,

    val messageUid: String,

    val databaseId: Long,

    val senderAddress: String?,

app/ui/src/test/java/com/fsck/k9/fragment/MessageListAdapterTest.kt

+23 −25
Original line number Diff line number Diff line
@@ -483,7 +483,6 @@ class MessageListAdapterTest : RobolectricTest() { 
        hasAttachments: Boolean = false,

        uniqueId: Long = 0L,

        folderId: Long = 0L,

        folderServerId: String = "irrelevant",

        messageUid: String = "irrelevant",

        databaseId: Long = 0L,

        senderAddress: String? = null,
@@ -509,7 +508,6 @@ class MessageListAdapterTest : RobolectricTest() { 
            hasAttachments,

            uniqueId,

            folderId,

                folderServerId,

            messageUid,

            databaseId,

            senderAddress,