From 7606a3c35131965e6017fda2537cc6cd25456224 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Sun, 22 Dec 2019 02:36:38 +0100
Subject: [PATCH] Readability improvements XmppPeerRepository

---
 .../data/repository/XmppPeerRepository.java          | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/data/src/main/java/org/mercury_im/messenger/data/repository/XmppPeerRepository.java b/data/src/main/java/org/mercury_im/messenger/data/repository/XmppPeerRepository.java
index bd3bb96..994c5a0 100644
--- a/data/src/main/java/org/mercury_im/messenger/data/repository/XmppPeerRepository.java
+++ b/data/src/main/java/org/mercury_im/messenger/data/repository/XmppPeerRepository.java
@@ -24,6 +24,9 @@ import io.reactivex.Observable;
 import io.reactivex.Scheduler;
 import io.reactivex.Single;
 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.reactivex.ReactiveEntityStore;
 
@@ -139,8 +142,7 @@ public class XmppPeerRepository
     public Observable<List<Peer>> observeAllContactsOfAccount(UUID accountId) {
         return data().select(PeerModel.class)
                 .where(PeerModel.ACCOUNT_ID.eq(accountId))
-                .and(PeerModel.SUBSCRIPTION_DIRECTION.in(
-                        Arrays.asList(SubscriptionDirection.both, SubscriptionDirection.to)))
+                .and(isContact())
                 .get().observableResult()
                 .map(ResultDelegate::toList)
                 .map(peerModels -> {
@@ -154,6 +156,12 @@ public class XmppPeerRepository
                 .observeOn(observerScheduler());
     }
 
+    private LogicalCondition<? extends Expression<SubscriptionDirection>, ?> isContact() {
+        return PeerModel.SUBSCRIPTION_DIRECTION.in(Arrays.asList(
+                SubscriptionDirection.both,
+                SubscriptionDirection.to));
+    }
+
     @Override
     public Single<Peer> updatePeer(Peer peer) {
         // In order to update, we fetch the model, update it and write it back.