Update wordpress-rs to 4fac42b1a2 (#22662)

adalpari · claude · web-flow · commit f9a59e04de60 · 2026-03-06T16:18:36.000+01:00
* Update wordpress-rs to 4fac42b1a2

The library now requires a NetworkAvailabilityProvider to distinguish
between offline devices and non-existent sites on DNS failures. Also
adapts to the AutoDiscoveryAttemptSuccess API change where the
applicationPasswordsAuthenticationUrl field was replaced by a
DiscoveredAuthenticationMechanism enum.

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;

* Fix import ordering and use named parameters for consistency

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;

* Fix import ordering in ApplicationModule to pass checkstyle

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;

---------

Co-authored-by: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/WordPress/src/main/java/org/wordpress/android/modules/ApplicationModule.java b/WordPress/src/main/java/org/wordpress/android/modules/ApplicationModule.java
@@ -38,6 +38,7 @@
 import org.wordpress.android.util.config.RemoteConfigWrapper;
 import org.wordpress.android.util.wizard.WizardManager;
 import org.wordpress.android.fluxc.network.TrackNetworkRequestsInterceptor;
+import org.wordpress.android.fluxc.network.rest.wpapi.rs.WpNetworkAvailabilityProvider;
 import org.wordpress.android.viewmodel.helpers.ConnectionStatus;
 import org.wordpress.android.viewmodel.helpers.ConnectionStatusLiveData;
 
@@ -156,8 +157,12 @@ public static RecordingStrategy provideVoiceToContentRecordingStrategy() {
 
     @Provides
     public static WpLoginClient provideWpLoginClient(
-            @NonNull TrackNetworkRequestsInterceptor trackNetworkRequestsInterceptor
+            @NonNull TrackNetworkRequestsInterceptor trackNetworkRequestsInterceptor,
+            @NonNull WpNetworkAvailabilityProvider networkAvailabilityProvider
     ) {
-        return new WpLoginClient(Collections.singletonList(trackNetworkRequestsInterceptor));
+        return new WpLoginClient(
+                Collections.singletonList(trackNetworkRequestsInterceptor),
+                networkAvailabilityProvider
+        );
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/networking/restapi/WpComApiClientProvider.kt b/WordPress/src/main/java/org/wordpress/android/networking/restapi/WpComApiClientProvider.kt
@@ -1,6 +1,7 @@
 package org.wordpress.android.networking.restapi
 
 import okhttp3.OkHttpClient
+import org.wordpress.android.fluxc.network.rest.wpapi.rs.WpNetworkAvailabilityProvider
 import rs.wordpress.api.kotlin.WpComApiClient
 import rs.wordpress.api.kotlin.WpHttpClient
 import rs.wordpress.api.kotlin.WpRequestExecutor
@@ -12,7 +13,9 @@ import javax.inject.Inject
 private const val READ_WRITE_TIMEOUT = 60L
 private const val CONNECT_TIMEOUT = 30L
 
-class WpComApiClientProvider @Inject constructor() {
+class WpComApiClientProvider @Inject constructor(
+    private val networkAvailabilityProvider: WpNetworkAvailabilityProvider,
+) {
     fun getWpComApiClient(accessToken: String): WpComApiClient {
         val okHttpClient = OkHttpClient.Builder()
             .connectTimeout(CONNECT_TIMEOUT, TimeUnit.SECONDS)
@@ -21,7 +24,10 @@ class WpComApiClientProvider @Inject constructor() {
             .build()
 
         return WpComApiClient(
-            requestExecutor = WpRequestExecutor(httpClient = WpHttpClient.CustomOkHttpClient(okHttpClient)),
+            requestExecutor = WpRequestExecutor(
+                httpClient = WpHttpClient.CustomOkHttpClient(okHttpClient),
+                networkAvailabilityProvider = networkAvailabilityProvider
+            ),
             authProvider = WpAuthenticationProvider.staticWithAuth(WpAuthentication.Bearer(token = accessToken)
             )
         )
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/applicationpassword/ApplicationPasswordsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/accounts/applicationpassword/ApplicationPasswordsViewModel.kt
@@ -10,6 +10,7 @@ import org.wordpress.android.R
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.network.TrackNetworkRequestsInterceptor
 import org.wordpress.android.fluxc.network.rest.wpapi.rs.WpApiClientProvider
+import org.wordpress.android.fluxc.network.rest.wpapi.rs.WpNetworkAvailabilityProvider
 import org.wordpress.android.fluxc.store.AccountStore
 import org.wordpress.android.fluxc.utils.AppLogWrapper
 import org.wordpress.android.modules.IO_THREAD
@@ -43,6 +44,7 @@ class ApplicationPasswordsViewModel @Inject constructor(
     networkUtilsWrapper: NetworkUtilsWrapper,
     @Named(IO_THREAD) ioDispatcher: CoroutineDispatcher,
     trackNetworkRequestsInterceptor: TrackNetworkRequestsInterceptor,
+    networkAvailabilityProvider: WpNetworkAvailabilityProvider,
 ) : DataViewViewModel(
     mainDispatcher = mainDispatcher,
     appLogWrapper = appLogWrapper,
@@ -51,7 +53,8 @@ class ApplicationPasswordsViewModel @Inject constructor(
     selectedSiteRepository = selectedSiteRepository,
     accountStore = accountStore,
     ioDispatcher = ioDispatcher,
-    trackNetworkRequestsInterceptor = trackNetworkRequestsInterceptor
+    trackNetworkRequestsInterceptor = trackNetworkRequestsInterceptor,
+    networkAvailabilityProvider = networkAvailabilityProvider
 ) {
     init {
         initialize()
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/ApplicationPasswordLoginHelper.kt b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/ApplicationPasswordLoginHelper.kt
@@ -16,6 +16,7 @@ import org.wordpress.android.util.BuildConfigWrapper
 import org.wordpress.android.util.UrlUtils
 import rs.wordpress.api.kotlin.ApiDiscoveryResult
 import rs.wordpress.api.kotlin.WpLoginClient
+import uniffi.wp_api.applicationPasswordsUrl
 import javax.inject.Inject
 import javax.inject.Named
 
@@ -260,7 +261,12 @@ class ApplicationPasswordLoginHelper @Inject constructor(
     class DiscoverSuccessWrapper @Inject constructor() {
         fun getApiRootUrl(successObject: ApiDiscoveryResult.Success) = successObject.success.apiRootUrl.url()
 
-        fun getApplicationPasswordsAuthenticationUrl(successObject: ApiDiscoveryResult.Success) =
-            successObject.success.applicationPasswordsAuthenticationUrl.url()
+        fun getApplicationPasswordsAuthenticationUrl(
+            successObject: ApiDiscoveryResult.Success
+        ): String = requireNotNull(
+            applicationPasswordsUrl(successObject.success.authentication)?.url()
+        ) {
+            "Application passwords authentication URL is required"
+        }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/dataview/DataViewViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/dataview/DataViewViewModel.kt
@@ -22,6 +22,7 @@ import org.wordpress.android.ui.mysite.SelectedSiteRepository
 import org.wordpress.android.util.AppLog
 import org.wordpress.android.util.NetworkUtilsWrapper
 import org.wordpress.android.fluxc.network.TrackNetworkRequestsInterceptor
+import org.wordpress.android.fluxc.network.rest.wpapi.rs.WpNetworkAvailabilityProvider
 import org.wordpress.android.viewmodel.ScopedViewModel
 import rs.wordpress.api.kotlin.WpComApiClient
 import uniffi.wp_api.WpApiParamOrder
@@ -45,6 +46,7 @@ open class DataViewViewModel @Inject constructor(
     private val accountStore: AccountStore,
     @Named(IO_THREAD) protected val ioDispatcher: CoroutineDispatcher,
     private val trackNetworkRequestsInterceptor: TrackNetworkRequestsInterceptor,
+    private val networkAvailabilityProvider: WpNetworkAvailabilityProvider,
 ) : ScopedViewModel(mainDispatcher) {
     private val _uiState = MutableStateFlow(DataViewUiState())
     val uiState: StateFlow<DataViewUiState> = _uiState.asStateFlow()
@@ -88,7 +90,8 @@ open class DataViewViewModel @Inject constructor(
                     WpAuthentication.Bearer(token = token)
                 }
             ),
-            interceptors = listOf(trackNetworkRequestsInterceptor)
+            interceptors = listOf(trackNetworkRequestsInterceptor),
+            networkAvailabilityProvider = networkAvailabilityProvider
         )
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpackrestconnection/JetpackConnectionHelper.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpackrestconnection/JetpackConnectionHelper.kt
@@ -3,6 +3,7 @@ package org.wordpress.android.ui.jetpackrestconnection
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.network.TrackNetworkRequestsInterceptor
 import org.wordpress.android.fluxc.network.rest.wpapi.rs.WpApiClientProvider
+import org.wordpress.android.fluxc.network.rest.wpapi.rs.WpNetworkAvailabilityProvider
 import org.wordpress.android.fluxc.utils.AppLogWrapper
 import org.wordpress.android.util.AppLog
 import rs.wordpress.api.kotlin.WpApiClient
@@ -19,6 +20,7 @@ class JetpackConnectionHelper @Inject constructor(
     private val wpApiClientProvider: WpApiClientProvider,
     private val appLogWrapper: AppLogWrapper,
     private val trackNetworkRequestsInterceptor: TrackNetworkRequestsInterceptor,
+    private val networkAvailabilityProvider: WpNetworkAvailabilityProvider,
 ) {
     fun initWpApiClient(site: SiteModel): WpApiClient {
         requireRestCredentials(site)
@@ -30,7 +32,10 @@ class JetpackConnectionHelper @Inject constructor(
 
         val delegate = WpApiClientDelegate(
             authProvider = createRestAuthProvider(site),
-            requestExecutor = WpRequestExecutor(interceptors = listOf(trackNetworkRequestsInterceptor)),
+            requestExecutor = WpRequestExecutor(
+                interceptors = listOf(trackNetworkRequestsInterceptor),
+                networkAvailabilityProvider = networkAvailabilityProvider
+            ),
             middlewarePipeline = WpApiMiddlewarePipeline(emptyList()),
             appNotifier = InvalidAuthNotifier()
         )
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/postsrs/data/WpServiceProvider.kt b/WordPress/src/main/java/org/wordpress/android/ui/postsrs/data/WpServiceProvider.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import dagger.hilt.android.qualifiers.ApplicationContext
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.WpAppNotifierHandler
+import org.wordpress.android.fluxc.network.rest.wpapi.rs.WpNetworkAvailabilityProvider
 import org.wordpress.android.fluxc.network.rest.wpapi.rs.createWpComAuthProvider
 import org.wordpress.android.fluxc.store.AccountStore
 import rs.wordpress.api.kotlin.WpRequestExecutor
@@ -29,6 +30,7 @@ class WpServiceProvider @Inject constructor(
     @ApplicationContext private val context: Context,
     private val wpAppNotifierHandler: WpAppNotifierHandler,
     private val accountStore: AccountStore,
+    private val networkAvailabilityProvider: WpNetworkAvailabilityProvider,
 ) {
     private val services = mutableMapOf<Int, WpService>()
     private var cache: WordPressApiCache? = null
@@ -69,7 +71,10 @@ class WpServiceProvider @Inject constructor(
 
         return WpApiClientDelegate(
             authProvider = authProvider,
-            requestExecutor = WpRequestExecutor(emptyList()),
+            requestExecutor = WpRequestExecutor(
+                interceptors = emptyList(),
+                networkAvailabilityProvider = networkAvailabilityProvider
+            ),
             middlewarePipeline = WpApiMiddlewarePipeline(emptyList()),
             appNotifier = object : WpAppNotifier {
                 override suspend fun requestedWithInvalidAuthentication(requestUrl: String) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/subscribers/AddSubscribersViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/subscribers/AddSubscribersViewModel.kt
@@ -7,6 +7,7 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.withContext
 import org.wordpress.android.R
 import org.wordpress.android.fluxc.network.TrackNetworkRequestsInterceptor
+import org.wordpress.android.fluxc.network.rest.wpapi.rs.WpNetworkAvailabilityProvider
 import org.wordpress.android.fluxc.store.AccountStore
 import org.wordpress.android.fluxc.utils.AppLogWrapper
 import org.wordpress.android.modules.BG_THREAD
@@ -31,6 +32,7 @@ class AddSubscribersViewModel @Inject constructor(
     private val appLogWrapper: AppLogWrapper,
     private val toastUtilsWrapper: ToastUtilsWrapper,
     private val trackNetworkRequestsInterceptor: TrackNetworkRequestsInterceptor,
+    private val networkAvailabilityProvider: WpNetworkAvailabilityProvider,
 ) : ScopedViewModel(bgDispatcher) {
     @Inject
     @Named(IO_THREAD)
@@ -50,7 +52,8 @@ class AddSubscribersViewModel @Inject constructor(
             WpAuthenticationProvider.staticWithAuth(
                 WpAuthentication.Bearer(token = accountStore.accessToken!!)
             ),
-            interceptors = listOf(trackNetworkRequestsInterceptor)
+            interceptors = listOf(trackNetworkRequestsInterceptor),
+            networkAvailabilityProvider = networkAvailabilityProvider
         )
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/subscribers/SubscribersViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/subscribers/SubscribersViewModel.kt
@@ -9,6 +9,7 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.withContext
 import org.wordpress.android.R
 import org.wordpress.android.fluxc.network.TrackNetworkRequestsInterceptor
+import org.wordpress.android.fluxc.network.rest.wpapi.rs.WpNetworkAvailabilityProvider
 import org.wordpress.android.fluxc.store.AccountStore
 import org.wordpress.android.fluxc.utils.AppLogWrapper
 import org.wordpress.android.models.wrappers.SimpleDateFormatWrapper
@@ -45,6 +46,7 @@ class SubscribersViewModel @Inject constructor(
     accountStore: AccountStore,
     @Named(IO_THREAD) ioDispatcher: CoroutineDispatcher,
     trackNetworkRequestsInterceptor: TrackNetworkRequestsInterceptor,
+    networkAvailabilityProvider: WpNetworkAvailabilityProvider,
 ) : DataViewViewModel(
     mainDispatcher = mainDispatcher,
     appLogWrapper = appLogWrapper,
@@ -53,7 +55,8 @@ class SubscribersViewModel @Inject constructor(
     selectedSiteRepository = selectedSiteRepository,
     accountStore = accountStore,
     ioDispatcher = ioDispatcher,
-    trackNetworkRequestsInterceptor = trackNetworkRequestsInterceptor
+    trackNetworkRequestsInterceptor = trackNetworkRequestsInterceptor,
+    networkAvailabilityProvider = networkAvailabilityProvider
 ) {
     private val _subscriberStats = MutableStateFlow<IndividualSubscriberStats?>(null)
     val subscriberStats = _subscriberStats.asStateFlow()
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/taxonomies/TermsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/taxonomies/TermsViewModel.kt
@@ -21,6 +21,7 @@ import org.wordpress.android.fluxc.model.TermModel
 import org.wordpress.android.fluxc.model.TermsModel
 import org.wordpress.android.fluxc.network.TrackNetworkRequestsInterceptor
 import org.wordpress.android.fluxc.network.rest.wpapi.rs.WpApiClientProvider
+import org.wordpress.android.fluxc.network.rest.wpapi.rs.WpNetworkAvailabilityProvider
 import org.wordpress.android.fluxc.store.AccountStore
 import org.wordpress.android.fluxc.store.TaxonomyStore
 import org.wordpress.android.fluxc.store.TaxonomyStore.DEFAULT_TAXONOMY_CATEGORY
@@ -89,6 +90,7 @@ class TermsViewModel @Inject constructor(
     networkUtilsWrapper: NetworkUtilsWrapper,
     @Named(IO_THREAD) ioDispatcher: CoroutineDispatcher,
     trackNetworkRequestsInterceptor: TrackNetworkRequestsInterceptor,
+    networkAvailabilityProvider: WpNetworkAvailabilityProvider,
 ) : DataViewViewModel(
     mainDispatcher = mainDispatcher,
     appLogWrapper = appLogWrapper,
@@ -97,7 +99,8 @@ class TermsViewModel @Inject constructor(
     selectedSiteRepository = selectedSiteRepository,
     accountStore = accountStore,
     ioDispatcher = ioDispatcher,
-    trackNetworkRequestsInterceptor = trackNetworkRequestsInterceptor
+    trackNetworkRequestsInterceptor = trackNetworkRequestsInterceptor,
+    networkAvailabilityProvider = networkAvailabilityProvider
 ) {
     private var taxonomySlug: String = ""
     private var isHierarchical: Boolean = false
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/accounts/login/ApplicationPasswordLoginHelperTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/accounts/login/ApplicationPasswordLoginHelperTest.kt
@@ -22,6 +22,7 @@ import org.wordpress.android.util.BuildConfigWrapper
 import rs.wordpress.api.kotlin.ApiDiscoveryResult
 import rs.wordpress.api.kotlin.WpLoginClient
 import uniffi.wp_api.AutoDiscoveryAttemptSuccess
+import uniffi.wp_api.DiscoveredAuthenticationMechanism
 import uniffi.wp_api.ParseUrlException
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
@@ -170,7 +171,9 @@ class ApplicationPasswordLoginHelperTest : BaseUnitTest() {
 
     @Test
     fun `given proper site, when api discovery is success, then return discovery url`() = runTest {
-        val autoDiscoveryAttemptSuccess = AutoDiscoveryAttemptSuccess(mock(), mock(), mock(), mock())
+        val autoDiscoveryAttemptSuccess = AutoDiscoveryAttemptSuccess(
+            mock(), mock(), mock(), DiscoveredAuthenticationMechanism.ApplicationPasswords(mock())
+        )
         whenever(uriLoginWrapper.appendParamsToRestAuthorizationUrl(any()))
             .thenReturn("$TEST_URL_AUTH$TEST_URL_AUTH_SUFFIX")
         val apiDiscoveryResult = ApiDiscoveryResult.Success(
@@ -200,7 +203,9 @@ class ApplicationPasswordLoginHelperTest : BaseUnitTest() {
 
     @Test
     fun `given login scenario, when api discovery is empty, then return empty`() = runTest {
-        val autoDiscoveryAttemptSuccess = AutoDiscoveryAttemptSuccess(mock(), mock(), mock(), mock())
+        val autoDiscoveryAttemptSuccess = AutoDiscoveryAttemptSuccess(
+            mock(), mock(), mock(), DiscoveredAuthenticationMechanism.ApplicationPasswords(mock())
+        )
         val apiDiscoveryResult = ApiDiscoveryResult.Success(autoDiscoveryAttemptSuccess)
         whenever(wpLoginClient.apiDiscovery(eq(TEST_URL))).thenReturn(apiDiscoveryResult)
         val result = applicationPasswordLoginHelper.getAuthorizationUrlComplete(TEST_URL)
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/dataview/DataViewViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/dataview/DataViewViewModelTest.kt
@@ -14,6 +14,7 @@ import org.wordpress.android.BaseUnitTest
 import org.wordpress.android.R
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.network.TrackNetworkRequestsInterceptor
+import org.wordpress.android.fluxc.network.rest.wpapi.rs.WpNetworkAvailabilityProvider
 import org.wordpress.android.fluxc.store.AccountStore
 import org.wordpress.android.fluxc.utils.AppLogWrapper
 import org.wordpress.android.ui.dataview.DataViewViewModel.Companion.PAGE_SIZE
@@ -44,6 +45,9 @@ class DataViewViewModelTest : BaseUnitTest() {
     @Mock
     private lateinit var trackNetworkRequestsInterceptor: TrackNetworkRequestsInterceptor
 
+    @Mock
+    private lateinit var networkAvailabilityProvider: WpNetworkAvailabilityProvider
+
     private val testSite = SiteModel().apply {
         id = 1
         siteId = TEST_SITE_SITE_ID
@@ -73,7 +77,8 @@ class DataViewViewModelTest : BaseUnitTest() {
             selectedSiteRepository = selectedSiteRepository,
             accountStore = accountStore,
             ioDispatcher = testDispatcher(),
-            trackNetworkRequestsInterceptor = trackNetworkRequestsInterceptor
+            trackNetworkRequestsInterceptor = trackNetworkRequestsInterceptor,
+            networkAvailabilityProvider = networkAvailabilityProvider
         )
     }
 
@@ -232,7 +237,8 @@ class DataViewViewModelTest : BaseUnitTest() {
                 selectedSiteRepository = selectedSiteRepository,
                 accountStore = accountStore,
                 ioDispatcher = testDispatcher(),
-                trackNetworkRequestsInterceptor = trackNetworkRequestsInterceptor
+                trackNetworkRequestsInterceptor = trackNetworkRequestsInterceptor,
+                networkAvailabilityProvider = networkAvailabilityProvider
             )
             // Access the wpComApiClient property to trigger the lazy initialization
             viewModel.testAccessWpComApiClient()
@@ -500,7 +506,8 @@ class DataViewViewModelTest : BaseUnitTest() {
         selectedSiteRepository: SelectedSiteRepository,
         accountStore: AccountStore,
         ioDispatcher: kotlinx.coroutines.CoroutineDispatcher,
-        trackNetworkRequestsInterceptor: TrackNetworkRequestsInterceptor
+        trackNetworkRequestsInterceptor: TrackNetworkRequestsInterceptor,
+        networkAvailabilityProvider: WpNetworkAvailabilityProvider
     ) : DataViewViewModel(
         mainDispatcher,
         appLogWrapper,
@@ -509,7 +516,8 @@ class DataViewViewModelTest : BaseUnitTest() {
         selectedSiteRepository,
         accountStore,
         ioDispatcher,
-        trackNetworkRequestsInterceptor
+        trackNetworkRequestsInterceptor,
+        networkAvailabilityProvider
     ) {
         init {
             initialize()
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/taxonomies/TermsViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/taxonomies/TermsViewModelTest.kt
@@ -19,6 +19,7 @@ import org.wordpress.android.fluxc.Dispatcher
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.network.TrackNetworkRequestsInterceptor
 import org.wordpress.android.fluxc.network.rest.wpapi.rs.WpApiClientProvider
+import org.wordpress.android.fluxc.network.rest.wpapi.rs.WpNetworkAvailabilityProvider
 import org.wordpress.android.fluxc.store.AccountStore
 import org.wordpress.android.fluxc.store.TaxonomyStore
 import org.wordpress.android.fluxc.store.TaxonomyStore.DEFAULT_TAXONOMY_CATEGORY
@@ -59,6 +60,9 @@ class TermsViewModelTest : BaseUnitTest() {
     @Mock
     private lateinit var trackNetworkRequestsInterceptor: TrackNetworkRequestsInterceptor
 
+    @Mock
+    private lateinit var networkAvailabilityProvider: WpNetworkAvailabilityProvider
+
     @Before
     fun setUp() {
         MockitoAnnotations.openMocks(this)
@@ -77,7 +81,8 @@ class TermsViewModelTest : BaseUnitTest() {
             ioDispatcher = testDispatcher(),
             taxonomyStore = taxonomyStore,
             fluxCDispatcher = fluxCDispatcher,
-            trackNetworkRequestsInterceptor = trackNetworkRequestsInterceptor
+            trackNetworkRequestsInterceptor = trackNetworkRequestsInterceptor,
+            networkAvailabilityProvider = networkAvailabilityProvider
         )
     }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -102,7 +102,7 @@ wellsql = '2.0.0'
 wordpress-aztec = 'v2.1.4'
 wordpress-lint = '2.2.0'
 wordpress-persistent-edittext = '1.0.2'
-wordpress-rs = 'trunk-a557060af03d5ed2eb41a21afd51f434fe864e20'
+wordpress-rs = 'trunk-4fac42b1a262e93adcbc0cd0353aafa0369671d2'
 wordpress-utils = '3.14.0'
 automattic-ucrop = '2.2.11'
 zendesk = '5.5.3'
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/rs/WpApiClientProvider.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/rs/WpApiClientProvider.kt
diff --git a/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/rs/WpNetworkAvailabilityProvider.kt b/libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpapi/rs/WpNetworkAvailabilityProvider.kt
