Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -152,6 +154,6 @@ public static RecordingStrategy provideVoiceToContentRecordingStrategy() {

@Provides
public static WpLoginClient provideWpLoginClient() {
return new WpLoginClient();
return new WpLoginClient(Collections.emptyList());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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()
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ class AddSubscribersViewModel @Inject constructor(
WpComApiClient(
WpAuthenticationProvider.staticWithAuth(
WpAuthentication.Bearer(token = accountStore.accessToken!!)
)
),
interceptors = emptyList()
)
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down