Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 09:49:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implement new Safety Number Changes bottom sheeet.

Browse Source
This commit is contained in:
Alex Hart
2022-07-11 12:54:30 -03:00
parent b0dc7fe6df
commit 7a0f4fafe2
42 changed files with 1787 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/main/java/org/thoughtcrime/securesms/database/DistributionListDatabase.kt
View File

@@ -488,6 +488,13 @@ class DistributionListDatabase constructor(context: Context?, databaseHelper: Si
.run()
}
fun removeAllMembers(listId: DistributionListId, privacyMode: DistributionListPrivacyMode) {
writableDatabase
.delete(MembershipTable.TABLE_NAME)
.where("${MembershipTable.LIST_ID} = ? AND ${MembershipTable.PRIVACY_MODE} = ?", listId.serialize(), privacyMode.serialize())
.run()
}
fun remapRecipient(oldId: RecipientId, newId: RecipientId) {
val values = ContentValues().apply {
put(MembershipTable.RECIPIENT_ID, newId.serialize())
@@ -644,4 +651,33 @@ class DistributionListDatabase constructor(context: Context?, databaseHelper: Si
private fun createUniqueNameForUnknownDistributionId(): String {
return "DELETED-${UUID.randomUUID()}"
}
fun excludeFromStory(recipientId: RecipientId, record: DistributionListRecord) {
excludeAllFromStory(listOf(recipientId), record)
}
fun excludeAllFromStory(recipientIds: List<RecipientId>, record: DistributionListRecord) {
writableDatabase.withinTransaction {
when (record.privacyMode) {
DistributionListPrivacyMode.ONLY_WITH -> {
recipientIds.forEach {
removeMemberFromList(record.id, record.privacyMode, it)
}
}
DistributionListPrivacyMode.ALL_EXCEPT -> {
recipientIds.forEach {
addMemberToList(record.id, record.privacyMode, it)
}
}
DistributionListPrivacyMode.ALL -> {
removeAllMembers(record.id, DistributionListPrivacyMode.ALL_EXCEPT)
setPrivacyMode(record.id, DistributionListPrivacyMode.ALL_EXCEPT)
recipientIds.forEach {
addMemberToList(record.id, DistributionListPrivacyMode.ALL_EXCEPT, it)
}
}
}
}
}
}

6
app/src/main/java/org/thoughtcrime/securesms/database/model/MessageId.kt
View File

@@ -1,13 +1,17 @@
package org.thoughtcrime.securesms.database.model
import android.os.Parcelable
import kotlinx.parcelize.Parcelize
/**
* Represents a pair of values that can be used to find a message. Because we have two tables,
* that means this has both the primary key and a boolean indicating which table it's in.
*/
@Parcelize
data class MessageId(
val id: Long,
@get:JvmName("isMms") val mms: Boolean
) {
) : Parcelable {
fun serialize(): String {
return "$id|$mms"
}