#193 provide user in ACL

1 files changed, 18 insertions, 1 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DataBaseAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DataBaseAdapter.java
index 128c8728c..cf8281e8e 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DataBaseAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DataBaseAdapter.java
@@ -107,6 +107,21 @@ public class DataBaseAdapter {
         }
     }
 
+    public void readRelationsForACL(List<AccessControl> acl) {
+        if (acl != null){
+            for (AccessControl accessControl : acl) {
+                readRelationsForACL(accessControl);
+            }
+        }
+    }
+    public void readRelationsForACL(AccessControl acl) {
+        if (acl != null){
+            if (acl.getUserId() != null){
+                acl.setUser(db.getUserDao().getUserByLocalIdDirectly(acl.getUserId()));
+            }
+        }
+    }
+
     private void readRelationsForCard(List<FullCard> card) {
         if (card == null){
             return;
@@ -364,7 +379,9 @@ public class DataBaseAdapter {
     }
 
     public LiveData<List<AccessControl>> getAccessControlByLocalBoardId(long accountId, Long id) {
-        return db.getAccessControlDao().getAccessControlByLocalBoardId(accountId, id);
+        return LiveDataHelper.interceptLiveData(db.getAccessControlDao().getAccessControlByLocalBoardId(accountId, id), (acl) -> {
+            readRelationsForACL(acl);
+        });
     }
 
     public void updateAccessControl(AccessControl entity, boolean setStatus) {