Skip to content

Commit fc05d3b

Browse files
oguzkoceroguzkocer
authored
Bump wordpress-rs to trunk-e72723b9 and fix breaking changes (#22890)
- WpService constructor changed from factory methods to SiteInfo enum - UserCapabilitiesMap now wraps extraCapabilities field - WpRequestResult status code type changed from UShort to UInt
1 parent 3d67ed4 commit fc05d3b

5 files changed

Lines changed: 24 additions & 17 deletions

File tree

‎WordPress/src/main/java/org/wordpress/android/ui/postsrs/data/WpServiceProvider.kt‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@ import org.wordpress.android.fluxc.store.AccountStore
1010
import rs.wordpress.api.kotlin.WpRequestExecutor
1111
import rs.wordpress.cache.kotlin.DatabaseChangeNotifier
1212
import rs.wordpress.cache.kotlin.WordPressApiCache
13+
import uniffi.wp_api.ParsedUrl
1314
import uniffi.wp_api.WpApiClientDelegate
1415
import uniffi.wp_api.WpApiMiddlewarePipeline
1516
import uniffi.wp_api.WpAppNotifier
1617
import uniffi.wp_api.WpAuthenticationProvider
18+
import uniffi.wp_mobile.SiteInfo
1719
import uniffi.wp_mobile.WpService
1820
import java.io.File
1921
import javax.inject.Inject
@@ -49,12 +51,17 @@ class WpServiceProvider @Inject constructor(
4951
private fun createService(site: SiteModel): WpService {
5052
val delegate = createDelegate(site)
5153
val wpApiCache = getOrCreateCache()
52-
return if (site.isWPCom) {
53-
WpService.wordpressCom(site.siteId.toULong(), delegate, wpApiCache.cache)
54+
val siteInfo = if (site.isWPCom) {
55+
SiteInfo.WordPressCom(siteId = site.siteId.toULong())
5456
} else {
55-
val apiRoot = site.wpApiRestUrl?.takeIf { it.isNotEmpty() } ?: "${site.url}/wp-json"
56-
WpService.selfHosted(site.url, apiRoot, delegate, wpApiCache.cache)
57+
val apiRoot = site.wpApiRestUrl?.takeIf { it.isNotEmpty() }
58+
?: "${site.url}/wp-json"
59+
SiteInfo.SelfHosted(
60+
siteUrl = ParsedUrl.parse(site.url),
61+
apiRoot = ParsedUrl.parse(apiRoot),
62+
)
5763
}
64+
return WpService(siteInfo, delegate, wpApiCache.cache)
5865
}
5966

6067
private fun createDelegate(site: SiteModel): WpApiClientDelegate {

‎WordPress/src/main/java/org/wordpress/android/ui/selfhostedusers/SampleUsers.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ object SampleUsers {
1818
avatarUrls = emptyMap(),
1919
capabilities = UserCapabilitiesMap(emptyMap()),
2020
email = "email@example.com",
21-
extraCapabilities = emptyMap(),
21+
extraCapabilities = UserCapabilitiesMap(emptyMap()),
2222
firstName = "Sample",
2323
lastName = "User",
2424
link = "example.com",
@@ -39,7 +39,7 @@ object SampleUsers {
3939
capabilities = UserCapabilitiesMap(emptyMap()),
4040
description = "User description",
4141
email = "email@example.com",
42-
extraCapabilities = emptyMap(),
42+
extraCapabilities = UserCapabilitiesMap(emptyMap()),
4343
firstName = "Sample",
4444
lastName = "User",
4545
link = "example.com",
@@ -59,7 +59,7 @@ object SampleUsers {
5959
capabilities = UserCapabilitiesMap(emptyMap()),
6060
description = "User description",
6161
email = "email@example.com",
62-
extraCapabilities = emptyMap(),
62+
extraCapabilities = UserCapabilitiesMap(emptyMap()),
6363
firstName = "Sample",
6464
lastName = "User",
6565
link = "example.com",

‎WordPress/src/test/java/org/wordpress/android/support/aibot/repository/AIBotSupportRepositoryTest.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ class AIBotSupportRepositoryTest : BaseUnitTest() {
125125
@Test
126126
fun `loadConversations returns empty list on error`() = test {
127127
val errorResponse: WpRequestResult<Any> = WpRequestResult.UnknownError(
128-
statusCode = 500u.toUShort(),
128+
statusCode = 500u,
129129
response = "",
130130
requestUrl = "",
131131
requestMethod = RequestMethod.GET
@@ -145,7 +145,7 @@ class AIBotSupportRepositoryTest : BaseUnitTest() {
145145
@Test
146146
fun `loadConversation returns null on error`() = test {
147147
val errorResponse: WpRequestResult<Any> = WpRequestResult.UnknownError(
148-
statusCode = 404u.toUShort(),
148+
statusCode = 404u,
149149
response = "",
150150
requestUrl = "",
151151
requestMethod = RequestMethod.GET
@@ -200,7 +200,7 @@ class AIBotSupportRepositoryTest : BaseUnitTest() {
200200
@Test
201201
fun `createNewConversation returns null on error`() = test {
202202
val errorResponse: WpRequestResult<Any> = WpRequestResult.UnknownError(
203-
statusCode = 500u.toUShort(),
203+
statusCode = 500u,
204204
response = "",
205205
requestUrl = "",
206206
requestMethod = RequestMethod.GET
@@ -258,7 +258,7 @@ class AIBotSupportRepositoryTest : BaseUnitTest() {
258258
@Test
259259
fun `sendMessageToConversation returns null on error`() = test {
260260
val errorResponse: WpRequestResult<Any> = WpRequestResult.UnknownError(
261-
statusCode = 500u.toUShort(),
261+
statusCode = 500u,
262262
response = "",
263263
requestUrl = "",
264264
requestMethod = RequestMethod.GET

‎WordPress/src/test/java/org/wordpress/android/support/he/repository/HESupportRepositoryTest.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ class HESupportRepositoryTest : BaseUnitTest() {
110110
repository.init(testAccessToken)
111111

112112
val errorResponse: WpRequestResult<List<SupportConversationSummary>> =
113-
WpRequestResult.UnknownError(500.toUShort(), "Internal Server Error", "", RequestMethod.GET)
113+
WpRequestResult.UnknownError(500.toUInt(), "Internal Server Error", "", RequestMethod.GET)
114114

115115
whenever(
116116
wpComApiClient.request<List<SupportConversationSummary>>(any())
@@ -159,7 +159,7 @@ class HESupportRepositoryTest : BaseUnitTest() {
159159
val conversationId = 123L
160160

161161
val errorResponse: WpRequestResult<uniffi.wp_api.SupportConversation> =
162-
WpRequestResult.UnknownError(404.toUShort(), "Not Found", "", RequestMethod.GET)
162+
WpRequestResult.UnknownError(404.toUInt(), "Not Found", "", RequestMethod.GET)
163163

164164
whenever(
165165
wpComApiClient.request<uniffi.wp_api.SupportConversation>(any())
@@ -221,7 +221,7 @@ class HESupportRepositoryTest : BaseUnitTest() {
221221
WpRequestResult.WpError(
222222
errorCode = WpErrorCode.Forbidden(),
223223
errorMessage = "Forbidden",
224-
statusCode = 403.toUShort(),
224+
statusCode = 403.toUInt(),
225225
response = "",
226226
requestUrl = "",
227227
requestMethod = RequestMethod.GET
@@ -250,7 +250,7 @@ class HESupportRepositoryTest : BaseUnitTest() {
250250
repository.init(testAccessToken)
251251

252252
val errorResponse: WpRequestResult<uniffi.wp_api.SupportConversation> =
253-
WpRequestResult.UnknownError(500.toUShort(), "Internal Server Error", "", RequestMethod.GET)
253+
WpRequestResult.UnknownError(500.toUInt(), "Internal Server Error", "", RequestMethod.GET)
254254

255255
whenever(
256256
wpComApiClient.request<uniffi.wp_api.SupportConversation>(any())
@@ -312,7 +312,7 @@ class HESupportRepositoryTest : BaseUnitTest() {
312312
repository.init(testAccessToken)
313313

314314
val errorResponse: WpRequestResult<uniffi.wp_api.SupportConversation> =
315-
WpRequestResult.UnknownError(500.toUShort(), "Internal Server Error", "", RequestMethod.GET)
315+
WpRequestResult.UnknownError(500.toUInt(), "Internal Server Error", "", RequestMethod.GET)
316316

317317
whenever(
318318
wpComApiClient.request<uniffi.wp_api.SupportConversation>(any())

‎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 = 'alpha-2026-04-20'
104+
wordpress-rs = 'trunk-e72723b903746f1505c8f0df1e3634dfa50e2d36'
105105
wordpress-utils = '3.14.0'
106106
automattic-ucrop = '2.2.11'
107107
zendesk = '5.5.3'

0 commit comments

Comments
 (0)