Skip to content

Commit 9d74c82

Browse files
committed
feat: remove gmail prefix in folder structure
1 parent 9e3d6c4 commit 9d74c82

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,14 @@ internal class GetDisplayTreeFolder : UseCase.GetDisplayTreeFolder {
5454
paths: List<Pair<List<String>, DisplayAccountFolder>>,
5555
parentPath: String = "",
5656
): List<DisplayTreeFolder> {
57-
return paths.groupBy { it.first.getOrNull(0) ?: "(Unnamed)" }
57+
return paths
58+
.map {
59+
Pair(
60+
it.first.filter { name -> name != "[Gmail]" },
61+
it.second,
62+
)
63+
}
64+
.groupBy { it.first.getOrNull(0) ?: "(Unnamed)" }
5865
.map { (segment, entries) ->
5966
val childPaths = entries.mapNotNull { (segments, folders) ->
6067
if (segments.size > 1) {

legacy/ui/folder/src/main/java/app/k9mail/legacy/ui/folder/FolderNameFormatter.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,18 @@ class FolderNameFormatter(private val resources: Resources) {
1919
FolderType.DRAFTS -> resources.getString(R.string.special_mailbox_name_drafts)
2020
FolderType.SENT -> resources.getString(R.string.special_mailbox_name_sent)
2121
FolderType.TRASH -> resources.getString(R.string.special_mailbox_name_trash)
22-
else -> folder.name
22+
else -> folder.name.removeGmailPrefix()
2323
}
2424

2525
private fun remoteFolderDisplayName(folder: Folder) = when (folder.type) {
2626
FolderType.INBOX -> resources.getString(R.string.special_mailbox_name_inbox)
27-
else -> folder.name
27+
else -> folder.name.removeGmailPrefix()
2828
}
2929

3030
fun displayName(folder: RemoteFolder) = when (folder.type) {
3131
FolderType.INBOX -> resources.getString(R.string.special_mailbox_name_inbox)
32-
else -> folder.name
32+
else -> folder.name.removeGmailPrefix()
3333
}
3434
}
35+
36+
private fun String.removeGmailPrefix(): String = this.replace("[Gmail]/", "")

0 commit comments

Comments
 (0)