Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 02:10:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add context menus to chat folders.

Browse Source
This commit is contained in:
Michelle Tang
2024-10-11 10:59:07 -07:00
committed by Greyson Parrelli
parent 6b66e4666b
commit bfa5703aaa
16 changed files with 474 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
app/src/main/java/org/thoughtcrime/securesms/database/ChatFolderTables.kt
View File

@@ -9,6 +9,7 @@ import org.signal.core.util.groupBy
import org.signal.core.util.insertInto
import org.signal.core.util.readToList
import org.signal.core.util.readToSingleInt
import org.signal.core.util.readToSingleObject
import org.signal.core.util.requireBoolean
import org.signal.core.util.requireInt
import org.signal.core.util.requireLong
@@ -117,6 +118,37 @@ class ChatFolderTables(context: Context?, databaseHelper: SignalDatabase?) : Dat
.run()
}
/**
* Returns a single chat folder that corresponds to that id
*/
fun getChatFolder(id: Long): ChatFolderRecord {
val includedChats: Map<Long, List<Long>> = getIncludedChats(id)
val excludedChats: Map<Long, List<Long>> = getExcludedChats(id)
val folder = readableDatabase
.select()
.from(ChatFolderTable.TABLE_NAME)
.where("${ChatFolderTable.ID} = ?", id)
.run()
.readToSingleObject { cursor ->
ChatFolderRecord(
id = id,
name = cursor.requireString(ChatFolderTable.NAME) ?: "",
position = cursor.requireInt(ChatFolderTable.POSITION),
showUnread = cursor.requireBoolean(ChatFolderTable.SHOW_UNREAD),
showMutedChats = cursor.requireBoolean(ChatFolderTable.SHOW_MUTED),
showIndividualChats = cursor.requireBoolean(ChatFolderTable.SHOW_INDIVIDUAL),
showGroupChats = cursor.requireBoolean(ChatFolderTable.SHOW_GROUPS),
isMuted = cursor.requireBoolean(ChatFolderTable.IS_MUTED),
folderType = ChatFolderRecord.FolderType.deserialize(cursor.requireInt(ChatFolderTable.FOLDER_TYPE)),
includedChats = includedChats[id] ?: emptyList(),
excludedChats = excludedChats[id] ?: emptyList()
)
}
return folder ?: ChatFolderRecord()
}
/**
* Maps the chat folder ids to its corresponding chat folder
*/
@@ -158,13 +190,20 @@ class ChatFolderTables(context: Context?, databaseHelper: SignalDatabase?) : Dat
}
/**
* Maps chat folder ids to all of its corresponding included chats
* Maps a chat folder id to all of its corresponding included chats.
* If an id is not specified, all chat folder ids will be mapped.
*/
private fun getIncludedChats(): Map<Long, List<Long>> {
private fun getIncludedChats(id: Long? = null): Map<Long, List<Long>> {
val whereQuery = if (id != null) {
"${ChatFolderMembershipTable.MEMBERSHIP_TYPE} = ${MembershipType.INCLUDED.value} AND ${ChatFolderMembershipTable.CHAT_FOLDER_ID} = $id"
} else {
"${ChatFolderMembershipTable.MEMBERSHIP_TYPE} = ${MembershipType.INCLUDED.value}"
}
return readableDatabase
.select()
.from(ChatFolderMembershipTable.TABLE_NAME)
.where("${ChatFolderMembershipTable.MEMBERSHIP_TYPE} = ${MembershipType.INCLUDED.value}")
.where(whereQuery)
.run()
.groupBy { cursor ->
cursor.requireLong(ChatFolderMembershipTable.CHAT_FOLDER_ID) to cursor.requireLong(ChatFolderMembershipTable.THREAD_ID)
@@ -172,13 +211,20 @@ class ChatFolderTables(context: Context?, databaseHelper: SignalDatabase?) : Dat
}
/**
* Maps the chat folder ids to all of its corresponding excluded chats
* Maps a chat folder id to all of its corresponding excluded chats.
* If an id is not specified, all chat folder ids will be mapped.
*/
private fun getExcludedChats(): Map<Long, List<Long>> {
private fun getExcludedChats(id: Long? = null): Map<Long, List<Long>> {
val whereQuery = if (id != null) {
"${ChatFolderMembershipTable.MEMBERSHIP_TYPE} = ${MembershipType.EXCLUDED.value} AND ${ChatFolderMembershipTable.CHAT_FOLDER_ID} = $id"
} else {
"${ChatFolderMembershipTable.MEMBERSHIP_TYPE} = ${MembershipType.EXCLUDED.value}"
}
return readableDatabase
.select()
.from(ChatFolderMembershipTable.TABLE_NAME)
.where("${ChatFolderMembershipTable.MEMBERSHIP_TYPE} = ${MembershipType.EXCLUDED.value}")
.where(whereQuery)
.run()
.groupBy { cursor ->
cursor.requireLong(ChatFolderMembershipTable.CHAT_FOLDER_ID) to cursor.requireLong(ChatFolderMembershipTable.THREAD_ID)

41
app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt
View File

@@ -1041,6 +1041,47 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa
}
}
fun getThreadIdsByChatFolder(chatFolder: ChatFolderRecord): List<Long> {
val folderQuery = chatFolder.toQuery()
val query =
"""
SELECT ${TABLE_NAME}.$ID
FROM $TABLE_NAME
LEFT OUTER JOIN ${RecipientTable.TABLE_NAME} ON $TABLE_NAME.$RECIPIENT_ID = ${RecipientTable.TABLE_NAME}.${RecipientTable.ID}
WHERE
$ACTIVE = 1
$folderQuery
"""
return readableDatabase.rawQuery(query, null).readToList { cursor -> cursor.requireLong(ID) }
}
fun getRecipientIdsByChatFolder(chatFolder: ChatFolderRecord): List<RecipientId> {
return if (chatFolder.folderType == ChatFolderRecord.FolderType.ALL) {
readableDatabase
.select(RECIPIENT_ID)
.from(TABLE_NAME)
.where("$ACTIVE = 1")
.run()
.readToList { cursor ->
RecipientId.from(cursor.requireLong(RECIPIENT_ID))
}
} else {
val folderQuery = chatFolder.toQuery()
val query =
"""
SELECT $RECIPIENT_ID
FROM $TABLE_NAME
LEFT OUTER JOIN ${RecipientTable.TABLE_NAME} ON $TABLE_NAME.$RECIPIENT_ID = ${RecipientTable.TABLE_NAME}.${RecipientTable.ID}
WHERE
$ACTIVE = 1
$folderQuery
"""
readableDatabase.rawQuery(query, null).readToList { cursor ->
RecipientId.from(cursor.requireLong(RECIPIENT_ID))
}
}
}
/**
* @return Pinned recipients, in order from top to bottom.
*/