gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-15 16:55:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #341

Browse Source
This commit is contained in:
Mario Danic 2018-11-04 01:12:05 +01:00
parent 732a24692e
commit ec2557567c
1 changed files with 50 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -504,7 +504,6 @@ public class ChatController extends BaseController implements MessagesListAdapte
protected void onDetach(@NonNull View view) {
super.onDetach(view);
if (conversationUser.hasSpreedCapabilityWithName("no-ping")) {
dispose();
wasDetached = true;
}
}
@ -572,6 +571,8 @@ public class ChatController extends BaseController implements MessagesListAdapte
private void joinRoomWithPassword() {
wasDetached = false;
if (currentCall == null) {
ncApi.joinRoom(credentials, ApiUtils.getUrlForSettingMyselfAsActiveParticipant(baseUrl, roomToken), roomPassword)
.subscribeOn(Schedulers.newThread())
@ -738,62 +739,64 @@ public class ChatController extends BaseController implements MessagesListAdapte
fieldMap.put("lastKnownMessageId", lastKnown);
}
if (lookIntoFuture == 1) {
ncApi.pullChatMessages(credentials, ApiUtils.getUrlForChat(baseUrl, roomToken), fieldMap)
.subscribeOn(Schedulers.newThread())
.observeOn(AndroidSchedulers.mainThread())
.takeWhile(observable -> inChat)
.retry(3, observable -> inChat)
.subscribe(new Observer<Response>() {
@Override
public void onSubscribe(Disposable d) {
disposableList.add(d);
}
if (!wasDetached) {
if (lookIntoFuture == 1) {
ncApi.pullChatMessages(credentials, ApiUtils.getUrlForChat(baseUrl, roomToken), fieldMap)
.subscribeOn(Schedulers.newThread())
.observeOn(AndroidSchedulers.mainThread())
.takeWhile(observable -> inChat && !wasDetached)
.retry(3, observable -> inChat && !wasDetached)
.subscribe(new Observer<Response>() {
@Override
public void onSubscribe(Disposable d) {
disposableList.add(d);
}
@Override
public void onNext(Response response) {
processMessages(response, true);
}
@Override
public void onNext(Response response) {
processMessages(response, true);
}
@Override
public void onError(Throwable e) {
@Override
public void onError(Throwable e) {
}
}
@Override
public void onComplete() {
pullChatMessages(1);
}
});
@Override
public void onComplete() {
pullChatMessages(1);
}
});
} else {
ncApi.pullChatMessages(credentials,
ApiUtils.getUrlForChat(baseUrl, roomToken), fieldMap)
.subscribeOn(Schedulers.newThread())
.observeOn(AndroidSchedulers.mainThread())
.retry(3, observable -> inChat)
.takeWhile(observable -> inChat)
.subscribe(new Observer<Response>() {
@Override
public void onSubscribe(Disposable d) {
disposableList.add(d);
}
} else {
ncApi.pullChatMessages(credentials,
ApiUtils.getUrlForChat(baseUrl, roomToken), fieldMap)
.subscribeOn(Schedulers.newThread())
.observeOn(AndroidSchedulers.mainThread())
.retry(3, observable -> inChat && !wasDetached)
.takeWhile(observable -> inChat && !wasDetached)
.subscribe(new Observer<Response>() {
@Override
public void onSubscribe(Disposable d) {
disposableList.add(d);
}
@Override
public void onNext(Response response) {
processMessages(response, false);
}
@Override
public void onNext(Response response) {
processMessages(response, false);
}
@Override
public void onError(Throwable e) {
@Override
public void onError(Throwable e) {
}
}
@Override
public void onComplete() {
@Override
public void onComplete() {
}
});
}
});
}
}
}