gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-25 14:40:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1876 from nextcloud/bugfix/1853/fixQueryMap

Browse Source 
Bugfix/1853/fix query map
This commit is contained in:
Andy Scherzinger 2022-03-17 20:36:08 +01:00 committed by GitHub
commit 5472097279
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt
View File

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

7
app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
View File

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

10
app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java
View File

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

5
app/src/main/java/com/nextcloud/talk/api/NcApi.java
View File

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

7
app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
View File

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