diff --git a/WordPress/src/main/java/org/wordpress/android/modules/ApplicationModule.java b/WordPress/src/main/java/org/wordpress/android/modules/ApplicationModule.java index 5f66ba76d752..cd7641468995 100644 --- a/WordPress/src/main/java/org/wordpress/android/modules/ApplicationModule.java +++ b/WordPress/src/main/java/org/wordpress/android/modules/ApplicationModule.java @@ -39,6 +39,8 @@ import org.wordpress.android.viewmodel.helpers.ConnectionStatus; import org.wordpress.android.viewmodel.helpers.ConnectionStatusLiveData; +import java.util.Collections; + import javax.inject.Named; import dagger.Binds; @@ -152,6 +154,6 @@ public static RecordingStrategy provideVoiceToContentRecordingStrategy() { @Provides public static WpLoginClient provideWpLoginClient() { - return new WpLoginClient(); + return new WpLoginClient(Collections.emptyList()); } } 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 index e435841fa8b7..6ae67d18af3c 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/dataview/DataViewViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/dataview/DataViewViewModel.kt @@ -81,11 +81,12 @@ open class DataViewViewModel @Inject constructor( // TODO this is strictly for wp.com sites, we'll need different auth for self-hosted protected val wpComApiClient: WpComApiClient by lazy { WpComApiClient( - WpAuthenticationProvider.staticWithAuth( + authProvider = WpAuthenticationProvider.staticWithAuth( requireNotNull(accountStore.accessToken) { "Access token is required but was null" }.let { token -> WpAuthentication.Bearer(token = token) } - ) + ), + interceptors = emptyList() ) } 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 index e512a5851c5b..67bf37ea3962 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/jetpackrestconnection/JetpackConnectionHelper.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpackrestconnection/JetpackConnectionHelper.kt @@ -28,7 +28,7 @@ class JetpackConnectionHelper @Inject constructor( val delegate = WpApiClientDelegate( authProvider = createRestAuthProvider(site), - requestExecutor = WpRequestExecutor(), + requestExecutor = WpRequestExecutor(interceptors = emptyList()), middlewarePipeline = WpApiMiddlewarePipeline(emptyList()), appNotifier = InvalidAuthNotifier() ) 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 index 918a8ec69e33..3a7108194d41 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/subscribers/AddSubscribersViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/subscribers/AddSubscribersViewModel.kt @@ -47,7 +47,8 @@ class AddSubscribersViewModel @Inject constructor( WpComApiClient( WpAuthenticationProvider.staticWithAuth( WpAuthentication.Bearer(token = accountStore.accessToken!!) - ) + ), + interceptors = emptyList() ) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 83e333c7b6b1..bec920699157 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -101,7 +101,7 @@ wellsql = '2.0.0' wordpress-aztec = 'v2.1.4' wordpress-lint = '2.2.0' wordpress-persistent-edittext = '1.0.2' -wordpress-rs = 'trunk-3d2dafdc1f8b058b4ed9101673fdf690671da73c' +wordpress-rs = 'trunk-e062d94e66354cad9bd710219f321104782bb6fc' wordpress-utils = '3.14.0' automattic-ucrop = '2.2.11' zendesk = '5.5.1' 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 index b4b351a890fa..e37df9967014 100644 --- 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 @@ -29,7 +29,7 @@ class WpApiClientProvider @Inject constructor( val client = WpApiClient( wpOrgSiteApiRootUrl = apiRootUrl, authProvider = authProvider, - requestExecutor = WpRequestExecutor(uploadListener = uploadListener), + requestExecutor = WpRequestExecutor(uploadListener = uploadListener, interceptors = emptyList()), appNotifier = object : WpAppNotifier { override suspend fun requestedWithInvalidAuthentication(requestUrl: String) { wpAppNotifierHandler.notifyRequestedWithInvalidAuthentication(site)