|
@@ -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
|
|
|
|
- .getDisplayName())
|
|
|
|
|
|
+ message, conversationUser.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);
|