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

Improve sending nick

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-06-21 11:32:34 +02:00
parent 6ce0d53412
commit c48e9e01a2
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/com/nextcloud/talk/controllers/CallController.java
View File

@ -1722,19 +1722,35 @@ public class CallController extends BaseController {
nickChangedPayload.put("userid", conversationUser.getUserId()); nickChangedPayload.put("userid", conversationUser.getUserId());
nickChangedPayload.put("name", conversationUser.getDisplayName()); nickChangedPayload.put("name", conversationUser.getDisplayName());
dataChannelMessage.setPayload(nickChangedPayload); dataChannelMessage.setPayload(nickChangedPayload);
final MagicPeerConnectionWrapper magicPeerConnectionWrapper;
for (int i = 0; i < magicPeerConnectionWrapperList.size(); i++) { for (int i = 0; i < magicPeerConnectionWrapperList.size(); i++) {
if (magicPeerConnectionWrapperList.get(i).isMCUPublisher()) { if (magicPeerConnectionWrapperList.get(i).isMCUPublisher()) {
int finalI = i; magicPeerConnectionWrapper = magicPeerConnectionWrapperList.get(i);
Observable Observable
.interval(1, TimeUnit.SECONDS) .interval(1, TimeUnit.SECONDS)
.repeat() .repeatWhen() -> !isConnectionEstablished() || isBeingDestroyed() || isDestroyed() || !MerlinTheWizard.isConnectedToInternet())
.observeOn(Schedulers.io()) .observeOn(Schedulers.io())
.doOnNext(new Consumer<Long>() { .subscribe(new Observer<Long>() {
@Override @Override
public void accept(Long aLong) { public void onSubscribe(Disposable d) {
magicPeerConnectionWrapperList.get(finalI).sendNickChannelData(dataChannelMessage);
} }
}).subscribe();
@Override
public void onNext(Long aLong) {
magicPeerConnectionWrapper.sendNickChannelData(dataChannelMessage);
}
@Override
public void onError(Throwable e) {
}
@Override
public void onComplete() {
}
});
break; break;
} }

1
app/src/main/java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java
View File

@ -137,7 +137,6 @@ public class MagicWebSocketInstance extends WebSocketListener {
@Override @Override
public void onMessage(WebSocket webSocket, String text) { public void onMessage(WebSocket webSocket, String text) {
Log.d(TAG, "ReceivingBEFORE : " + webSocket.toString() + " " + text);
if (webSocket == internalWebSocket) { if (webSocket == internalWebSocket) {
Log.d(TAG, "Receiving : " + webSocket.toString() + " " + text); Log.d(TAG, "Receiving : " + webSocket.toString() + " " + text);
LoggingUtils.writeLogEntryToFile(context, LoggingUtils.writeLogEntryToFile(context,