Add sort by size feature

Author: Kilian Hu

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

@@ -8,4 +8,5 @@ enum class SortType(val isDefaultAscending: Boolean) {
     SORT_UNREAD(true),
     SORT_FLAGGED(true),
     SORT_ATTACHMENT(true),
+    SORT_SIZE(false),
 }

feature/widget/message-list-glance/src/debug/kotlin/net/thunderbird/feature/widget/message/list/ui/MessageListWidgetContentPreview.kt

@@ -38,6 +38,7 @@ private fun generateMessageListItems(): ImmutableList<MessageListItem> {
             preview = "Preview 1",
             color = Color.BLUE,
             isRead = false,
+            size = 1L,
         ),
         generateMessageListItem(
             displayName = "Bob",
@@ -46,6 +47,7 @@ private fun generateMessageListItems(): ImmutableList<MessageListItem> {
             preview = "Preview 2",
             color = Color.RED,
             isRead = true,
+            size = 2L * 1024L,
         ),
         generateMessageListItem(
             displayName = "Charlie",
@@ -54,6 +56,7 @@ private fun generateMessageListItems(): ImmutableList<MessageListItem> {
             preview = "Preview 3",
             color = Color.RED,
             isRead = false,
+            size = 3L * 1024L * 1024L,
         ),
     )
 }
@@ -65,6 +68,7 @@ private fun generateMessageListItem(
     preview: String,
     color: Int,
     isRead: Boolean,
+    size: Long,
 ): MessageListItem {
     return MessageListItem(
         displayName = displayName,
@@ -82,5 +86,6 @@ private fun generateMessageListItem(
         sortInternalDate = 0,
         sortIsStarred = false,
         sortDatabaseId = 0,
+        sortSize = size,
     )
 }

feature/widget/message-list-glance/src/main/kotlin/net/thunderbird/feature/widget/message/list/MessageListItem.kt

@@ -19,4 +19,5 @@ internal data class MessageListItem(
     val sortInternalDate: Long,
     val sortIsStarred: Boolean,
     val sortDatabaseId: Long,
+    val sortSize: Long,
 )

feature/widget/message-list-glance/src/main/kotlin/net/thunderbird/feature/widget/message/list/MessageListItemMapper.kt

@@ -45,6 +45,7 @@ internal class MessageListItemMapper(
             sortInternalDate = message.internalDate,
             sortIsStarred = message.isStarred,
             sortDatabaseId = message.id,
+            sortSize = message.size,
         )
     }
 

feature/widget/message-list-glance/src/main/kotlin/net/thunderbird/feature/widget/message/list/MessageListLoader.kt

@@ -74,6 +74,7 @@ internal class MessageListLoader(
             SortType.SORT_SUBJECT -> "${MessageColumns.SUBJECT} COLLATE NOCASE"
             SortType.SORT_UNREAD -> MessageColumns.READ
             SortType.SORT_DATE -> MessageColumns.DATE
+            SortType.SORT_SIZE -> MessageColumns.SIZE
             else -> MessageColumns.DATE
         }
 
@@ -125,6 +126,11 @@ internal class MessageListLoader(
                 compareBy<MessageListItem>(!config.sortAscending) { it.hasAttachments }
                     .thenByDate(config)
             }
+
+            SortType.SORT_SIZE -> {
+                compareBy<MessageListItem>(config.sortAscending) { it.sortSize }
+                    .thenByDate(config)
+            }
         }.thenByDescending { it.sortDatabaseId }
 
         return this.sortedWith(comparator)

feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListItem.kt

@@ -19,4 +19,5 @@ internal data class MessageListItem(
     val sortInternalDate: Long,
     val sortIsStarred: Boolean,
     val sortDatabaseId: Long,
+    val sortSize: Long,
 )

feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListItemMapper.kt

@@ -45,6 +45,7 @@ internal class MessageListItemMapper(
             sortInternalDate = message.internalDate,
             sortIsStarred = message.isStarred,
             sortDatabaseId = message.id,
+            sortSize = message.size,
         )
     }
 

feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListLoader.kt

@@ -74,6 +74,7 @@ internal class MessageListLoader(
             SortType.SORT_SUBJECT -> "${MessageColumns.SUBJECT} COLLATE NOCASE"
             SortType.SORT_UNREAD -> MessageColumns.READ
             SortType.SORT_DATE -> MessageColumns.DATE
+            SortType.SORT_SIZE -> MessageColumns.SIZE
             else -> MessageColumns.DATE
         }
 
@@ -125,6 +126,11 @@ internal class MessageListLoader(
                 compareBy<MessageListItem>(!config.sortAscending) { it.hasAttachments }
                     .thenByDate(config)
             }
+
+            SortType.SORT_SIZE -> {
+                compareBy<MessageListItem>(config.sortAscending) { it.sortSize }
+                    .thenByDate(config)
+            }
         }.thenByDescending { it.sortDatabaseId }
 
         return this.sortedWith(comparator)

legacy/core/src/main/java/com/fsck/k9/K9.kt

@@ -198,6 +198,9 @@ object K9 : KoinComponent {
     @JvmStatic
     var isShowContactPicture = true
 
+    @JvmStatic
+    var isShowMessageSize = true
+
     @JvmStatic
     var isUseMessageViewFixedWidthFont = false
 
@@ -352,6 +355,7 @@ object K9 : KoinComponent {
         isShowCorrespondentNames = storage.getBoolean("showCorrespondentNames", true)
         isShowContactName = storage.getBoolean("showContactName", false)
         isShowContactPicture = storage.getBoolean("showContactPicture", true)
+        isShowMessageSize = storage.getBoolean("showMessageSize", true)
         isChangeContactNameColor = storage.getBoolean("changeRegisteredNameColor", false)
         contactNameColor = storage.getInt("registeredNameColor", 0xFF1093F5.toInt())
         isUseMessageViewFixedWidthFont = storage.getBoolean("messageViewFixedWidthFont", false)
@@ -441,6 +445,7 @@ object K9 : KoinComponent {
         editor.putBoolean("showCorrespondentNames", isShowCorrespondentNames)
         editor.putBoolean("showContactName", isShowContactName)
         editor.putBoolean("showContactPicture", isShowContactPicture)
+        editor.putBoolean("showMessageSize", isShowMessageSize)
         editor.putBoolean("changeRegisteredNameColor", isChangeContactNameColor)
         editor.putInt("registeredNameColor", contactNameColor)
         editor.putBoolean("messageViewFixedWidthFont", isUseMessageViewFixedWidthFont)

legacy/core/src/main/java/com/fsck/k9/mailstore/LocalMessage.java

@@ -40,6 +40,7 @@ public class LocalMessage extends MimeMessage {
     private PreviewType previewType;
     private boolean headerNeedsUpdating = false;
     private LocalFolder mFolder;
+    private long size;
 
 
     LocalMessage(LocalStore localStore, String uid, LocalFolder folder) {
@@ -133,6 +134,8 @@ void populateFromGetMessageCursor(Cursor cursor) throws MessagingException {
             Log.d("No headers available for this message!");
         }
 
+        this.size = cursor.isNull(LocalStore.MSG_INDEX_SIZE) ? 0 : cursor.getLong(LocalStore.MSG_INDEX_SIZE);
+
         headerNeedsUpdating = false;
     }
 
@@ -449,4 +452,8 @@ public int hashCode() {
     private String getAccountUuid() {
         return getAccount().getUuid();
     }
+
+    public long getSize() {
+        return size;
+    }
 }