Skip to content

Commit 97f07de

Browse files
committed
Use DomainSubtypeId.SiteRedirect for redirect domain URL generation
Bump wordpress-rs to pick up the `SiteRedirect` variant and replace the `Other("redirect")` workaround in `GetDomainDetailsUrl`.
1 parent 09f151f commit 97f07de

3 files changed

Lines changed: 4 additions & 10 deletions

File tree

WordPress/src/main/java/org/wordpress/android/ui/domains/management/GetDomainDetailsUrl.kt

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,13 @@ package org.wordpress.android.ui.domains.management
33
import uniffi.wp_api.AllDomainItem
44
import uniffi.wp_api.DomainSubtypeId
55

6-
private const val REDIRECT_SUBTYPE = "redirect"
7-
86
fun AllDomainItem.getDomainDetailsUrl(): String? {
97
if (domain.isEmpty() || siteSlug.isEmpty()) return null
108
return when (subtype.id) {
119
is DomainSubtypeId.DomainTransfer ->
1210
"https://wordpress.com/domains/manage/all/$domain/transfer/in/$siteSlug"
13-
is DomainSubtypeId.Other ->
14-
if ((subtype.id as DomainSubtypeId.Other).v1 == REDIRECT_SUBTYPE) {
15-
"https://wordpress.com/domains/manage/all/$domain/redirect/$siteSlug"
16-
} else {
17-
"https://wordpress.com/domains/manage/all/$domain/edit/$siteSlug"
18-
}
11+
is DomainSubtypeId.SiteRedirect ->
12+
"https://wordpress.com/domains/manage/all/$domain/redirect/$siteSlug"
1913
else ->
2014
"https://wordpress.com/domains/manage/all/$domain/edit/$siteSlug"
2115
}

WordPress/src/test/java/org/wordpress/android/ui/domains/management/GetDomainDetailsUrlTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class GetDomainDetailsUrlTest : BaseUnitTest() {
2525
val domain = testDomainItem(
2626
domain = "redirect.domain",
2727
siteSlug = "redirect.domain.slug",
28-
subtypeId = DomainSubtypeId.Other("redirect"),
28+
subtypeId = DomainSubtypeId.SiteRedirect,
2929
)
3030
val expected =
3131
"https://wordpress.com/domains/manage/all/redirect.domain/redirect/redirect.domain.slug"

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ wellsql = '2.0.0'
101101
wordpress-aztec = 'v2.1.4'
102102
wordpress-lint = '2.2.0'
103103
wordpress-persistent-edittext = '1.0.2'
104-
wordpress-rs = 'trunk-2266e8a6f44012a7f514e61a70c398385f6dafc9'
104+
wordpress-rs = 'trunk-99776d6504632951fe57fa044d26612d13a1629b'
105105
wordpress-utils = '3.14.0'
106106
automattic-ucrop = '2.2.11'
107107
zendesk = '5.5.3'

0 commit comments

Comments
 (0)