From 7349e67b79964f5c38d9873676e3ff62854c8cc1 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Thu, 1 Aug 2019 10:35:17 +0200 Subject: [PATCH] Fix double message when using MCU Signed-off-by: Mario Danic --- .../com/nextcloud/talk/controllers/ChatController.java | 8 ++++---- .../com/nextcloud/talk/jobs/SignalingSettingsWorker.java | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java index 2bc3f3560..ad1c34c61 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java @@ -792,8 +792,7 @@ public class ChatController extends BaseController implements MessagesListAdapte private void sendMessage(CharSequence message) { ncApi.sendChatMessage(credentials, ApiUtils.getUrlForChat(conversationUser.getBaseUrl(), roomToken), - message, conversationUser - .getDisplayName()) + message, conversationUser.getDisplayName()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer() { @@ -855,12 +854,13 @@ public class ChatController extends BaseController implements MessagesListAdapte return; } - if (!lookingIntoFuture && lookIntoFuture > 0) { + if (!lookingIntoFuture) { lookingIntoFuture = true; - lookIntoFuture = 1; havePulledFutureBefore = true; } + lookIntoFuture = lookIntoFuture > 0 ? 1 : 0; + Map fieldMap = new HashMap<>(); fieldMap.put("lookIntoFuture", lookIntoFuture); fieldMap.put("limit", 25); diff --git a/app/src/main/java/com/nextcloud/talk/jobs/SignalingSettingsWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/SignalingSettingsWorker.java index 0f7ff3578..475b80c23 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/SignalingSettingsWorker.java +++ b/app/src/main/java/com/nextcloud/talk/jobs/SignalingSettingsWorker.java @@ -96,7 +96,6 @@ public class SignalingSettingsWorker extends Worker { externalSignalingServer.setExternalSignalingServer(signalingSettingsOverall.getOcs().getSettings().getExternalSignalingServer()); externalSignalingServer.setExternalSignalingTicket(signalingSettingsOverall.getOcs().getSettings().getExternalSignalingTicket()); - Log.d("MARIO", "MARIO"); try { userUtils.createOrUpdateUser(null, null, null, null, null, null, null, finalUserEntity.getId(), null, null, LoganSquare.serialize(externalSignalingServer))