Skip to content

WIP: missing capabilities lead to NoSupportedApiException #6317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mahibi wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −13
Draft

WIP: missing capabilities lead to NoSupportedApiException #6317

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 14 additions & 13 deletions app/src/main/java/com/nextcloud/talk/chat/data/network/RetrofitChatNetwork.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,36 +27,37 @@ import retrofit2.Response

class RetrofitChatNetwork(private val ncApi: NcApi, private val ncApiCoroutines: NcApiCoroutines) :
ChatNetworkDataSource {
override fun getRoom(user: User, roomToken: String): Observable<ConversationModel> {
override fun getRoom(user: User, roomToken: String): Observable<ConversationModel> = Observable.defer {
val credentials: String = ApiUtils.getCredentials(user.username, user.token)!!
val apiVersion = ApiUtils.getConversationApiVersion(user, intArrayOf(ApiUtils.API_V4, ApiUtils.API_V3, 1))

return ncApi.getRoom(
ncApi.getRoom(
credentials,
ApiUtils.getUrlForRoom(apiVersion, user.baseUrl!!, roomToken)
).map { ConversationModel.mapToConversationModel(it.ocs?.data!!, user) }
}

override fun getCapabilities(user: User, roomToken: String): Observable<SpreedCapability> {
override fun getCapabilities(user: User, roomToken: String): Observable<SpreedCapability> = Observable.defer {
val credentials: String = ApiUtils.getCredentials(user.username, user.token)!!
val apiVersion = ApiUtils.getConversationApiVersion(user, intArrayOf(ApiUtils.API_V4, ApiUtils.API_V3, 1))

return ncApi.getRoomCapabilities(
ncApi.getRoomCapabilities(
credentials,
ApiUtils.getUrlForRoomCapabilities(apiVersion, user.baseUrl!!, roomToken)
).map { it.ocs?.data }
}

override fun joinRoom(user: User, roomToken: String, roomPassword: String): Observable<ConversationModel> {
val credentials: String = ApiUtils.getCredentials(user.username, user.token)!!
val apiVersion = ApiUtils.getConversationApiVersion(user, intArrayOf(ApiUtils.API_V4, 1))
override fun joinRoom(user: User, roomToken: String, roomPassword: String): Observable<ConversationModel> =
Observable.defer {
val credentials: String = ApiUtils.getCredentials(user.username, user.token)!!
val apiVersion = ApiUtils.getConversationApiVersion(user, intArrayOf(ApiUtils.API_V4, 1))

return ncApi.joinRoom(
credentials,
ApiUtils.getUrlForParticipantsActive(apiVersion, user.baseUrl!!, roomToken),
roomPassword
).map { ConversationModel.mapToConversationModel(it.ocs?.data!!, user) }
}
ncApi.joinRoom(
credentials,
ApiUtils.getUrlForParticipantsActive(apiVersion, user.baseUrl!!, roomToken),
roomPassword
).map { ConversationModel.mapToConversationModel(it.ocs?.data!!, user) }
}

override fun setReminder(
user: User,
Expand Down
Loading