Skip to content

Fix ecosystem account switching : add support for additional account formats #899

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

Open
sowjanyakch wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix ecosystem account switching : add support for additional account formats #899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c65fe2
fix account name
sowjanyakch Feb 25, 2026
e6de362
add tests for new pattern
alperozturk96 Feb 26, 2026
d4944fe
fix spotless check
alperozturk96 Feb 26, 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
7 changes: 6 additions & 1 deletion core/src/main/java/com/nextcloud/android/common/core/utils/ecosystem/EcosystemManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,12 @@ class EcosystemManager(
private const val PLAY_STORE_MARKET_LINK = "market://details?id="
private const val EXTRA_KEY_ACCOUNT = "KEY_ACCOUNT"

const val ACCOUNT_NAME_PATTERN_REGEX = "[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-z]{2,}"
const val ACCOUNT_NAME_PATTERN_REGEX =
"^[A-Za-z0-9._%+-]+(?:" +
"@(?:[A-Za-z0-9-]+\\.)+[A-Za-z]{2,}(?:@(?:[A-Za-z0-9-]+\\.)+[A-Za-z]{2,})?" +
"|" +
"@(?:\\d{1,3}\\.){2,3}\\d{1,3}(?::\\d{1,5})?" +
")$"
}

private val accountNamePattern = Pattern.compile(ACCOUNT_NAME_PATTERN_REGEX)
Expand Down
7 changes: 7 additions & 0 deletions core/src/test/java/com/nextcloud/android/common/core/utils/AccountNamePatternTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,11 @@ class AccountNamePatternTest {
assertFalse(pattern.matcher("").matches())
assertFalse(pattern.matcher(" ").matches())
}

@Test
fun `special account name formats`() {
assertTrue(pattern.matcher("abc@cloud.com@example.inst2.cloud.com").matches())
assertTrue(pattern.matcher("admin@10.0.2.2:55002").matches())
assertTrue(pattern.matcher("admin@10.0.2.2").matches())
}
}
Loading