From b2f7cc811f4423ee76d6006a43a552cad77b7b1f Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Sun, 6 Jan 2019 20:00:37 +0000
Subject: [PATCH] Fix applying of groups from journal.

---
 .../com/etesync/syncadapter/resource/LocalAddressBook.kt | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/etesync/syncadapter/resource/LocalAddressBook.kt b/app/src/main/java/com/etesync/syncadapter/resource/LocalAddressBook.kt
index 90eb08b3..bb3ed8b4 100644
--- a/app/src/main/java/com/etesync/syncadapter/resource/LocalAddressBook.kt
+++ b/app/src/main/java/com/etesync/syncadapter/resource/LocalAddressBook.kt
@@ -270,7 +270,14 @@ class LocalAddressBook(
         return reallyDirty
     }
 
-    override fun findByUid(uid: String): LocalAddress? = findContactByUID(uid)
+    override fun findByUid(uid: String): LocalAddress? {
+        val found = findContactByUID(uid)
+        if (found != null) {
+            return found
+        } else {
+            return queryGroups("${AndroidGroup.COLUMN_UID}=?", arrayOf(uid)).firstOrNull()
+        }
+    }
 
     override fun count(): Long {
         try {