فهرست منبع

Fix double message when using MCU

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 5 سال پیش
والد
کامیت
7349e67b79

+ 4 - 4
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<GenericOverall>() {
@@ -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<String, Integer> fieldMap = new HashMap<>();
         fieldMap.put("lookIntoFuture", lookIntoFuture);
         fieldMap.put("limit", 25);

+ 0 - 1
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))