Mercury-IM/Mercury-IM
Mercury-IM
/
Mercury-IM
mirror of https://codeberg.org/Mercury-IM/Mercury-IM
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Small tweaks

This commit is contained in:
Paul Schaub 2020-07-01 20:25:33 +02:00
parent 89695c617f
commit 4bab6244b3
Signed by: vanitasvitae
GPG Key ID: 62BEE9264BF17311
3 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/mercury_im/messenger/android/ui/account/AccountViewItem.java Normal file
View File

@ -0,0 +1,10 @@
package org.mercury_im.messenger.android.ui.account;
public class AccountViewItem {
private boolean enabled;
private String jid;
private String status;
private String fingerprint;
}

16
app/src/main/java/org/mercury_im/messenger/android/ui/chat/AndroidChatViewModel.java
View File

@ -81,7 +81,7 @@ public class AndroidChatViewModel extends ViewModel implements MercuryAndroidVie
error -> LOGGER.log(Level.SEVERE, "Error subscribing display name to peer", error)));
// Subscribe messages
disposable.add(((RxMessageRepository) messageRepository).observeAllMessages()
disposable.add(messageRepository.observeMessages(chat)
.doOnNext(m -> LOGGER.log(Level.INFO, "NEW MESSAGES."))
.subscribe(messageList -> {
@ -118,20 +118,6 @@ public class AndroidChatViewModel extends ViewModel implements MercuryAndroidVie
AndroidChatViewModel.this.messages.setValue(messages)));
}
public Completable requestMamMessages() {
/*
return Completable.fromAction(() -> {
ChatModel chatModel = AndroidChatViewModel.this.chat.getValue();
if (chatModel == null) {
return;
}
connectionCenter.requestMamMessagesFor(chatModel);
});
*/
return null;
}
public void deleteContact() {
Peer contact = getContact().getValue();
disposable.add(messenger.deleteContact(contact)

11
data/src/main/java/org/mercury_im/messenger/data/repository/RxMessageRepository.java
View File

@ -82,6 +82,7 @@ public class RxMessageRepository
public Observable<List<Message>> observeMessages(DirectChat chat) {
return data().select(MessageModel.class)
.from(MessageModel.class)
.where(MessageModel.CHAT_ID.eq(chat.getId()))
.get().observableResult()
.map(ResultDelegate::toList)
.map(this::messageModelsToEntities);
@ -99,6 +100,7 @@ public class RxMessageRepository
public Observable<List<Message>> observeMessages(GroupChat chat) {
return data().select(MessageModel.class)
.from(MessageModel.class)
.where(MessageModel.CHAT_ID.eq(chat.getId()))
.get().observableResult()
.map(ResultDelegate::toList)
.map(this::messageModelsToEntities);
@ -119,9 +121,8 @@ public class RxMessageRepository
return data().select(MessageModel.class)
.from(MessageModel.class)
.where(MessageModel.BODY.eq(body))
.and(MessageModel.SENDER.eq(chat.getPeer().getAddress())
.or(MessageModel.RECIPIENT.eq(chat.getPeer().getAddress())))
.where(MessageModel.BODY.eq(body)
.and(MessageModel.CHAT_ID.eq(chat.getId())))
.get().observableResult()
.map(ResultDelegate::toList)
.map(this::messageModelsToEntities);
@ -132,8 +133,8 @@ public class RxMessageRepository
return data().select(MessageModel.class)
.from(MessageModel.class)
.where(MessageModel.BODY.eq(body))
.and(MessageModel.SENDER.eq(chat.getRoomName()))
.where(MessageModel.BODY.eq(body)
.and(MessageModel.CHAT_ID.eq(chat.getId())))
.get().observableResult()
.map(ResultDelegate::toList)
.map(this::messageModelsToEntities);