mirror of
https://codeberg.org/Mercury-IM/Mercury-IM
synced 2024-09-26 17:59:34 +02:00
Readability improvements XmppPeerRepository
This commit is contained in:
parent
c165d7a633
commit
7606a3c351
|
@ -24,6 +24,9 @@ import io.reactivex.Observable;
|
||||||
import io.reactivex.Scheduler;
|
import io.reactivex.Scheduler;
|
||||||
import io.reactivex.Single;
|
import io.reactivex.Single;
|
||||||
import io.requery.Persistable;
|
import io.requery.Persistable;
|
||||||
|
import io.requery.query.Conditional;
|
||||||
|
import io.requery.query.Expression;
|
||||||
|
import io.requery.query.LogicalCondition;
|
||||||
import io.requery.query.ResultDelegate;
|
import io.requery.query.ResultDelegate;
|
||||||
import io.requery.reactivex.ReactiveEntityStore;
|
import io.requery.reactivex.ReactiveEntityStore;
|
||||||
|
|
||||||
|
@ -139,8 +142,7 @@ public class XmppPeerRepository
|
||||||
public Observable<List<Peer>> observeAllContactsOfAccount(UUID accountId) {
|
public Observable<List<Peer>> observeAllContactsOfAccount(UUID accountId) {
|
||||||
return data().select(PeerModel.class)
|
return data().select(PeerModel.class)
|
||||||
.where(PeerModel.ACCOUNT_ID.eq(accountId))
|
.where(PeerModel.ACCOUNT_ID.eq(accountId))
|
||||||
.and(PeerModel.SUBSCRIPTION_DIRECTION.in(
|
.and(isContact())
|
||||||
Arrays.asList(SubscriptionDirection.both, SubscriptionDirection.to)))
|
|
||||||
.get().observableResult()
|
.get().observableResult()
|
||||||
.map(ResultDelegate::toList)
|
.map(ResultDelegate::toList)
|
||||||
.map(peerModels -> {
|
.map(peerModels -> {
|
||||||
|
@ -154,6 +156,12 @@ public class XmppPeerRepository
|
||||||
.observeOn(observerScheduler());
|
.observeOn(observerScheduler());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private LogicalCondition<? extends Expression<SubscriptionDirection>, ?> isContact() {
|
||||||
|
return PeerModel.SUBSCRIPTION_DIRECTION.in(Arrays.asList(
|
||||||
|
SubscriptionDirection.both,
|
||||||
|
SubscriptionDirection.to));
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Single<Peer> updatePeer(Peer peer) {
|
public Single<Peer> updatePeer(Peer peer) {
|
||||||
// In order to update, we fetch the model, update it and write it back.
|
// In order to update, we fetch the model, update it and write it back.
|
||||||
|
|
Loading…
Reference in a new issue