allow getPeersForCall without QueryMap

- null was not allowed for query map (led to Illegal Argument Exception which caused issue #1853)

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2022-03-17 14:15:55 +01:00
parent 5a90f999dc
commit 1b30a6ef62
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
5 changed files with 23 additions and 7 deletions

View File

@ -280,8 +280,7 @@ class MagicFirebaseMessagingService : FirebaseMessagingService() {
apiVersion,
signatureVerification.userEntity.baseUrl,
decryptedPushMessage.id
),
null
)
)
.repeatWhen { completed ->
completed.zipWith(Observable.range(1, OBSERVABLE_COUNT), { _, i -> i })

View File

@ -1787,7 +1787,12 @@ public class CallActivity extends CallBaseActivity {
Log.d(TAG, "getPeersForCall");
int apiVersion = ApiUtils.getCallApiVersion(conversationUser, new int[]{ApiUtils.APIv4, 1});
ncApi.getPeersForCall(credentials, ApiUtils.getUrlForCall(apiVersion, baseUrl, roomToken), null)
ncApi.getPeersForCall(
credentials,
ApiUtils.getUrlForCall(
apiVersion,
baseUrl,
roomToken))
.subscribeOn(Schedulers.io())
.subscribe(new Observer<ParticipantsOverall>() {
@Override

View File

@ -214,8 +214,12 @@ public class CallNotificationActivity extends CallBaseActivity {
private void checkIfAnyParticipantsRemainInRoom() {
int apiVersion = ApiUtils.getCallApiVersion(userBeingCalled, new int[]{ApiUtils.APIv4, 1});
ncApi.getPeersForCall(credentials, ApiUtils.getUrlForCall(apiVersion, userBeingCalled.getBaseUrl(),
currentConversation.getToken()), null)
ncApi.getPeersForCall(
credentials,
ApiUtils.getUrlForCall(
apiVersion,
userBeingCalled.getBaseUrl(),
currentConversation.getToken()))
.subscribeOn(Schedulers.io())
.repeatWhen(completed -> completed.zipWith(Observable.range(1, 12), (n, i) -> i)
.flatMap(retryCount -> Observable.timer(5, TimeUnit.SECONDS))

View File

@ -186,6 +186,9 @@ public interface NcApi {
/*
Server URL is: baseUrl + ocsApiVersion + spreedApiVersion + /call/callToken
*/
@GET
Observable<ParticipantsOverall> getPeersForCall(@Header("Authorization") String authorization, @Url String url);
@GET
Observable<ParticipantsOverall> getPeersForCall(@Header("Authorization") String authorization, @Url String url,
@QueryMap Map<String, Boolean> fields);

View File

@ -438,7 +438,12 @@ class ConversationInfoController(args: Bundle) :
ncApi?.getPeersForCall(
credentials,
ApiUtils.getUrlForParticipants(apiVersion, conversationUser!!.baseUrl, conversationToken), fieldMap
ApiUtils.getUrlForParticipants(
apiVersion,
conversationUser!!.baseUrl,
conversationToken
),
fieldMap
)
?.subscribeOn(Schedulers.io())
?.observeOn(AndroidSchedulers.mainThread())