#148 Share boards with permissions

2 files changed, 8 insertions, 8 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 fbdcdcdb5..41176530a 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
@@ -392,9 +392,9 @@ public class DataBaseAdapter {
         return db.getUserDao().searchUserByUidOrDisplayName(accountId, notYetAssignedToLocalCardId, "%"+searchTerm.trim()+"%");
     }
 
-    public LiveData<List<User>> searchUserByUidOrDisplayName(final long accountId, final String searchTerm){
+    public LiveData<List<User>> searchUserByUidOrDisplayNameForACL(final long accountId, final long notYetAssignedToACL, final String searchTerm){
         validateSearchTerm(searchTerm);
-        return db.getUserDao().searchUserByUidOrDisplayName(accountId, "%"+searchTerm.trim()+"%");
+        return db.getUserDao().searchUserByUidOrDisplayNameForACL(accountId, /*notYetAssignedToACL, */"%"+searchTerm.trim()+"%");
     }
 
     public LiveData<List<Label>> searchLabelByTitle(final long accountId, final long boardId, final long notYetAssignedToLocalCardId, String searchTerm){
@@ -406,8 +406,8 @@ public class DataBaseAdapter {
         return db.getUserDao().findProposalsForUsersToAssign(accountId, boardId, notAssignedToLocalCardId, topX);
     }
 
-    public LiveData<List<User>> findProposalsForUsersToAssign(final long accountId, long boardId, final int topX){
-        return db.getUserDao().findProposalsForUsersToAssign(accountId, boardId, topX);
+    public LiveData<List<User>> findProposalsForUsersToAssignForACL(final long accountId, long boardId, final int topX){
+        return db.getUserDao().findProposalsForUsersToAssignForACL(accountId, boardId, topX);
     }
 
     public LiveData<List<Label>> findProposalsForLabelsToAssign(final long accountId, final long boardId, long notAssignedToLocalCardId, final int topX){
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 d669fe055..c0dd7b389 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
@@ -29,14 +29,14 @@ public interface UserDao extends GenericDao<User> {
             "and ( uid LIKE :searchTerm or displayname LIKE :searchTerm or primaryKey LIKE :searchTerm )")
     LiveData<List<User>> searchUserByUidOrDisplayName(final long accountId, final long notYetAssignedToLocalCardId, final String searchTerm);
 
-    // TODO @desperateCoder check for synergy effects
+    // TODO @desperateCoder exclude all which are already in the ACL for the given boardId
     @Query("SELECT u.* FROM user u WHERE accountId = :accountId " +
             "    AND NOT EXISTS (" +
             "            select 1 from joincardwithuser ju" +
             "            where ju.userId = u.localId" +
             "    )" +
             "and ( uid LIKE :searchTerm or displayname LIKE :searchTerm or primaryKey LIKE :searchTerm )")
-    LiveData<List<User>> searchUserByUidOrDisplayName(final long accountId, final String searchTerm);
+    LiveData<List<User>> searchUserByUidOrDisplayNameForACL(final long accountId/*, final long boardId*/, final String searchTerm);
 
     @Query("SELECT * FROM user WHERE accountId = :accountId and uid = :uid")
     User getUserByUidDirectly(final long accountId, final String uid);
@@ -72,7 +72,7 @@ public interface UserDao extends GenericDao<User> {
             "    LIMIT :topX")
     LiveData<List<User>> findProposalsForUsersToAssign(long accountId, long boardId, long notAssignedToLocalCardId, int topX);
 
-    // TODO @desperateCoder check for synergy effects
+    // TODO @desperateCoder exclude all which are already in the ACL for the given boardId
     @Query("    SELECT u.* FROM user u" +
             "    WHERE u.accountId = :accountId" +
             "    AND NOT EXISTS (" +
@@ -95,5 +95,5 @@ public interface UserDao extends GenericDao<User> {
             "    where userId = u.localId and cardId in (select c.localId from card c inner join stack s on s.localId = c.stackId where s.boardId = :boardId)" +
             ") DESC" +
             "    LIMIT :topX")
-    LiveData<List<User>> findProposalsForUsersToAssign(long accountId, long boardId, int topX);
+    LiveData<List<User>> findProposalsForUsersToAssignForACL(long accountId, long boardId, int topX);
 }
\ No newline at end of file