Skip to content

Convert Address to Kotlin #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Goooler merged 12 commits into from
Feb 25, 2026
Merged

Convert Address to Kotlin #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2e23c72
Initial plan
Copilot Feb 25, 2026
2d4f263
refactor: convert Address class from Java to Kotlin
Copilot Feb 25, 2026
8a8951d
Remove TextUtils
Goooler Feb 25, 2026
7c85620
Mark internal
Goooler Feb 25, 2026
33880a7
Simplify return
Goooler Feb 25, 2026
e2f29a4
Revert gradle.properties
Goooler Feb 25, 2026
7dc322d
Use data class
Goooler Feb 25, 2026
3652182
Revert "Use data class"
Goooler Feb 25, 2026
d6a52b6
Fix build and lint
Goooler Feb 25, 2026
3341218
Remove null types
Goooler Feb 25, 2026
c4ac09f
Update legacy/core/src/main/java/com/fsck/k9/helper/MessageHelper.kt
Goooler Feb 25, 2026
c1f7b5a
Restore hostname
Goooler Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions legacy/core/src/main/java/com/fsck/k9/helper/MessageHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package com.fsck.k9.helper
import android.text.Spannable
import android.text.SpannableString
import android.text.SpannableStringBuilder
import android.text.TextUtils
import android.text.style.ForegroundColorSpan
import app.k9mail.core.android.common.contact.ContactRepository
import com.fsck.k9.CoreResourceProvider
Expand Down Expand Up @@ -153,8 +152,9 @@ class MessageHelper(
}
}
}
return if (!TextUtils.isEmpty(address.personal) && !isSpoofAddress(address.personal)) {
address.personal
val personal = address.personal
return if (!personal.isNullOrEmpty() && !isSpoofAddress(personal)) {
personal
} else {
address.address
}
Expand Down
2 changes: 1 addition & 1 deletion legacy/ui/legacy/src/main/java/com/fsck/k9/view/UserInputEmailAddressParser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ internal class UserInputEmailAddressParser {

private fun Address.isNonAsciiAddress() = !CharsetUtil.isASCII(address)

private fun Address.isInvalidDomainPart() = HostNameUtils.isLegalHostNameOrIP(hostname) == null
private fun Address.isInvalidDomainPart() = HostNameUtils.isLegalHostNameOrIP(checkNotNull(hostname)) == null
}

internal class NonAsciiEmailAddressException(message: String) : Exception(message)
331 changes: 0 additions & 331 deletions mail/common/src/main/java/com/fsck/k9/mail/Address.java
View file
Open in desktop

This file was deleted.

Loading
Loading