gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix double message when using MCU

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-08-01 10:35:17 +02:00
parent 7ebf1648ca
commit 7349e67b79
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
View File

@ -792,8 +792,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
private void sendMessage(CharSequence message) { private void sendMessage(CharSequence message) {
ncApi.sendChatMessage(credentials, ApiUtils.getUrlForChat(conversationUser.getBaseUrl(), roomToken), ncApi.sendChatMessage(credentials, ApiUtils.getUrlForChat(conversationUser.getBaseUrl(), roomToken),
message, conversationUser message, conversationUser.getDisplayName())
.getDisplayName())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<GenericOverall>() { .subscribe(new Observer<GenericOverall>() {
@ -855,12 +854,13 @@ public class ChatController extends BaseController implements MessagesListAdapte
return; return;
} }
if (!lookingIntoFuture && lookIntoFuture > 0) { if (!lookingIntoFuture) {
lookingIntoFuture = true; lookingIntoFuture = true;
lookIntoFuture = 1;
havePulledFutureBefore = true; havePulledFutureBefore = true;
} }
lookIntoFuture = lookIntoFuture > 0 ? 1 : 0;
Map<String, Integer> fieldMap = new HashMap<>(); Map<String, Integer> fieldMap = new HashMap<>();
fieldMap.put("lookIntoFuture", lookIntoFuture); fieldMap.put("lookIntoFuture", lookIntoFuture);
fieldMap.put("limit", 25); fieldMap.put("limit", 25);

1
app/src/main/java/com/nextcloud/talk/jobs/SignalingSettingsWorker.java
View File

@ -96,7 +96,6 @@ public class SignalingSettingsWorker extends Worker {
externalSignalingServer.setExternalSignalingServer(signalingSettingsOverall.getOcs().getSettings().getExternalSignalingServer()); externalSignalingServer.setExternalSignalingServer(signalingSettingsOverall.getOcs().getSettings().getExternalSignalingServer());
externalSignalingServer.setExternalSignalingTicket(signalingSettingsOverall.getOcs().getSettings().getExternalSignalingTicket()); externalSignalingServer.setExternalSignalingTicket(signalingSettingsOverall.getOcs().getSettings().getExternalSignalingTicket());
Log.d("MARIO", "MARIO");
try { try {
userUtils.createOrUpdateUser(null, null, null, null, null, userUtils.createOrUpdateUser(null, null, null, null, null,
null, null, finalUserEntity.getId(), null, null, LoganSquare.serialize(externalSignalingServer)) null, null, finalUserEntity.getId(), null, null, LoganSquare.serialize(externalSignalingServer))