#864 Show DisplayName instead of UID attribute for LDAP users (#925)

* #864 Show DisplayName instead of UID attribute for LDAP users

Signed-off-by: Stefan Niedermann <info@niedermann.it>

* #864 include accounts username in liveData

* #864 Show DisplayName instead of UID attribute for LDAP users

Signed-off-by: Stefan Niedermann <info@niedermann.it>

* #864 Show DisplayName instead of UID attribute for LDAP users

Signed-off-by: Stefan Niedermann <info@niedermann.it>

Co-authored-by: desperateCoder <echotodevnull@gmail.com>

2 files changed, 25 insertions, 7 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 49face983..c66edbc42 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
@@ -324,7 +324,7 @@ public class DataBaseAdapter {
         }
         if (filter.getFilterText() != null && !filter.getFilterText().isEmpty()) {
             query.append(" and (c.description like ? or c.title like ?) ");
-            String filterText = "%"+filter.getFilterText()+"%";
+            String filterText = "%" + filter.getFilterText() + "%";
             args.add(filterText);
             args.add(filterText);
         }
@@ -535,13 +535,31 @@ public class DataBaseAdapter {
         db.getAccountDao().update(account);
     }
 
+    @AnyThread
     public LiveData<Account> readAccount(long id) {
-        return distinctUntilChanged(db.getAccountDao().getAccountById(id));
+        return fillAccountsUserName(db.getAccountDao().getAccountById(id));
     }
 
+    @AnyThread
     public LiveData<Account> readAccount(String name) {
-        return LiveDataHelper.wrapInLiveData(() -> db.getAccountDao().getAccountByNameDirectly(name));
-//        return distinctUntilChanged(db.getAccountDao().getAccountByName(name));
+        return fillAccountsUserName(db.getAccountDao().getAccountByName(name));
+    }
+
+    @AnyThread
+    public LiveData<List<Account>> readAccounts() {
+        return fillAccountsListUserName(db.getAccountDao().getAllAccounts());
+    }
+
+    private LiveData<Account> fillAccountsUserName(LiveData<Account> source) {
+        return LiveDataHelper.interceptLiveData(distinctUntilChanged(source), data -> data.setUserDisplayName(db.getUserDao().getUserNameByUidDirectly(data.getId(), data.getUserName())));
+    }
+
+    private LiveData<List<Account>> fillAccountsListUserName(LiveData<List<Account>> source) {
+        return LiveDataHelper.interceptLiveData(distinctUntilChanged(source), data -> {
+            for (Account a : data) {
+                a.setUserDisplayName(db.getUserDao().getUserNameByUidDirectly(a.getId(), a.getUserName()));
+            }
+        });
     }
 
     @WorkerThread
@@ -549,9 +567,6 @@ public class DataBaseAdapter {
         return db.getAccountDao().getAccountByIdDirectly(id);
     }
 
-    public LiveData<List<Account>> readAccounts() {
-        return distinctUntilChanged(db.getAccountDao().getAllAccounts());
-    }
 
     public LiveData<List<Board>> getBoards(long accountId) {
         return distinctUntilChanged(db.getBoardDao().getBoardsForAccount(accountId));
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/UserDao.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/UserDao.java
index 6e42cdaae..671f044b0 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/UserDao.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/UserDao.java
@@ -20,6 +20,9 @@ public interface UserDao extends GenericDao<User> {
     @Query("SELECT * FROM user WHERE accountId = :accountId and uid = :uid")
     LiveData<User> getUserByUid(final long accountId, final String uid);
 
+    @Query("SELECT u.displayname FROM user u WHERE accountId = :accountId and uid = :uid")
+    String getUserNameByUidDirectly(final long accountId, final String uid);
+
     @Query("SELECT u.* FROM user u WHERE accountId = :accountId " +
             "    AND NOT EXISTS (" +
             "            select 1 from joincardwithuser ju" +